@gajae-code/coding-agent 0.11.6 → 0.11.8

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

@@ -1,12 +1,28 @@
-import { prompt } from "@gajae-code/utils";
 import btwUserPrompt from "../../prompts/system/btw-user.md" with { type: "text" };
+import type { BtwConversationScope, BtwTurnCapture } from "../../session/agent-session";
+import {
+	BTW_MAX_QUESTION_UTF8_BYTES,
+	type BtwTextExchange,
+	boundBtwExchanges,
+	sanitizeBtwError,
+	utf8ByteLength,
+} from "../../session/btw-contract";
 import { BtwPanelComponent } from "../components/btw-panel";
 import type { InteractiveModeContext } from "../types";
 
+type BtwFollowUpResult = "accepted" | "busy" | "closed" | "rejected";
+
+interface ActiveBtwTurn extends BtwTurnCapture {
+	abortController: AbortController | undefined;
+	active: boolean;
+}
+
 interface BtwRequest {
 	component: BtwPanelComponent;
-	abortController: AbortController;
-	question: string;
+	conversationScope: BtwConversationScope | undefined;
+	activeTurn: ActiveBtwTurn | undefined;
+	inFlight: boolean;
+	contextExchanges: BtwTextExchange[];
 }
 
 export class BtwController {
@@ -18,84 +34,151 @@ export class BtwController {
 		return this.#activeRequest !== undefined;
 	}
 
+	hasOpenPanel(): boolean {
+		return this.hasActiveRequest();
+	}
+
+	isTurnInFlight(): boolean {
+		return this.#activeRequest?.inFlight ?? false;
+	}
+
 	handleEscape(): boolean {
 		if (!this.#activeRequest) return false;
-		this.#closeActiveRequest({ abort: this.#activeRequest.abortController.signal.aborted === false });
+		this.#closeActiveRequest();
 		return true;
 	}
 
 	dispose(): void {
-		this.#closeActiveRequest({ abort: true });
+		this.#closeActiveRequest();
 	}
 
 	async start(question: string): Promise<void> {
+		if (this.hasOpenPanel()) {
+			this.ctx.showStatus("A /btw chat is already open. Type a follow-up or press Esc to return to the main chat.");
+			return;
+		}
 		const trimmedQuestion = question.trim();
 		if (!trimmedQuestion) {
 			this.ctx.showStatus("Usage: /btw <question>");
 			return;
 		}
+		if (!this.#acceptQuestion(trimmedQuestion) || !this.#hasModel()) return;
+		const scope = this.ctx.session.createBtwConversationScope(btwUserPrompt);
+		const request = this.#openRequest(trimmedQuestion, scope);
+		void this.#runRequest(request);
+	}
 
-		const model = this.ctx.session.model;
-		if (!model) {
-			this.ctx.showError("No active model available for /btw.");
-			return;
+	async submitFollowUp(question: string): Promise<BtwFollowUpResult> {
+		const request = this.#activeRequest;
+		if (!request) return "closed";
+		if (request.inFlight) {
+			this.ctx.showStatus("The /btw chat is still answering. Wait for it to finish.");
+			return "busy";
 		}
+		const trimmedQuestion = question.trim();
+		if (!trimmedQuestion) return "closed";
+		if (!this.#acceptQuestion(trimmedQuestion)) return "rejected";
+		if (!request.conversationScope) return "closed";
+		request.activeTurn = this.#createTurn(trimmedQuestion, request.conversationScope);
+		request.inFlight = true;
+		request.component.beginTurn(trimmedQuestion);
+		void this.#runRequest(request);
+		return "accepted";
+	}
+
+	#acceptQuestion(question: string): boolean {
+		if (utf8ByteLength(question) <= BTW_MAX_QUESTION_UTF8_BYTES) return true;
+		this.ctx.showError(`/btw questions are limited to ${BTW_MAX_QUESTION_UTF8_BYTES} UTF-8 bytes.`);
+		return false;
+	}
+
+	#hasModel(): boolean {
+		if (this.ctx.session.model) return true;
+		this.ctx.showError("No active model available for /btw.");
+		return false;
+	}
 
-		this.#closeActiveRequest({ abort: true });
+	#createTurn(question: string, scope: BtwConversationScope): ActiveBtwTurn {
+		return { question, scope, abortController: new AbortController(), active: true };
+	}
 
+	#openRequest(question: string, scope: BtwConversationScope): BtwRequest {
 		const request: BtwRequest = {
-			component: new BtwPanelComponent({ question: trimmedQuestion, tui: this.ctx.ui }),
-			abortController: new AbortController(),
-			question: trimmedQuestion,
+			component: new BtwPanelComponent({ question, tui: this.ctx.ui }),
+			conversationScope: scope,
+			activeTurn: this.#createTurn(question, scope),
+			inFlight: true,
+			contextExchanges: [],
 		};
 		this.ctx.btwContainer.clear();
 		this.ctx.btwContainer.addChild(request.component);
 		this.ctx.ui.requestRender();
 		this.#activeRequest = request;
-		void this.#runRequest(request);
+		return request;
 	}
 
 	async #runRequest(request: BtwRequest): Promise<void> {
+		const turn = request.activeTurn;
+		const abortController = turn?.abortController;
+		if (!turn?.scope || !abortController) return;
 		try {
-			const promptText = prompt.render(btwUserPrompt, { question: request.question });
 			const { replyText } = await this.ctx.session.runEphemeralTurn({
 				purpose: "btw",
-				promptText,
+				turn,
+				contextExchanges: request.contextExchanges.map(exchange => ({ ...exchange })),
 				onTextDelta: delta => {
-					if (this.#isActiveRequest(request)) {
-						request.component.appendText(delta);
-					}
+					if (turn.active && this.#isActiveRequest(request)) request.component.appendText(delta);
 				},
-				signal: request.abortController.signal,
+				signal: abortController.signal,
 			});
-
-			if (!this.#isActiveRequest(request)) {
-				return;
-			}
-			if (replyText) {
-				request.component.setAnswer(replyText);
-			}
+			if (!turn.active || !this.#isActiveRequest(request)) return;
+			request.inFlight = false;
+			request.contextExchanges = boundBtwExchanges([
+				...request.contextExchanges,
+				{ question: turn.question, answer: replyText },
+			]);
+			if (replyText) request.component.setAnswer(replyText);
 			request.component.markComplete();
-		} catch (error) {
-			if (!this.#isActiveRequest(request)) {
-				return;
-			}
-			if (request.abortController.signal.aborted) {
+		} catch {
+			if (!turn.active || !this.#isActiveRequest(request)) return;
+			request.inFlight = false;
+			if (abortController.signal.aborted) {
 				request.component.markAborted();
 				return;
 			}
-			request.component.markError(error instanceof Error ? error.message : String(error));
+			request.component.markError(sanitizeBtwError("Side-chat request failed."));
+		} finally {
+			if (request.activeTurn === turn) request.activeTurn = undefined;
+			this.#scrubTurn(turn);
 		}
 	}
 
-	#closeActiveRequest(options: { abort: boolean }): void {
+	#scrubTurn(turn: ActiveBtwTurn): void {
+		turn.active = false;
+		turn.question = "";
+		turn.abortController = undefined;
+		turn.scope = undefined;
+	}
+
+	#closeActiveRequest(): void {
 		const request = this.#activeRequest;
 		if (!request) return;
 		this.#activeRequest = undefined;
-		if (options.abort) {
-			request.abortController.abort();
+		const turn = request.activeTurn;
+		const abortController = turn?.abortController;
+		if (turn) this.#scrubTurn(turn);
+		request.activeTurn = undefined;
+		request.contextExchanges.splice(0);
+		request.inFlight = false;
+		if (request.conversationScope) {
+			request.conversationScope.messages.splice(0);
+			request.conversationScope.systemPrompt.splice(0);
+			request.conversationScope = undefined;
 		}
+		abortController?.abort();
 		request.component.close();
+		this.ctx.editor?.setText("");
+		this.ctx.pendingImages = [];
 		this.ctx.btwContainer.clear();
 		this.ctx.ui.requestRender();
 	}

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

@@ -10,12 +10,12 @@ import {
 	type UsageLimit,
 	type UsageReport,
 } from "@gajae-code/ai";
-import { Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@gajae-code/tui";
+import { type Keybinding, Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@gajae-code/tui";
 import { formatDuration, Snowflake, setProjectDir } from "@gajae-code/utils";
-import { $ } from "bun";
 import { resolveAppendOnlyMode } from "../../append-only-mode";
 import { jobElapsedMs } from "../../async";
 import { reset as resetCapabilities } from "../../capability";
+import type { KeybindingsManager } from "../../config/keybindings";
 import { clearClaudePluginRootsCache } from "../../discovery/helpers";
 import { loadCustomShare } from "../../export/custom-share";
 import type { CompactOptions } from "../../extensibility/extensions/types";
@@ -36,7 +36,7 @@ import { EvalExecutionComponent } from "../../modes/components/eval-execution";
 import { getMarkdownTheme, getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
 import { computeContextBreakdown, renderContextUsage } from "../../modes/utils/context-usage";
-import { buildHotkeysMarkdown } from "../../modes/utils/hotkeys-markdown";
+import { buildHotkeysMarkdown, formatHotkeyMarkdownCode } from "../../modes/utils/hotkeys-markdown";
 import { buildToolsMarkdown } from "../../modes/utils/tools-markdown";
 import type { AsyncJobSnapshotItem } from "../../session/agent-session";
 import type { AuthStorage } from "../../session/auth-storage";
@@ -61,6 +61,39 @@ function showMarkdownPanel(ctx: InteractiveModeContext, title: string, markdown:
 	ctx.ui.requestRender();
 }
 
+export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAccessibleDisplayString">): string {
+	const displayKey = (action: Keybinding): string => keybindings.getAccessibleDisplayString(action) || "Disabled";
+	const sessionNewKey = formatHotkeyMarkdownCode(displayKey("app.session.new"));
+	const selectModelKey = formatHotkeyMarkdownCode(displayKey("app.model.select"));
+	const autocompleteNavigationKeys = formatHotkeyMarkdownCode(
+		`${displayKey("tui.select.up")}/${displayKey("tui.select.down")}`,
+		false,
+	);
+	const autocompleteConfirmKeys = formatHotkeyMarkdownCode(
+		`${displayKey("tui.input.submit")}/${displayKey("tui.input.tab")}`,
+		false,
+	);
+
+	return [
+		"**Beginner actions**",
+		"",
+		"| Action | How |",
+		"|---|---|",
+		`| Start a fresh session | ${sessionNewKey} or \`/new\` |`,
+		"| Resume another session | `/resume` |",
+		"| Show session details | `/session info` |",
+		"| Delete current session transcript/artifacts | `/session delete` |",
+		`| Select a model | \`/model\` or ${selectModelKey} |`,
+		"| Show all shortcuts | `?` on an empty prompt or `/hotkeys` |",
+		"",
+		"**Finding commands**",
+		"",
+		`- Type \`/\` to browse slash commands, then use ${autocompleteNavigationKeys} and ${autocompleteConfirmKeys}.`,
+		"- Type `#` to browse prompt actions like starting a session, pasting an image, or moving the cursor.",
+		"- Type `!` for shell commands and `$` for Python snippets.",
+	].join("\n");
+}
+
 export class CommandController {
 	constructor(private readonly ctx: InteractiveModeContext) {}
 
@@ -120,21 +153,34 @@ export class CommandController {
 	}
 
 	async handleShareCommand(): Promise<void> {
-		const tmpFile = path.join(os.tmpdir(), `${Snowflake.next()}.html`);
-		const cleanupTempFile = async () => {
+		let tempDir: string | undefined;
+		try {
+			let tmpFile: string;
 			try {
-				await fs.rm(tmpFile, { force: true });
-			} catch {
-				// Ignore cleanup errors
+				tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "gjc-share-"));
+				if (process.platform !== "win32") await fs.chmod(tempDir, 0o700);
+				tmpFile = path.join(tempDir, "session.html");
+				const file = await fs.open(tmpFile, "wx", 0o600);
+				await file.close();
+				await this.ctx.session.exportToHtml(tmpFile);
+				if (process.platform !== "win32") await fs.chmod(tmpFile, 0o600);
+			} catch (error: unknown) {
+				this.ctx.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
+				return;
+			}
+			await this.#shareExport(tmpFile);
+		} finally {
+			if (tempDir) {
+				try {
+					await fs.rm(tempDir, { recursive: true, force: true });
+				} catch {
+					// Ignore cleanup errors
+				}
 			}
-		};
-		try {
-			await this.ctx.session.exportToHtml(tmpFile);
-		} catch (error: unknown) {
-			this.ctx.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
-			return;
 		}
+	}
 
+	async #shareExport(tmpFile: string): Promise<void> {
 		try {
 			const customShare = await loadCustomShare();
 			if (customShare) {
@@ -149,7 +195,6 @@ export class CommandController {
 					this.ctx.editorContainer.clear();
 					this.ctx.editorContainer.addChild(this.ctx.editor);
 					this.ctx.ui.setFocus(this.ctx.editor);
-					await cleanupTempFile();
 				};
 
 				try {
@@ -176,20 +221,22 @@ export class CommandController {
 				}
 			}
 		} catch (err) {
-			await cleanupTempFile();
 			this.ctx.showError(err instanceof Error ? err.message : String(err));
 			return;
 		}
 
 		try {
-			const authResult = await $`gh auth status`.quiet().nothrow();
-			if (authResult.exitCode !== 0) {
-				await cleanupTempFile();
+			const authProcess = Bun.spawn(["gh", "auth", "status"], {
+				env: process.env,
+				stdin: "ignore",
+				stdout: "ignore",
+				stderr: "ignore",
+			});
+			if ((await authProcess.exited) !== 0) {
 				this.ctx.showError("GitHub CLI is not logged in. Run 'gh auth login' first.");
 				return;
 			}
 		} catch {
-			await cleanupTempFile();
 			this.ctx.showError("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/");
 			return;
 		}
@@ -205,27 +252,40 @@ export class CommandController {
 			this.ctx.editorContainer.clear();
 			this.ctx.editorContainer.addChild(this.ctx.editor);
 			this.ctx.ui.setFocus(this.ctx.editor);
-			await cleanupTempFile();
-		};
-
-		loader.onAbort = () => {
-			void restoreEditor();
-			this.ctx.showStatus("Share cancelled");
 		};
 
+		let cancellationRequested = false;
 		try {
-			const result = await $`gh gist create --public=false ${tmpFile}`.quiet().nothrow();
-			if (loader.signal.aborted) return;
+			const gistProcess = Bun.spawn(["gh", "gist", "create", "--public=false", tmpFile], {
+				env: process.env,
+				stdin: "ignore",
+				stdout: "pipe",
+				stderr: "pipe",
+				signal: loader.signal,
+			});
+			loader.onAbort = () => {
+				cancellationRequested = gistProcess.exitCode === null;
+			};
+			const stdoutPromise = new Response(gistProcess.stdout).text();
+			const stderrPromise = new Response(gistProcess.stderr).text();
+			const exitCode = await gistProcess.exited;
+			const [stdout, stderr] = await Promise.all([stdoutPromise, stderrPromise]);
+
+			if (cancellationRequested) {
+				await restoreEditor();
+				this.ctx.showStatus("Share cancelled");
+				return;
+			}
 
 			await restoreEditor();
 
-			if (result.exitCode !== 0) {
-				const errorMsg = result.stderr.toString("utf-8").trim() || "Unknown error";
+			if (exitCode !== 0) {
+				const errorMsg = stderr.trim() || "Unknown error";
 				this.ctx.showError(`Failed to create gist: ${errorMsg}`);
 				return;
 			}
 
-			const gistUrl = result.stdout.toString("utf-8").trim();
+			const gistUrl = stdout.trim();
 			const gistId = gistUrl.split("/").pop();
 			if (!gistId) {
 				this.ctx.showError("Failed to parse gist ID from gh output");
@@ -236,10 +296,12 @@ export class CommandController {
 			this.ctx.showStatus(`Share URL: ${previewUrl}\nGist: ${gistUrl}`);
 			this.openInBrowser(previewUrl);
 		} catch (error: unknown) {
-			if (!loader.signal.aborted) {
-				await restoreEditor();
-				this.ctx.showError(`Failed to create gist: ${error instanceof Error ? error.message : "Unknown error"}`);
+			await restoreEditor();
+			if (cancellationRequested) {
+				this.ctx.showStatus("Share cancelled");
+				return;
 			}
+			this.ctx.showError(`Failed to create gist: ${error instanceof Error ? error.message : "Unknown error"}`);
 		}
 	}
 
@@ -577,26 +639,7 @@ export class CommandController {
 	}
 
 	handleHelpCommand(): void {
-		const sessionNewKey = this.ctx.keybindings.getDisplayString("app.session.new") || "/new";
-		const markdown = [
-			"**Beginner actions**",
-			"",
-			"| Action | How |",
-			"|---|---|",
-			`| Start a fresh session | \`${sessionNewKey}\` or \`/new\` |`,
-			"| Resume another session | `/resume` |",
-			"| Show session details | `/session info` |",
-			"| Delete current session transcript/artifacts | `/session delete` |",
-			"| Select a model | `/model` or `Ctrl+L` |",
-			"| Show all shortcuts | `?` on an empty prompt or `/hotkeys` |",
-			"",
-			"**Finding commands**",
-			"",
-			"- Type `/` to browse slash commands, then use arrows and Enter/Tab.",
-			"- Type `#` to browse prompt actions like starting a session, pasting an image, or moving the cursor.",
-			"- Type `!` for shell commands and `$` for Python snippets.",
-		].join("\n");
-		showMarkdownPanel(this.ctx, "GJC Help", markdown);
+		showMarkdownPanel(this.ctx, "GJC Help", buildHelpMarkdown(this.ctx.keybindings));
 	}
 
 	handleToolsCommand(): void {

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

@@ -242,6 +242,7 @@ export class EventController {
 	}
 
 	async #handleAgentStart(_event: Extract<AgentSessionEvent, { type: "agent_start" }>): Promise<void> {
+		this.ctx.promptSuggestion?.onAgentStart();
 		this.#lastIntent = undefined;
 		this.#readToolCallArgs.clear();
 		this.#readToolCallAssistantComponents.clear();
@@ -836,6 +837,7 @@ export class EventController {
 		this.ctx.ui.requestRender();
 		this.#scheduleIdleCompaction();
 		this.sendCompletionNotification();
+		this.ctx.promptSuggestion?.onAgentEnd();
 	}
 
 	async #handleAutoCompactionStart(
@@ -847,6 +849,10 @@ export class EventController {
 		this.ctx.editor.onEscape = () => {
 			this.ctx.session.abortCompaction();
 		};
+		if (this.ctx.loadingAnimation) {
+			this.ctx.loadingAnimation.stop();
+			this.ctx.loadingAnimation = undefined;
+		}
 		this.ctx.statusContainer.clear();
 		const reasonText =
 			event.reason === "overflow" ? "Context overflow detected, " : event.reason === "idle" ? "Idle " : "";
@@ -939,6 +945,10 @@ export class EventController {
 				this.ctx.session.abortRetry();
 			}
 		};
+		if (this.ctx.loadingAnimation) {
+			this.ctx.loadingAnimation.stop();
+			this.ctx.loadingAnimation = undefined;
+		}
 		this.ctx.statusContainer.clear();
 		// Stop any prior retry loader/timer before installing a new one.
 		this.ctx.retryLoader?.stop();

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

@@ -2,7 +2,7 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { type AgentMessage, ThinkingLevel } from "@gajae-code/agent-core";
 import { type AutocompleteProvider, matchesKey, type SlashCommand } from "@gajae-code/tui";
-import { $env, logger, sanitizeText } from "@gajae-code/utils";
+import { $pickenv, logger, sanitizeText } from "@gajae-code/utils";
 import { type AppKeybinding, KEYBINDINGS } from "../../config/keybindings";
 import { isSettingsInitialized, settings } from "../../config/settings";
 import { resolveSubskillActivationForSkillInvocation } from "../../extensibility/gjc-plugins";
@@ -725,8 +725,12 @@ export class InputController {
 			});
 		}
 
+		// Tab on an empty composer accepts the pending ghost-text prompt suggestion.
+		this.ctx.editor.onTab = (text: string) => this.ctx.promptSuggestion?.tryAcceptOnTab(text) === true;
+
 		this.ctx.editor.onChange = (text: string) => {
 			this.#resetEscapeGestures();
+			this.ctx.promptSuggestion?.notifyEditorChanged(text);
 			const wasBashMode = this.ctx.isBashMode;
 			const wasBashNoContext = this.ctx.isBashNoContext;
 			const wasPythonMode = this.ctx.isPythonMode;
@@ -752,6 +756,29 @@ export class InputController {
 	async submitText(text: string, composer: ComposerSubmissionOptions): Promise<void> {
 		text = text.trim();
 		if ((!isSettingsInitialized() || settings.get("emojiAutocomplete")) && text) text = expandEmoticons(text);
+		if (this.ctx.hasActiveBtw()) {
+			if (!text) return;
+			if (!text.startsWith("/")) {
+				const result = await this.ctx.handleBtwFollowUp(text);
+				if (result === "accepted" && this.#canModifyComposer(composer)) {
+					this.ctx.editor.setText("");
+					this.ctx.pendingImages = [];
+				}
+				return;
+			}
+		}
+
+		if (/^\/btw(?:\s|$)/.test(text)) {
+			const slashResult = await executeBuiltinSlashCommand(text, {
+				ctx: this.ctx,
+				handleBackgroundCommand: () => this.handleBackgroundCommand(),
+				composer,
+			});
+			if (slashResult === true) {
+				this.ctx.pendingImages = [];
+				return;
+			}
+		}
 
 		// Empty submit while streaming with queued messages: flush queues immediately
 		if (!text && this.ctx.session.isStreaming && this.ctx.session.queuedMessageCount > 0) {
@@ -907,7 +934,7 @@ export class InputController {
 
 		// Generate session title on first message
 		const hasUserMessages = this.ctx.session.messages.some((m: AgentMessage) => m.role === "user");
-		if (!hasUserMessages && !this.ctx.sessionManager.getSessionName() && !$env.PI_NO_TITLE) {
+		if (!hasUserMessages && !this.ctx.sessionManager.getSessionName() && !$pickenv("GJC_NO_TITLE", "PI_NO_TITLE")) {
 			const registry = this.ctx.session.modelRegistry;
 			generateSessionTitle(
 				text,
@@ -1357,6 +1384,14 @@ export class InputController {
 	async handleFollowUp(): Promise<void> {
 		const text = this.ctx.editor.getText().trim();
 		if (!text) return;
+		// While /btw is open, plain text stays in the side chat. Slash-origin
+		// input keeps normal dispatch so commands remain available.
+		if (this.ctx.hasActiveBtw() && !text.startsWith("/")) {
+			if ((await this.ctx.handleBtwFollowUp(text)) === "accepted") {
+				this.ctx.editor.setText("");
+			}
+			return;
+		}
 
 		// Compaction first: while compacting, queue free text and `/skill:*`
 		// commands in the compaction-local queue. `flushCompactionQueue`
@@ -1758,6 +1793,7 @@ export class InputController {
 			moveCursorToMessageStart: () => this.ctx.editor.moveToMessageStart(),
 			moveCursorToLineStart: () => this.ctx.editor.moveToLineStart(),
 			moveCursorToLineEnd: () => this.ctx.editor.moveToLineEnd(),
+			getPromptSuggestion: () => this.ctx.promptSuggestion?.current ?? null,
 		});
 	}