fix: address PR review feedback

- Prioritize 'latest', 'beta', 'next' tags in getPluginNameWithVersion()
  to ensure deterministic results when version matches multiple tags
- Add 5s timeout to fetchNpmDistTags() to prevent blocking on slow networks
- Remove unused 'join' import from node:path
- Merge upstream/dev and resolve conflicts in config-manager.test.ts
This commit is contained in:
aw338WoWmUI
2026-01-15 06:02:25 +08:00
committed by Spark
141 changed files with 6400 additions and 10203 deletions
+23 -38
View File
@@ -1,24 +1,22 @@
# CLI KNOWLEDGE BASE
## OVERVIEW
CLI for oh-my-opencode: interactive installer, health diagnostics (doctor), runtime launcher. Entry: `bunx oh-my-opencode`.
## STRUCTURE
```
cli/
├── index.ts # Commander.js entry, subcommand routing
├── index.ts # Commander.js entry, subcommand routing (184 lines)
├── install.ts # Interactive TUI installer (436 lines)
├── config-manager.ts # JSONC parsing, env detection (725 lines)
├── types.ts # CLI-specific types
├── commands/ # CLI subcommands
├── commands/ # CLI subcommands (auth.ts)
├── doctor/ # Health check system
│ ├── index.ts # Doctor command entry
│ ├── runner.ts # Health check orchestration
│ ├── constants.ts # Check categories
│ ├── types.ts # Check result interfaces
│ └── checks/ # 17+ individual checks (auth, config, dependencies, gh, lsp, mcp, opencode, plugin, version)
│ └── checks/ # 10+ check modules (17+ individual checks)
├── get-local-version/ # Version detection
└── run/ # OpenCode session launcher
├── completion.ts # Completion logic
@@ -26,47 +24,34 @@ cli/
```
## CLI COMMANDS
| Command | Purpose |
|---------|---------|
| `install` | Interactive setup wizard |
| `doctor` | Environment health checks |
| `run` | Launch OpenCode session |
| `install` | Interactive setup wizard with subscription detection |
| `doctor` | Environment health checks (LSP, Auth, Config, Deps) |
| `run` | Launch OpenCode session with event handling |
| `auth` | Manage authentication providers |
## DOCTOR CHECKS
17+ checks in `doctor/checks/`:
- version.ts (OpenCode >= 1.0.150)
- config.ts (plugin registered)
- bun.ts, node.ts, git.ts
- anthropic-auth.ts, openai-auth.ts, google-auth.ts
- lsp-*.ts, mcp-*.ts
- `version.ts`: OpenCode >= 1.0.150
- `config.ts`: Plugin registration & JSONC validity
- `dependencies.ts`: bun, node, git, gh-cli
- `auth.ts`: Anthropic, OpenAI, Google (Antigravity)
- `lsp.ts`, `mcp.ts`: Tool connectivity checks
## CONFIG-MANAGER (669 lines)
- JSONC support (comments, trailing commas)
- Multi-source: User (~/.config/opencode/) + Project (.opencode/)
- Zod validation
- Legacy format migration
- Error aggregation for doctor
## CONFIG-MANAGER
- **JSONC**: Supports comments and trailing commas via `parseJsonc`
- **Multi-source**: Merges User (`~/.config/opencode/`) + Project (`.opencode/`)
- **Validation**: Strict Zod schema with error aggregation for `doctor`
- **Env**: Detects `OPENCODE_CONFIG_DIR` for profile isolation
## HOW TO ADD CHECK
1. Create `src/cli/doctor/checks/my-check.ts`:
```typescript
export const myCheck: DoctorCheck = {
name: "my-check",
category: "environment",
check: async () => {
return { status: "pass" | "warn" | "fail", message: "..." }
}
}
```
2. Add to `src/cli/doctor/checks/index.ts`
1. Create `src/cli/doctor/checks/my-check.ts` returning `DoctorCheck`
2. Export from `checks/index.ts` and add to `getAllCheckDefinitions()`
3. Use `CheckContext` for shared utilities (LSP, Auth)
## ANTI-PATTERNS
- Blocking prompts in non-TTY (check `process.stdout.isTTY`)
- Hardcoded paths (use shared utilities)
- JSON.parse for user files (use parseJsonc)
- Silent failures in doctor checks
- Direct `JSON.parse` (breaks JSONC compatibility)
- Silent failures (always return `warn` or `fail` in `doctor`)
- Environment-specific hardcoding (use `ConfigManager`)
-93
View File
@@ -1,93 +0,0 @@
import { loadAccounts, saveAccounts } from "../../auth/antigravity/storage"
import type { AccountStorage } from "../../auth/antigravity/types"
export async function listAccounts(): Promise<number> {
const accounts = await loadAccounts()
if (!accounts || accounts.accounts.length === 0) {
console.log("No accounts found.")
console.log("Run 'opencode auth login' and select Google (Antigravity) to add accounts.")
return 0
}
console.log(`\nGoogle Antigravity Accounts (${accounts.accounts.length}/10):\n`)
for (let i = 0; i < accounts.accounts.length; i++) {
const acc = accounts.accounts[i]
const isActive = i === accounts.activeIndex
const activeMarker = isActive ? "* " : " "
console.log(`${activeMarker}[${i}] ${acc.email || "Unknown"}`)
console.log(` Tier: ${acc.tier || "free"}`)
const rateLimits = acc.rateLimits || {}
const now = Date.now()
const limited: string[] = []
if (rateLimits.claude && rateLimits.claude > now) {
const mins = Math.ceil((rateLimits.claude - now) / 60000)
limited.push(`claude (${mins}m)`)
}
if (rateLimits["gemini-flash"] && rateLimits["gemini-flash"] > now) {
const mins = Math.ceil((rateLimits["gemini-flash"] - now) / 60000)
limited.push(`gemini-flash (${mins}m)`)
}
if (rateLimits["gemini-pro"] && rateLimits["gemini-pro"] > now) {
const mins = Math.ceil((rateLimits["gemini-pro"] - now) / 60000)
limited.push(`gemini-pro (${mins}m)`)
}
if (limited.length > 0) {
console.log(` Rate limited: ${limited.join(", ")}`)
}
console.log()
}
return 0
}
export async function removeAccount(indexOrEmail: string): Promise<number> {
const accounts = await loadAccounts()
if (!accounts || accounts.accounts.length === 0) {
console.error("No accounts found.")
return 1
}
let index: number
const parsedIndex = Number(indexOrEmail)
if (Number.isInteger(parsedIndex) && String(parsedIndex) === indexOrEmail) {
index = parsedIndex
} else {
index = accounts.accounts.findIndex((acc) => acc.email === indexOrEmail)
if (index === -1) {
console.error(`Account not found: ${indexOrEmail}`)
return 1
}
}
if (index < 0 || index >= accounts.accounts.length) {
console.error(`Invalid index: ${index}. Valid range: 0-${accounts.accounts.length - 1}`)
return 1
}
const removed = accounts.accounts[index]
accounts.accounts.splice(index, 1)
if (accounts.accounts.length === 0) {
accounts.activeIndex = -1
} else if (accounts.activeIndex >= accounts.accounts.length) {
accounts.activeIndex = accounts.accounts.length - 1
} else if (accounts.activeIndex > index) {
accounts.activeIndex--
}
await saveAccounts(accounts)
console.log(`Removed account: ${removed.email || "Unknown"} (index ${index})`)
console.log(`Remaining accounts: ${accounts.accounts.length}`)
return 0
}
+148 -1
View File
@@ -1,6 +1,7 @@
import { describe, expect, test, mock, beforeEach, afterEach } from "bun:test"
import { ANTIGRAVITY_PROVIDER_CONFIG, getPluginNameWithVersion, fetchNpmDistTags } from "./config-manager"
import { ANTIGRAVITY_PROVIDER_CONFIG, getPluginNameWithVersion, fetchNpmDistTags, generateOmoConfig } from "./config-manager"
import type { InstallConfig } from "./types"
describe("getPluginNameWithVersion", () => {
const originalFetch = globalThis.fetch
@@ -99,6 +100,22 @@ describe("getPluginNameWithVersion", () => {
// #then should fall back to pinned version
expect(result).toBe("oh-my-opencode@2.14.0")
})
test("prioritizes latest over other tags when version matches multiple", async () => {
// #given version matches both latest and beta (during release promotion)
globalThis.fetch = mock(() =>
Promise.resolve({
ok: true,
json: () => Promise.resolve({ beta: "3.0.0", latest: "3.0.0", next: "3.1.0-alpha.1" }),
} as Response)
) as unknown as typeof fetch
// #when current version matches both
const result = await getPluginNameWithVersion("3.0.0")
// #then should prioritize @latest
expect(result).toBe("oh-my-opencode@latest")
})
})
describe("fetchNpmDistTags", () => {
@@ -182,3 +199,133 @@ describe("config-manager ANTIGRAVITY_PROVIDER_CONFIG", () => {
}
})
})
describe("generateOmoConfig - GitHub Copilot fallback", () => {
test("frontend-ui-ux-engineer uses Copilot when no native providers", () => {
// #given user has only Copilot (no Claude, ChatGPT, Gemini)
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then frontend-ui-ux-engineer should use Copilot Gemini
const agents = result.agents as Record<string, { model?: string }>
expect(agents["frontend-ui-ux-engineer"]?.model).toBe("github-copilot/gemini-3-pro-preview")
})
test("document-writer uses Copilot when no native providers", () => {
// #given user has only Copilot
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then document-writer should use Copilot Gemini Flash
const agents = result.agents as Record<string, { model?: string }>
expect(agents["document-writer"]?.model).toBe("github-copilot/gemini-3-flash-preview")
})
test("multimodal-looker uses Copilot when no native providers", () => {
// #given user has only Copilot
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then multimodal-looker should use Copilot Gemini Flash
const agents = result.agents as Record<string, { model?: string }>
expect(agents["multimodal-looker"]?.model).toBe("github-copilot/gemini-3-flash-preview")
})
test("explore uses Copilot grok-code when no native providers", () => {
// #given user has only Copilot
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then explore should use Copilot Grok
const agents = result.agents as Record<string, { model?: string }>
expect(agents["explore"]?.model).toBe("github-copilot/grok-code-fast-1")
})
test("native Gemini takes priority over Copilot for frontend-ui-ux-engineer", () => {
// #given user has both Gemini and Copilot
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: true,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then native Gemini should be used (NOT Copilot)
const agents = result.agents as Record<string, { model?: string }>
expect(agents["frontend-ui-ux-engineer"]?.model).toBe("google/antigravity-gemini-3-pro-high")
})
test("native Claude takes priority over Copilot for frontend-ui-ux-engineer", () => {
// #given user has Claude and Copilot but no Gemini
const config: InstallConfig = {
hasClaude: true,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then native Claude should be used (NOT Copilot)
const agents = result.agents as Record<string, { model?: string }>
expect(agents["frontend-ui-ux-engineer"]?.model).toBe("anthropic/claude-opus-4-5")
})
test("categories use Copilot models when no native Gemini", () => {
// #given user has Copilot but no Gemini
const config: InstallConfig = {
hasClaude: false,
isMax20: false,
hasChatGPT: false,
hasGemini: false,
hasCopilot: true,
}
// #when generating config
const result = generateOmoConfig(config)
// #then categories should use Copilot models
const categories = result.categories as Record<string, { model?: string }>
expect(categories?.["visual-engineering"]?.model).toBe("github-copilot/gemini-3-pro-preview")
expect(categories?.["artistry"]?.model).toBe("github-copilot/gemini-3-pro-preview")
expect(categories?.["writing"]?.model).toBe("github-copilot/gemini-3-flash-preview")
})
})
+47 -80
View File
@@ -1,5 +1,4 @@
import { existsSync, mkdirSync, readFileSync, writeFileSync, statSync } from "node:fs"
import { join } from "node:path"
import {
parseJsonc,
getOpenCodeConfigPaths,
@@ -116,9 +115,13 @@ interface NpmDistTags {
[tag: string]: string | undefined
}
const NPM_FETCH_TIMEOUT_MS = 5000
export async function fetchNpmDistTags(packageName: string): Promise<NpmDistTags | null> {
try {
const res = await fetch(`https://registry.npmjs.org/-/package/${packageName}/dist-tags`)
const res = await fetch(`https://registry.npmjs.org/-/package/${packageName}/dist-tags`, {
signal: AbortSignal.timeout(NPM_FETCH_TIMEOUT_MS),
})
if (!res.ok) return null
const data = await res.json() as NpmDistTags
return data
@@ -129,12 +132,15 @@ export async function fetchNpmDistTags(packageName: string): Promise<NpmDistTags
const PACKAGE_NAME = "oh-my-opencode"
const PRIORITIZED_TAGS = ["latest", "beta", "next"] as const
export async function getPluginNameWithVersion(currentVersion: string): Promise<string> {
const distTags = await fetchNpmDistTags(PACKAGE_NAME)
if (distTags) {
for (const [tag, tagVersion] of Object.entries(distTags)) {
if (tagVersion === currentVersion) {
const allTags = new Set([...PRIORITIZED_TAGS, ...Object.keys(distTags)])
for (const tag of allTags) {
if (distTags[tag] === currentVersion) {
return `${PACKAGE_NAME}@${tag}`
}
}
@@ -305,14 +311,12 @@ export function generateOmoConfig(installConfig: InstallConfig): Record<string,
$schema: "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json",
}
if (installConfig.hasGemini) {
config.google_auth = false
}
const agents: Record<string, Record<string, unknown>> = {}
if (!installConfig.hasClaude) {
agents["Sisyphus"] = { model: "opencode/glm-4.7-free" }
agents["Sisyphus"] = {
model: installConfig.hasCopilot ? "github-copilot/claude-opus-4.5" : "opencode/glm-4.7-free",
}
}
agents["librarian"] = { model: "opencode/glm-4.7-free" }
@@ -323,38 +327,56 @@ export function generateOmoConfig(installConfig: InstallConfig): Record<string,
agents["explore"] = { model: "google/antigravity-gemini-3-flash" }
} else if (installConfig.hasClaude && installConfig.isMax20) {
agents["explore"] = { model: "anthropic/claude-haiku-4-5" }
} else if (installConfig.hasCopilot) {
agents["explore"] = { model: "github-copilot/grok-code-fast-1" }
} else {
agents["explore"] = { model: "opencode/glm-4.7-free" }
}
if (!installConfig.hasChatGPT) {
agents["oracle"] = {
model: installConfig.hasClaude ? "anthropic/claude-opus-4-5" : "opencode/glm-4.7-free",
}
const oracleFallback = installConfig.hasCopilot
? "github-copilot/gpt-5.2"
: installConfig.hasClaude
? "anthropic/claude-opus-4-5"
: "opencode/glm-4.7-free"
agents["oracle"] = { model: oracleFallback }
}
if (installConfig.hasGemini) {
agents["frontend-ui-ux-engineer"] = { model: "google/antigravity-gemini-3-pro-high" }
agents["document-writer"] = { model: "google/antigravity-gemini-3-flash" }
agents["multimodal-looker"] = { model: "google/antigravity-gemini-3-flash" }
} else if (installConfig.hasClaude) {
agents["frontend-ui-ux-engineer"] = { model: "anthropic/claude-opus-4-5" }
agents["document-writer"] = { model: "anthropic/claude-opus-4-5" }
agents["multimodal-looker"] = { model: "anthropic/claude-opus-4-5" }
} else if (installConfig.hasCopilot) {
agents["frontend-ui-ux-engineer"] = { model: "github-copilot/gemini-3-pro-preview" }
agents["document-writer"] = { model: "github-copilot/gemini-3-flash-preview" }
agents["multimodal-looker"] = { model: "github-copilot/gemini-3-flash-preview" }
} else {
const fallbackModel = installConfig.hasClaude ? "anthropic/claude-opus-4-5" : "opencode/glm-4.7-free"
agents["frontend-ui-ux-engineer"] = { model: fallbackModel }
agents["document-writer"] = { model: fallbackModel }
agents["multimodal-looker"] = { model: fallbackModel }
agents["frontend-ui-ux-engineer"] = { model: "opencode/glm-4.7-free" }
agents["document-writer"] = { model: "opencode/glm-4.7-free" }
agents["multimodal-looker"] = { model: "opencode/glm-4.7-free" }
}
if (Object.keys(agents).length > 0) {
config.agents = agents
}
// Categories: override model for Antigravity auth (gemini-3-pro-preview → gemini-3-pro-high)
// Categories: override model for Antigravity auth or GitHub Copilot fallback
if (installConfig.hasGemini) {
config.categories = {
"visual-engineering": { model: "google/gemini-3-pro-high" },
artistry: { model: "google/gemini-3-pro-high" },
writing: { model: "google/gemini-3-flash-high" },
}
} else if (installConfig.hasCopilot) {
config.categories = {
"visual-engineering": { model: "github-copilot/gemini-3-pro-preview" },
artistry: { model: "github-copilot/gemini-3-pro-preview" },
writing: { model: "github-copilot/gemini-3-flash-preview" },
}
}
return config
@@ -388,7 +410,6 @@ export function writeOmoConfig(installConfig: InstallConfig): ConfigMergeResult
return { success: true, configPath: omoConfigPath }
}
delete existing.agents
const merged = deepMerge(existing, newConfig)
writeFileSync(omoConfigPath, JSON.stringify(merged, null, 2) + "\n")
} catch (parseErr) {
@@ -474,11 +495,7 @@ export async function addAuthPlugins(config: InstallConfig): Promise<ConfigMerge
}
}
if (config.hasChatGPT) {
if (!plugins.some((p) => p.startsWith("opencode-openai-codex-auth"))) {
plugins.push("opencode-openai-codex-auth")
}
}
const newConfig = { ...(existingConfig ?? {}), plugin: plugins }
writeFileSync(path, JSON.stringify(newConfig, null, 2) + "\n")
@@ -588,54 +605,7 @@ export const ANTIGRAVITY_PROVIDER_CONFIG = {
},
}
const CODEX_PROVIDER_CONFIG = {
openai: {
name: "OpenAI",
options: {
reasoningEffort: "medium",
reasoningSummary: "auto",
textVerbosity: "medium",
include: ["reasoning.encrypted_content"],
store: false,
},
models: {
"gpt-5.2": {
name: "GPT 5.2 (OAuth)",
limit: { context: 272000, output: 128000 },
modalities: { input: ["text", "image"], output: ["text"] },
variants: {
none: { reasoningEffort: "none", reasoningSummary: "auto", textVerbosity: "medium" },
low: { reasoningEffort: "low", reasoningSummary: "auto", textVerbosity: "medium" },
medium: { reasoningEffort: "medium", reasoningSummary: "auto", textVerbosity: "medium" },
high: { reasoningEffort: "high", reasoningSummary: "detailed", textVerbosity: "medium" },
xhigh: { reasoningEffort: "xhigh", reasoningSummary: "detailed", textVerbosity: "medium" },
},
},
"gpt-5.2-codex": {
name: "GPT 5.2 Codex (OAuth)",
limit: { context: 272000, output: 128000 },
modalities: { input: ["text", "image"], output: ["text"] },
variants: {
low: { reasoningEffort: "low", reasoningSummary: "auto", textVerbosity: "medium" },
medium: { reasoningEffort: "medium", reasoningSummary: "auto", textVerbosity: "medium" },
high: { reasoningEffort: "high", reasoningSummary: "detailed", textVerbosity: "medium" },
xhigh: { reasoningEffort: "xhigh", reasoningSummary: "detailed", textVerbosity: "medium" },
},
},
"gpt-5.1-codex-max": {
name: "GPT 5.1 Codex Max (OAuth)",
limit: { context: 272000, output: 128000 },
modalities: { input: ["text", "image"], output: ["text"] },
variants: {
low: { reasoningEffort: "low", reasoningSummary: "detailed", textVerbosity: "medium" },
medium: { reasoningEffort: "medium", reasoningSummary: "detailed", textVerbosity: "medium" },
high: { reasoningEffort: "high", reasoningSummary: "detailed", textVerbosity: "medium" },
xhigh: { reasoningEffort: "xhigh", reasoningSummary: "detailed", textVerbosity: "medium" },
},
},
},
},
}
export function addProviderConfig(config: InstallConfig): ConfigMergeResult {
try {
@@ -665,10 +635,6 @@ export function addProviderConfig(config: InstallConfig): ConfigMergeResult {
providers.google = ANTIGRAVITY_PROVIDER_CONFIG.google
}
if (config.hasChatGPT) {
providers.openai = CODEX_PROVIDER_CONFIG.openai
}
if (Object.keys(providers).length > 0) {
newConfig.provider = providers
}
@@ -681,7 +647,6 @@ export function addProviderConfig(config: InstallConfig): ConfigMergeResult {
}
interface OmoConfigData {
google_auth?: boolean
agents?: Record<string, { model?: string }>
}
@@ -692,6 +657,7 @@ export function detectCurrentConfig(): DetectedConfig {
isMax20: true,
hasChatGPT: true,
hasGemini: false,
hasCopilot: false,
}
const { format, path } = detectConfigFormat()
@@ -713,7 +679,6 @@ export function detectCurrentConfig(): DetectedConfig {
}
result.hasGemini = plugins.some((p) => p.startsWith("opencode-antigravity-auth"))
result.hasChatGPT = plugins.some((p) => p.startsWith("opencode-openai-codex-auth"))
const omoConfigPath = getOmoConfig()
if (!existsSync(omoConfigPath)) {
@@ -752,9 +717,11 @@ export function detectCurrentConfig(): DetectedConfig {
result.hasChatGPT = false
}
if (omoConfig.google_auth === false) {
result.hasGemini = plugins.some((p) => p.startsWith("opencode-antigravity-auth"))
}
const hasAnyCopilotModel = Object.values(agents).some(
(agent) => agent?.model?.startsWith("github-copilot/")
)
result.hasCopilot = hasAnyCopilotModel
} catch {
/* intentionally empty - malformed omo config returns defaults from opencode config detection */
}
+3 -1
View File
@@ -50,7 +50,9 @@ export async function getVersionInfo(): Promise<VersionCheckInfo> {
}
const currentVersion = getCachedVersion()
const latestVersion = await getLatestVersion()
const { extractChannel } = await import("../../../hooks/auto-update-checker/index")
const channel = extractChannel(pluginInfo?.pinnedVersion ?? currentVersion)
const latestVersion = await getLatestVersion(channel)
const isUpToDate =
!currentVersion ||
+3 -1
View File
@@ -54,7 +54,9 @@ export async function getLocalVersion(options: GetLocalVersionOptions = {}): Pro
return 1
}
const latestVersion = await getLatestVersion()
const { extractChannel } = await import("../../hooks/auto-update-checker/index")
const channel = extractChannel(pluginInfo?.pinnedVersion ?? currentVersion)
const latestVersion = await getLatestVersion(channel)
if (!latestVersion) {
const info: VersionInfo = {
-40
View File
@@ -4,7 +4,6 @@ import { install } from "./install"
import { run } from "./run"
import { getLocalVersion } from "./get-local-version"
import { doctor } from "./doctor"
import { listAccounts, removeAccount } from "./commands/auth"
import type { InstallArgs } from "./types"
import type { RunOptions } from "./run"
import type { GetLocalVersionOptions } from "./get-local-version/types"
@@ -135,45 +134,6 @@ Categories:
process.exit(exitCode)
})
const authCommand = program
.command("auth")
.description("Manage Google Antigravity accounts")
authCommand
.command("list")
.description("List all Google Antigravity accounts")
.addHelpText("after", `
Examples:
$ bunx oh-my-opencode auth list
Shows:
- Account index and email
- Account tier (free/paid)
- Active account (marked with *)
- Rate limit status per model family
`)
.action(async () => {
const exitCode = await listAccounts()
process.exit(exitCode)
})
authCommand
.command("remove <index-or-email>")
.description("Remove an account by index or email")
.addHelpText("after", `
Examples:
$ bunx oh-my-opencode auth remove 0
$ bunx oh-my-opencode auth remove user@example.com
Note:
- Use 'auth list' to see account indices
- Removing the active account will switch to the next available account
`)
.action(async (indexOrEmail: string) => {
const exitCode = await removeAccount(indexOrEmail)
process.exit(exitCode)
})
program
.command("version")
.description("Show version information")
+60 -37
View File
@@ -41,6 +41,7 @@ function formatConfigSummary(config: InstallConfig): string {
lines.push(formatProvider("Claude", config.hasClaude, claudeDetail))
lines.push(formatProvider("ChatGPT", config.hasChatGPT))
lines.push(formatProvider("Gemini", config.hasGemini))
lines.push(formatProvider("GitHub Copilot", config.hasCopilot, "fallback provider"))
lines.push("")
lines.push(color.dim("─".repeat(40)))
@@ -49,8 +50,8 @@ function formatConfigSummary(config: InstallConfig): string {
lines.push(color.bold(color.white("Agent Configuration")))
lines.push("")
const sisyphusModel = config.hasClaude ? "claude-opus-4-5" : "glm-4.7-free"
const oracleModel = config.hasChatGPT ? "gpt-5.2" : (config.hasClaude ? "claude-opus-4-5" : "glm-4.7-free")
const sisyphusModel = config.hasClaude ? "claude-opus-4-5" : (config.hasCopilot ? "github-copilot/claude-opus-4.5" : "glm-4.7-free")
const oracleModel = config.hasChatGPT ? "gpt-5.2" : (config.hasCopilot ? "github-copilot/gpt-5.2" : (config.hasClaude ? "claude-opus-4-5" : "glm-4.7-free"))
const librarianModel = "glm-4.7-free"
const frontendModel = config.hasGemini ? "antigravity-gemini-3-pro-high" : (config.hasClaude ? "claude-opus-4-5" : "glm-4.7-free")
@@ -133,6 +134,12 @@ function validateNonTuiArgs(args: InstallArgs): { valid: boolean; errors: string
errors.push(`Invalid --gemini value: ${args.gemini} (expected: no, yes)`)
}
if (args.copilot === undefined) {
errors.push("--copilot is required (values: no, yes)")
} else if (!["no", "yes"].includes(args.copilot)) {
errors.push(`Invalid --copilot value: ${args.copilot} (expected: no, yes)`)
}
return { valid: errors.length === 0, errors }
}
@@ -142,10 +149,11 @@ function argsToConfig(args: InstallArgs): InstallConfig {
isMax20: args.claude === "max20",
hasChatGPT: args.chatgpt === "yes",
hasGemini: args.gemini === "yes",
hasCopilot: args.copilot === "yes",
}
}
function detectedToInitialValues(detected: DetectedConfig): { claude: ClaudeSubscription; chatgpt: BooleanArg; gemini: BooleanArg } {
function detectedToInitialValues(detected: DetectedConfig): { claude: ClaudeSubscription; chatgpt: BooleanArg; gemini: BooleanArg; copilot: BooleanArg } {
let claude: ClaudeSubscription = "no"
if (detected.hasClaude) {
claude = detected.isMax20 ? "max20" : "yes"
@@ -155,6 +163,7 @@ function detectedToInitialValues(detected: DetectedConfig): { claude: ClaudeSubs
claude,
chatgpt: detected.hasChatGPT ? "yes" : "no",
gemini: detected.hasGemini ? "yes" : "no",
copilot: detected.hasCopilot ? "yes" : "no",
}
}
@@ -204,11 +213,26 @@ async function runTuiMode(detected: DetectedConfig): Promise<InstallConfig | nul
return null
}
const copilot = await p.select({
message: "Do you have a GitHub Copilot subscription?",
options: [
{ value: "no" as const, label: "No", hint: "Only native providers will be used" },
{ value: "yes" as const, label: "Yes", hint: "Fallback option when native providers unavailable" },
],
initialValue: initial.copilot,
})
if (p.isCancel(copilot)) {
p.cancel("Installation cancelled.")
return null
}
return {
hasClaude: claude !== "no",
isMax20: claude === "max20",
hasChatGPT: chatgpt === "yes",
hasGemini: gemini === "yes",
hasCopilot: copilot === "yes",
}
}
@@ -221,7 +245,7 @@ async function runNonTuiInstall(args: InstallArgs): Promise<number> {
console.log(` ${SYMBOLS.bullet} ${err}`)
}
console.log()
printInfo("Usage: bunx oh-my-opencode install --no-tui --claude=<no|yes|max20> --chatgpt=<no|yes> --gemini=<no|yes>")
printInfo("Usage: bunx oh-my-opencode install --no-tui --claude=<no|yes|max20> --chatgpt=<no|yes> --gemini=<no|yes> --copilot=<no|yes>")
console.log()
return 1
}
@@ -260,7 +284,7 @@ async function runNonTuiInstall(args: InstallArgs): Promise<number> {
}
printSuccess(`Plugin ${isUpdate ? "verified" : "added"} ${SYMBOLS.arrow} ${color.dim(pluginResult.configPath)}`)
if (config.hasGemini || config.hasChatGPT) {
if (config.hasGemini) {
printStep(step++, totalSteps, "Adding auth plugins...")
const authResult = await addAuthPlugins(config)
if (!authResult.success) {
@@ -290,25 +314,10 @@ async function runNonTuiInstall(args: InstallArgs): Promise<number> {
printBox(formatConfigSummary(config), isUpdate ? "Updated Configuration" : "Installation Complete")
if (!config.hasClaude && !config.hasChatGPT && !config.hasGemini) {
if (!config.hasClaude && !config.hasChatGPT && !config.hasGemini && !config.hasCopilot) {
printWarning("No model providers configured. Using opencode/glm-4.7-free as fallback.")
}
if ((config.hasClaude || config.hasChatGPT || config.hasGemini) && !args.skipAuth) {
console.log(color.bold("Next Steps - Authenticate your providers:"))
console.log()
if (config.hasClaude) {
console.log(` ${SYMBOLS.arrow} ${color.dim("opencode auth login")} ${color.gray("(select Anthropic → Claude Pro/Max)")}`)
}
if (config.hasChatGPT) {
console.log(` ${SYMBOLS.arrow} ${color.dim("opencode auth login")} ${color.gray("(select OpenAI → ChatGPT Plus/Pro)")}`)
}
if (config.hasGemini) {
console.log(` ${SYMBOLS.arrow} ${color.dim("opencode auth login")} ${color.gray("(select Google → OAuth with Antigravity)")}`)
}
console.log()
}
console.log(`${SYMBOLS.star} ${color.bold(color.green(isUpdate ? "Configuration updated!" : "Installation complete!"))}`)
console.log(` Run ${color.cyan("opencode")} to start!`)
console.log()
@@ -326,6 +335,17 @@ async function runNonTuiInstall(args: InstallArgs): Promise<number> {
console.log(color.dim("oMoMoMoMo... Enjoy!"))
console.log()
if ((config.hasClaude || config.hasChatGPT || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
printBox(
`Run ${color.cyan("opencode auth login")} and select your provider:\n` +
(config.hasClaude ? ` ${SYMBOLS.bullet} Anthropic ${color.gray("→ Claude Pro/Max")}\n` : "") +
(config.hasChatGPT ? ` ${SYMBOLS.bullet} OpenAI ${color.gray("→ ChatGPT Plus/Pro")}\n` : "") +
(config.hasGemini ? ` ${SYMBOLS.bullet} Google ${color.gray("→ OAuth with Antigravity")}\n` : "") +
(config.hasCopilot ? ` ${SYMBOLS.bullet} GitHub ${color.gray("→ Copilot")}` : ""),
"🔐 Authenticate Your Providers"
)
}
return 0
}
@@ -371,7 +391,7 @@ export async function install(args: InstallArgs): Promise<number> {
}
s.stop(`Plugin added to ${color.cyan(pluginResult.configPath)}`)
if (config.hasGemini || config.hasChatGPT) {
if (config.hasGemini) {
s.start("Adding auth plugins (fetching latest versions)")
const authResult = await addAuthPlugins(config)
if (!authResult.success) {
@@ -400,26 +420,12 @@ export async function install(args: InstallArgs): Promise<number> {
}
s.stop(`Config written to ${color.cyan(omoResult.configPath)}`)
if (!config.hasClaude && !config.hasChatGPT && !config.hasGemini) {
if (!config.hasClaude && !config.hasChatGPT && !config.hasGemini && !config.hasCopilot) {
p.log.warn("No model providers configured. Using opencode/glm-4.7-free as fallback.")
}
p.note(formatConfigSummary(config), isUpdate ? "Updated Configuration" : "Installation Complete")
if ((config.hasClaude || config.hasChatGPT || config.hasGemini) && !args.skipAuth) {
const steps: string[] = []
if (config.hasClaude) {
steps.push(`${color.dim("opencode auth login")} ${color.gray("(select Anthropic → Claude Pro/Max)")}`)
}
if (config.hasChatGPT) {
steps.push(`${color.dim("opencode auth login")} ${color.gray("(select OpenAI → ChatGPT Plus/Pro)")}`)
}
if (config.hasGemini) {
steps.push(`${color.dim("opencode auth login")} ${color.gray("(select Google → OAuth with Antigravity)")}`)
}
p.note(steps.join("\n"), "Next Steps - Authenticate your providers")
}
p.log.success(color.bold(isUpdate ? "Configuration updated!" : "Installation complete!"))
p.log.message(`Run ${color.cyan("opencode")} to start!`)
@@ -435,5 +441,22 @@ export async function install(args: InstallArgs): Promise<number> {
p.outro(color.green("oMoMoMoMo... Enjoy!"))
if ((config.hasClaude || config.hasChatGPT || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
const providers: string[] = []
if (config.hasClaude) providers.push(`Anthropic ${color.gray("→ Claude Pro/Max")}`)
if (config.hasChatGPT) providers.push(`OpenAI ${color.gray("→ ChatGPT Plus/Pro")}`)
if (config.hasGemini) providers.push(`Google ${color.gray("→ OAuth with Antigravity")}`)
if (config.hasCopilot) providers.push(`GitHub ${color.gray("→ Copilot")}`)
console.log()
console.log(color.bold("🔐 Authenticate Your Providers"))
console.log()
console.log(` Run ${color.cyan("opencode auth login")} and select:`)
for (const provider of providers) {
console.log(` ${SYMBOLS.bullet} ${provider}`)
}
console.log()
}
return 0
}
+58 -1
View File
@@ -1,5 +1,5 @@
import { describe, it, expect } from "bun:test"
import { createEventState, type EventState } from "./events"
import { createEventState, serializeError, type EventState } from "./events"
import type { RunContext, EventPayload } from "./types"
const createMockContext = (sessionID: string = "test-session"): RunContext => ({
@@ -15,6 +15,63 @@ async function* toAsyncIterable<T>(items: T[]): AsyncIterable<T> {
}
}
describe("serializeError", () => {
it("returns 'Unknown error' for null/undefined", () => {
// #given / #when / #then
expect(serializeError(null)).toBe("Unknown error")
expect(serializeError(undefined)).toBe("Unknown error")
})
it("returns message from Error instance", () => {
// #given
const error = new Error("Something went wrong")
// #when / #then
expect(serializeError(error)).toBe("Something went wrong")
})
it("returns string as-is", () => {
// #given / #when / #then
expect(serializeError("Direct error message")).toBe("Direct error message")
})
it("extracts message from plain object", () => {
// #given
const errorObj = { message: "Object error message", code: "ERR_001" }
// #when / #then
expect(serializeError(errorObj)).toBe("Object error message")
})
it("extracts message from nested error object", () => {
// #given
const errorObj = { error: { message: "Nested error message" } }
// #when / #then
expect(serializeError(errorObj)).toBe("Nested error message")
})
it("extracts message from data.message path", () => {
// #given
const errorObj = { data: { message: "Data error message" } }
// #when / #then
expect(serializeError(errorObj)).toBe("Data error message")
})
it("JSON stringifies object without message property", () => {
// #given
const errorObj = { code: "ERR_001", status: 500 }
// #when
const result = serializeError(errorObj)
// #then
expect(result).toContain("ERR_001")
expect(result).toContain("500")
})
})
describe("createEventState", () => {
it("creates initial state with correct defaults", () => {
// #given / #when
+53 -3
View File
@@ -11,6 +11,51 @@ import type {
ToolResultProps,
} from "./types"
export function serializeError(error: unknown): string {
if (!error) return "Unknown error"
if (error instanceof Error) {
const parts = [error.message]
if (error.cause) {
parts.push(`Cause: ${serializeError(error.cause)}`)
}
return parts.join(" | ")
}
if (typeof error === "string") {
return error
}
if (typeof error === "object") {
const obj = error as Record<string, unknown>
const messagePaths = [
obj.message,
obj.error,
(obj.data as Record<string, unknown>)?.message,
(obj.data as Record<string, unknown>)?.error,
(obj.error as Record<string, unknown>)?.message,
]
for (const msg of messagePaths) {
if (typeof msg === "string" && msg.length > 0) {
return msg
}
}
try {
const json = JSON.stringify(error, null, 2)
if (json !== "{}") {
return json
}
} catch (_) {
void _
}
}
return String(error)
}
export interface EventState {
mainSessionIdle: boolean
mainSessionError: boolean
@@ -125,6 +170,13 @@ function logEventVerbose(ctx: RunContext, payload: EventPayload): void {
break
}
case "session.error": {
const errorProps = props as SessionErrorProps | undefined
const errorMsg = serializeError(errorProps?.error)
console.error(pc.red(`${sessionTag} ❌ SESSION.ERROR: ${errorMsg}`))
break
}
default:
console.error(pc.dim(`${sessionTag} ${payload.type}`))
}
@@ -166,9 +218,7 @@ function handleSessionError(
const props = payload.properties as SessionErrorProps | undefined
if (props?.sessionID === ctx.sessionID) {
state.mainSessionError = true
state.lastError = props?.error
? String(props.error instanceof Error ? props.error.message : props.error)
: "Unknown error"
state.lastError = serializeError(props?.error)
console.error(pc.red(`\n[session.error] ${state.lastError}`))
}
}
+2 -2
View File
@@ -2,7 +2,7 @@ import { createOpencode } from "@opencode-ai/sdk"
import pc from "picocolors"
import type { RunOptions, RunContext } from "./types"
import { checkCompletionConditions } from "./completion"
import { createEventState, processEvents } from "./events"
import { createEventState, processEvents, serializeError } from "./events"
const POLL_INTERVAL_MS = 500
const DEFAULT_TIMEOUT_MS = 0
@@ -115,7 +115,7 @@ export async function run(options: RunOptions): Promise<number> {
if (err instanceof Error && err.name === "AbortError") {
return 130
}
console.error(pc.red(`Error: ${err}`))
console.error(pc.red(`Error: ${serializeError(err)}`))
return 1
}
}
+3
View File
@@ -6,6 +6,7 @@ export interface InstallArgs {
claude?: ClaudeSubscription
chatgpt?: BooleanArg
gemini?: BooleanArg
copilot?: BooleanArg
skipAuth?: boolean
}
@@ -14,6 +15,7 @@ export interface InstallConfig {
isMax20: boolean
hasChatGPT: boolean
hasGemini: boolean
hasCopilot: boolean
}
export interface ConfigMergeResult {
@@ -28,4 +30,5 @@ export interface DetectedConfig {
isMax20: boolean
hasChatGPT: boolean
hasGemini: boolean
hasCopilot: boolean
}