@gajae-code/coding-agent 0.3.1 → 0.4.0

package/src/modes/components/model-selector.ts

@@ -12,6 +12,7 @@ import {
 	Text,
 	type TUI,
 } from "@gajae-code/tui";
+import type { ModelProfileDefinition } from "../../config/model-profiles";
 import type { GjcModelAssignmentTargetId, ModelRegistry } from "../../config/model-registry";
 import { GJC_MODEL_ASSIGNMENT_TARGET_IDS, GJC_MODEL_ASSIGNMENT_TARGETS } from "../../config/model-registry";
 import {
@@ -74,6 +75,12 @@ interface CanonicalModelItem {
 	explicitThinkingLevel?: boolean;
 }
 
+interface ProfileItem {
+	kind: "profile";
+	name: string;
+	profile: ModelProfileDefinition;
+}
+
 type ScopedModelItem = ScopedModelSelection;
 
 interface RoleAssignment {
@@ -102,6 +109,11 @@ export type ModelSelectorSelection =
 			selector: string;
 			preset: ModelAssignmentPreset;
 			assignments: Record<GjcModelAssignmentTargetId, ThinkingLevel>;
+	  }
+	| {
+			kind: "profile";
+			profileName: string;
+			setDefault: boolean;
 	  };
 
 interface PendingThinkingChoice {
@@ -110,7 +122,7 @@ interface PendingThinkingChoice {
 	levels: ThinkingLevel[];
 }
 
-type RoleSelectCallback = (selection: ModelSelectorSelection) => void;
+type RoleSelectCallback = (selection: ModelSelectorSelection) => void | Promise<void>;
 type CancelCallback = () => void;
 
 interface ProviderTabState {
@@ -161,6 +173,7 @@ export class ModelSelectorComponent extends Container {
 	#filteredModels: ModelItem[] = [];
 	#canonicalModels: CanonicalModelItem[] = [];
 	#filteredCanonicalModels: CanonicalModelItem[] = [];
+	#profileItems: ProfileItem[] = [];
 	#selectedIndex: number = 0;
 	#roles = {} as Record<string, RoleAssignment | undefined>;
 	#settings = null as unknown as Settings;
@@ -228,7 +241,11 @@ export class ModelSelectorComponent extends Container {
 		this.#searchInput.onSubmit = () => {
 			const selectedItem = this.#getSelectedItem();
 			if (selectedItem) {
-				this.#beginActionMenuOrSelect(selectedItem);
+				if (selectedItem.kind === "profile") {
+					this.#beginProfileActionMenu(selectedItem);
+				} else {
+					this.#beginActionMenuOrSelect(selectedItem);
+				}
 			}
 		};
 		this.addChild(this.#searchInput);
@@ -465,11 +482,18 @@ export class ModelSelectorComponent extends Container {
 
 		this.#sortModels(models);
 		this.#sortCanonicalModels(canonicalModels);
+		const profiles = this.#modelRegistry.getModelProfiles?.() ?? new Map();
+		const profileItems = this.#temporaryOnly
+			? []
+			: [...profiles.values()]
+					.sort((a, b) => a.name.localeCompare(b.name))
+					.map(profile => ({ kind: "profile" as const, name: profile.name, profile }));
 
 		this.#allModels = models;
 		this.#filteredModels = models;
 		this.#canonicalModels = canonicalModels;
 		this.#filteredCanonicalModels = canonicalModels;
+		this.#profileItems = profileItems;
 		this.#selectedIndex = Math.min(this.#selectedIndex, Math.max(0, models.length - 1));
 	}
 
@@ -664,20 +688,40 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#getVisibleProfiles(): ProfileItem[] {
+		return !this.#temporaryOnly && !this.#isCanonicalTab() && this.#getActiveTabId() === ALL_TAB
+			? this.#profileItems
+			: [];
+	}
+
 	#updateList(): void {
 		this.#listContainer.clear();
 		const isCanonicalTab = this.#isCanonicalTab();
+		const visibleProfiles = this.#getVisibleProfiles();
+		const modelSelectedIndex = Math.max(0, this.#selectedIndex - visibleProfiles.length);
 		const visibleItems = isCanonicalTab ? this.#filteredCanonicalModels : this.#filteredModels;
 
 		const maxVisible = 10;
 		const startIndex = Math.max(
 			0,
-			Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), visibleItems.length - maxVisible),
+			Math.min(modelSelectedIndex - Math.floor(maxVisible / 2), visibleItems.length - maxVisible),
 		);
 		const endIndex = Math.min(startIndex + maxVisible, visibleItems.length);
 
 		const showProvider = this.#getActiveTabId() === ALL_TAB;
 
+		if (visibleProfiles.length > 0) {
+			this.#listContainer.addChild(new Text(theme.fg("muted", "Profiles"), 0, 0));
+			for (let i = 0; i < visibleProfiles.length; i++) {
+				const profile = visibleProfiles[i];
+				if (!profile) continue;
+				const isSelected = i === this.#selectedIndex;
+				const prefix = isSelected ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+				const label = isSelected ? theme.fg("accent", profile.name) : profile.name;
+				this.#listContainer.addChild(new Text(`${prefix}${label}`, 0, 0));
+			}
+			this.#listContainer.addChild(new Spacer(1));
+		}
 		// Show visible slice of filtered models
 		for (let i = startIndex; i < endIndex; i++) {
 			const item = visibleItems[i];
@@ -685,7 +729,7 @@ export class ModelSelectorComponent extends Container {
 			const canonicalItem = isCanonicalTab ? (item as CanonicalModelItem) : undefined;
 			const providerItem = isCanonicalTab ? undefined : (item as ModelItem);
 
-			const isSelected = i === this.#selectedIndex;
+			const isSelected = i + visibleProfiles.length === this.#selectedIndex;
 
 			// Build role badges (inverted: color as background, black text)
 			const roleBadgeTokens: string[] = [];
@@ -742,7 +786,7 @@ export class ModelSelectorComponent extends Container {
 			for (const line of errorLines) {
 				this.#listContainer.addChild(new Text(theme.fg("error", line), 0, 0));
 			}
-		} else if (visibleItems.length === 0) {
+		} else if (visibleItems.length === 0 && visibleProfiles.length === 0) {
 			const statusMessage = this.#getProviderEmptyStateMessage();
 			this.#listContainer.addChild(
 				new Text(
@@ -751,8 +795,13 @@ export class ModelSelectorComponent extends Container {
 					0,
 				),
 			);
+		} else if (this.#selectedIndex < visibleProfiles.length) {
+			const selectedProfile = visibleProfiles[this.#selectedIndex];
+			if (selectedProfile && this.#pendingActionItem) {
+				this.#renderProfileActionMenu(selectedProfile);
+			}
 		} else {
-			const selected = visibleItems[this.#selectedIndex];
+			const selected = visibleItems[modelSelectedIndex];
 			if (!selected) {
 				return;
 			}
@@ -806,6 +855,20 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#renderProfileActionMenu(profile: ProfileItem): void {
+		this.#listContainer.addChild(new Spacer(1));
+		this.#listContainer.addChild(new Text(theme.fg("muted", `  Action for profile: ${profile.name}`), 0, 0));
+		this.#listContainer.addChild(new Spacer(1));
+		const labels = ["Apply for this session", "Set as default"];
+		for (let i = 0; i < labels.length; i++) {
+			const label = labels[i] ?? "";
+			const prefix = i === this.#selectedActionIndex ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+			this.#listContainer.addChild(
+				new Text(`${prefix}${i === this.#selectedActionIndex ? theme.fg("accent", label) : label}`, 0, 0),
+			);
+		}
+	}
+
 	#getCurrentRoleThinkingLevel(role: string): ThinkingLevel {
 		return this.#roles[role]?.thinkingLevel ?? ThinkingLevel.Inherit;
 	}
@@ -813,10 +876,11 @@ export class ModelSelectorComponent extends Container {
 		return GJC_MODEL_ASSIGNMENT_TARGET_IDS.length + (supportsOpenAICodexPreset(model) ? 1 : 0);
 	}
 
-	#getSelectedItem(): ModelItem | CanonicalModelItem | undefined {
-		return this.#isCanonicalTab()
-			? this.#filteredCanonicalModels[this.#selectedIndex]
-			: this.#filteredModels[this.#selectedIndex];
+	#getSelectedItem(): ModelItem | CanonicalModelItem | ProfileItem | undefined {
+		const visibleProfiles = this.#getVisibleProfiles();
+		if (this.#selectedIndex < visibleProfiles.length) return visibleProfiles[this.#selectedIndex];
+		const modelIndex = this.#selectedIndex - visibleProfiles.length;
+		return this.#isCanonicalTab() ? this.#filteredCanonicalModels[modelIndex] : this.#filteredModels[modelIndex];
 	}
 
 	handleInput(keyData: string): void {
@@ -836,7 +900,9 @@ export class ModelSelectorComponent extends Container {
 
 		// Up arrow - navigate list (wrap to bottom when at top)
 		if (matchesKey(keyData, "up")) {
-			const itemCount = this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length;
+			const itemCount =
+				this.#getVisibleProfiles().length +
+				(this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length);
 			if (itemCount === 0) return;
 			this.#selectedIndex = this.#selectedIndex === 0 ? itemCount - 1 : this.#selectedIndex - 1;
 			this.#updateList();
@@ -845,7 +911,9 @@ export class ModelSelectorComponent extends Container {
 
 		// Down arrow - navigate list (wrap to top when at bottom)
 		if (matchesKey(keyData, "down")) {
-			const itemCount = this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length;
+			const itemCount =
+				this.#getVisibleProfiles().length +
+				(this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length);
 			if (itemCount === 0) return;
 			this.#selectedIndex = this.#selectedIndex === itemCount - 1 ? 0 : this.#selectedIndex + 1;
 			this.#updateList();
@@ -857,7 +925,11 @@ export class ModelSelectorComponent extends Container {
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selectedItem = this.#getSelectedItem();
 			if (selectedItem) {
-				this.#beginActionMenuOrSelect(selectedItem);
+				if (selectedItem.kind === "profile") {
+					this.#beginProfileActionMenu(selectedItem);
+				} else {
+					this.#beginActionMenuOrSelect(selectedItem);
+				}
 			}
 			return;
 		}
@@ -872,6 +944,12 @@ export class ModelSelectorComponent extends Container {
 		this.#searchInput.handleInput(keyData);
 		this.#filterModels(this.#searchInput.getValue());
 	}
+	#beginProfileActionMenu(profile: ProfileItem): void {
+		this.#pendingActionItem = profile as unknown as ModelItem;
+		this.#selectedActionIndex = 0;
+		this.#updateList();
+	}
+
 	#beginActionMenuOrSelect(item: ModelItem | CanonicalModelItem): void {
 		if (this.#temporaryOnly) {
 			this.#handleSelect(item, null);
@@ -885,7 +963,7 @@ export class ModelSelectorComponent extends Container {
 	#handleActionMenuInput(keyData: string): void {
 		const item = this.#pendingActionItem;
 		if (!item) return;
-		const actionCount = this.#getActionCount(item.model);
+		const actionCount = (item as unknown as ProfileItem).kind === "profile" ? 2 : this.#getActionCount(item.model);
 		if (matchesKey(keyData, "up")) {
 			this.#selectedActionIndex = this.#selectedActionIndex === 0 ? actionCount - 1 : this.#selectedActionIndex - 1;
 			this.#updateList();
@@ -898,11 +976,20 @@ export class ModelSelectorComponent extends Container {
 		}
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			this.#pendingActionItem = undefined;
-			const role = GJC_MODEL_ASSIGNMENT_TARGET_IDS[this.#selectedActionIndex];
-			if (role) {
-				this.#handleSelect(item, role);
+			if ((item as unknown as ProfileItem).kind === "profile") {
+				const profile = item as unknown as ProfileItem;
+				this.#onSelectCallback({
+					kind: "profile",
+					profileName: profile.name,
+					setDefault: this.#selectedActionIndex === 1,
+				});
 			} else {
-				this.#handlePresetSelect(item, OPENAI_CODE_PROFILE_PRESET);
+				const role = GJC_MODEL_ASSIGNMENT_TARGET_IDS[this.#selectedActionIndex];
+				if (role) {
+					this.#handleSelect(item, role);
+				} else {
+					this.#handlePresetSelect(item, OPENAI_CODE_PROFILE_PRESET);
+				}
 			}
 			return;
 		}
@@ -1004,6 +1091,9 @@ export class ModelSelectorComponent extends Container {
 	getSearchInput(): Input {
 		return this.#searchInput;
 	}
+	async __testSelectProfile(profileName: string, setDefault: boolean): Promise<void> {
+		await this.#onSelectCallback({ kind: "profile", profileName, setDefault });
+	}
 }
 
 function requiresExplicitThinkingChoice(model: Model): boolean {

package/src/modes/components/provider-onboarding-selector.ts

@@ -4,7 +4,7 @@ import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import { formatModelOnboardingGuidance } from "../../setup/model-onboarding-guidance";
 import { DynamicBorder } from "./dynamic-border";
 
-export type ProviderOnboardingAction = "oauth-login" | "api-guide";
+export type ProviderOnboardingAction = "custom-provider-wizard" | "oauth-login" | "api-guide";
 
 interface ProviderOnboardingOption {
 	label: string;
@@ -13,6 +13,11 @@ interface ProviderOnboardingOption {
 }
 
 const PROVIDER_ONBOARDING_OPTIONS: ProviderOnboardingOption[] = [
+	{
+		label: "Add custom provider",
+		description: "Configure an OpenAI- or Anthropic-compatible API provider interactively.",
+		action: "custom-provider-wizard",
+	},
 	{
 		label: "Login with OAuth/subscription",
 		description: "Open the interactive OAuth provider selector.",

package/src/modes/controllers/input-controller.ts

@@ -4,6 +4,7 @@ import { type AgentMessage, ThinkingLevel } from "@gajae-code/agent-core";
 import type { AutocompleteProvider, SlashCommand } from "@gajae-code/tui";
 import { $env, sanitizeText } from "@gajae-code/utils";
 import { isSettingsInitialized, settings } from "../../config/settings";
+import { resolveSubskillActivationForSkillInvocation } from "../../extensibility/gjc-plugins";
 import { buildSkillPromptMessage, parseSkillInvocations } from "../../extensibility/skills";
 import { expandEmoticons } from "../../modes/emoji-autocomplete";
 import { createPromptActionAutocompleteProvider } from "../../modes/prompt-action-autocomplete";
@@ -472,9 +473,20 @@ export class InputController {
 			for (let index = 0; index < invocations.length; index += 1) {
 				const invocation = invocations[index];
 				if (!invocation) continue;
-				const built = await buildSkillPromptMessage(invocation.skill, invocation.args);
+				const activationResult = await resolveSubskillActivationForSkillInvocation({
+					cwd: this.ctx.sessionManager.getCwd(),
+					sessionId: this.ctx.session.sessionId,
+					skillName: invocation.skill.name,
+					args: invocation.args,
+				});
+				const built = await buildSkillPromptMessage(invocation.skill, activationResult.cleanedArgs, {
+					subskillActivation: activationResult.activation,
+					subskillActivationSet: activationResult.activeSubskillsToPersist,
+					cwd: this.ctx.sessionManager.getCwd(),
+					sessionId: this.ctx.session.sessionId,
+				});
 				const details: SkillPromptDetails = built.details;
-				const displayText = `/${invocation.commandName}${invocation.args ? ` ${invocation.args}` : ""}`;
+				const displayText = `/${invocation.commandName}${activationResult.cleanedArgs ? ` ${activationResult.cleanedArgs}` : ""}`;
 				// When the agent is streaming, register a compact slash-form text as
 				// the pending-display twin BEFORE dispatching the CustomMessage. The
 				// returned tag is embedded in details so AgentSession.#handleAgentEvent

package/src/modes/controllers/selector-controller.ts

@@ -4,6 +4,7 @@ import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle } from "@gajae-code/tui";
 import { Input, Loader, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir } from "@gajae-code/utils";
+import { activateModelProfile } from "../../config/model-profile-activation";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
@@ -35,10 +36,12 @@ import {
 	MODEL_ONBOARDING_PROVIDER_PRESET_COMMAND,
 	MODEL_ONBOARDING_SETUP_COMMAND,
 } from "../../setup/model-onboarding-guidance";
+import { addApiCompatibleProvider, formatProviderSetupResult } from "../../setup/provider-onboarding";
 import { isSearchProviderPreference, setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
 import { setSessionTerminalTitle } from "../../utils/title-generator";
 import { AgentDashboard } from "../components/agent-dashboard";
 import { AssistantMessageComponent } from "../components/assistant-message";
+import { CustomProviderWizardComponent, type CustomProviderWizardSubmit } from "../components/custom-provider-wizard";
 import { ExtensionDashboard } from "../components/extensions";
 import { HistorySearchComponent } from "../components/history-search";
 import { JobsOverlayComponent } from "../components/jobs-overlay";
@@ -119,7 +122,9 @@ export class SelectorController {
 			const selector = new ProviderOnboardingSelectorComponent(
 				(action: ProviderOnboardingAction) => {
 					done();
-					if (action === "oauth-login") {
+					if (action === "custom-provider-wizard") {
+						this.showCustomProviderWizard();
+					} else if (action === "oauth-login") {
 						void this.showOAuthSelector("login");
 					} else {
 						this.ctx.showStatus(formatProviderOnboardingCommandGuide());
@@ -134,6 +139,36 @@ export class SelectorController {
 		});
 	}
 
+	showCustomProviderWizard(): void {
+		this.showSelector(done => {
+			let wizard: CustomProviderWizardComponent;
+			const submit = async (input: CustomProviderWizardSubmit): Promise<void> => {
+				try {
+					const result = await addApiCompatibleProvider(input);
+					await this.ctx.session.modelRegistry.refresh("offline");
+					await this.ctx.notifyConfigChanged?.();
+					this.ctx.showStatus(formatProviderSetupResult(result));
+					done();
+					this.ctx.ui.requestRender();
+				} catch (err) {
+					const message = err instanceof Error ? err.message : String(err);
+					wizard.setSubmitError(`Provider setup failed: ${message}`);
+				}
+			};
+			wizard = new CustomProviderWizardComponent(
+				input => {
+					void submit(input);
+				},
+				() => {
+					done();
+					this.ctx.ui.requestRender();
+				},
+				() => this.ctx.ui.requestRender(),
+			);
+			return { component: wizard, focus: wizard };
+		});
+	}
+
 	showSettingsSelector(): void {
 		getAvailableThemes().then(availableThemes => {
 			this.showSelector(done => {
@@ -502,6 +537,27 @@ export class SelectorController {
 							this.ctx.ui.requestRender();
 							return;
 						}
+						if (selection.kind === "profile") {
+							await activateModelProfile(
+								{
+									session: this.ctx.session,
+									modelRegistry: this.ctx.session.modelRegistry,
+									settings: this.ctx.settings,
+									profileName: selection.profileName,
+								},
+								{ persistDefault: selection.setDefault },
+							);
+							this.ctx.statusLine.invalidate();
+							this.ctx.updateEditorBorderColor();
+							this.ctx.showStatus(
+								selection.setDefault
+									? `Default model profile: ${selection.profileName}`
+									: `Model profile: ${selection.profileName}`,
+							);
+							done();
+							this.ctx.ui.requestRender();
+							return;
+						}
 						const { model, role, thinkingLevel, selector } = selection;
 						if (role === null) {
 							// Temporary: update agent state but don't persist to settings

package/src/modes/prompt-action-autocomplete.ts

@@ -1,11 +1,7 @@
-import {
-	type AutocompleteItem,
-	type AutocompleteProvider,
-	CombinedAutocompleteProvider,
-	getKeybindings,
-	type SlashCommand,
-} from "@gajae-code/tui";
-import { formatKeyHints, type KeybindingsManager } from "../config/keybindings";
+import type { AutocompleteItem, AutocompleteProvider, SlashCommand } from "@gajae-code/tui";
+import { CombinedAutocompleteProvider, getKeybindings, getSlashCommandMatchRank } from "@gajae-code/tui";
+import type { KeybindingsManager } from "../config/keybindings";
+import { formatKeyHints } from "../config/keybindings";
 import { isSettingsInitialized, settings } from "../config/settings";
 import { applyEmojiCompletion, getEmojiSuggestions, isEmojiPrefix, tryEmojiInlineReplace } from "./emoji-autocomplete";
 
@@ -104,6 +100,43 @@ function mergeAutocompleteSuggestions(
 	return { items, prefix: primary.prefix };
 }
 
+function sortSlashCommandSuggestions(
+	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
+	commands: SlashCommand[],
+): { items: AutocompleteItem[]; prefix: string } | null {
+	if (!suggestions) return null;
+	const query = suggestions.prefix.slice(1).toLowerCase();
+	const commandIndexes = new Map(commands.map((command, index) => [command.name, index]));
+	const commandByName = new Map(commands.map(command => [command.name, command]));
+	const items = suggestions.items
+		.map((item, index) => {
+			const command = commandByName.get(item.value);
+			const commandIndex = commandIndexes.get(item.value) ?? index;
+			const lowerName = item.value.toLowerCase();
+			const lowerDesc = command?.description?.toLowerCase() ?? item.description?.toLowerCase() ?? "";
+			const nameScore = fuzzyMatch(query, lowerName) ? fuzzyScore(query, lowerName) : 0;
+			const descScore = fuzzyMatch(query, lowerDesc) ? fuzzyScore(query, lowerDesc) * 0.5 : 0;
+			return {
+				item,
+				index,
+				commandIndex,
+				matchRank: getSlashCommandMatchRank(query, lowerName),
+				priority: command?.priority ?? 0,
+				score: Math.max(nameScore, descScore),
+			};
+		})
+		.sort(
+			(a, b) =>
+				a.matchRank - b.matchRank ||
+				b.priority - a.priority ||
+				b.score - a.score ||
+				a.commandIndex - b.commandIndex ||
+				a.index - b.index,
+		)
+		.map(({ item }) => item);
+	return { ...suggestions, items };
+}
+
 function withoutSkillCommandSuggestions(
 	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
 ): { items: AutocompleteItem[]; prefix: string } | null {
@@ -182,7 +215,10 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 				await this.#baseProvider.getSuggestions(lines, cursorLine, cursorCol),
 			);
 			const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-			return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
+			return sortSlashCommandSuggestions(
+				mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
+				this.#commands,
+			);
 		}
 
 		if (!isSettingsInitialized() || settings.get("emojiAutocomplete")) {
@@ -253,7 +289,10 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			this.#baseProvider.trySyncSlashCompletion?.(textBeforeCursor) ?? null,
 		);
 		const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-		return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
+		return sortSlashCommandSuggestions(
+			mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions),
+			this.#commands,
+		);
 	}
 	trySyncInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
 		if (isSettingsInitialized() && !settings.get("emojiAutocomplete")) return null;

package/src/modes/rpc/rpc-client.ts

@@ -20,6 +20,9 @@ import type {
 	RpcHostToolUpdate,
 	RpcResponse,
 	RpcSessionState,
+	RpcWorkflowGate,
+	RpcWorkflowGateResolution,
+	RpcWorkflowGateResponse,
 } from "./rpc-types";
 
 /** Distributive Omit that works with union types */
@@ -97,7 +100,7 @@ function isRpcResponse(value: unknown): value is RpcResponse {
 	if (typeof value.success !== "boolean") return false;
 	if (value.id !== undefined && typeof value.id !== "string") return false;
 	if (value.success === false) {
-		return typeof value.error === "string";
+		return typeof value.error === "string" || isRecord(value.error);
 	}
 	return true;
 }
@@ -130,6 +133,21 @@ function isRpcExtensionUiRequest(value: unknown): value is RpcExtensionUIRequest
 	return value.type === "extension_ui_request" && typeof value.id === "string" && typeof value.method === "string";
 }
 
+function isRpcWorkflowGate(value: unknown): value is RpcWorkflowGate {
+	if (!isRecord(value)) return false;
+	return (
+		value.type === "workflow_gate" &&
+		typeof value.gate_id === "string" &&
+		typeof value.stage === "string" &&
+		typeof value.kind === "string" &&
+		isRecord(value.schema) &&
+		typeof value.schema_hash === "string" &&
+		isRecord(value.context) &&
+		typeof value.created_at === "string" &&
+		value.required === true
+	);
+}
+
 function normalizeToolResult<TDetails>(result: RpcClientToolResult<TDetails>): AgentToolResult<TDetails> {
 	if (typeof result === "string") {
 		return {
@@ -152,6 +170,7 @@ export class RpcClient {
 	#pendingHostToolCalls = new Map<string, { controller: AbortController }>();
 	#requestId = 0;
 	#extensionUiListeners: Set<(req: RpcExtensionUIRequest) => void> = new Set();
+	#workflowGateListeners: Set<(gate: RpcWorkflowGate) => void> = new Set();
 	#abortController = new AbortController();
 
 	constructor(private options: RpcClientOptions = {}) {
@@ -299,6 +318,29 @@ export class RpcClient {
 		};
 	}
 
+	/**
+	 * Subscribe to workflow lifecycle gates emitted by RPC mode.
+	 */
+	onWorkflowGate(listener: (gate: RpcWorkflowGate) => void): () => void {
+		this.#workflowGateListeners.add(listener);
+		return () => {
+			this.#workflowGateListeners.delete(listener);
+		};
+	}
+
+	/**
+	 * Answer a workflow lifecycle gate and wait for the server resolution envelope.
+	 */
+	async respondGate(gateId: string, answer: unknown, idempotencyKey?: string): Promise<RpcWorkflowGateResolution> {
+		const response = await this.#send({
+			type: "workflow_gate_response",
+			gate_id: gateId,
+			answer,
+			idempotency_key: idempotencyKey,
+		});
+		return this.#getData(response);
+	}
+
 	/**
 	 * Get collected stderr output (useful for debugging).
 	 */
@@ -687,6 +729,13 @@ export class RpcClient {
 			return;
 		}
 
+		if (isRpcWorkflowGate(data)) {
+			for (const listener of this.#workflowGateListeners) {
+				listener(data);
+			}
+			return;
+		}
+
 		if (isRpcHostToolCancelRequest(data)) {
 			this.#pendingHostToolCalls.get(data.targetId)?.controller.abort();
 			return;
@@ -798,7 +847,10 @@ export class RpcClient {
 		}
 	}
 
-	#writeFrame(frame: RpcCommand | RpcHostToolResult | RpcHostToolUpdate, onError?: (error: Error) => void): void {
+	#writeFrame(
+		frame: RpcCommand | RpcWorkflowGateResponse | RpcHostToolResult | RpcHostToolUpdate,
+		onError?: (error: Error) => void,
+	): void {
 		if (!this.#process?.stdin) {
 			throw new Error("Client not started");
 		}
@@ -815,7 +867,9 @@ export class RpcClient {
 	#getData<T>(response: RpcResponse): T {
 		if (!response.success) {
 			const errorResponse = response as Extract<RpcResponse, { success: false }>;
-			throw new Error(errorResponse.error);
+			throw new Error(
+				typeof errorResponse.error === "string" ? errorResponse.error : JSON.stringify(errorResponse.error),
+			);
 		}
 		// Type assertion: we trust response.data matches T based on the command sent.
 		// This is safe because each public method specifies the correct T for its command.