Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/cli/handlers/account.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { spawn } from 'node:child_process'
import { spawn, spawnSync } from 'node:child_process'
import { assertWslDistroAllowed } from '@orca/process-host/wsl-distro-allowlist'
import { mkdtempSync, rmSync } from 'node:fs'
import { tmpdir } from 'node:os'
Expand Down Expand Up @@ -140,6 +140,22 @@ async function runAgentLoginInTerminal(
})
}

function readAgentLoginHelp(command: string, args: string[]): string | null {
const resolvedCommand = resolveCliCommand(command)
try {
const { spawnCmd, spawnArgs } = getSpawnArgsForWindows(resolvedCommand, args)
const env = withCliRuntimeOnPath(
resolvedCommand,
addAgentNodePaths(stripElectronRunAsNode(process.env))
)
const probe = spawnSync(spawnCmd, spawnArgs, { encoding: 'utf8', env, timeout: 15_000 })
// A probe that fails proves nothing; the login then reports the real launch error.
return probe.error || probe.status !== 0 ? null : `${probe.stdout}${probe.stderr}`
} catch {
return null
}
}

async function addClaudeAccount({ client, cwd, json }: HandlerContext): Promise<void> {
const { result: signIn } = await client.call<ClaudeAccountSignIn>(
'accounts.beginClaudeSignIn',
Expand Down Expand Up @@ -262,7 +278,7 @@ export const ACCOUNT_HANDLERS: Record<string, CommandHandler> = {
}
rejectAccountRemoteSelectionFlags(ctx, 'orca account add')
if (agent === 'opencode' || agent === 'devin') {
await addDataAccount(ctx, agent, runAgentLoginInTerminal)
await addDataAccount(ctx, agent, runAgentLoginInTerminal, readAgentLoginHelp)
return
}
// Check runtime support before spending an OAuth round trip.
Expand Down
29 changes: 27 additions & 2 deletions src/cli/handlers/data-account-commands.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const context = {
rawArgs: []
}

const OPENCODE_2_HELP = 'opencode auth login [url]\n --standalone run without the shared server'
const readHelp = vi.fn(() => OPENCODE_2_HELP)

afterEach(() => vi.restoreAllMocks())

describe('managed data account enrollment', () => {
Expand Down Expand Up @@ -50,7 +53,9 @@ describe('managed data account enrollment', () => {
_meta: { runtimeId: 'test' }
})
const login = vi.fn()
await expect(addDataAccount(context, 'opencode', login)).rejects.toThrow('Update or restart')
await expect(addDataAccount(context, 'opencode', login, readHelp)).rejects.toThrow(
'Update or restart'
)
expect(login).not.toHaveBeenCalled()
})

Expand All @@ -74,12 +79,32 @@ describe('managed data account enrollment', () => {
expect(env.OPENCODE_DB).toBe('opencode.db')
expect(existsSync(directory)).toBe(true)
})
await expect(addDataAccount(context, 'opencode', login)).rejects.toThrow('capture failed')
await expect(addDataAccount(context, 'opencode', login, readHelp)).rejects.toThrow(
'capture failed'
)
expect(call).toHaveBeenLastCalledWith('accounts.addDataFromHome', {
provider: 'opencode',
sourceDataHome: join(directory, 'data'),
label: 'opencode'
})
expect(existsSync(directory)).toBe(false)
})

it('refuses OpenCode 1.x before starting login', async () => {
vi.spyOn(client, 'call').mockResolvedValue({
id: 'test',
ok: true,
result: { capabilities: [DATA_ACCOUNT_RUNTIME_CAPABILITY] },
_meta: { runtimeId: 'test' }
})
const login = vi.fn()
const opencode1Help = vi.fn(
() => 'opencode auth login [url]\n --pure run without external plugins'
)
await expect(addDataAccount(context, 'opencode', login, opencode1Help)).rejects.toThrow(
'Managed OpenCode accounts need OpenCode 2'
)
expect(opencode1Help).toHaveBeenCalledWith('opencode', ['auth', 'login', '--help'])
expect(login).not.toHaveBeenCalled()
})
})
17 changes: 16 additions & 1 deletion src/cli/handlers/data-account-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ export async function assertDataAccountsSupported(ctx: HandlerContext): Promise<
}
}

// Managed accounts rely on OpenCode 2's isolated `auth login --standalone`; OpenCode 1.x lacks it.
function assertOpenCodeStandaloneLogin(help: string | null): void {
if (help !== null && !help.includes('--standalone')) {
throw new RuntimeClientError(
'invalid_environment',
'Managed OpenCode accounts need OpenCode 2. The installed `opencode` has no ' +
'`auth login --standalone` (OpenCode 1.x). Install OpenCode 2, or sign in with `opencode auth login`.'
)
}
}

export async function addDataAccount(
ctx: HandlerContext,
provider: ManagedDataAccountProvider,
Expand All @@ -36,7 +47,8 @@ export async function addDataAccount(
extraEnv: Record<string, string>,
json: boolean,
session: InteractiveLoginSession
) => Promise<void>
) => Promise<void>,
readLoginHelp: (command: string, args: string[]) => string | null
): Promise<void> {
if (getWslAccountTarget(ctx.cwd)?.runtime === 'wsl') {
throw new RuntimeClientError(
Expand All @@ -59,6 +71,9 @@ export async function addDataAccount(
'--integration requires an OpenCode integration ID or name.'
)
}
if (provider === 'opencode') {
assertOpenCodeStandaloneLogin(readLoginHelp('opencode', ['auth', 'login', '--help']))
}
const directory = mkdtempSync(join(tmpdir(), `orca-account-add-${provider}-`))
const session: InteractiveLoginSession = {
child: null,
Expand Down