expandai 0.0.2 → 0.0.3

package/src/main.ts

@@ -3,21 +3,46 @@ import { CliConfig, Command, ValidationError } from '@effect/cli'
 import { Terminal } from '@effect/platform'
 import { NodeContext, NodeRuntime } from '@effect/platform-node'
 import { Cause, Config, Console, Effect, Layer, Logger, LogLevel, Option, Schema, String } from 'effect'
+import { ManualAuthorization } from './Auth/ManualAuthorization.js'
+import { PendingInitStore } from './Auth/PendingInit.js'
+import { SetupGrantAuthorization } from './Auth/SetupGrantAuthorization.js'
 import { Authentication, LoginCommand, LogoutCommand, WhoamiCommand } from './Authentication.js'
+import { commandFromArgv } from './CommandPath.js'
 import { FetchCommand } from './Commands/Fetch.js'
 import { AgentHookCommand, HumanHookCommand } from './Commands/Hook.js'
+import {
+	AgentInitCommand,
+	HumanInitCommand,
+	InitTerminalInteraction,
+	preflightAgentInitArgv,
+	resolveInitExecutionMode,
+} from './Commands/Init.js'
 import { InstallSubCommand, UninstallSubCommand } from './Commands/Mcp.js'
 import { McpRunCommand } from './Commands/McpRun.js'
 import { SearchCommand } from './Commands/Search.js'
 import { SkillCommand } from './Commands/Skill.js'
+import {
+	AgentStatusCommand,
+	HumanStatusCommand,
+	preflightAgentStatusArgv,
+	resolveStatusExecutionMode,
+	StatusTerminalInteraction,
+} from './Commands/Status.js'
+import { TelemetryCommand } from './Commands/Telemetry.js'
 import { UninstallCommand } from './Commands/Uninstall.js'
-import { ConfigManager } from './Config.js'
+import { ConfigManager, envFlag, envLiteral } from './Config.js'
 import { ClaudeHook } from './Hook/Claude.js'
 import { OpencodeHook } from './Hook/Opencode.js'
+import { HarnessDetector } from './Init/HarnessDetector.js'
+import { HarnessRegistry } from './Init/HarnessRegistry.js'
+import { InitService } from './Init/Service.js'
+import { StatusService } from './Init/Status.js'
 import { HookInstaller } from './Install/Hook.js'
 import { Mcp } from './Install/Mcp.js'
 import { Skill as SkillInstaller } from './Install/Skill.js'
 import { Uninstall } from './Install/Uninstall.js'
+import { Telemetry } from './Telemetry.js'
+import { CLI_VERSION } from './Version.js'
 
 /**
  * Where this process is running:
@@ -27,18 +52,39 @@ import { Uninstall } from './Install/Uninstall.js'
  *  - 'mcp':   the binary is serving as the MCP transport. MCP only runs in agents.
  */
 
+// envFlag / envLiteral read leniently: a malformed value (CLAUDECODE=banana,
+// EXPANDAI_CLI_CONTEXT=bogus) must degrade instead of crashing the CLI —
+// Config.option / Config.withDefault only absorb missing data, not invalid.
 const EnvironmentSignals = Config.all({
-	override: Schema.Config('EXPANDAI_CLI_CONTEXT', Schema.Literal('human', 'agent')).pipe(Config.option),
+	override: envLiteral('EXPANDAI_CLI_CONTEXT', Schema.Literal('human', 'agent')),
 	mcpTransport: Config.string('MCP_TRANSPORT').pipe(Config.option, Config.map(Option.isSome)),
-	claudeCode: Config.boolean('CLAUDECODE').pipe(Config.withDefault(false)),
+	claudeCode: envFlag('CLAUDECODE'),
 	cursor: Config.string('CURSOR_TRACE_ID').pipe(Config.option, Config.map(Option.isSome)),
 	codex: Config.string('CODEX_RUN_ID').pipe(Config.option, Config.map(Option.isSome)),
 })
 
-const detectContext = Effect.gen(function* () {
+const detectContext = Effect.fnUntraced(function* (command: string) {
+	const initMode = resolveInitExecutionMode({
+		argv: process.argv,
+		environment: process.env,
+		stdinIsTty: process.stdin.isTTY === true,
+		stdoutIsTty: process.stdout.isTTY === true,
+	})
+	if (initMode !== undefined) return initMode === 'machine' ? ('agent' as const) : ('human' as const)
+	const statusMode = resolveStatusExecutionMode({
+		argv: process.argv,
+		environment: process.env,
+		stdinIsTty: process.stdin.isTTY === true,
+		stdoutIsTty: process.stdout.isTTY === true,
+	})
+	if (statusMode !== undefined) return statusMode === 'machine' ? ('agent' as const) : ('human' as const)
+
 	const signals = yield* EnvironmentSignals
 
-	const mcp = signals.mcpTransport ? Option.some('mcp' as const) : Option.none<'mcp'>()
+	// Installed MCP entries invoke `expandai mcp run` without any transport env
+	// var, so the resolved command is the reliable signal; MCP_TRANSPORT stays
+	// as a secondary hint for hand-written configs that set it.
+	const mcp = command === 'mcp run' || signals.mcpTransport ? Option.some('mcp' as const) : Option.none<'mcp'>()
 	// Authentication.logout uses both stdout and stdin TTY checks because Prompt
 	// reads from stdin; for context detection a non-TTY stdout alone is enough
 	// to identify a non-interactive caller.
@@ -60,6 +106,21 @@ const AgentMcp = Command.make('mcp').pipe(
 	Command.withSubcommands([McpRunCommand]),
 )
 
+const InitServiceLive = InitService.DefaultWithoutDependencies.pipe(
+	Layer.provide(
+		Layer.mergeAll(
+			Authentication.Default,
+			ManualAuthorization.Default,
+			SetupGrantAuthorization.Default,
+			HarnessRegistry.Default,
+		),
+	),
+)
+
+const StatusServiceLive = StatusService.DefaultWithoutDependencies.pipe(
+	Layer.provide(Layer.mergeAll(ConfigManager.Default, PendingInitStore.Default, HarnessRegistry.Default)),
+)
+
 const HumanCli = Command.make('expandai').pipe(
 	Command.withDescription('expand.ai CLI and MCP server'),
 	Command.withSubcommands([
@@ -68,10 +129,13 @@ const HumanCli = Command.make('expandai').pipe(
 		LoginCommand,
 		WhoamiCommand,
 		LogoutCommand,
+		HumanInitCommand,
+		HumanStatusCommand,
 		UninstallCommand,
 		HumanMcp,
 		SkillCommand,
 		HumanHookCommand,
+		TelemetryCommand,
 	]),
 	Command.provide(
 		Layer.mergeAll(
@@ -83,6 +147,11 @@ const HumanCli = Command.make('expandai').pipe(
 			Uninstall.Default,
 			ClaudeHook.Default,
 			OpencodeHook.Default,
+			InitServiceLive,
+			HarnessDetector.Default,
+			InitTerminalInteraction.Default,
+			StatusServiceLive,
+			StatusTerminalInteraction.Default,
 		),
 	),
 )
@@ -95,27 +164,98 @@ const AgentCli = Command.make('expandai').pipe(
 		LoginCommand,
 		WhoamiCommand,
 		LogoutCommand,
+		AgentInitCommand,
+		AgentStatusCommand,
+		// The consent step tells the user `expandai uninstall` is how to undo
+		// setup — including removing the machine-wide `WebFetch` deny rule. That
+		// text is read by an agent, so the command has to exist in this tree too;
+		// it was human-only, and an agent running it got "Invalid subcommand".
+		UninstallCommand,
 		AgentMcp,
 		AgentHookCommand,
+		TelemetryCommand,
 	]),
 	Command.provide(
-		Layer.mergeAll(ConfigManager.Default, Authentication.Default, ClaudeHook.Default, OpencodeHook.Default),
+		Layer.mergeAll(
+			ConfigManager.Default,
+			Authentication.Default,
+			ClaudeHook.Default,
+			OpencodeHook.Default,
+			Mcp.Default,
+			HookInstaller.Default,
+			SkillInstaller.Default,
+			Uninstall.Default,
+			InitServiceLive,
+			HarnessDetector.Default,
+			StatusServiceLive,
+		),
 	),
 )
 
 const LoggerLive = Layer.unwrapEffect(
 	Effect.gen(function* () {
 		const isDebug = yield* Config.boolean('DEBUG').pipe(Config.withDefault(false))
-		return Logger.minimumLogLevel(isDebug ? LogLevel.All : LogLevel.Info)
+		// stdout is a protocol/data surface (hook JSON payloads, fetched
+		// markdown) — a log line ahead of the payload corrupts it for the
+		// consumer, so diagnostics go to stderr.
+		return Layer.mergeAll(
+			Logger.replace(Logger.defaultLogger, Logger.prettyLogger({ stderr: true })),
+			Logger.minimumLogLevel(isDebug ? LogLevel.All : LogLevel.Info),
+		)
 	}),
 )
 
-const Env = Layer.mergeAll(NodeContext.layer, CliConfig.layer({ showBuiltIns: false }), LoggerLive)
+// Status is a read-only diagnostic contract, and `init --detect` documents itself
+// as changing nothing — the guide prints "This changes nothing:" directly above
+// it. Select the no-op service before layer acquisition so Telemetry.Default
+// cannot persist a distinct id, repair config permissions, display a notice, or
+// send a request. A brand-new HOME came back from `--detect` with a config.json
+// holding a telemetry id, which is a write however small. Other commands retain
+// the ordinary telemetry service unchanged.
+const writesNothing =
+	commandFromArgv(process.argv) === 'status' ||
+	(commandFromArgv(process.argv) === 'init' && process.argv.includes('--detect'))
+const TelemetryLive = writesNothing ? Telemetry.DISABLED : Telemetry.Default
+const Env = Layer.mergeAll(NodeContext.layer, CliConfig.layer({ showBuiltIns: false }), LoggerLive, TelemetryLive)
+
+const errorTagFromCause = (cause: Cause.Cause<unknown>): string =>
+	Cause.failureOption(cause).pipe(
+		Option.match({
+			onNone: () => 'Defect',
+			onSome: (error) =>
+				typeof error === 'object' && error !== null && '_tag' in error && typeof error._tag === 'string'
+					? error._tag
+					: 'UnknownError',
+		}),
+	)
+
+function startupOnboardingPreflightError(): string | undefined {
+	const initMode = resolveInitExecutionMode({
+		argv: process.argv,
+		environment: process.env,
+		stdinIsTty: process.stdin.isTTY === true,
+		stdoutIsTty: process.stdout.isTTY === true,
+	})
+	if (initMode === 'machine') return preflightAgentInitArgv(process.argv)
+	const statusMode = resolveStatusExecutionMode({
+		argv: process.argv,
+		environment: process.env,
+		stdinIsTty: process.stdin.isTTY === true,
+		stdoutIsTty: process.stdout.isTTY === true,
+	})
+	return statusMode === 'machine' ? preflightAgentStatusArgv(process.argv) : undefined
+}
 
 const program = Effect.gen(function* () {
-	const context = yield* detectContext
+	const command = commandFromArgv(process.argv)
+	const context = yield* detectContext(command)
+	const telemetry = yield* Telemetry
+	if (context === 'human') {
+		yield* telemetry.showNoticeIfNeeded()
+	}
+	yield* telemetry.capture('cli_command_run', { command, context })
 	const cli = context === 'human' ? HumanCli : AgentCli
-	return yield* Command.run(cli, { name: 'expand.ai CLI', version: '0.0.1' })(process.argv)
+	return yield* Command.run(cli, { name: 'expand.ai CLI', version: CLI_VERSION })(process.argv)
 }).pipe(
 	Effect.catchAllCause((cause) => {
 		const failure = Cause.failureOption(cause)
@@ -138,9 +278,28 @@ const program = Effect.gen(function* () {
 				),
 		})
 		const debug = Effect.logDebug('Error cause').pipe(Effect.annotateLogs({ cause: Cause.pretty(cause) }))
-		return print.pipe(Effect.zipRight(debug), Effect.zipRight(Effect.failCause(cause)))
+		const trackFailure = Effect.flatMap(Telemetry, (telemetry) =>
+			telemetry.capture('cli_command_failed', {
+				command: commandFromArgv(process.argv),
+				error_tag: errorTagFromCause(cause),
+			}),
+		)
+		return print.pipe(Effect.zipRight(debug), Effect.zipRight(trackFailure), Effect.zipRight(Effect.failCause(cause)))
 	}),
+	// Deliver any pending telemetry before the process exits; capped at 1s by
+	// Telemetry.flush so it can never hold a short-lived invocation open.
+	Effect.ensuring(Effect.flatMap(Telemetry, (telemetry) => telemetry.flush)),
 	Effect.provide(Env),
 )
 
-NodeRuntime.runMain(program, { disableErrorReporting: true })
+// disablePrettyLogger: runMain's own pretty logger writes to stdout, which
+// would put diagnostics back on the protocol/data stream LoggerLive keeps clean.
+const preflightError = startupOnboardingPreflightError()
+if (preflightError !== undefined) {
+	// This validation must finish before the Effect runtime acquires Telemetry,
+	// otherwise an invalid machine command could still create local state.
+	process.stderr.write(`${preflightError}\n`)
+	process.exitCode = 2
+} else {
+	NodeRuntime.runMain(program, { disableErrorReporting: true, disablePrettyLogger: true })
+}

package/build/dts/DeviceAuth.d.ts

@@ -1,87 +0,0 @@
-import { HttpClient } from '@effect/platform';
-import { Duration, Effect, Schema } from 'effect';
-import { ConfigManager } from './Config.js';
-declare const DeviceCodeResponse_base: Schema.Class<DeviceCodeResponse, {
-    device_code: typeof Schema.String;
-    user_code: Schema.transform<typeof Schema.String, typeof Schema.String>;
-    verification_uri: typeof Schema.String;
-    verification_uri_complete: typeof Schema.String;
-    expires_in: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-    interval: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-}, Schema.Struct.Encoded<{
-    device_code: typeof Schema.String;
-    user_code: Schema.transform<typeof Schema.String, typeof Schema.String>;
-    verification_uri: typeof Schema.String;
-    verification_uri_complete: typeof Schema.String;
-    expires_in: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-    interval: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-}>, never, {
-    readonly expires_in: Duration.Duration;
-} & {
-    readonly device_code: string;
-} & {
-    readonly user_code: string;
-} & {
-    readonly verification_uri: string;
-} & {
-    readonly verification_uri_complete: string;
-} & {
-    readonly interval: Duration.Duration;
-}, {}, {}>;
-export declare class DeviceCodeResponse extends DeviceCodeResponse_base {
-}
-declare const TokenResponse_base: Schema.Class<TokenResponse, {
-    access_token: typeof Schema.String;
-    expires_in: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-    token_type: typeof Schema.String;
-    scope: Schema.optional<typeof Schema.String>;
-}, Schema.Struct.Encoded<{
-    access_token: typeof Schema.String;
-    expires_in: Schema.transform<typeof Schema.Number, typeof Schema.DurationFromSelf>;
-    token_type: typeof Schema.String;
-    scope: Schema.optional<typeof Schema.String>;
-}>, never, {
-    readonly access_token: string;
-} & {
-    readonly expires_in: Duration.Duration;
-} & {
-    readonly token_type: string;
-} & {
-    readonly scope?: string | undefined;
-}, {}, {}>;
-export declare class TokenResponse extends TokenResponse_base {
-}
-declare const DeviceAuthRequestFailed_base: Schema.TaggedErrorClass<DeviceAuthRequestFailed, "DeviceAuthRequestFailed", {
-    readonly _tag: Schema.tag<"DeviceAuthRequestFailed">;
-} & {
-    endpoint: typeof Schema.String;
-    error: typeof Schema.Defect;
-    status: Schema.optional<typeof Schema.Number>;
-}>;
-export declare class DeviceAuthRequestFailed extends DeviceAuthRequestFailed_base {
-    get message(): string;
-}
-declare const DeviceAuthorizationDenied_base: Schema.TaggedErrorClass<DeviceAuthorizationDenied, "DeviceAuthorizationDenied", {
-    readonly _tag: Schema.tag<"DeviceAuthorizationDenied">;
-}>;
-export declare class DeviceAuthorizationDenied extends DeviceAuthorizationDenied_base {
-    get message(): string;
-}
-declare const DeviceAuthorizationExpired_base: Schema.TaggedErrorClass<DeviceAuthorizationExpired, "DeviceAuthorizationExpired", {
-    readonly _tag: Schema.tag<"DeviceAuthorizationExpired">;
-}>;
-export declare class DeviceAuthorizationExpired extends DeviceAuthorizationExpired_base {
-    get message(): string;
-}
-declare const DeviceAuthService_base: Effect.Service.Class<DeviceAuthService, "@expandai/cli/DeviceAuthService", {
-    readonly dependencies: readonly [import("effect/Layer").Layer<HttpClient.HttpClient, never, never>, import("effect/Layer").Layer<ConfigManager, import("effect/ConfigError").ConfigError, never>];
-    readonly effect: Effect.Effect<{
-        readonly requestDeviceCode: () => Effect.Effect<DeviceCodeResponse, import("@effect/platform/HttpBody").HttpBodyError | DeviceAuthRequestFailed, never>;
-        readonly pollForToken: (deviceCode: string, interval: Duration.Duration, expiresIn: Duration.Duration) => Effect.Effect<TokenResponse, DeviceAuthRequestFailed | DeviceAuthorizationDenied | DeviceAuthorizationExpired, never>;
-        readonly saveToken: (tokenResponse: TokenResponse) => Effect.Effect<void, import("./Config.js").ConfigNotWritable | import("effect/ParseResult").ParseError, never>;
-    }, import("./Config.js").ConfigParseError | import("effect/ConfigError").ConfigError | import("@effect/platform/Error").PlatformError, ConfigManager | HttpClient.HttpClient>;
-}>;
-export declare class DeviceAuthService extends DeviceAuthService_base {
-}
-export {};
-//# sourceMappingURL=DeviceAuth.d.ts.map

package/build/dts/DeviceAuth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceAuth.d.ts","sourceRoot":"","sources":["../../src/DeviceAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyC,MAAM,kBAAkB,CAAA;AAEpF,OAAO,EAAY,QAAQ,EAAE,MAAM,EAA6C,MAAM,EAAU,MAAM,QAAQ,CAAA;AAC9G,OAAO,EAAE,aAAa,EAAe,MAAM,aAAa,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiBxD,qBAAa,kBAAmB,SAAQ,uBAOtC;CAAG;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,aAAc,SAAQ,kBAKjC;CAAG;;;;;;;;AAEL,qBAAa,uBAAwB,SAAQ,4BAI3C;IACD,IAAI,OAAO,WAEV;CACD;;;;AAED,qBAAa,yBAA0B,SAAQ,8BAG9C;IACA,IAAI,OAAO,WAEV;CACD;;;;AAED,qBAAa,0BAA2B,SAAQ,+BAG/C;IACA,IAAI,OAAO,WAEV;CACD;;;;;;;;;AAID,qBAAa,iBAAkB,SAAQ,sBA8HrC;CAAG"}

package/build/esm/DeviceAuth.js

@@ -1,127 +0,0 @@
-import { HttpClient, HttpClientRequest, HttpClientResponse } from '@effect/platform';
-import { NodeHttpClient } from '@effect/platform-node';
-import { DateTime, Duration, Effect, Inspectable, Match, Option, Redacted, Ref, Schema, String } from 'effect';
-import { ConfigManager, OAuthConfig } from './Config.js';
-const FormattedUserCode = Schema.transform(Schema.String, Schema.String, {
-    strict: true,
-    decode: (raw) => {
-        const upper = String.toUpperCase(raw);
-        return upper.length > 4 ? `${String.takeLeft(upper, 4)}-${String.takeRight(upper, upper.length - 4)}` : upper;
-    },
-    encode: (formatted) => formatted.replace('-', ''),
-});
-const DurationFromSeconds = Schema.transform(Schema.Number, Schema.DurationFromSelf, {
-    strict: true,
-    decode: Duration.seconds,
-    encode: Duration.toSeconds,
-});
-export class DeviceCodeResponse extends Schema.Class('DeviceCodeResponse')({
-    device_code: Schema.String,
-    user_code: FormattedUserCode,
-    verification_uri: Schema.String,
-    verification_uri_complete: Schema.String,
-    expires_in: DurationFromSeconds,
-    interval: DurationFromSeconds,
-}) {
-}
-export class TokenResponse extends Schema.Class('TokenResponse')({
-    access_token: Schema.String,
-    expires_in: DurationFromSeconds,
-    token_type: Schema.String,
-    scope: Schema.optional(Schema.String),
-}) {
-}
-export class DeviceAuthRequestFailed extends Schema.TaggedError()('DeviceAuthRequestFailed', {
-    endpoint: Schema.String,
-    error: Schema.Defect,
-    status: Schema.optional(Schema.Number),
-}) {
-    get message() {
-        return `Device auth request to ${this.endpoint} failed${this.status ? ` (${this.status})` : ''}: ${Inspectable.format(this.error)}`;
-    }
-}
-export class DeviceAuthorizationDenied extends Schema.TaggedError()('DeviceAuthorizationDenied', {}) {
-    get message() {
-        return 'Authorization was denied by the user';
-    }
-}
-export class DeviceAuthorizationExpired extends Schema.TaggedError()('DeviceAuthorizationExpired', {}) {
-    get message() {
-        return 'Device authorization code expired';
-    }
-}
-const CLIENT_ID = 'expandai-cli';
-export class DeviceAuthService extends Effect.Service()('@expandai/cli/DeviceAuthService', {
-    dependencies: [NodeHttpClient.layer, ConfigManager.Default],
-    effect: Effect.gen(function* () {
-        const httpClient = yield* HttpClient.HttpClient;
-        const configManager = yield* ConfigManager;
-        const apiUrl = yield* configManager.getApiUrl();
-        const requestDeviceCode = Effect.fn('DeviceAuthService.requestDeviceCode')(function* () {
-            const DEVICE_AUTH_CODE_ENDPOINT = '/api/auth/device/code';
-            const request = yield* HttpClientRequest.post(new URL(DEVICE_AUTH_CODE_ENDPOINT, apiUrl)).pipe(HttpClientRequest.bodyJson({ client_id: CLIENT_ID }));
-            return yield* httpClient.execute(request).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(DeviceCodeResponse)), Effect.mapError((error) => new DeviceAuthRequestFailed({
-                endpoint: DEVICE_AUTH_CODE_ENDPOINT,
-                error,
-            })));
-        });
-        const pollForToken = Effect.fn('DeviceAuthService.pollForToken')(function* (deviceCode, interval, expiresIn) {
-            const DEVICE_AUTH_TOKEN_ENDPOINT = '/api/auth/device/token';
-            // RFC 8628 §3.5: on `slow_down`, the polling interval MUST be increased by 5
-            // seconds for this and all subsequent requests.
-            const SLOW_DOWN_BUMP = Duration.seconds(5);
-            const intervalRef = yield* Ref.make(interval);
-            const PollErrorBody = Schema.Struct({
-                error: Schema.String,
-                error_description: Schema.optional(Schema.String),
-            });
-            // better-auth's `deviceAuthorization` plugin accepts JSON; RFC 8628 §3.4
-            // would normally require `application/x-www-form-urlencoded`. If we ever
-            // target a non-better-auth server, switch to `HttpClientRequest.bodyUrlParams`.
-            const singlePoll = HttpClientRequest.post(new URL(DEVICE_AUTH_TOKEN_ENDPOINT, apiUrl)).pipe(HttpClientRequest.bodyJson({
-                grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
-                device_code: deviceCode,
-                client_id: CLIENT_ID,
-            }), Effect.flatMap(httpClient.execute), Effect.flatMap(HttpClientResponse.matchStatus({
-                '200': (response) => HttpClientResponse.schemaBodyJson(TokenResponse)(response).pipe(Effect.map(Option.some)),
-                orElse: (response) => HttpClientResponse.schemaBodyJson(PollErrorBody)(response).pipe(Effect.flatMap(({ error, error_description }) => Match.value(error).pipe(Match.when('authorization_pending', () => Ref.get(intervalRef).pipe(Effect.flatMap(Effect.sleep), Effect.as(Option.none()))), Match.when('slow_down', () => Ref.updateAndGet(intervalRef, (current) => Duration.sum(current, SLOW_DOWN_BUMP)).pipe(Effect.flatMap(Effect.sleep), Effect.as(Option.none()))), Match.when('access_denied', () => Effect.fail(new DeviceAuthorizationDenied())), Match.when('expired_token', () => Effect.fail(new DeviceAuthorizationExpired())), Match.orElse(() => Effect.fail(new DeviceAuthRequestFailed({
-                    endpoint: DEVICE_AUTH_TOKEN_ENDPOINT,
-                    status: response.status,
-                    error: error_description ?? error,
-                })))))),
-            })), Effect.catchTags({
-                RequestError: (error) => new DeviceAuthRequestFailed({ endpoint: DEVICE_AUTH_TOKEN_ENDPOINT, error }),
-                ResponseError: (error) => new DeviceAuthRequestFailed({ endpoint: DEVICE_AUTH_TOKEN_ENDPOINT, error }),
-                HttpBodyError: (error) => new DeviceAuthRequestFailed({ endpoint: DEVICE_AUTH_TOKEN_ENDPOINT, error }),
-                ParseError: (error) => new DeviceAuthRequestFailed({ endpoint: DEVICE_AUTH_TOKEN_ENDPOINT, error }),
-            }));
-            const result = yield* Effect.repeat(singlePoll, { until: Option.isSome }).pipe(Effect.timeoutFail({
-                duration: expiresIn,
-                onTimeout: () => new DeviceAuthorizationExpired(),
-            }));
-            return yield* Option.match(result, {
-                onNone: () => new DeviceAuthorizationExpired(),
-                onSome: Effect.succeed,
-            });
-        });
-        // INFO: better-auth's `deviceAuthorization` plugin issues access tokens
-        // with no refresh flow — `/api/auth/device/token` only accepts
-        // `grant_type=urn:ietf:params:oauth:grant-type:device_code`. Refresh is
-        // not part of the auth surface we're using, so we don't persist the
-        // refresh_token at all; ApiClient pre-empts the post-expiry 401 with
-        // `OAuthTokenExpired` and asks the user to re-login.
-        const saveToken = Effect.fn('DeviceAuthService.saveToken')(function* (tokenResponse) {
-            const now = yield* DateTime.now;
-            const expiresAt = DateTime.addDuration(now, tokenResponse.expires_in);
-            yield* configManager.updateConfig({
-                authMethod: OAuthConfig.make({
-                    accessToken: Redacted.make(tokenResponse.access_token),
-                    expiresAt,
-                }),
-            });
-        });
-        return { requestDeviceCode, pollForToken, saveToken };
-    }),
-}) {
-}
-//# sourceMappingURL=DeviceAuth.js.map

package/build/esm/DeviceAuth.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceAuth.js","sourceRoot":"","sources":["../../src/DeviceAuth.ts"],"names":[],"mappings":"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"}