@gajae-code/coding-agent 0.15.5 → 0.16.0

package/src/cli/accounts-cli.ts

@@ -10,6 +10,7 @@ import {
 	type AuthStorage,
 	type CredentialInventoryRecord,
 	type CredentialRemovalTarget,
+	isSqliteCorruptionError,
 	OAuthCredentialSelectorError,
 	type OAuthPinTarget,
 	resolveOAuthStorageProvider,
@@ -23,6 +24,7 @@ import {
 	checkAccountInventory,
 	clearPersistentPinForRemovedRows,
 } from "../session/account-inventory";
+import { CREDENTIAL_STORE_UNREADABLE_MESSAGE } from "../session/credential-store-errors";
 import { resolveStartupAuthConfig, type StartupAuthConfigSnapshot } from "../session/startup-auth-config";
 
 export const ACCOUNTS_ACTIONS = ["list", "check", "pin", "logout"] as const;
@@ -48,6 +50,7 @@ class AccountsCommandError extends Error {
 	}
 }
 export function toAccountsCommandError(error: unknown): AccountsCommandError | undefined {
+	if (isSqliteCorruptionError(error)) return new AccountsCommandError(CREDENTIAL_STORE_UNREADABLE_MESSAGE);
 	if (error instanceof OAuthCredentialSelectorError) return new AccountsCommandError(error.message);
 	return undefined;
 }
@@ -391,16 +394,17 @@ export async function runAccountsCommand(cmd: AccountsCommandArgs): Promise<void
 			}
 		}
 	} catch (error) {
+		const normalizedError = toAccountsCommandError(error) ?? error;
 		if (cmd.flags.json) {
-			if (!(error instanceof AccountsCommandError)) {
-				process.stderr.write(`accounts command failed: ${cleanReason(error) ?? "Command failed."}\n`);
+			if (!(normalizedError instanceof AccountsCommandError)) {
+				process.stderr.write(`accounts command failed: ${cleanReason(normalizedError) ?? "Command failed."}\n`);
 			}
 			process.exitCode = 1;
-			writeJsonFailure(error);
+			writeJsonFailure(normalizedError);
 			return;
 		}
-		if (error instanceof AccountsCommandError) {
-			process.stderr.write(`${error.message}\n`);
+		if (normalizedError instanceof AccountsCommandError) {
+			process.stderr.write(`${normalizedError.message}\n`);
 			process.exitCode = 1;
 			return;
 		}

package/src/cli/args.ts

@@ -84,6 +84,8 @@ export interface Args {
 	noRules?: boolean;
 	listModels?: string | true;
 	noTitle?: boolean;
+	master?: true;
+	masterScope?: "repo" | "pwd" | "global";
 	messages: string[];
 	fileArgs: string[];
 	/** Flags unknown to every launch parser; their consumer supplies the diagnostic. */
@@ -178,6 +180,17 @@ export function parseArgs(args: string[], authority: ParseArgsAuthority = "local
 			result.help = true;
 		} else if (arg === "--version" || arg === "-v") {
 			result.version = true;
+		} else if (arg === "--master") {
+			result.master = true;
+		} else if (arg === "--scope") {
+			const scope = takeFlagValue(args, i++, "--scope");
+			if (scope !== "repo" && scope !== "pwd" && scope !== "global") {
+				throw new CliParseError("invalid --scope value (expected repo, pwd, or global)");
+			}
+			if (result.masterScope !== undefined && result.masterScope !== scope) {
+				throw new CliParseError("--scope cannot be specified with conflicting values");
+			}
+			result.masterScope = scope;
 		} else if (arg === "--allow-home") {
 			result.allowHome = true;
 		} else if (arg === "--mode") {
@@ -371,6 +384,10 @@ export function parseArgs(args: string[], authority: ParseArgsAuthority = "local
 		}
 	}
 
+	if (result.masterScope !== undefined && result.master !== true) {
+		throw new CliParseError("--scope requires --master");
+	}
+	if (result.master === true && result.masterScope === undefined) result.masterScope = "repo";
 	if (result.default && !result.mpreset) {
 		throw new CliParseError("--default requires --mpreset <name>");
 	}

package/src/cli/auth-broker-cli.ts

@@ -17,6 +17,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
+import * as readline from "node:readline";
 import { cleanReason } from "@gajae-code/ai/auth-broker/redact";
 import {
 	AuthBrokerClient,
@@ -226,19 +227,46 @@ async function runLogin(flags: AuthBrokerCommandArgs["flags"]): Promise<void> {
 	await runLocalLogin(providerArg as OAuthProvider);
 }
 
+function promptForLogin(rl: readline.Interface, question: string): Promise<string> {
+	const { promise, resolve } = Promise.withResolvers<string>();
+	rl.question(question, answer => resolve(answer));
+	return promise;
+}
+
 async function runLocalLogin(provider: OAuthProvider): Promise<void> {
-	// Spawn the pi-ai CLI in-process — it handles the per-provider OAuth dance
-	// and persists into the same SQLite store the broker uses.
-	const piAiCli = Bun.fileURLToPath(import.meta.resolve("@gajae-code/ai/cli"));
-	const proc = Bun.spawn({
-		cmd: [process.execPath, piAiCli, "login", provider],
-		stdin: "inherit",
-		stdout: "inherit",
-		stderr: "inherit",
-	});
-	const exitCode = await proc.exited;
-	if (exitCode !== 0) {
-		throw new Error(`pi-ai login exited with code ${exitCode}`);
+	// Drive AuthStorage.login() in-process against the local SQLite store the
+	// broker uses. Previously this spawned a child process resolved via
+	// `import.meta.resolve("@gajae-code/ai/cli")`, which requires an on-disk
+	// `node_modules` package resolution — present in a source/dev checkout but
+	// absent inside a compiled `bun build --compile` binary's `$bunfs`, so the
+	// standalone binary failed with a module-resolution error (issue #5064).
+	// `AuthStorage` is already a normal, statically-traceable import from
+	// `@gajae-code/ai/core` (see the top of this file), so it bundles cleanly
+	// into the compiled binary the same way every other `@gajae-code/ai/core`
+	// export used elsewhere in this file already does.
+	const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+	const store = await SqliteAuthCredentialStore.open(getAgentDbPath());
+	const storage = new AuthStorage(store);
+	await storage.reload();
+	try {
+		await storage.login(provider, {
+			onAuth(info) {
+				const { url, instructions } = info;
+				process.stdout.write(`\nOpen this URL in your browser:\n${url}\n`);
+				if (instructions) process.stdout.write(`${instructions}\n`);
+				process.stdout.write("\n");
+			},
+			onProgress(message) {
+				process.stdout.write(`${message}\n`);
+			},
+			onPrompt(p) {
+				return promptForLogin(rl, `${p.message}${p.placeholder ? ` (${p.placeholder})` : ""}: `);
+			},
+		});
+		process.stdout.write(`\nCredentials saved to ${getAgentDbPath()}\n`);
+	} finally {
+		store.close();
+		rl.close();
 	}
 }