diff --git a/packages/cli/src/commands/commands.ts b/packages/cli/src/commands/commands.ts index d6277087913..92ca9d46115 100644 --- a/packages/cli/src/commands/commands.ts +++ b/packages/cli/src/commands/commands.ts @@ -98,17 +98,6 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME Spec.make("paths", { description: "Show global paths (data, config, cache, state)" }), ], }), - Spec.make("console", { - description: "Manage OpenCode Console access", - commands: [ - Spec.make("login", { - description: "Log in to OpenCode Console", - params: { - url: Argument.string("url").pipe(Argument.withDescription("Console server URL"), Argument.optional), - }, - }), - ], - }), Spec.make("auth", { description: "manage AI providers and credentials", commands: [ diff --git a/packages/cli/src/commands/handlers/console/login.ts b/packages/cli/src/commands/handlers/console/login.ts deleted file mode 100644 index 0ee62295c3a..00000000000 --- a/packages/cli/src/commands/handlers/console/login.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Cause, Effect, Exit, Option } from "effect" -import { Service } from "@opencode/client/effect/service" -import { OpenCode, type OpenCodeClient } from "@opencode/client/promise" -import { AppProcess } from "@opencode/util/process" -import { Commands } from "../../commands" -import { Runtime } from "../../../framework/runtime" -import { ServiceConfig } from "../../../services/service-config" -import { createTimelineHost, type TimelineHost } from "../../../ui/timeline" -import { errorMessage } from "../../../util/error" - -const integrationID = "opencode" -const location = { directory: process.cwd() } - -export default Runtime.handler( - Commands.commands.console.commands.login, - Effect.fn("cli.console.login")(function* (input) { - const timeline = yield* Effect.acquireRelease( - Effect.promise(() => createTimelineHost()), - (value) => request(() => value.close()).pipe(Effect.ignore), - ) - const exit = yield* login(timeline, Option.getOrUndefined(input.url)).pipe( - Effect.raceFirst(AppProcess.waitForAbort(timeline.signal)), - Effect.exit, - ) - if (Exit.isSuccess(exit)) return - - const cancelled = timeline.signal.aborted - yield* request(() => - timeline.failure(cancelled ? "Authorization cancelled" : errorMessage(Cause.squash(exit.cause))), - ).pipe(Effect.ignore) - process.exitCode = cancelled ? 130 : 1 - }), -) - -const login = Effect.fn("cli.console.login.run")(function* (timeline: TimelineHost, server?: string) { - yield* request(() => timeline.intro("Log in")) - yield* request(() => timeline.pending("Connecting to OpenCode...")) - - const endpoint = yield* Service.ensure(yield* ServiceConfig.options()) - const client = OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) }) - const found = yield* request((signal) => client.integration.get({ integrationID, location }, { signal })) - const integration = yield* required(found.data, "OpenCode Console integration is unavailable") - const method = yield* required( - integration.methods.find((candidate) => candidate.type === "oauth"), - "OpenCode Console login is unavailable", - ) - - yield* request(() => timeline.pending("Starting authorization...")) - const started = yield* request((signal) => - client.integration.oauth.connect( - { - integrationID, - methodID: method.id, - ...(server ? { answer: { server } } : {}), - location, - }, - { signal }, - ), - ) - const attempt = started.data - yield* Effect.addFinalizer(() => - request(() => - client.integration.oauth.cancel( - { integrationID, attemptID: attempt.attemptID, location }, - { signal: AbortSignal.timeout(5_000) }, - ), - ).pipe(Effect.ignore), - ) - if (attempt.mode !== "auto") yield* Effect.fail(new Error("OpenCode Console requires a device login")) - - yield* request(() => timeline.item(`Go to: ${attempt.url}`)) - yield* request(() => timeline.item(attempt.instructions)) - yield* request(async () => { - const { default: open } = await import("open") - await open(attempt.url) - }).pipe(Effect.ignore) - yield* request(() => timeline.pending("Waiting for authorization...")) - - const status = yield* waitForConsoleLogin(client, integrationID, attempt.attemptID) - if (status.status === "failed") yield* Effect.fail(new Error(status.message)) - if (status.status === "expired") yield* Effect.fail(new Error("Device code expired")) - - yield* request(() => timeline.success("Connected to OpenCode Console")) - yield* request(() => timeline.outro("Done")) -}) - -const waitForConsoleLogin = Effect.fn("cli.console.login.wait")(function* ( - client: OpenCodeClient, - integrationID: string, - attemptID: string, -) { - while (true) { - const response = yield* request((signal) => - client.integration.oauth.status({ integrationID, attemptID, location }, { signal }), - ) - if (response.data.status !== "pending") return response.data - yield* Effect.sleep(500) - } -}) - -function request(task: (signal: AbortSignal) => Promise) { - return Effect.tryPromise({ - try: task, - catch: (cause) => cause, - }) -} - -function required(value: A | null | undefined, message: string) { - return value === null || value === undefined ? Effect.fail(new Error(message)) : Effect.succeed(value) -} diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 2aa07a08c16..1c1371085c9 100755 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -30,9 +30,6 @@ const Handlers = Runtime.handlers(Commands, { config: () => import("./commands/handlers/debug/config"), paths: () => import("./commands/handlers/debug/paths"), }, - console: { - login: () => import("./commands/handlers/console/login"), - }, mcp: { list: () => import("./commands/handlers/mcp/list"), add: () => import("./commands/handlers/mcp/add"),