@gajae-code/coding-agent 0.17.1 → 0.17.4

package/src/modes/acp/acp-event-mapper.ts

@@ -239,6 +239,7 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 				content: todo.content,
 				priority: "medium" as const,
 				status: mapTodoStatus(todo.status),
+				_meta: { gjcTodoStatus: todo.status },
 			}));
 			return [toSessionNotification(sessionId, { sessionUpdate: "plan", entries })];
 		}
@@ -502,6 +503,13 @@ function toSessionNotification(sessionId: string, update: SessionUpdate): Sessio
 	return { sessionId, update };
 }
 
+/**
+ * ACP's `PlanEntryStatus` has only three members, so an `abandoned` todo has to be projected as
+ * one of them and `completed` is the one that stops a client's plan UI from showing a dropped task
+ * as outstanding work. That projection is lossy, so every plan entry also carries the internal
+ * status as `_meta.gjcTodoStatus` for readers that need the truth rather than the rendering
+ * (issue #5669).
+ */
 const todoStatusMap: Record<TodoStatus, "pending" | "in_progress" | "completed"> = {
 	pending: "pending",
 	in_progress: "in_progress",
@@ -529,6 +537,7 @@ function mapTodoWriteResultToPlanUpdate(
 			content: todo.content,
 			priority: "medium" as const,
 			status: mapTodoStatus(todo.status),
+			_meta: { gjcTodoStatus: todo.status },
 		})),
 	};
 }

package/src/modes/acp/startup-provenance.ts

@@ -0,0 +1,59 @@
+import { AcpSdkAdapterError } from "../../sdk/acp";
+
+type JsonObject = Record<string, unknown>;
+
+export type PrimaryControlSurface = "cli" | "sdk";
+
+/**
+ * Startup-control provenance is the authority record ACP needs before it may take
+ * permission, provider, and lifecycle ownership of a session. Hosts serving that
+ * record report capabilities carrying `promptTerminalOutcomeVersion`
+ * and `primaryControlSurface`; a host that predates the record reports neither, and a
+ * host that cannot answer at all reports nothing. Those are three different operator
+ * problems, so they get three different messages instead of one "restart the session".
+ */
+export function resolveStartupProvenance(input: {
+	sessionId: string;
+	capabilities: JsonObject | undefined;
+	queryFailure: unknown;
+}): PrimaryControlSurface {
+	const { sessionId, capabilities, queryFailure } = input;
+	if (!capabilities)
+		throw new AcpSdkAdapterError(
+			"unavailable",
+			`ACP session ${sessionId} did not answer runtime.capabilities, so its startup control provenance is unknown${describeFailure(queryFailure)}.`,
+		);
+	const surface =
+		capabilities.primaryControlSurface === "sdk"
+			? "sdk"
+			: capabilities.primaryControlSurface === "cli"
+				? "cli"
+				: undefined;
+	if (capabilities.promptTerminalOutcomeVersion !== 1 || surface === undefined)
+		throw new AcpSdkAdapterError(
+			"unavailable",
+			`ACP session ${sessionId} is served by a live GJC host that predates startup control provenance. Upgrading the client does not upgrade that already-running host: stop it, then reopen the session so the current build resumes it from its stored record.`,
+		);
+	return surface;
+}
+
+function describeFailure(failure: unknown): string {
+	if (failure === undefined) return "";
+	let code: unknown;
+	try {
+		if ((typeof failure !== "object" || failure === null) && typeof failure !== "function") return " (query failed)";
+		code = (failure as { code?: unknown }).code;
+	} catch {
+		return " (query failed)";
+	}
+	switch (code) {
+		case "connection_closed":
+			return " (connection closed)";
+		case "timeout":
+			return " (query timed out)";
+		case "uncertain_after_send":
+			return " (query outcome uncertain)";
+		default:
+			return " (query failed)";
+	}
+}

package/src/modes/components/custom-provider-wizard.ts

@@ -1,3 +1,4 @@
+import * as crypto from "node:crypto";
 import { Container, Input, matchesKey, SecretInput, Spacer, Text, TruncatedText } from "@gajae-code/tui";
 import type { ProviderCompatibility, ProviderSetupInput } from "../../setup/provider-onboarding";
 import { theme } from "../theme/theme";
@@ -12,6 +13,7 @@ type WizardStep =
 	| "base-url"
 	| "credential-source"
 	| "credential"
+	| "discover"
 	| "models"
 	| "confirm"
 	| "force-confirm";
@@ -22,11 +24,33 @@ interface WizardState {
 	baseUrl: string;
 	credentialSource: CustomProviderCredentialSource;
 	credential: string;
+	discoverModels: boolean;
+	discoveredModels: string[];
+	/** Inputs that produced discoveredModels; empty when results are stale/unprobed. */
+	discoveredForBaseUrl: string;
+	/** SHA-256 of the credential that produced the results — never the secret itself. */
+	discoveredForCredentialHash: string;
+	discoveredForCredentialSource: CustomProviderCredentialSource;
+	discoveryError: string | null;
 	models: string;
 }
 
 export type CustomProviderWizardSubmit = ProviderSetupInput;
 
+export interface CustomProviderWizardDiscoveryDeps {
+	discoverModels?: (input: {
+		baseUrl: string;
+		apiKeyEnv?: string;
+		apiKey?: string;
+		signal?: AbortSignal;
+	}) => Promise<{ models: string[] }>;
+}
+
+/** Non-secret fingerprint binding probe results to the credential that produced them. */
+function fingerprintCredential(credential: string): string {
+	return `sha256:${crypto.createHash("sha256").update(credential, "utf8").digest("hex")}`;
+}
+
 export class CustomProviderWizardComponent extends Container {
 	#contentContainer: Container;
 	#input: Input | SecretInput | null = null;
@@ -39,22 +63,37 @@ export class CustomProviderWizardComponent extends Container {
 		baseUrl: "",
 		credentialSource: "env",
 		credential: "",
+		discoverModels: false,
+		discoveredModels: [],
+		discoveredForBaseUrl: "",
+		discoveredForCredentialHash: "",
+		discoveredForCredentialSource: "env",
+		discoveryError: null,
 		models: "",
 	};
 	#submitInFlight = false;
+	#discoveryInFlight = false;
+	#discoveryGeneration = 0;
+	#submitGeneration = 0;
+	#discoveryAbort: AbortController | null = null;
+	#submitAbort: AbortController | null = null;
+	#dismissed = false;
 	#onSubmit: (input: CustomProviderWizardSubmit) => void;
 	#onCancel: () => void;
 	#onRender: () => void;
+	#discoveryDeps: CustomProviderWizardDiscoveryDeps = {};
 
 	constructor(
 		onSubmit: (input: CustomProviderWizardSubmit) => void,
 		onCancel: () => void,
 		onRender: () => void = () => {},
+		discoveryDeps: CustomProviderWizardDiscoveryDeps = {},
 	) {
 		super();
 		this.#onSubmit = onSubmit;
 		this.#onCancel = onCancel;
 		this.#onRender = onRender;
+		this.#discoveryDeps = discoveryDeps;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -83,6 +122,8 @@ export class CustomProviderWizardComponent extends Container {
 	handleInput(keyData: string): void {
 		if (matchesAppInterrupt(keyData)) {
 			if (this.#step === "compatibility") {
+				this.#dismissed = true;
+				this.#cancelDiscovery();
 				this.#clearLiteralCredential();
 				this.#onCancel();
 				return;
@@ -155,6 +196,9 @@ export class CustomProviderWizardComponent extends Container {
 					this.#renderSecretInputStep();
 				}
 				break;
+			case "discover":
+				this.#renderDiscoverStep();
+				break;
 			case "models":
 				this.#renderInputStep(
 					"Step 6: Model id(s)",
@@ -204,6 +248,49 @@ export class CustomProviderWizardComponent extends Container {
 		this.#addHelp("[Enter to continue, Esc to go back]");
 	}
 
+	#renderDiscoverStep(): void {
+		this.#contentContainer.addChild(new Text(theme.fg("accent", "Step 6: Model discovery")));
+		this.#contentContainer.addChild(new Spacer(1));
+		if (this.#state.compatibility !== "openai") {
+			this.#contentContainer.addChild(
+				new Text("Model discovery needs an OpenAI-compatible endpoint. Continue with manual model ids.", 0, 0),
+			);
+			this.#contentContainer.addChild(new Spacer(1));
+			this.#addOption(0, "Enter model ids manually");
+			this.#addHelp("[Enter to continue, Esc to go back]");
+			return;
+		}
+		if (this.#discoveryInFlight) {
+			this.#contentContainer.addChild(new Text("Discovering models from the provider /v1/models endpoint…", 0, 0));
+			this.#contentContainer.addChild(new Spacer(1));
+			this.#addHelp("The API key is sent only to your configured base URL.");
+			return;
+		}
+		if (this.#state.discoveryError) {
+			this.#contentContainer.addChild(
+				new Text(theme.fg("warning", `Discovery failed: ${this.#state.discoveryError}`), 0, 0),
+			);
+			this.#contentContainer.addChild(new Spacer(1));
+		}
+		if (this.#state.discoveredModels.length > 0) {
+			const preview = this.#state.discoveredModels.slice(0, 10).join(", ");
+			const extra =
+				this.#state.discoveredModels.length > 10 ? ` (+${this.#state.discoveredModels.length - 10} more)` : "";
+			this.#contentContainer.addChild(
+				new Text(`Discovered ${this.#state.discoveredModels.length} model(s): ${preview}${extra}`, 0, 0),
+			);
+			this.#contentContainer.addChild(new Spacer(1));
+		} else if (!this.#state.discoveryError) {
+			this.#contentContainer.addChild(
+				new Text("Probe the provider /v1/models endpoint, or enter model ids manually.", 0, 0),
+			);
+			this.#contentContainer.addChild(new Spacer(1));
+		}
+		this.#addOption(0, this.#state.discoveredModels.length > 0 ? "Use discovered models" : "Discover models now");
+		this.#addOption(1, "Enter model ids manually");
+		this.#addHelp("[↑↓ to navigate, Enter to select, Esc to go back]");
+	}
+
 	#renderSecretInputStep(): void {
 		this.#contentContainer.addChild(new Text(theme.fg("accent", "Step 5: Credential")));
 		this.#contentContainer.addChild(new Spacer(1));
@@ -214,9 +301,7 @@ export class CustomProviderWizardComponent extends Container {
 			const credential = secret.consume().trim();
 			if (!credential) return;
 			this.#state.credential = credential;
-			this.#step = "models";
-			this.#renderStep();
-			this.#onRender();
+			this.#enterDiscovery();
 		};
 		this.#input = input;
 		this.#contentContainer.addChild(input);
@@ -267,16 +352,25 @@ export class CustomProviderWizardComponent extends Container {
 		if (!value) return;
 		if (this.#step === "provider-id") {
 			this.#state.providerId = value;
+			// A provider-ID revision invalidates pending submits exactly
+			// like URL/credential revisions do.
+			this.#clearStaleDiscovery();
 			this.#step = "base-url";
 		} else if (this.#step === "base-url") {
 			this.#state.baseUrl = value;
+			this.#clearStaleDiscovery();
 			this.#step = "credential-source";
 			this.#selectedIndex = 0;
 		} else if (this.#step === "credential") {
 			this.#state.credential = value;
-			this.#step = "models";
+			this.#enterDiscovery();
+			return;
 		} else if (this.#step === "models") {
 			this.#state.models = value;
+			// Manual entry supersedes any accepted discovery (clearStale
+			// also resets discoverModels): submitting both would silently
+			// persist live discovery the manual screen never disclosed.
+			this.#clearStaleDiscovery();
 			this.#step = "confirm";
 			this.#selectedIndex = 0;
 			this.#lastSubmitError = null;
@@ -285,6 +379,18 @@ export class CustomProviderWizardComponent extends Container {
 		this.#onRender();
 	}
 
+	#enterDiscovery(): void {
+		this.#clearStaleDiscovery();
+		this.#step = "discover";
+		this.#selectedIndex = 0;
+		if (this.#state.compatibility === "openai" && this.#discoveryDeps.discoverModels) {
+			this.#runDiscovery();
+		} else {
+			this.#renderStep();
+			this.#onRender();
+		}
+	}
+
 	#selectCurrentOption(): void {
 		if (this.#step === "compatibility") {
 			this.#state.compatibility = this.#selectedIndex === 0 ? "openai" : "anthropic";
@@ -293,37 +399,189 @@ export class CustomProviderWizardComponent extends Container {
 			this.#state.credentialSource = this.#selectedIndex === 0 ? "env" : "literal";
 			this.#state.credential = "";
 			this.#step = "credential";
+		} else if (this.#step === "discover") {
+			if (this.#state.compatibility !== "openai") {
+				this.#step = "models";
+			} else if (this.#selectedIndex === 0) {
+				if (this.#state.discoveredModels.length > 0 && this.#discoveryResultsAreFresh()) {
+					this.#state.discoverModels = true;
+					this.#state.models = "";
+					this.#step = "confirm";
+					this.#selectedIndex = 0;
+					this.#lastSubmitError = null;
+				} else {
+					this.#runDiscovery();
+					return;
+				}
+			} else {
+				this.#state.discoverModels = false;
+				this.#cancelDiscovery();
+				this.#step = "models";
+			}
 		} else if (this.#step === "confirm" || this.#step === "force-confirm") {
 			if (this.#selectedIndex === 0) {
 				this.#submit();
 				return;
 			}
-			this.#step = "models";
+			this.#goBack();
+			return;
 		}
 		this.#renderStep();
 		this.#onRender();
 	}
 
+	#clearStaleDiscovery(): void {
+		this.#discoveryGeneration += 1;
+		this.#submitGeneration += 1;
+		this.#discoveryAbort?.abort();
+		this.#discoveryAbort = null;
+		// A revision also invalidates an in-flight submit: without this,
+		// a submit-time probe started before the edit could still persist
+		// the old URL/key and close the wizard as successful.
+		this.#submitAbort?.abort();
+		this.#submitAbort = null;
+		this.#discoveryInFlight = false;
+		this.#state.discoveredModels = [];
+		this.#state.discoveredForBaseUrl = "";
+		this.#state.discoveredForCredentialHash = "";
+		this.#state.discoverModels = false;
+		this.#state.discoveryError = null;
+	}
+
+	#discoveryResultsAreFresh(): boolean {
+		return (
+			this.#state.discoveredForBaseUrl !== "" &&
+			this.#state.discoveredForBaseUrl === this.#state.baseUrl.trim() &&
+			this.#state.discoveredForCredentialHash !== "" &&
+			this.#state.discoveredForCredentialHash === fingerprintCredential(this.#state.credential.trim()) &&
+			this.#state.discoveredForCredentialSource === this.#state.credentialSource
+		);
+	}
+
+	#runDiscovery(): void {
+		const discover = this.#discoveryDeps.discoverModels;
+		if (!discover || this.#discoveryInFlight) return;
+		this.#discoveryAbort?.abort();
+		const controller = new AbortController();
+		this.#discoveryAbort = controller;
+		this.#discoveryInFlight = true;
+		this.#discoveryGeneration += 1;
+		const generation = this.#discoveryGeneration;
+		this.#state.discoveryError = null;
+		this.#renderStep();
+		this.#onRender();
+		// Immutable fingerprint of the inputs being probed: completions are
+		// accepted only when both the generation and the live inputs still
+		// match, so an edit made while the request was in flight cannot
+		// inherit a catalog fetched for different inputs.
+		const credential = this.#state.credential.trim();
+		const fingerprint = {
+			baseUrl: this.#state.baseUrl.trim(),
+			credential,
+			credentialSource: this.#state.credentialSource,
+		};
+		const request = {
+			baseUrl: fingerprint.baseUrl,
+			apiKeyEnv: fingerprint.credentialSource === "env" ? fingerprint.credential : undefined,
+			apiKey: fingerprint.credentialSource === "literal" ? fingerprint.credential : undefined,
+			signal: controller.signal,
+		};
+		void Promise.resolve()
+			.then(() => discover(request))
+			.then(
+				result => {
+					if (!this.#isCurrentDiscoveryGeneration(generation)) return;
+					this.#discoveryInFlight = false;
+					if (!this.#discoveryFingerprintMatches(fingerprint)) {
+						if (this.#step === "discover") {
+							this.#renderStep();
+							this.#onRender();
+						}
+						return;
+					}
+					const models = [...new Set(result.models.map(model => model.trim()).filter(Boolean))].sort((a, b) =>
+						a.localeCompare(b),
+					);
+					this.#state.discoveredModels = models;
+					this.#state.discoveredForBaseUrl = fingerprint.baseUrl;
+					this.#state.discoveredForCredentialHash = fingerprintCredential(fingerprint.credential);
+					this.#state.discoveredForCredentialSource = fingerprint.credentialSource;
+					this.#state.discoveryError = models.length === 0 ? "The endpoint returned no models." : null;
+					this.#selectedIndex = 0;
+					if (this.#step === "discover") {
+						this.#renderStep();
+						this.#onRender();
+					}
+				},
+				error => {
+					if (!this.#isCurrentDiscoveryGeneration(generation)) return;
+					this.#discoveryInFlight = false;
+					if (!this.#discoveryFingerprintMatches(fingerprint)) {
+						if (this.#step === "discover") {
+							this.#renderStep();
+							this.#onRender();
+						}
+						return;
+					}
+					this.#state.discoveredModels = [];
+					this.#state.discoveredForBaseUrl = "";
+					this.#state.discoveredForCredentialHash = "";
+					this.#state.discoveryError = error instanceof Error ? error.message : String(error);
+					this.#selectedIndex = 1;
+					if (this.#step === "discover") {
+						this.#renderStep();
+						this.#onRender();
+					}
+				},
+			);
+	}
+
+	#isCurrentDiscoveryGeneration(generation: number): boolean {
+		return generation === this.#discoveryGeneration;
+	}
+
+	#discoveryFingerprintMatches(fingerprint: {
+		baseUrl: string;
+		credential: string;
+		credentialSource: CustomProviderCredentialSource;
+	}): boolean {
+		return (
+			fingerprint.baseUrl === this.#state.baseUrl.trim() &&
+			fingerprint.credential === this.#state.credential.trim() &&
+			fingerprint.credentialSource === this.#state.credentialSource
+		);
+	}
+
 	#submit(): void {
 		if (this.#submitInFlight) return;
 		this.#submitInFlight = true;
+		// Own the submit-time pre-write probe lifecycle: Esc-cancel during a
+		// stalled submit aborts the probe via #cancelDiscovery so the
+		// provider cannot be written after dismissal.
+		this.#submitAbort?.abort();
+		this.#submitAbort = new AbortController();
+		this.#submitGeneration += 1;
 		let submission: unknown;
 		try {
 			submission = this.#onSubmit(this.#buildInput(this.#step === "force-confirm"));
 		} catch (error) {
 			this.#submitInFlight = false;
+			this.#endSubmitDiscovery();
 			throw error;
 		}
 		if (!(submission instanceof Promise)) {
 			this.#submitInFlight = false;
+			this.#endSubmitDiscovery();
 			return;
 		}
 		void submission.then(
 			() => {
 				this.#submitInFlight = false;
+				this.#endSubmitDiscovery();
 			},
 			() => {
 				this.#submitInFlight = false;
+				this.#endSubmitDiscovery();
 			},
 		);
 	}
@@ -339,6 +597,8 @@ export class CustomProviderWizardComponent extends Container {
 				.split(",")
 				.map(model => model.trim())
 				.filter(Boolean),
+			discover: this.#state.compatibility === "openai" ? this.#state.discoverModels : false,
+			discoverySignal: this.#submitAbort?.signal,
 			force,
 		};
 
@@ -346,9 +606,44 @@ export class CustomProviderWizardComponent extends Container {
 	}
 
 	complete(): void {
+		this.#cancelDiscovery();
 		this.#clearLiteralCredential();
 	}
 
+	/**
+	 * Abort any in-flight probe and invalidate its generation so a late
+	 * completion cannot render into (or retain credentials from) a
+	 * dismissed wizard. Used by both submit and cancel paths.
+	 */
+	#cancelDiscovery(): void {
+		this.#discoveryGeneration += 1;
+		this.#submitGeneration += 1;
+		this.#discoveryAbort?.abort();
+		this.#discoveryAbort = null;
+		this.#submitAbort?.abort();
+		this.#submitAbort = null;
+		this.#discoveryInFlight = false;
+	}
+
+	/** Clear the settled submit controller without aborting (submit finished). */
+	#endSubmitDiscovery(): void {
+		this.#submitAbort = null;
+	}
+
+	/** Generation token for the latest submit attempt. */
+	currentSubmitGeneration(): number {
+		return this.#submitGeneration;
+	}
+
+	/**
+	 * Whether a submit attempt is still current: same generation and not
+	 * dismissed. Revision or cancel invalidates pending completions so a
+	 * stale refresh cannot report success or rerender over new inputs.
+	 */
+	isSubmitCurrent(generation: number): boolean {
+		return generation === this.#submitGeneration && !this.#dismissed;
+	}
+
 	#clearLiteralCredential(): void {
 		if (this.#state.credentialSource === "literal") this.#state.credential = "";
 	}
@@ -358,7 +653,8 @@ export class CustomProviderWizardComponent extends Container {
 			this.#step === "confirm" ||
 			this.#step === "force-confirm" ||
 			this.#step === "compatibility" ||
-			this.#step === "credential-source"
+			this.#step === "credential-source" ||
+			this.#step === "discover"
 				? 1
 				: 0;
 		this.#selectedIndex = (this.#selectedIndex + delta + maxIndex + 1) % (maxIndex + 1);
@@ -367,11 +663,16 @@ export class CustomProviderWizardComponent extends Container {
 	}
 
 	#goBack(): void {
+		if (this.#step === "discover" || this.#step === "confirm" || this.#step === "force-confirm") {
+			// Revision starts on entry to the editor, not when its new value is saved.
+			this.#cancelDiscovery();
+		}
 		if (this.#step === "provider-id") this.#step = "compatibility";
 		else if (this.#step === "base-url") this.#step = "provider-id";
 		else if (this.#step === "credential-source") this.#step = "base-url";
 		else if (this.#step === "credential") this.#step = "credential-source";
-		else if (this.#step === "models") this.#step = "credential";
+		else if (this.#step === "discover") this.#step = "credential";
+		else if (this.#step === "models") this.#step = "discover";
 		else if (this.#step === "confirm" || this.#step === "force-confirm") this.#step = "models";
 		this.#selectedIndex = 0;
 		this.#renderStep();