@gajae-code/coding-agent 0.16.1 → 0.16.4

package/src/main.ts

@@ -31,7 +31,15 @@ import { selectSession } from "./cli/session-picker";
 import { findConfigFile } from "./config";
 import { activateModelProfile, ModelProfileCredentialError } from "./config/model-profile-activation";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
-import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
+import {
+	parseModelString,
+	refreshMissingQualifiedModelProviders,
+	resolveCliModel,
+	resolveModelRoleValue,
+	resolveModelScope,
+	resolveStartupModelRefreshSelectors,
+	type ScopedModel,
+} from "./config/model-resolver";
 import { selectorHead } from "./config/model-selector-value";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
 import { resolveMachineLocalUpdateChannel, type UpdateChannel } from "./config/update-channel";
@@ -49,7 +57,7 @@ import type { PrintModeOptions } from "./modes/print-mode";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
 import type { SubmittedUserInput } from "./modes/types";
 import { applyCliRuntimeApiKeyOverride } from "./runtime-api-key";
-import { parseCliCredentialSelector } from "./runtime-credential-selector";
+import { type CliCredentialSelector, parseCliCredentialSelector } from "./runtime-credential-selector";
 import type { MCPManager } from "./runtime-mcp";
 import {
 	type CreateAgentSessionOptions,
@@ -1645,6 +1653,66 @@ export async function runRootCommand(
 			)
 		: undefined;
 
+	if (parsedArgs.apiKey && parsedArgs.credential) {
+		process.stderr.write(`${chalk.red("--api-key and --credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+	if (parsedArgs.credential && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--credential and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+	if (parsedArgs.apiKey && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--api-key and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+
+	let credentialSelector: CliCredentialSelector | undefined;
+	let preferredCredentialSelector: CliCredentialSelector | undefined;
+	try {
+		credentialSelector = parsedArgs.credential ? parseCliCredentialSelector(parsedArgs.credential) : undefined;
+		preferredCredentialSelector = parsedArgs.preferCredential
+			? parseCliCredentialSelector(parsedArgs.preferCredential)
+			: undefined;
+		if (preferredCredentialSelector) {
+			const provider =
+				preferredCredentialSelector.provider ??
+				authStorage.resolveRuntimePreferredCredentialSelectorProvider(preferredCredentialSelector.selector);
+			authStorage.setRuntimePreferredCredentialSelector(provider, preferredCredentialSelector.selector);
+		}
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		process.stderr.write(`${chalk.red(message)}\n`);
+		process.exit(1);
+	}
+
+	const hasRootStartupProfile = Boolean(settingsInstance.get("modelProfile.default") || parsedArgs.mpreset);
+	const startupModelSelectors = resolveStartupModelRefreshSelectors(
+		{
+			model: parsedArgs.model,
+			provider: parsedArgs.provider,
+			credential: parsedArgs.credential,
+			continue: parsedArgs.continue,
+			resume: parsedArgs.resume,
+			hasStartupProfile: hasRootStartupProfile,
+		},
+		settingsInstance,
+	);
+	const explicitStartupModelSelector = parsedArgs.model
+		? typeof startupModelSelectors === "string"
+			? startupModelSelectors
+			: parsedArgs.model
+		: undefined;
+	if (parsedArgs.apiKey && explicitStartupModelSelector) {
+		const parsedModel = parseModelString(explicitStartupModelSelector);
+		if (parsedModel) authStorage.setRuntimeApiKey(parsedModel.provider, parsedArgs.apiKey);
+	}
+	await logger.time(
+		"refreshStartupModelProviders",
+		refreshMissingQualifiedModelProviders,
+		startupModelSelectors,
+		modelRegistry,
+	);
+
 	let scopedModels: ScopedModel[] = [];
 	const modelPatterns = parsedArgs.models ?? settingsInstance.get("enabledModels");
 	const modelMatchPreferences = {
@@ -1779,7 +1847,6 @@ export async function runRootCommand(
 	if (isInteractive && sessionOptions.mcpConfigPath) {
 		sessionOptions.deferMcpConfigStartup = true;
 	}
-	const hasRootStartupProfile = Boolean(settingsInstance.get("modelProfile.default") || parsedArgs.mpreset);
 	// ACP is not carved out: `gjc acp` is broker-backed and never builds a local
 	// session here, and the broker-launched lifecycle child defers memory startup
 	// unconditionally (createLifecycleAgentSession) so readiness never waits on
@@ -1790,37 +1857,8 @@ export async function runRootCommand(
 	const acpStartupOptions = mode === "acp" ? resolveAcpStartupOptions(parsedArgs, sessionOptions) : undefined;
 
 	// Handle CLI credential selection and --api-key as runtime overrides (not persisted).
-	if (parsedArgs.apiKey && parsedArgs.credential) {
-		process.stderr.write(`${chalk.red("--api-key and --credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-	if (parsedArgs.credential && parsedArgs.preferCredential) {
-		process.stderr.write(`${chalk.red("--credential and --prefer-credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-	if (parsedArgs.apiKey && parsedArgs.preferCredential) {
-		process.stderr.write(`${chalk.red("--api-key and --prefer-credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-
-	if (parsedArgs.credential) {
-		try {
-			sessionOptions.credentialSelector = parseCliCredentialSelector(parsedArgs.credential);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			process.stderr.write(`${chalk.red(message)}\n`);
-			process.exit(1);
-		}
-	}
-	if (parsedArgs.preferCredential) {
-		try {
-			sessionOptions.preferredCredentialSelector = parseCliCredentialSelector(parsedArgs.preferCredential);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			process.stderr.write(`${chalk.red(message)}\n`);
-			process.exit(1);
-		}
-	}
+	if (credentialSelector) sessionOptions.credentialSelector = credentialSelector;
+	if (preferredCredentialSelector) sessionOptions.preferredCredentialSelector = preferredCredentialSelector;
 	if (parsedArgs.apiKey) {
 		if (!sessionOptions.model && !sessionOptions.modelPattern) {
 			process.stderr.write(

package/src/modes/DESIGN.md

@@ -347,6 +347,60 @@ CJK/Latin todo, IRC, status, and BTW text break at semantic phrase boundaries,
 not inside a phase/action/status label, short identifier, or grapheme cluster.
 Those defects, width overflow, overlap, hidden focus/cursor, and lost anchors
 are blocking visual-QA failures.
+
+### Status Line Custom Editor simulation
+
+The Appearance tab's Status Line Custom Editor is a spatial editor, not a
+generic setting row list. It renders a simulated statusbar with left/right
+segment areas, a hidden-segment palette, visible Separator and segment-option
+controls, and Confirm/Exit actions. It must not render legacy `Segment`,
+`Move left`, or `Move right` rows.
+
+The editor owns transient state locally: focused statusbar slot, focused palette
+item, focused root control, open visible-choice panel, picked segment, floating
+ghost, empty origin slot, and overflow warning. Durable settings remain only the
+existing `statusLine.leftSegments`, `statusLine.rightSegments`,
+`statusLine.separator`, and `statusLine.segmentOptions` keys; Confirm persists
+through the existing settings guard, while Exit or root-state Escape restores
+the previous preview and closes.
+
+Focus variants are `statusbar`, `palette`, `separator-control`,
+`option-control(path)`, `choice(target, focusedValue, returnFocus)`, `confirm`,
+and `exit`. Left/Right is owned by the editor while active and never switches
+settings tabs. Enter selects/deselects, picks/drops, applies a focused choice,
+or activates Confirm/Exit according to focus. Up/Down traverses palette,
+visible root controls, actions, and choice candidates. Escape inside `choice`
+returns to the opener without mutation; Escape everywhere else cancels and
+restores. Delete only hides a focused visible statusbar segment.
+
+Separator and every segment option are visible-choice controls, never cycle-only
+rows. Descriptor data owns labels, allowed values, visible current-value
+formatting, and typed draft application. Separator choices are Powerline, Thin
+chevron, Slash, Pipe, Block, None, and ASCII. Boolean options show `true` and
+`false`; enum options show their union values; `path.maxLength` shows `16`,
+`24`, `32`, `40`, `50`, `60`, and `80`.
+
+At constrained width the simulated statusbar renders as two rows and emits an
+explicit overflow/wrap warning. ANSI-aware cell measurement remains mandatory;
+ASCII/no-color output must retain textual focus, ghost/origin, selected choice,
+and warning affordances.
+
+Deterministic evidence belongs to
+`test/fixtures/tui/status-line-custom-editor-showcase.ts`, captured by
+`scripts/capture-status-line-custom-editor-showcase.ts --out
+.gjc/qa/status-line-custom-editor-<run>` and verified by
+`scripts/verify-status-line-custom-editor-showcase.ts --root
+.gjc/qa/status-line-custom-editor-<run> --require-independent-review`. The
+canonical states are `root-statusbar`, `picked-origin-slot`,
+`palette-exact-insert`, `separator-control`, `separator-choice-focused`,
+`separator-choice-applied`, `option-boolean-choice-focused`,
+`option-enum-choice-focused`, `option-numeric-choice-focused`,
+`option-choice-applied`, `exit-restored`, `confirm-persisted`,
+`overflow-two-row-warning`, and `narrow-cjk`. Each state records
+`terminal.txt`, `terminal-ansi.txt`, `terminal.html`, and `metadata.json`, plus
+the root manifest. Missing state witnesses, ANSI/plain mismatch, invalid
+metadata, and absent independent review are blocking visual-QA failures.
+
 ### Sticky viewport deterministic visual QA
 
 `test/fixtures/tui/sticky-viewport-showcase.ts` is a fixed-clock, no-network,

package/src/modes/acp/acp-agent.ts

@@ -1699,9 +1699,13 @@ export class AcpAgent implements Agent {
 		try {
 			await record.adapter.ensureProviders();
 		} catch (error) {
-			if (waiter.settled || record.cancelRequested || record.activePrompt !== waiter) {
+			if (waiter.settled || record.activePrompt !== waiter) {
 				this.#retiredPromptAcknowledgements.delete(params.sessionId);
-				if (!waiter.settled) await this.#settleCancelledPrompt(params.sessionId, record, waiter);
+				return await response;
+			}
+			if (record.cancelRequested && waiter.cancelAcknowledged) {
+				this.#retiredPromptAcknowledgements.delete(params.sessionId);
+				await this.#settleCancelledPrompt(params.sessionId, record, waiter);
 				return await response;
 			}
 			if (record.activePrompt === waiter) {
@@ -1712,9 +1716,13 @@ export class AcpAgent implements Agent {
 			}
 			throw error;
 		}
-		if (waiter.settled || record.cancelRequested || record.activePrompt !== waiter) {
+		if (waiter.settled || record.activePrompt !== waiter) {
 			this.#retiredPromptAcknowledgements.delete(params.sessionId);
-			if (!waiter.settled) await this.#settleCancelledPrompt(params.sessionId, record, waiter);
+			return await response;
+		}
+		if (record.cancelRequested && waiter.cancelAcknowledged) {
+			this.#retiredPromptAcknowledgements.delete(params.sessionId);
+			await this.#settleCancelledPrompt(params.sessionId, record, waiter);
 			return await response;
 		}
 
@@ -1739,8 +1747,11 @@ export class AcpAgent implements Agent {
 			);
 		}
 		waiter.dispatched = true;
-		if (waiter.settled || record.cancelRequested || record.activePrompt !== waiter) {
-			if (!waiter.settled) await this.#settleCancelledPrompt(params.sessionId, record, waiter);
+		if (waiter.settled || record.activePrompt !== waiter) {
+			return await response;
+		}
+		if (record.cancelRequested && waiter.cancelAcknowledged) {
+			await this.#settleCancelledPrompt(params.sessionId, record, waiter);
 			return await response;
 		}
 
@@ -1922,7 +1933,7 @@ export class AcpAgent implements Agent {
 			// return the semantically meaningful `cancelled` stop reason, so that Clients
 			// can reliably confirm the cancellation." Surfacing the transport's `busy`
 			// rejection instead would show the user a spurious error for their own cancel.
-			if (record.cancelRequested) {
+			if (record.cancelRequested && waiter.cancelAcknowledged) {
 				record.cancelRequested = false;
 				// The client's turn is settled by the return; the advisory idle publication
 				// must not gate it and must still be attempted so the running phase is
@@ -2006,11 +2017,6 @@ export class AcpAgent implements Agent {
 			}
 			waiter?.cancelAttemptResolve?.(true);
 		} catch (error) {
-			if (waiter && !waiter.dispatched) {
-				await this.#settleCancelledPrompt(params.sessionId, record, waiter);
-				waiter.cancelAttemptResolve?.(true);
-				return;
-			}
 			if (!waiter) record.cancelRequested = false;
 			// Only the LAST in-flight attempt resolves the shared promise false;
 			// an earlier attempt may still acknowledge (review thread P2). After
@@ -2058,7 +2064,8 @@ export class AcpAgent implements Agent {
 
 	async #settleCancelledPrompt(id: string, record: SessionRecord, waiter: PromptWaiter): Promise<void> {
 		// The authoritative terminal wins whenever it arrives in time; this only runs
-		// when nothing settled the prompt the client already asked to cancel.
+		// when nothing settled the prompt after the SDK acknowledged the cancellation.
+		if (!waiter.cancelAcknowledged) return;
 		if (this.#sessions.get(id) !== record || record.activePrompt !== waiter || waiter.settled) return;
 		if (waiter.terminalReserved) return;
 		record.activePrompt = undefined;
@@ -2896,6 +2903,14 @@ export class AcpAgent implements Agent {
 			if (reconnected) {
 				const waiter = record.activePrompt;
 				if (waiter && !waiter.settled && !waiter.terminal) {
+					// A successful abort acknowledgement is authoritative for this prompt even
+					// when the SDK transport changes identity during the cancellation grace.
+					// Treating the reconnect as owner loss would replace the acknowledged
+					// cancellation with connection_closed and leave cancellation nondeterministic.
+					if (record.cancelRequested && waiter.cancelAcknowledged) {
+						await this.#settleCancelledPrompt(id, record, waiter);
+						return;
+					}
 					record.activePrompt = undefined;
 					record.busy = record.backgroundBusy;
 					clearPromptWatchdog(waiter);
@@ -3113,7 +3128,7 @@ export class AcpAgent implements Agent {
 		id: string,
 		notification: SessionNotification,
 		adapter: AcpSdkAdapter,
-		publicationGeneration: number,
+		_publicationGeneration: number,
 	): void {
 		const prior = this.#failureDiagnosticTails.get(id) ?? Promise.resolve();
 		const task = prior.then(async () => {

package/src/modes/components/assistant-message.ts

@@ -106,16 +106,24 @@ export class AssistantMessageComponent extends Container {
 	#toolImagesRevision = 0;
 	#convertedToolImagesRevision = 0;
 	#disposed = false;
+	// Cached Markdown children can outlive their attachment to this assistant.
+	// Session/live-parent validity belongs to the owner, not the paint lifetime.
+	readonly #requestRepaint?: () => void;
 	constructor(
 		message?: AssistantMessage,
 		private hideThinkingBlock = false,
-		private readonly onImageUpdate?: () => void,
+		onImageUpdate?: () => void,
 		viewportAnchorId?: string,
 		private readonly onVisibleMutation?: () => void,
 		private readonly hintSession?: ProviderSafetyStopHintSession,
 	) {
 		super();
 		this.#viewportAnchorId = viewportAnchorId;
+		if (onImageUpdate) {
+			this.#requestRepaint = () => {
+				if (!this.#disposed) onImageUpdate();
+			};
+		}
 
 		this.#contentContainer = new Container();
 		this.addChild(this.#contentContainer);
@@ -172,6 +180,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	#notifyVisibleMutation(): void {
+		if (this.#disposed) return;
 		const after = this.#visibleContentSignature();
 		if (after === this.#visibleSignature) return;
 		this.#visibleSignature = after;
@@ -186,6 +195,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	override invalidate(): void {
+		if (this.#disposed) return;
 		super.invalidate();
 		if (this.#lastMessage) {
 			this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
@@ -193,13 +203,14 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	setHideThinkingBlock(hide: boolean): void {
+		if (this.#disposed) return;
 		if (this.hideThinkingBlock === hide) return;
 		this.hideThinkingBlock = hide;
 		this.#notifyVisibleMutation();
 	}
 
 	setToolResultImages(toolCallId: string, images: ImageContent[]): void {
-		if (!toolCallId) return;
+		if (this.#disposed || !toolCallId) return;
 		const validImages = images.filter(img => img.type === "image" && img.data && img.mimeType);
 		const previousImages = this.#toolImagesByCallId.get(toolCallId);
 		if (
@@ -268,7 +279,7 @@ export class AssistantMessageComponent extends Container {
 					this.#convertedKittyImages.set(key, { type: "image", data, mimeType: "image/png", source });
 					this.#convertedToolImagesRevision += 1;
 					if (this.#lastMessage) this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
-					this.onImageUpdate?.();
+					this.#requestRepaint?.();
 				})
 				.catch(() => {
 					if (
@@ -283,6 +294,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	setUsageInfo(usage: Usage): void {
+		if (this.#disposed) return;
 		this.#usageInfo = usage;
 		if (this.#lastMessage) {
 			this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
@@ -311,7 +323,7 @@ export class AssistantMessageComponent extends Container {
 		const cached = this.#contentBlocksCache.get(content);
 		if (cached?.source === content.text) {
 			if (cached.component instanceof Markdown) {
-				cached.component.setOnStaleThrottle(this.onImageUpdate);
+				cached.component.setOnStaleThrottle(this.#requestRepaint);
 				cached.component.setStreaming(streaming);
 			}
 			return cached.component;
@@ -322,14 +334,14 @@ export class AssistantMessageComponent extends Container {
 		// instead of constructing a new one each chunk; combined with the markdown
 		// per-code-block highlight cache, appends no longer re-highlight the whole prefix.
 		if (!deepInterview && cached && cached.component instanceof Markdown) {
-			cached.component.setOnStaleThrottle(this.onImageUpdate);
+			cached.component.setOnStaleThrottle(this.#requestRepaint);
 			cached.component.setText(trimmed, { streaming });
 			cached.source = content.text;
 			return cached.component;
 		}
 		const component = deepInterview ?? new Markdown(trimmed, 1, 0, getMarkdownTheme());
 		if (component instanceof Markdown) {
-			component.setOnStaleThrottle(this.onImageUpdate);
+			component.setOnStaleThrottle(this.#requestRepaint);
 			component.setStreaming(streaming);
 		}
 		this.#contentBlocksCache.set(content, { source: content.text, component });
@@ -341,14 +353,14 @@ export class AssistantMessageComponent extends Container {
 		const cached = this.#contentBlocksCache.get(content);
 		if (cached?.source === content.thinking) {
 			if (cached.component instanceof Markdown) {
-				cached.component.setOnStaleThrottle(this.onImageUpdate);
+				cached.component.setOnStaleThrottle(this.#requestRepaint);
 				cached.component.setStreaming(streaming);
 			}
 			return cached.component as Markdown;
 		}
 		const trimmed = elideRunawayThinkingRepetition(content.thinking.trim());
 		if (cached?.component instanceof Markdown) {
-			cached.component.setOnStaleThrottle(this.onImageUpdate);
+			cached.component.setOnStaleThrottle(this.#requestRepaint);
 			cached.component.setText(trimmed, { streaming });
 			cached.source = content.thinking;
 			return cached.component;
@@ -357,7 +369,7 @@ export class AssistantMessageComponent extends Container {
 			color: (text: string) => theme.fg("thinkingText", text),
 			italic: true,
 		});
-		component.setOnStaleThrottle(this.onImageUpdate);
+		component.setOnStaleThrottle(this.#requestRepaint);
 		component.setStreaming(streaming);
 		this.#contentBlocksCache.set(content, { source: content.thinking, component });
 		this.#reusableChildren.add(component);
@@ -437,6 +449,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	updateContent(message: AssistantMessage, options?: AssistantMessageUpdateOptions): void {
+		if (this.#disposed) return;
 		this.#lastMessage = message;
 		this.#lastStreaming = options?.streaming ?? false;