@iowarp/clio-coder 0.4.6 → 0.4.8

package/src/interactive/clio-editor.ts

@@ -112,7 +112,7 @@ function composerMode(chrome: EditorChrome, text: string): ComposerMode {
 function lowerRailHint(theme: ClioTheme, chrome: EditorChrome): string {
 	return theme.fg(
 		"dim",
-		`${chrome.getSubmitKeyLabel?.() ?? "Enter"} send · ${chrome.getNewlineKeyLabel?.() ?? "Shift+Enter"} newline`,
+		`${chrome.getSubmitKeyLabel?.() ?? "Enter"} send · ${chrome.getNewlineKeyLabel?.() ?? "Ctrl+J"} newline`,
 	);
 }
 
@@ -205,6 +205,25 @@ function startsWithPastedOperator(text: string, pastedBangOffsets: ReadonlySet<n
 export class ClioEditor extends Editor {
 	private pastedBangOffsets = new Set<number>();
 	private bracketedPasteActive = false;
+	private revision = 0;
+	private pastedOperatorTokens = new Set<string>();
+
+	get draftRevision(): number {
+		return this.revision;
+	}
+
+	/** Restored queues and external buffers are literal editor content. */
+	setLiteralText(text: string): void {
+		this.setText(text);
+		this.pastedBangOffsets = new Set([...text.matchAll(/!/gu)].map((match) => match.index));
+	}
+
+	override applyEdit(operation: Parameters<Editor["applyEdit"]>[0]): void {
+		const before = this.getText();
+		super.applyEdit(operation);
+		this.revision += 1;
+		this.pastedBangOffsets = remapPastedBangOffsets(before, this.getText(), this.pastedBangOffsets, operation === "undo");
+	}
 
 	constructor(
 		tui: TUI,
@@ -270,18 +289,20 @@ export class ClioEditor extends Editor {
 	 */
 	getTextForSubmit(): string {
 		const text = this.getExpandedText();
-		return startsWithPastedOperator(this.getText(), this.pastedBangOffsets) ? guardPastedEditorOperator(text) : text;
+		return this.startsWithLiteralOperator() ? guardPastedEditorOperator(text) : text;
 	}
 
-	/**
-	 * pi-tui's bracketed-paste handling inserts pasted text (including a
-	 * trailing newline the paste carried) without submitting: a pasted
-	 * `/model\n` lands as two lines in the buffer and just sits there. Once
-	 * the base handler has applied a chunk that closed a paste, check whether
-	 * the buffer now reads as a completed slash command and, if so, submit it
-	 * through the same handler the typed-Enter path uses.
-	 */
+	private startsWithLiteralOperator(): boolean {
+		const visible = this.getText();
+		return (
+			startsWithPastedOperator(visible, this.pastedBangOffsets) ||
+			[...this.pastedOperatorTokens].some((token) => visible.trimStart().startsWith(token))
+		);
+	}
+
+	/** Paste is always literal; a later deliberate key submits it. */
 	override handleInput(data: string): void {
+		this.revision += 1;
 		const openedPaste = data.includes("\x1b[200~");
 		const closedPaste = data.includes("\x1b[201~");
 		const pasteMutation = this.bracketedPasteActive || openedPaste;
@@ -291,10 +312,7 @@ export class ClioEditor extends Editor {
 		// pasted bang draft for that synchronous handoff so the Bash parser can
 		// distinguish it from a typed operator; the submit controller unwraps it
 		// before sending the literal prompt onward.
-		if (
-			startsWithPastedOperator(textBeforeInput, this.pastedBangOffsets) &&
-			keybindings.matches(data, "tui.input.submit")
-		) {
+		if (this.startsWithLiteralOperator() && keybindings.matches(data, "tui.input.submit")) {
 			const pastedText = this.getTextForSubmit();
 			this.pastedBangOffsets.clear();
 			this.bracketedPasteActive = false;
@@ -322,16 +340,30 @@ export class ClioEditor extends Editor {
 		);
 		if (openedPaste) this.bracketedPasteActive = true;
 		if (closedPaste) this.bracketedPasteActive = false;
-		if (!closedPaste) return;
-		const text = this.getText();
-		if (!text.endsWith("\n")) return;
-		const command = text.trimEnd();
-		if (!command.startsWith("/")) return;
-		this.setText("");
-		this.onSubmit?.(command);
+		if (pasteMutation && textAfterInput !== this.getExpandedText()) {
+			// A large paste is represented by an opaque visible token. Remember the
+			// inserted token through edits and undo, without depending on its format.
+			let start = 0;
+			while (
+				start < textBeforeInput.length &&
+				start < textAfterInput.length &&
+				textBeforeInput[start] === textAfterInput[start]
+			)
+				start++;
+			let oldEnd = textBeforeInput.length,
+				end = textAfterInput.length;
+			while (oldEnd > start && end > start && textBeforeInput[oldEnd - 1] === textAfterInput[end - 1]) {
+				oldEnd--;
+				end--;
+			}
+			const token = textAfterInput.slice(start, end).trimStart();
+			if (token && !token.startsWith("!")) this.pastedOperatorTokens.add(token);
+		}
 	}
 
 	override setText(text: string): void {
+		this.revision += 1;
+		this.pastedOperatorTokens.clear();
 		this.pastedBangOffsets.clear();
 		this.bracketedPasteActive = false;
 		super.setText(text);

package/src/interactive/command-output.ts

@@ -1,5 +1,6 @@
 import { wrapTextWithAnsi } from "../engine/tui.js";
-import type { RunIo } from "./slash-commands.js";
+import { renderReferenceCard } from "./renderers/reference-card.js";
+import type { PromptReferenceCard, RunIo } from "./slash-commands.js";
 import { type ClioToken, clioTheme, GLYPH } from "./theme/index.js";
 
 export type NoticeLevel = "info" | "success" | "warn" | "error";
@@ -54,6 +55,60 @@ export function appendOperatorCommand(text: string, sink: CommandOutputSink): vo
 	sink.requestRender();
 }
 
+/**
+ * Render a display-only prompt template for the operator. A replay block like
+ * the command echo above: it is never persisted as a session entry and never
+ * reaches the model, which is what "display only" promises the author.
+ */
+export function appendReferenceCard(card: PromptReferenceCard, sink: CommandOutputSink): void {
+	sink.appendReplayBlock((width) => renderReferenceCard(card, width));
+	sink.requestRender();
+}
+
+/**
+ * A dim line under an operator turn, in the prose gutter, saying something
+ * about the turn that the operator did not type: which template expanded, how
+ * long it was. Transcript-only, like the echo above.
+ */
+export function appendOperatorAside(text: string, sink: CommandOutputSink): void {
+	const normalized = text.replace(/\r/g, "").replace(/\n+/gu, " ").trim();
+	if (normalized.length === 0) return;
+	sink.appendReplayBlock((width) => {
+		const theme = clioTheme();
+		return wrapTextWithAnsi(theme.fg("dim", normalized), Math.max(1, width - 2)).map((line) => `  ${line}`);
+	});
+	sink.requestRender();
+}
+
+export interface InterviewRecordEntry {
+	/** The question's header, or its first line when it has none. */
+	label: string;
+	answer: string;
+}
+
+/**
+ * What a round of an interview asked and what the operator answered, kept in
+ * the transcript once the overlay has moved on. Without it the round left
+ * only a tool row reading `▸ tool action {"action":"ask",…`, and the answers
+ * lived on `/decisions` alone.
+ */
+export function appendInterviewRecord(entries: ReadonlyArray<InterviewRecordEntry>, sink: CommandOutputSink): void {
+	const kept = entries.filter((entry) => entry.answer.trim().length > 0);
+	if (kept.length === 0) return;
+	sink.appendReplayBlock((width) => {
+		const theme = clioTheme();
+		const lines: string[] = [];
+		const inner = Math.max(1, width - 2);
+		for (const entry of kept) {
+			const label = entry.label.replace(/\s+/gu, " ").trim();
+			lines.push(...wrapTextWithAnsi(`${theme.fg("accent", GLYPH.cursor)} ${theme.fg("dim", label)}`, width));
+			lines.push(...wrapTextWithAnsi(theme.fg("muted", entry.answer.trim()), inner).map((line) => `  ${line}`));
+		}
+		return lines;
+	});
+	sink.requestRender();
+}
+
 export type CommandOutputReplayBlock = (width: number) => string[];
 
 export interface CommandOutputSink {

package/src/interactive/editor-submit.ts

@@ -52,6 +52,9 @@ export interface EditorSubmitEditor {
 	getText(): string;
 	/** Draft spelling for an immediate send, including any editor provenance envelope. */
 	getTextForSubmit(): string;
+	getExpandedText?(): string;
+	readonly draftRevision?: number;
+	setLiteralText?(text: string): void;
 	setText(text: string): void;
 	addToHistory(text: string): void;
 }
@@ -103,7 +106,7 @@ export interface EditorSubmitDeps {
 
 export interface EditorSubmitController {
 	runEditorBash(text: string): boolean;
-	openExternalEditorForInput(): void;
+	openExternalEditorForInput(text?: string): boolean;
 	handleEditorSteerMention(mention: { target: string; text: string }): boolean;
 	submitEditorText(text: string): void;
 	/** Admit an immutable boot record without reading or mutating the live draft. */
@@ -115,7 +118,7 @@ export interface EditorSubmitController {
 	 * refusals (attached dispatch, parked permission ask), which degrade the
 	 * message to next-slot delivery with a notice.
 	 */
-	interruptFromEditor(): void;
+	interruptFromEditor(text?: string): void;
 	restoreQueuedFollowUpsToEditor(): void;
 	hasActiveEditorBash(): boolean;
 	cancelActiveEditorBash(): boolean;
@@ -236,27 +239,45 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 		return true;
 	};
 
-	const openExternalEditorForInput = (): void => {
+	const setLiteralText = (text: string): void => {
+		if (deps.editor.setLiteralText) deps.editor.setLiteralText(text);
+		else deps.editor.setText(text);
+	};
+	const openExternalEditorForInput = (explicitText?: string): boolean => {
 		const command = (deps.resolveEditor ?? resolveExternalEditor)();
 		if (!command) {
 			deps.io.stderr("[editor] no external editor configured; set VISUAL or EDITOR\n");
-			return;
+			return false;
 		}
-		const currentText = deps.editor.getText();
+		const currentText =
+			explicitText ?? deps.editor.getExpandedText?.() ?? unguardPastedEditorOperator(deps.editor.getTextForSubmit());
 		let result: ExternalEditResult;
 		try {
 			deps.ui.stop();
 			result = (deps.editExternally ?? editTextExternally)(currentText, command);
+		} catch (error) {
+			result = { ok: false, error: error instanceof Error ? error.message : String(error) };
 		} finally {
 			deps.ui.start();
 			deps.ui.requestRender(true);
 		}
-		if (result.ok) {
-			deps.editor.setText(result.text ?? "");
-		} else if (result.error) {
-			deps.io.stderr(`[editor] ${result.error}\n`);
-		}
+		if (result.ok) setLiteralText(result.text ?? "");
+		else if (result.error) deps.io.stderr(`[editor] ${result.error}\n`);
 		deps.ui.requestRender(true);
+		return result.ok;
+	};
+
+	// A snapshot remains owned until expansion and admission finish. A second
+	// press on that same snapshot is inert; a newer draft has its own identity.
+	const pendingDrafts = new Set<string>();
+	const captureDraft = () => {
+		const text = deps.editor.getText();
+		const revision = deps.editor.draftRevision;
+		const key = JSON.stringify([revision, text]);
+		return {
+			key,
+			owns: () => deps.editor.getText() === text && deps.editor.draftRevision === revision,
+		};
 	};
 
 	const submitEditorSteerMention = (mention: { target: string; text: string }): EditorSteerSubmission => {
@@ -337,7 +358,12 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			}
 		}
 		const command = parseSlashCommand(trimmed);
-		if (isRejectedCommand(command)) {
+		if (command.kind === "editor" || command.kind === "interrupt") {
+			// Keep the correctable command until its owner accepts the snapshot.
+			deps.editor.setText(literalText);
+			const result = deps.dispatchCommand(trimmed);
+			if (result === "accepted") deps.editor.addToHistory(literalText);
+		} else if (isRejectedCommand(command)) {
 			deps.editor.setText(literalText);
 			deps.dispatchCommand(trimmed);
 		} else if (command.kind === "unknown-command") {
@@ -419,7 +445,8 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 
 	const queueFollowUpFromEditor = (): void => {
 		const streaming = deps.chat.isStreaming();
-		const text = (streaming ? deps.editor.getText() : deps.editor.getTextForSubmit()).trim();
+		const snapshot = captureDraft();
+		const text = deps.editor.getTextForSubmit().trim();
 		if (text.length === 0) return;
 		if (!streaming) {
 			deps.editor.setText("");
@@ -427,8 +454,10 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			deps.ui.requestRender();
 			return;
 		}
+		if (pendingDrafts.has(snapshot.key)) return;
+		pendingDrafts.add(snapshot.key);
 		void (async () => {
-			const submitted = await deps.expandSubmit(text);
+			const submitted = await deps.expandSubmit(unguardPastedEditorOperator(text));
 			if (submitted.images.length > 0) {
 				deps.io.stderr("[follow-up] image references cannot be queued while a response is streaming\n");
 				return;
@@ -439,17 +468,20 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 				return;
 			}
 			deps.editor.addToHistory(text);
-			deps.editor.setText("");
+			if (snapshot.owns()) deps.editor.setText("");
 			deps.ui.requestRender();
-		})().catch((err) => {
-			const msg = err instanceof Error ? err.message : String(err);
-			deps.io.stderr(`[follow-up] ${msg}\n`);
-		});
+		})()
+			.catch((err) => {
+				const msg = err instanceof Error ? err.message : String(err);
+				deps.io.stderr(`[follow-up] ${msg}\n`);
+			})
+			.finally(() => pendingDrafts.delete(snapshot.key));
 	};
 
-	const interruptFromEditor = (): void => {
+	const interruptFromEditor = (explicitText?: string): void => {
 		const streaming = deps.chat.isStreaming();
-		const text = (streaming ? deps.editor.getText() : deps.editor.getTextForSubmit()).trim();
+		const snapshot = captureDraft();
+		const text = (explicitText ?? deps.editor.getTextForSubmit()).trim();
 		if (text.length === 0) return;
 		if (!streaming) {
 			deps.editor.setText("");
@@ -457,8 +489,10 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			deps.ui.requestRender();
 			return;
 		}
+		if (pendingDrafts.has(snapshot.key)) return;
+		pendingDrafts.add(snapshot.key);
 		void (async () => {
-			const submitted = await deps.expandSubmit(text);
+			const submitted = await deps.expandSubmit(unguardPastedEditorOperator(text));
 			if (submitted.images.length > 0) {
 				deps.io.stderr("[interrupt] image references cannot be sent while a response is streaming\n");
 				return;
@@ -469,7 +503,8 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			// than vanishing with the cancelled run. A refused interrupt cancels
 			// nothing, so the queue stays put.
 			const restored = deps.chat.interruptRefusal() === null ? deps.chat.clearQueuedFollowUps() : [];
-			deps.editor.setText(restored.join("\n\n"));
+			const newerDraft = snapshot.owns() ? "" : (deps.editor.getExpandedText?.() ?? deps.editor.getText());
+			setLiteralText([...restored, newerDraft].filter((part) => part.length > 0).join("\n\n"));
 			deps.ui.requestRender();
 			// An interrupt is a fresh prompt, so it carries what the idle path
 			// carries: the launchpad collapse, the submitted-turn count, and the
@@ -486,10 +521,12 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 				...(skillRequests.length > 0 ? { pendingSkillRequests: skillRequests } : {}),
 			});
 			await deps.settleVisibleFrame?.("interrupt-submit-return");
-		})().catch((err) => {
-			const msg = err instanceof Error ? err.message : String(err);
-			deps.io.stderr(`[interrupt] ${msg}\n`);
-		});
+		})()
+			.catch((err) => {
+				const msg = err instanceof Error ? err.message : String(err);
+				deps.io.stderr(`[interrupt] ${msg}\n`);
+			})
+			.finally(() => pendingDrafts.delete(snapshot.key));
 	};
 
 	const restoreQueuedFollowUpsToEditor = (): void => {
@@ -498,9 +535,9 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			deps.io.stderr("[follow-up] no queued messages to restore\n");
 			return;
 		}
-		const currentText = deps.editor.getText();
+		const currentText = deps.editor.getExpandedText?.() ?? deps.editor.getText();
 		const queuedText = restored.join("\n\n");
-		deps.editor.setText([queuedText, currentText].filter((part) => part.trim().length > 0).join("\n\n"));
+		setLiteralText([queuedText, currentText].filter((part) => part.trim().length > 0).join("\n\n"));
 		deps.ui.requestRender();
 	};
 

package/src/interactive/fleet-run-preview.ts

@@ -177,6 +177,8 @@ export function compileFleetRunPreview(input: FleetRunPreviewInput): FleetRunPre
 	let plan: ExecutionPlan;
 	try {
 		plan = compileFleetExecutionPlan({
+			commands,
+			vars: input.vars,
 			contract,
 			task,
 			resolveAgent(context) {

package/src/interactive/follow-up-queue-panel.ts

@@ -11,8 +11,8 @@ export interface FollowUpQueuePanelOptions {
 }
 
 /**
- * Keybindings are stored lowercase (`alt+up`), but the hint vocabulary spells
- * modifiers and keys in title case (`[Alt+Up]`). Format the bound key for
+ * Keybindings are stored lowercase (`alt+q`), but the hint vocabulary spells
+ * modifiers and keys in title case (`[Alt+Q]`). Format the bound key for
  * display so the panel reads the same whether or not the binding is customized.
  */
 function displayKey(key: string): string {
@@ -52,7 +52,7 @@ export function createFollowUpQueuePanel(options: FollowUpQueuePanelOptions = {}
 				message.kind === "steer" ? theme.fg("action", `${GLYPH.user} steer`) : theme.fg("muted", `${GLYPH.queued} queued`);
 			lines.push(`${marker} ${theme.fg("muted", preview)}`);
 		}
-		const restoreKey = key && key.length > 0 ? displayKey(key) : "Alt+Up";
+		const restoreKey = key && key.length > 0 ? displayKey(key) : "see /help";
 		lines.push(theme.fg("dim", `[${restoreKey}] restore to editor`));
 
 		cachedLines = frame(theme, "Steering Queue", lines, bodyWidth + 4);

package/src/interactive/footer/dashboard.ts

@@ -86,6 +86,7 @@ export type { ToolTallySnapshot } from "./widgets.js";
 export type FooterDashboardMode = "compact" | "expanded";
 
 export interface FooterDashboardDeps {
+	getExtensionStatus?: () => ReadonlyArray<string>;
 	providers: ProvidersContract;
 	getSettings?: () => Readonly<ClioSettings>;
 	getAgentStatus?: () => AgentStatus;
@@ -500,7 +501,9 @@ export function buildFooterDashboard(deps: FooterDashboardDeps): FooterDashboard
 		if (current.agent.statusText) frame = (frame + 1) % 10;
 		const grid = renderFooterDashboardLines(current, width, dashboardMode);
 		const notices = renderFooterNotices(current.notices, width, dashboardMode, deps.dismissKeyLabel);
-		view.setText([...grid, ...notices].join("\n"));
+		const contributed = deps.getExtensionStatus?.() ?? [];
+		const extensionLine = contributed.length ? [fitDashboardLine(`Extensions: ${contributed.join(" | ")}`, width)] : [];
+		view.setText([...grid, ...extensionLine, ...notices].join("\n"));
 		view.invalidate();
 	};
 	const setExpanded = (expanded: boolean): void => {

package/src/interactive/footer/notifications.ts

@@ -442,7 +442,7 @@ export function formatNotificationBadge(
 	const count = entries.length;
 	const noun = count === 1 ? "notice" : "notices";
 	const lead = entries[0]?.text ?? "";
-	const dismiss = options.dismissKeyLabel ?? "Alt+X";
+	const dismiss = options.dismissKeyLabel ?? "/notifications dismiss";
 	const compactHead = theme.fg(token, `${glyph} ${count}`);
 	const head = theme.fg(token, `${glyph} ${count} ${noun}`);
 	const separator = ` ${theme.fg("dim", "·")} `;
@@ -482,7 +482,7 @@ export function formatNotificationPanel(
 	if (entries.length === 0) return [];
 	const theme = options.theme ?? clioTheme();
 	const maxRows = Math.max(1, options.maxRows ?? 4);
-	const dismiss = options.dismissKeyLabel ?? "Alt+X";
+	const dismiss = options.dismissKeyLabel ?? "/notifications dismiss";
 	const lines: string[] = [rule(theme, width, { left: "notices" })];
 	for (const entry of entries.slice(0, maxRows)) {
 		const glyph = theme.fg(notificationToken(entry.level), notificationGlyph(entry.level));

package/src/interactive/footer/widgets.ts

@@ -1195,13 +1195,13 @@ function buildMetricStrip(
 	// Ranked above every measurement: the strip is cut by dropping the
 	// lowest-ranked chip, and these two are the answer to "did that key
 	// register". The quit hint outranks the leader because its window is
-	// 500ms wide and the leader's is open until the next keystroke.
+	// 500ms wide and the leader remains visible until dismissed.
 	// Two rungs rather than one: the strip drops a chip it cannot fit whole, and
 	// a terminal narrow enough to lose the sentence is exactly the one where the
 	// operator most needs to be told the press registered.
 	const shutdownHint = safeMaxWidth >= 20 ? "Ctrl+C again to quit" : "Ctrl+C again";
 	pushChip(chips, shutdownArmed ? theme.fg("warning", shutdownHint) : null, CHIP_RANK_SHUTDOWN);
-	pushChip(chips, leaderArmed ? theme.fg("accent", "leader armed") : null, CHIP_RANK_LEADER);
+	pushChip(chips, leaderArmed ? theme.fg("accent", "action menu") : null, CHIP_RANK_LEADER);
 	for (const chip of candidates) pushChip(chips, chip, CHIP_RANK_DETAIL);
 	pushChip(chips, totalChip, CHIP_RANK_TOTALS);
 	pushChip(chips, costChip, CHIP_RANK_DETAIL);