@gajae-code/coding-agent 0.16.7 → 0.17.1

package/src/main.ts

@@ -70,6 +70,7 @@ import { newMasterAttestationEpoch, resolveSessionLocator, SessionIndex } from "
 import type { AgentSession } from "./session/agent-session";
 import { ManagedAppendIdentityMismatchError } from "./session/internal/managed-session-storage";
 import { SessionMigrationBusyError } from "./session/internal/session-open-errors";
+import { setPrimaryControlSurface } from "./session/primary-control-surface";
 import {
 	type ResumeSessionIdentity,
 	resolveResumableSession,
@@ -82,6 +83,7 @@ import {
 	SessionTranscriptOversizedError,
 	type StrictSessionOpenResult,
 } from "./session/session-manager";
+import { resolveStartupAuthConfig } from "./session/startup-auth-config";
 import { runStartupCredentialAutoImportIfNeeded } from "./setup/credential-auto-import";
 import {
 	readOnboardingState,
@@ -472,7 +474,10 @@ async function applyStartupModelProfilesWithPolicy(
 	const applyProfile = async (
 		profileName: string,
 		persistDefault: boolean,
-		options: { thinkingLevelOverride?: CreateAgentSessionOptions["thinkingLevel"] } = {},
+		options: {
+			thinkingLevelOverride?: CreateAgentSessionOptions["thinkingLevel"];
+			tolerateCredentialError?: boolean;
+		} = {},
 	): Promise<boolean> => {
 		try {
 			await activateModelProfile(
@@ -481,14 +486,22 @@ async function applyStartupModelProfilesWithPolicy(
 			);
 			return true;
 		} catch (error) {
-			if (onCredentialError && error instanceof ModelProfileCredentialError) {
-				onCredentialError(error);
+			if (error instanceof ModelProfileCredentialError && (onCredentialError || options.tolerateCredentialError)) {
+				if (onCredentialError) onCredentialError(error);
+				else process.stderr.write(`${chalk.yellow(`Warning: ${error.message}`)}\n`);
 				return false;
 			}
 			throw error;
 		}
 	};
 
+	// An explicit startup selector (--mpreset or --model) fully replaces the
+	// persisted default profile for this session, so a failing default must not
+	// abort a non-interactive run: it is reported as a warning and the explicit
+	// selection proceeds. Without an explicit selector the historic fatal
+	// contract is unchanged.
+	const tolerateDefaultProfileFailure = args.parsedArgs.mpreset !== undefined || args.parsedArgs.model !== undefined;
+
 	// Capture the explicitly-selected startup model BEFORE profile activation can
 	// override it. startupModel covers the eager path; session.model covers the
 	// deferred `--model <pattern>` path resolved inside createAgentSession.
@@ -505,6 +518,7 @@ async function applyStartupModelProfilesWithPolicy(
 					thinkingLevelOverride: args.settings.has("defaultThinkingLevel")
 						? args.settings.get("defaultThinkingLevel")
 						: undefined,
+					tolerateCredentialError: tolerateDefaultProfileFailure,
 				})) && applied;
 		}
 		if (args.parsedArgs.mpreset) {
@@ -520,14 +534,15 @@ async function applyStartupModelProfilesWithPolicy(
 			applied = await applyConfiguredProfiles();
 		} catch (error) {
 			if (error instanceof ModelProfileCredentialError) throw error;
-			await args.modelRegistry.refresh("online-if-uncached");
+			await args.modelRegistry.refresh("online-if-uncached", args.session.credentialSessionId);
 			refreshedOnline = true;
 			applied = await applyConfiguredProfiles();
 		}
-		if (applied && !refreshedOnline) args.modelRegistry.refreshInBackground();
+		if (applied && !refreshedOnline)
+			args.modelRegistry.refreshInBackground("online-if-uncached", args.session.credentialSessionId);
 	} else {
 		if (defaultProfile || args.parsedArgs.mpreset) {
-			await args.modelRegistry.refresh("online-if-uncached");
+			await args.modelRegistry.refresh("online-if-uncached", args.session.credentialSessionId);
 		}
 		await applyConfiguredProfiles();
 	}
@@ -683,17 +698,61 @@ export const BARE_RESUME_OPEN_ERROR = "Could not open the selected session. Use
 const SESSION_ARTIFACT_CAPACITY_RECOVERY_MESSAGE =
 	"The selected legacy session's artifacts exceed the supported migration capacity. Archive or remove only that legacy session's artifacts after confirming they are no longer needed, then retry.";
 
-function operatorFacingSessionOpenMessage(value: unknown): string | undefined {
+export class SessionForkDeclinedError extends Error {
+	readonly code = "session_fork_declined" as const;
+	readonly #sessionId: string;
+	readonly #projectDirectory: string;
+
+	constructor(sessionId: string, projectDirectory: string) {
+		super(
+			`Session "${sessionId}" is in another project (${projectDirectory}). Re-run from that directory, or accept the fork when prompted.`,
+		);
+		this.name = "SessionForkDeclinedError";
+		this.#sessionId = sessionId;
+		this.#projectDirectory = projectDirectory;
+	}
+
+	get sessionId(): string {
+		return this.#sessionId;
+	}
+
+	get projectDirectory(): string {
+		return this.#projectDirectory;
+	}
+}
+
+export class SessionNotFoundError extends Error {
+	readonly code = "session_not_found" as const;
+	readonly #sessionId: string;
+
+	constructor(sessionId: string) {
+		super(`Session "${sessionId}" not found.`);
+		this.name = "SessionNotFoundError";
+		this.#sessionId = sessionId;
+	}
+
+	get sessionId(): string {
+		return this.#sessionId;
+	}
+}
+
+export function operatorFacingSessionOpenMessage(value: unknown): string | undefined {
 	const code =
-		value instanceof SessionArtifactCapacityError
+		value instanceof SessionForkDeclinedError
 			? value.code
-			: value instanceof SessionMigrationBusyError
+			: value instanceof SessionNotFoundError
 				? value.code
-				: value instanceof SessionTranscriptOversizedError
+				: value instanceof SessionArtifactCapacityError
 					? value.code
-					: typeof value === "string"
-						? value
-						: undefined;
+					: value instanceof SessionMigrationBusyError
+						? value.code
+						: value instanceof SessionTranscriptOversizedError
+							? value.code
+							: typeof value === "string"
+								? value
+								: undefined;
+	if (code === "session_fork_declined" && value instanceof SessionForkDeclinedError) return value.message;
+	if (code === "session_not_found" && value instanceof SessionNotFoundError) return value.message;
 	if (code === "artifact_capacity_exceeded") return SESSION_ARTIFACT_CAPACITY_RECOVERY_MESSAGE;
 	if (code === "oversized") return SESSION_OVERSIZED_RECOVERY_MESSAGE;
 	if (code === "migration_busy") return new SessionMigrationBusyError().message;
@@ -738,6 +797,7 @@ export async function runInteractiveMode(
 	resumeAction?: "continue-tail" | "open-idle",
 	startDeferredMcpConfig?: CreateAgentSessionResult["startDeferredMcpConfig"],
 	startDeferredModelProfiles?: DeferredModelProfileStartup,
+	options?: { stopAfterFirstPaint?: boolean },
 ): Promise<void> {
 	const mode = createInteractiveMode
 		? createInteractiveMode({
@@ -759,7 +819,7 @@ export async function runInteractiveMode(
 				eventBus,
 			);
 
-	await initializeInteractiveModeWithStartupUpdate(mode, startupUpdate);
+	await logger.time("interactive:init", () => initializeInteractiveModeWithStartupUpdate(mode, startupUpdate));
 	try {
 		await persistCoordinatorRuntimeInputReady();
 	} catch (error) {
@@ -772,7 +832,10 @@ export async function runInteractiveMode(
 			normalInteractive: true,
 			automation:
 				/^(?:1|true|yes|on)$/i.test(process.env.CI ?? "") ||
-				/^(?:1|true|yes|on)$/i.test(process.env.GJC_AUTOMATION ?? ""),
+				/^(?:1|true|yes|on)$/i.test(process.env.GJC_AUTOMATION ?? "") ||
+				// The timing probe must never block on a fresh-profile onboarding
+				// selector waiting for input that will never come.
+				options?.stopAfterFirstPaint === true,
 			initialMessage,
 			initialMessages,
 			initialImages,
@@ -785,7 +848,14 @@ export async function runInteractiveMode(
 			if (shouldOfferOnboarding(onboardingState)) await mode.showFrictionlessOnboarding();
 		}
 	}
-	mode.renderInitialMessages(undefined, { preserveExistingChat: true });
+	logger.time("interactive:firstPaint", () => mode.renderInitialMessages(undefined, { preserveExistingChat: true }));
+	if (options?.stopAfterFirstPaint) {
+		// GJC_TIMING=x probe: the cold-start measurement ends here, so tear the UI
+		// down with the same shutdown/stop order the interactive exit path uses.
+		await mode.shutdown();
+		mode.stop();
+		return;
+	}
 
 	for (const notify of notifs) {
 		if (!notify) {
@@ -986,7 +1056,7 @@ export async function createSessionManager(
 			parsed.sessionDir ? undefined : activeSettings.getAgentDir(),
 		);
 		if (!match) {
-			throw new Error(`Session "${forkSource}" not found.`);
+			throw new SessionNotFoundError(forkSource);
 		}
 		return await SessionManager.forkFrom(
 			match.session.path,
@@ -1017,7 +1087,7 @@ export async function createSessionManager(
 			parsed.sessionDir ? undefined : activeSettings.getAgentDir(),
 		);
 		if (!match) {
-			throw new Error(`Session "${sessionArg}" not found.`);
+			throw new SessionNotFoundError(sessionArg);
 		}
 		if (match.scope === "global") {
 			const normalizedCwd = normalizePathForComparison(cwd);
@@ -1025,7 +1095,7 @@ export async function createSessionManager(
 			if (normalizedCwd !== normalizedMatchCwd) {
 				const shouldFork = await promptForkSession(match.session);
 				if (!shouldFork) {
-					throw new Error(`Session "${sessionArg}" is in another project (${match.session.cwd}).`);
+					throw new SessionForkDeclinedError(sessionArg, match.session.cwd);
 				}
 				return await SessionManager.forkFrom(
 					match.session.path,
@@ -1297,8 +1367,9 @@ async function buildSessionOptions(
 		options.rules = [];
 	}
 
-	// General extension modules stay preloaded/explicit, while the SDK performs
-	// bounded native/Claude/Codex hook discovery through the canonical adapter.
+	// Session startup discovers extension modules from the canonical locations, so
+	// these stay at their defaults. `--extension` / `--no-extensions` are retired
+	// ACP-only launch flags and deliberately do not feed the local startup path.
 	options.disableExtensionDiscovery = false;
 	options.additionalExtensionPaths = [];
 
@@ -1311,6 +1382,7 @@ export interface RunRootCommandDependencies {
 	createAgentSession?: typeof createAgentSession;
 	createSessionManager?: typeof createSessionManager;
 	discoverAuthStorage?: typeof discoverAuthStorage;
+	resolveStartupAuthConfig?: typeof resolveStartupAuthConfig;
 	runAcpMode?: (options?: { agentDir?: string }) => Promise<void>;
 	settings?: Settings;
 	suppressProcessExit?: boolean;
@@ -1496,8 +1568,15 @@ export async function runRootCommand(
 
 	const notifs: (InteractiveModeNotify | null)[] = [];
 
-	// Create AuthStorage and ModelRegistry upfront
-	const authStorage = await logger.time("discoverModels", deps.discoverAuthStorage ?? discoverAuthStorage);
+	// Keep store authority and persistent pin intent in the same startup snapshot.
+	// Injected discoverers own their auth unless they also supply a config resolver.
+	const agentDir = deps.settings?.getAgentDir() ?? getAgentDir();
+	const resolveAuthConfig =
+		deps.resolveStartupAuthConfig ?? (deps.discoverAuthStorage ? undefined : resolveStartupAuthConfig);
+	const startupAuthConfig = await resolveAuthConfig?.(agentDir);
+	const authStorage = await logger.time("discoverModels", () =>
+		(deps.discoverAuthStorage ?? discoverAuthStorage)(agentDir, startupAuthConfig),
+	);
 	const modelRegistry = new ModelRegistry(authStorage);
 
 	if (parsedArgs.version) {
@@ -1838,6 +1917,7 @@ export async function runRootCommand(
 	let rootStartupCacheAdmissionAttempted = false;
 	sessionOptions.authStorage = authStorage;
 	sessionOptions.modelRegistry = modelRegistry;
+	sessionOptions.startupAuthConfig = startupAuthConfig;
 	sessionOptions.modelRegistryStartupMutation = {
 		owner: "cli-root",
 		onAttempt: () => {
@@ -1847,9 +1927,16 @@ export async function runRootCommand(
 	sessionOptions.hasUI = isInteractive;
 	sessionOptions.notificationHostModeSupported = isInteractive;
 	sessionOptions.sdkHostModeSupported = isInteractive;
+	setPrimaryControlSurface(sessionOptions, "cli");
 	sessionOptions.settings = settingsInstance;
 	sessionOptions.masterModeContext = masterModeContext;
-	if (isInteractive && sessionOptions.mcpConfigPath) {
+	// Interactive launches paint before MCP connects: the deferred starter runs
+	// after first paint and a startup turn barrier keeps the first prompt from
+	// racing tool registration. A no-op whenever no MCP servers apply — exact
+	// `--mcp-config`, conventional autoload, or plugin bundles (plugins never
+	// defer; their connect evidence is published during session creation).
+	// ACP/print/SDK sessions connect eagerly and are not carved out here.
+	if (isInteractive) {
 		sessionOptions.deferMcpConfigStartup = true;
 	}
 	// ACP is not carved out: `gjc acp` is broker-backed and never builds a local
@@ -1958,7 +2045,7 @@ export async function runRootCommand(
 		// every parallel arm by ~30ms. Startup model profiles do their own foreground refresh
 		// before activation so project-scoped defaults can resolve freshly discovered models.
 		if (!context?.skipPostCreateModelRefresh && !rootStartupCacheAdmissionAttempted) {
-			modelRegistry.refreshInBackground();
+			modelRegistry.refreshInBackground("online-if-uncached", result.session.credentialSessionId);
 		}
 		return result;
 	};
@@ -2062,10 +2149,12 @@ export async function runRootCommand(
 		}
 
 		if (isInteractive) {
-			let exitForTiming = false;
+			const timingEnv = $pickenv("GJC_TIMING", "PI_TIMING");
+			const exitForTiming = timingEnv === "x";
+			let changelogMarkdown: string | undefined;
 			try {
 				startupUpdate.startBeforeInteractiveInitialization();
-				const changelogMarkdown = await logger.time(
+				changelogMarkdown = await logger.time(
 					"main:getChangelogForDisplay",
 					deps.getChangelogForDisplay ?? getChangelogForDisplay,
 					parsedArgs,
@@ -2082,9 +2171,8 @@ export async function runRootCommand(
 					process.stdout.write(`${chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Alt+N to cycle)")}`)}\n`);
 				}
 
-				if ($pickenv("GJC_TIMING", "PI_TIMING")) {
+				if (timingEnv && !exitForTiming) {
 					logger.printTimings();
-					exitForTiming = $pickenv("GJC_TIMING", "PI_TIMING") === "x";
 				}
 
 				if (!exitForTiming) {
@@ -2121,6 +2209,39 @@ export async function runRootCommand(
 			}
 
 			if (exitForTiming) {
+				// GJC_TIMING=x measures through the first transcript paint, so the
+				// cold-start number includes interactive init and time-to-first-render.
+				// The probe's deliverable is the timing report: a mode boot or teardown
+				// failure is logged, but session disposal still precedes the exit (the
+				// contract under startup-update-contract) and the report still prints.
+				// This block sits outside the try/catch so the mock-throwing exit in
+				// tests cannot unwind into a second disposal.
+				try {
+					await runInteractiveMode(
+						session,
+						VERSION,
+						changelogMarkdown,
+						notifs,
+						startupUpdate,
+						parsedArgs.messages,
+						setToolUIContext,
+						lspServers,
+						mcpManager,
+						eventBus,
+						initialMessage,
+						initialImages,
+						deps.createInteractiveMode,
+						bareResumeAction,
+						startDeferredMcpConfig,
+						startDeferredModelProfiles,
+						{ stopAfterFirstPaint: true },
+					);
+				} catch (error) {
+					logger.warn("Timing probe interactive boot failed", { error: String(error) });
+				}
+				// Report before teardown so Total ends at first paint, not at the end
+				// of session persistence and resource cleanup.
+				logger.printTimings();
 				await session.dispose();
 				process.exit(0);
 			}

package/src/memories/index.ts

@@ -973,14 +973,36 @@ function hasExactKeys(value: Record<string, unknown>, expectedKeys: string[], al
 function redactSecrets(input: string): string {
 	let out = input;
 	const patterns = [
+		// A PEM block is redacted whole and therefore runs first; the narrower rules
+		// would otherwise consume its base64 body and leave a truncated key behind.
+		/-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z0-9 ]*PRIVATE KEY-----/g,
 		/(?:sk|pk|rk|tok|key|secret|token|password)[-_A-Za-z0-9]{12,}/g,
-		/[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}/g,
-		/(?:AKIA|ASIA)[A-Z0-9]{16}/g,
+		// The leading boundary is anchored. Without it the first segment re-tries
+		// every offset of a long token-character run before failing to find `.`,
+		// which is quadratic: 200 KB of ordinary prose cost ~10.6s.
+		/(?<![A-Za-z0-9_-])[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}/g,
+		// ABIA (bearer) and ACCA (context) complete the AWS identifier prefixes the
+		// session-import and crash scrubbers already list.
+		/(?:AKIA|ASIA|ABIA|ACCA)[A-Z0-9]{16}/g,
 		// GitHub tokens carry no keyword the first pattern recognizes, so without
 		// this they reached MEMORY.md and memory_summary.md verbatim — and the
 		// summary is injected into every later session. Same shapes the
 		// contribution-prep scrubber already covers.
 		/\b(?:gh[opsur]_[A-Za-z0-9_]{12,}|github_pat_[A-Za-z0-9_]{12,})\b/g,
+		// Google API keys are a fixed 39-character shape carrying no keyword.
+		/\bAIza[0-9A-Za-z_-]{35}\b/g,
+		/\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g,
+		// The shapes `crash/upstream/envelope.ts` classifies as credential-like.
+		// Stripe and Hugging Face separate with `_`, so the keyword rule above,
+		// which requires `sk`/`pk`/`rk` followed by `[-_A-Za-z0-9]`, still misses
+		// `hf_` and `npm_` entirely.
+		/\bnpm_[A-Za-z0-9]{20,}\b/g,
+		/\bglpat-[A-Za-z0-9_-]{20,}\b/g,
+		/\b(?:sk|rk)_(?:live|test)_[A-Za-z0-9]{16,}\b/g,
+		/\bhf_[A-Za-z0-9]{20,}\b/g,
+		// Basic-auth credentials in a URL. The scheme repetition is bounded for the
+		// same reason the boundary above is anchored.
+		/(?<![A-Za-z0-9+.-])[a-z][a-z0-9+.-]{0,15}:\/\/[^/\s:@]{1,256}:[^/\s@]{1,256}@/gi,
 	];
 	for (const pattern of patterns) {
 		out = out.replace(pattern, "[REDACTED]");