@gajae-code/coding-agent 0.1.1 → 0.1.3

package/src/modes/interactive-mode.ts

@@ -121,9 +121,14 @@ const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 };
 
 function configureDefaultComposerChrome(editor: CustomEditor): void {
-	editor.setBorderVisible(false);
-	editor.setPromptGutter(`${theme.fg("accent", "›")} `);
+	editor.setBorderVisible(true);
+	editor.setBorderStyle("sharp");
+	editor.setClosedBorderBox(true);
+	editor.setPromptGutter(undefined);
+	editor.setInputPrefix(`${theme.fg("accent", ">")} `);
+	editor.setPlaceholder("Type your message...");
 	editor.setPaddingX(1);
+	editor.setTopBorder(undefined);
 }
 
 interface WorkingMessageAccent {
@@ -376,7 +381,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#syncEditorMaxHeight();
 		this.#resizeHandler = () => {
 			this.#syncEditorMaxHeight();
-			this.updateEditorTopBorder();
+			this.updateEditorChrome();
 		};
 		process.stdout.on("resize", this.#resizeHandler);
 		try {
@@ -500,7 +505,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.addChild(this.statusContainer);
 		this.ui.addChild(this.todoContainer);
 		this.ui.addChild(this.btwContainer);
-		this.ui.addChild(this.statusLine); // Main status rail + hook statuses; composer stays borderless.
+		this.ui.addChild(this.statusLine); // Main status rail + hook statuses; composer chrome is rendered by the editor.
 		this.ui.addChild(this.hookWidgetContainerAbove);
 		this.ui.addChild(this.editorContainer);
 		this.ui.addChild(this.hookWidgetContainerBelow);
@@ -526,7 +531,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.start();
 		pushTerminalTitle();
 		setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
-		this.updateEditorBorderColor();
+		this.updateEditorChrome();
 		this.#syncEditorMaxHeight();
 		this.isInitialized = true;
 		this.ui.requestRender(true);
@@ -544,7 +549,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			const draft = await this.sessionManager.consumeDraft();
 			if (draft && !this.editor.getText()) {
 				this.editor.setText(draft);
-				this.updateEditorBorderColor();
+				this.updateEditorChrome();
 				this.ui.requestRender();
 			}
 		} catch (err) {
@@ -564,7 +569,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			clearRenderCache();
 			configureDefaultComposerChrome(this.editor);
 			this.ui.invalidate();
-			this.updateEditorBorderColor();
+			this.updateEditorChrome();
 			this.ui.requestRender();
 		});
 
@@ -577,12 +582,12 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Set up git branch watcher
 		this.statusLine.watchBranch(() => {
-			this.updateEditorTopBorder();
+			this.updateEditorChrome();
 			this.ui.requestRender();
 		});
 
 		// Initial top border update
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 	}
 
 	/** Reload slash commands and autocomplete for the provided working directory. */
@@ -749,7 +754,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.loopLimit = undefined;
 		this.#cancelLoopAutoSubmit();
 		this.statusLine.setLoopModeStatus(undefined);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		if (wasEnabled) {
 			this.showStatus(message);
@@ -780,7 +785,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.loopPrompt = undefined;
 		this.loopLimit = createLoopLimitRuntime(parsedLimit);
 		this.statusLine.setLoopModeStatus({ enabled: true });
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		const limitSuffix = parsedLimit ? ` Limited to ${describeLoopLimit(parsedLimit)}.` : "";
 		const remainingSuffix = this.loopLimit ? ` ${describeLoopLimitRuntime(this.loopLimit)}.` : "";
@@ -874,7 +879,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.rebuildChatFromMessages();
 			this.editor.setText(submission.text);
 		}
-		this.updateEditorBorderColor();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		return true;
 	}
@@ -921,7 +926,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.setMaxHeight(this.#computeEditorMaxHeight());
 	}
 
-	updateEditorBorderColor(): void {
+	updateEditorChrome(): void {
 		if (this.isBashMode) {
 			this.editor.borderColor = theme.getBashModeBorderColor();
 		} else if (this.isPythonMode) {
@@ -938,13 +943,21 @@ export class InteractiveMode implements InteractiveModeContext {
 				this.editor.borderColor = theme.getThinkingBorderColor(level);
 			}
 		}
-		this.updateEditorTopBorder();
+		this.#setComposerTopBorder();
 		this.ui.requestRender();
 	}
 
+	updateEditorBorderColor(): void {
+		this.updateEditorChrome();
+	}
+
 	updateEditorTopBorder(): void {
-		// The opencode-style composer is intentionally borderless. Keep status-line
-		// rendering out of the input area so the prompt remains a simple gutter + body.
+		this.#setComposerTopBorder();
+	}
+
+	#setComposerTopBorder(): void {
+		// Keep the composer as a plain closed input rectangle; status-line
+		// rendering stays outside the input area.
 		this.editor.setTopBorder(undefined);
 	}
 
@@ -1048,7 +1061,7 @@ export class InteractiveMode implements InteractiveModeContext {
 					}
 				: undefined;
 		this.statusLine.setPlanModeStatus(status);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -1058,7 +1071,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				? { enabled: this.goalModeEnabled, paused: this.goalModePaused }
 				: undefined;
 		this.statusLine.setGoalModeStatus(status);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -1650,7 +1663,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			const applied = await this.sessionManager.setSessionName(seededName, "auto");
 			if (applied) {
 				setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
-				this.updateEditorBorderColor();
+				this.updateEditorChrome();
 			}
 		}
 
@@ -2121,8 +2134,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			logger.warn("Failed to refresh slash command state for custom editor", { error: String(error) });
 		});
 
-		this.updateEditorBorderColor();
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -2417,7 +2429,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				} else {
 					this.#cleanupMicAnimation();
 				}
-				this.updateEditorTopBorder();
+				this.updateEditorChrome();
 				this.ui.requestRender();
 			},
 		});

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

@@ -84,6 +84,34 @@ function isSkillCommandAutocompleteItem(item: AutocompleteItem): item is SkillCo
 	return "normalizedSkillCommand" in item && item.normalizedSkillCommand === true;
 }
 
+function mergeAutocompleteSuggestions(
+	primary: { items: AutocompleteItem[]; prefix: string } | null,
+	secondary: { items: AutocompleteItem[]; prefix: string } | null,
+): { items: AutocompleteItem[]; prefix: string } | null {
+	if (!primary) return secondary;
+	if (!secondary) return primary;
+	if (primary.prefix !== secondary.prefix) return primary;
+
+	const seen = new Set<string>();
+	const items: AutocompleteItem[] = [];
+	for (const item of [...primary.items, ...secondary.items]) {
+		const key = `${item.value}\0${item.label}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		items.push(item);
+	}
+
+	return { items, prefix: primary.prefix };
+}
+
+function withoutSkillCommandSuggestions(
+	suggestions: { items: AutocompleteItem[]; prefix: string } | null,
+): { items: AutocompleteItem[]; prefix: string } | null {
+	if (!suggestions) return null;
+	const items = suggestions.items.filter(item => !item.value.startsWith("skill:"));
+	return items.length > 0 ? { ...suggestions, items } : null;
+}
+
 function getPromptActionPrefix(textBeforeCursor: string): string | null {
 	const hashIndex = textBeforeCursor.lastIndexOf("#");
 	if (hashIndex === -1) return null;
@@ -148,8 +176,14 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			}
 		}
 
-		const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-		if (skillCommandSuggestions) return skillCommandSuggestions;
+		const slashPrefix = getSlashTokenPrefix(textBeforeCursor);
+		if (slashPrefix) {
+			const baseSuggestions = withoutSkillCommandSuggestions(
+				await this.#baseProvider.getSuggestions(lines, cursorLine, cursorCol),
+			);
+			const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
+			return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
+		}
 
 		if (!isSettingsInitialized() || settings.get("emojiAutocomplete")) {
 			const emojiSuggestions = getEmojiSuggestions(textBeforeCursor);
@@ -215,9 +249,11 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 		return this.#baseProvider.getInlineHint?.(lines, cursorLine, cursorCol) ?? null;
 	}
 	trySyncSlashCompletion(textBeforeCursor: string): { items: AutocompleteItem[]; prefix: string } | null {
+		const baseSuggestions = withoutSkillCommandSuggestions(
+			this.#baseProvider.trySyncSlashCompletion?.(textBeforeCursor) ?? null,
+		);
 		const skillCommandSuggestions = this.#getSkillCommandSuggestions(textBeforeCursor);
-		if (skillCommandSuggestions) return skillCommandSuggestions;
-		return this.#baseProvider.trySyncSlashCompletion?.(textBeforeCursor) ?? null;
+		return mergeAutocompleteSuggestions(baseSuggestions, skillCommandSuggestions);
 	}
 	trySyncInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
 		if (isSettingsInitialized() && !settings.get("emojiAutocomplete")) return null;
@@ -233,17 +269,6 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 		const exactNonSkillCommand = this.#commands.some(
 			command => command.name === query && !command.name.startsWith("skill:"),
 		);
-		if (exactNonSkillCommand) {
-			const command = this.#commands.find(
-				candidate => candidate.name === query && !candidate.name.startsWith("skill:"),
-			);
-			if (command) {
-				return {
-					items: [{ value: command.name, label: command.name, description: command.description }],
-					prefix,
-				};
-			}
-		}
 		const items = this.#commands
 			.filter(command => command.name.startsWith("skill:"))
 			.map(command => {

package/src/sdk.ts

@@ -40,6 +40,7 @@ import {
 	parseModelString,
 	resolveAllowedModels,
 	resolveModelRoleValue,
+	type ScopedModelSelection,
 } from "./config/model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
 import { Settings, type SkillsSettings } from "./config/settings";
@@ -230,7 +231,7 @@ export interface CreateAgentSessionOptions {
 	/** Thinking selector. Default: from settings, else unset */
 	thinkingLevel?: ThinkingLevel;
 	/** Models available for cycling (Ctrl+P in interactive mode) */
-	scopedModels?: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	scopedModels?: ScopedModelSelection[];
 
 	/** System prompt blocks. Array replaces default, function receives default blocks and returns final blocks. */
 	systemPrompt?: string[] | ((defaultPrompt: string[]) => string[]);
@@ -1760,6 +1761,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				}
 				return key;
 			},
+			getAuthCredentialType: provider => modelRegistry.getSessionCredentialType(provider, agent.sessionId),
 			streamFn: (streamModel, context, streamOptions) =>
 				streamSimple(streamModel, context, {
 					...streamOptions,

package/src/session/agent-session.ts

@@ -95,6 +95,7 @@ import {
 	parseModelString,
 	type ResolvedModelRoleValue,
 	resolveModelRoleValue,
+	type ScopedModelSelection,
 } from "../config/model-resolver";
 import { expandPromptTemplate, type PromptTemplate } from "../config/prompt-templates";
 import type { Settings, SkillsSettings } from "../config/settings";
@@ -167,6 +168,7 @@ import {
 import { deobfuscateSessionContext, type SecretObfuscator } from "../secrets/obfuscator";
 import { formatNoCredentialOnboardingError, formatNoModelOnboardingError } from "../setup/model-onboarding-guidance";
 import { isCanonicalGjcWorkflowSkill, syncSkillActiveState } from "../skill-state/active-state";
+import { assertDeepInterviewMutationAllowed } from "../skill-state/deep-interview-mutation-guard";
 import { invalidateHostMetadata } from "../ssh/connection-manager";
 import { resolveThinkingLevelForModel, toReasoningEffort } from "../thinking";
 import {
@@ -257,7 +259,7 @@ export interface AgentSessionConfig {
 	sessionManager: SessionManager;
 	settings: Settings;
 	/** Models to cycle through with Ctrl+P (from --models flag) */
-	scopedModels?: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	scopedModels?: ScopedModelSelection[];
 	/** Initial session thinking selector. */
 	thinkingLevel?: ThinkingLevel;
 	/** Prompt templates for expansion */
@@ -747,7 +749,7 @@ export class AgentSession {
 
 	readonly configWarnings: string[] = [];
 
-	#scopedModels: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	#scopedModels: ScopedModelSelection[];
 	#thinkingLevel: ThinkingLevel | undefined;
 	#promptTemplates: PromptTemplate[];
 	#slashCommands: FileSlashCommand[];
@@ -3273,6 +3275,35 @@ export class AgentSession {
 		}) as T;
 	}
 
+	/**
+	 * Wrap a tool with the deep-interview mutation guard. This guard is intentionally
+	 * outermost so active interviews reject product-code mutation before ACP permission
+	 * prompts or tool execution can run.
+	 */
+	#wrapToolForDeepInterviewMutationGuard<T extends AgentTool>(tool: T): T {
+		if (!["edit", "write", "ast_edit"].includes(tool.name)) return tool;
+		return new Proxy(tool, {
+			get: (target, prop) => {
+				if (prop !== "execute") return Reflect.get(target, prop, target);
+				return async (
+					toolCallId: string,
+					args: unknown,
+					signal: AbortSignal | undefined,
+					onUpdate: never,
+					ctx: never,
+				) => {
+					await assertDeepInterviewMutationAllowed({
+						cwd: this.sessionManager.getCwd(),
+						sessionId: this.sessionManager.getSessionId(),
+						tool: target,
+						args,
+					});
+					return await target.execute(toolCallId, args as never, signal, onUpdate, ctx);
+				};
+			},
+		}) as T;
+	}
+
 	async #applyActiveToolsByName(
 		toolNames: string[],
 		options?: { persistMCPSelection?: boolean; previousSelectedMCPToolNames?: string[] },
@@ -3284,7 +3315,7 @@ export class AgentSession {
 		for (const name of toolNames) {
 			const tool = this.#toolRegistry.get(name);
 			if (tool) {
-				tools.push(this.#wrapToolForAcpPermission(tool));
+				tools.push(this.#wrapToolForDeepInterviewMutationGuard(this.#wrapToolForAcpPermission(tool)));
 				validToolNames.push(name);
 			}
 		}
@@ -3719,7 +3750,7 @@ export class AgentSession {
 	}
 
 	/** Scoped models for cycling (from --models flag) */
-	get scopedModels(): ReadonlyArray<{ model: Model; thinkingLevel?: ThinkingLevel }> {
+	get scopedModels(): ReadonlyArray<ScopedModelSelection> {
 		return this.#scopedModels;
 	}
 
@@ -6415,6 +6446,7 @@ export class AgentSession {
 					metadata: this.agent.metadataForProvider(candidate.provider),
 					convertToLlm,
 					telemetry,
+					authCredentialType: this.#modelRegistry.getSessionCredentialType(candidate.provider, this.sessionId),
 				});
 			} catch (error) {
 				if (!this.#isCompactionAuthFailure(error)) {
@@ -6670,6 +6702,10 @@ export class AgentSession {
 								initiatorOverride: "agent",
 								convertToLlm,
 								telemetry,
+								authCredentialType: this.#modelRegistry.getSessionCredentialType(
+									candidate.provider,
+									this.sessionId,
+								),
 							});
 							break;
 						} catch (error) {

package/src/setup/model-onboarding-guidance.ts

@@ -7,14 +7,16 @@ export const MODEL_ONBOARDING_OAUTH_COMMAND = "/provider login [provider-id] or
 export function formatModelOnboardingGuidance(): string {
 	return [
 		"Model selection only shows configured providers.",
+		"Assignment targets are DEFAULT plus the GJC role agents: EXECUTOR, ARCHITECT, PLANNER, and CRITIC.",
+		"Legacy model-role aliases are compatibility-only and are not shown as assignment targets.",
 		`API-compatible providers: ${MODEL_ONBOARDING_API_PROVIDER_COMMAND} (or ${MODEL_ONBOARDING_SETUP_COMMAND}).`,
 		`OAuth/subscription providers: ${MODEL_ONBOARDING_OAUTH_COMMAND}.`,
-		"Then run /model to select a configured model.",
+		"Then run /model to select a configured model or assign it to a target.",
 	].join("\n");
 }
 
 export function formatModelOnboardingInlineHint(): string {
-	return `Add API-compatible providers with ${MODEL_ONBOARDING_API_PROVIDER_COMMAND} (or ${MODEL_ONBOARDING_SETUP_COMMAND}); OAuth/subscription with ${MODEL_ONBOARDING_OAUTH_COMMAND}; then run /model.`;
+	return `Add API-compatible providers with ${MODEL_ONBOARDING_API_PROVIDER_COMMAND} (or ${MODEL_ONBOARDING_SETUP_COMMAND}); OAuth/subscription with ${MODEL_ONBOARDING_OAUTH_COMMAND}; then run /model for DEFAULT, EXECUTOR, ARCHITECT, PLANNER, and CRITIC.`;
 }
 
 export function formatNoModelOnboardingError(): string {
@@ -27,7 +29,7 @@ export function formatNoCredentialOnboardingError(providerId: string): string {
 		"",
 		`For API-compatible providers, configure credentials with ${MODEL_ONBOARDING_API_PROVIDER_COMMAND} (or ${MODEL_ONBOARDING_SETUP_COMMAND}).`,
 		`For OAuth/subscription providers, use ${MODEL_ONBOARDING_OAUTH_COMMAND}.`,
-		"Then run /model to select a configured model.",
+		"Then run /model to select a configured model or assign it to DEFAULT, EXECUTOR, ARCHITECT, PLANNER, or CRITIC.",
 	].join("\n");
 }