diff --git a/packages/source-control-cursor-origin/package.json b/packages/source-control-cursor-origin/package.json index b15d11bfdb77f..31611103ccf17 100644 --- a/packages/source-control-cursor-origin/package.json +++ b/packages/source-control-cursor-origin/package.json @@ -26,6 +26,7 @@ }, "devDependencies": { "@effect/vitest": "catalog:", + "@t3tools/source-control-testing": "workspace:*", "@types/node": "catalog:", "vite-plus": "catalog:" } diff --git a/packages/source-control-cursor-origin/src/server/OriginCli.ts b/packages/source-control-cursor-origin/src/server/OriginCli.ts index 844fb223fb6f3..f8cf87aba88fc 100644 --- a/packages/source-control-cursor-origin/src/server/OriginCli.ts +++ b/packages/source-control-cursor-origin/src/server/OriginCli.ts @@ -57,13 +57,21 @@ export class OriginCliError extends Schema.TaggedError()("Origin /** What `origin auth status --json` reports. Only the fields this package reads. */ const OriginAuthStatusSchema = Schema.Struct({ authenticated: Schema.Boolean, - tokenValid: Schema.optional(Schema.Boolean), + tokenValid: Schema.optional(Schema.NullOr(Schema.Boolean)), account: Schema.optional( Schema.NullOr(Schema.Struct({ email: Schema.optional(Schema.NullOr(Schema.String)) })), ), }); type OriginAuthStatus = typeof OriginAuthStatusSchema.Type; +/** `origin` exits 1 on a bare `--json`, so this names the fields `OriginAuthStatusSchema` reads. */ +export const ORIGIN_AUTH_STATUS_ARGS = [ + "auth", + "status", + "--json", + "authenticated,tokenValid,account", +] as const; + export function parseOriginAuthStatus(raw: string): OriginAuthStatus | null { const decoded = decodeJsonResult(OriginAuthStatusSchema)(raw); return Result.isSuccess(decoded) ? decoded.success : null; @@ -382,7 +390,7 @@ const make = Effect.gen(function* () { }); const authStatus = (cwd: string) => - run({ cwd, operation: "authStatus", args: ["auth", "status", "--json"] }).pipe( + run({ cwd, operation: "authStatus", args: ORIGIN_AUTH_STATUS_ARGS }).pipe( Effect.flatMap((result) => { const status = parseOriginAuthStatus(result.stdout); if (status !== null) return Effect.succeed(status); diff --git a/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.test.ts b/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.test.ts new file mode 100644 index 0000000000000..aac4970ca3d40 --- /dev/null +++ b/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.test.ts @@ -0,0 +1,77 @@ +import { assert, it } from "@effect/vitest"; +import * as Effect from "effect/Effect"; +import * as Layer from "effect/Layer"; +import * as Option from "effect/Option"; +import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; +import * as TestSourceControlHost from "@t3tools/source-control-testing/TestSourceControlHost"; + +import * as OriginCli from "./OriginCli.ts"; +import * as OriginSourceControlProvider from "./OriginSourceControlProvider.ts"; + +const oauthSignIn: Record = { + authenticated: true, + authMethod: "oauth", + tokenValid: true, + account: { email: "dev@example.test" }, +}; +// A `CURSOR_API_KEY` sign-in has no token to check. +const apiKeySignIn = { ...oauthSignIn, authMethod: "api-key", tokenValid: null }; +const expiredToken = { ...oauthSignIn, authMethod: "expired", tokenValid: false }; +const signedOut = { authenticated: false, authMethod: "none", tokenValid: null, account: null }; + +// As the real CLI does, this exits 1 on a bare `--json` and prints only the fields it is asked for. +const origin = (status: Record) => (args: ReadonlyArray) => { + if (args[0] === "--version") return TestSourceControlHost.processOutput("2026.11.03"); + const fields = args[args.indexOf("--json") + 1]?.split(",") ?? []; + return fields.length === 0 + ? TestSourceControlHost.processOutput("", { + stderr: "Error: Specify one or more comma-separated fields for `--json`:\n authenticated", + exitCode: ChildProcessSpawner.ExitCode(1), + }) + : TestSourceControlHost.processOutput( + JSON.stringify(Object.fromEntries(fields.map((field) => [field, status[field]]))), + ); +}; + +it.effect("reads the sign-in from an Origin CLI that wants its --json fields named", () => + Effect.gen(function* () { + const probeWith = (cli: ReturnType) => + OriginSourceControlProvider.makeDiscovery.pipe( + Effect.provide( + Layer.mergeAll( + Layer.mock(OriginCli.OriginCli)({ personalNamespace: () => Effect.succeed("acme") }), + TestSourceControlHost.layer({ + process: { run: (input) => Effect.succeed(cli(input.args)) }, + }), + ), + ), + Effect.flatMap((discovery) => discovery.probe("/repo")), + ); + + for (const signedIn of [oauthSignIn, apiKeySignIn]) { + const cli = origin(signedIn); + const item = yield* probeWith(cli); + assert.strictEqual(item.auth.status, "authenticated", `${signedIn.authMethod}`); + assert.deepStrictEqual(item.auth.account, Option.some("acme")); + // Discovery shows the namespace instead, so only the viewer lookup needs the email. + assert.strictEqual( + OriginCli.originAccount( + OriginCli.parseOriginAuthStatus(cli(OriginCli.ORIGIN_AUTH_STATUS_ARGS).stdout), + ), + "dev@example.test", + ); + } + + for (const notSignedIn of [expiredToken, signedOut]) { + const cli = origin(notSignedIn); + const item = yield* probeWith(cli); + assert.strictEqual(item.auth.status, "unauthenticated", `${notSignedIn.authMethod}`); + assert.strictEqual( + OriginCli.originAccount( + OriginCli.parseOriginAuthStatus(cli(OriginCli.ORIGIN_AUTH_STATUS_ARGS).stdout), + ), + null, + ); + } + }), +); diff --git a/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.ts b/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.ts index e36a025649d98..5ecdd71497544 100644 --- a/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.ts +++ b/packages/source-control-cursor-origin/src/server/OriginSourceControlProvider.ts @@ -31,7 +31,7 @@ const discovery = { label: "Cursor Origin", executable: OriginCli.ORIGIN_COMMAND, versionArgs: ["--version"], - authArgs: ["auth", "status", "--json"], + authArgs: OriginCli.ORIGIN_AUTH_STATUS_ARGS, parseAuth: (input) => { const status = OriginCli.parseOriginAuthStatus(input.stdout); const account = OriginCli.originAccount(status); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 43c68fa25cadb..46d10f36f09dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2320,6 +2320,9 @@ importers: '@effect/vitest': specifier: 4.1.5 version: 4.1.5(patch_hash=dd0bf2b1ae0f63aff0d620ebc67b82d19759b3fa69a608ef85e2a5b40b4d46c5)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0) + '@t3tools/source-control-testing': + specifier: workspace:* + version: link:../source-control-testing '@types/node': specifier: 24.12.4 version: 24.12.4