@iowarp/clio-coder 0.3.9 → 0.4.1

package/src/interactive/dispatch-board.ts

@@ -41,13 +41,8 @@ import { type CostProvenance, foregroundStreamUsage } from "../domains/providers
 import { sanitizeCallTargetText } from "../domains/safety/call-target.js";
 import { type Component, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "../engine/tui.js";
 import { formatWorkerContextMeter } from "./context-meter.js";
-import {
-	COUNCIL_SYNTHESIS_LABEL,
-	type CouncilGroupView,
-	type CouncilMemberView,
-	councilGroupBody,
-	councilIslandLines,
-} from "./council-grid.js";
+import { COUNCIL_SYNTHESIS_LABEL } from "./council.js";
+import { type CouncilGroupView, type CouncilMemberView, councilGroupBody, councilIslandLines } from "./council-grid.js";
 import { formatFooterTokens } from "./footer-panel.js";
 import {
 	type ClioTheme,
@@ -187,10 +182,7 @@ export interface DispatchBoardPhase {
  * the column lines up across rows; a long step id is clipped with a marker
  * rather than pushing the row's other facts out of position.
  */
-export function formatDispatchPhaseCell(
-	phase: DispatchBoardPhase | undefined,
-	width = PHASE_COLUMN_WIDTH,
-): string | null {
+function formatDispatchPhaseCell(phase: DispatchBoardPhase | undefined, width = PHASE_COLUMN_WIDTH): string | null {
 	if (phase === undefined) return null;
 	return truncateToWidth(`w${phase.wave} ${phase.stepId}`, Math.max(1, width), "…", false);
 }
@@ -299,9 +291,7 @@ export interface AgentAudiencePresentation {
  * machinery. Returns null for base/custom agents, which the operator asked for
  * directly and which therefore render like any other row.
  */
-export function agentAudiencePresentation(
-	row: Pick<DispatchBoardRow, "agentAudience">,
-): AgentAudiencePresentation | null {
+function agentAudiencePresentation(row: Pick<DispatchBoardRow, "agentAudience">): AgentAudiencePresentation | null {
 	if (row.agentAudience === "shadow") return { glyph: GLYPH.subProcess, token: "muted" };
 	if (row.agentAudience === "internal") return { glyph: GLYPH.subProcess, token: "dim" };
 	return null;
@@ -444,10 +434,7 @@ function latestEvidenceFailureReason(notices: readonly ObservabilityNotice[], ru
  * summary with an evidence bundle is ready; the latest error-level evidence
  * notice for the run marks it failed.
  */
-export function deriveRunEvidenceState(
-	snapshot: ObservabilitySnapshot | undefined,
-	runId: string,
-): RunEvidencePresentation {
+function deriveRunEvidenceState(snapshot: ObservabilitySnapshot | undefined, runId: string): RunEvidencePresentation {
 	if (!snapshot || runId.length === 0) return { state: "none", viewFilter: `dispatch:${runId}` };
 	if (snapshot.pendingEvidenceBuildRunIds.includes(runId)) {
 		return { state: "pending", viewFilter: `evidence:${runId}` };
@@ -502,6 +489,16 @@ function cardUnitsLine(theme: ClioTheme, key: string, units: ReadonlyArray<strin
 	return visibleWidth(full) <= contentWidth ? full : fitUnits(theme, prefix, units, contentWidth);
 }
 
+/** A prose card value, wrapped inside the columns left by its one-time key. */
+function cardWrappedValueLines(theme: ClioTheme, key: string, value: string, contentWidth: number): string[] {
+	const prefix = cardKvKey(theme, key);
+	const prefixWidth = visibleWidth(prefix);
+	const valueWidth = Math.max(1, contentWidth - prefixWidth);
+	return wrapTextWithAnsi(value, valueWidth).map(
+		(line, index) => `${index === 0 ? prefix : " ".repeat(prefixWidth)}${line}`,
+	);
+}
+
 // The `proof` row: the colored state marker, an optional failure reason, then
 // the dim `/view` filter an operator would type.
 function evidenceCardLine(theme: ClioTheme, evidence: RunEvidencePresentation, contentWidth: number): string | null {
@@ -514,7 +511,7 @@ function evidenceCardLine(theme: ClioTheme, evidence: RunEvidencePresentation, c
 }
 
 /** Sanitize lifecycle task text at the terminal boundary and collapse it to one bounded line. */
-export function sanitizeDispatchTaskSummary(value: unknown): string | undefined {
+function sanitizeDispatchTaskSummary(value: unknown): string | undefined {
 	if (typeof value !== "string") return undefined;
 	const sanitized = sanitizeCallTargetText(value);
 	if (sanitized.length === 0) return undefined;
@@ -627,13 +624,19 @@ function trustCardLines(theme: ClioTheme, row: DispatchBoardRow, contentWidth: n
 	);
 }
 
-export function renderDispatchCard(
+function renderDispatchCard(
 	row: DispatchBoardRow,
 	width: number,
 	evidence?: RunEvidencePresentation,
-	options: { selected?: boolean; expanded?: boolean; endpointActive?: number } = {},
+	options: {
+		selected?: boolean;
+		expanded?: boolean;
+		endpointActive?: number;
+		endpointQueued?: number;
+		theme?: ClioTheme;
+	} = {},
 ): string[] {
-	const theme = clioTheme();
+	const theme = options.theme ?? clioTheme();
 	const contentWidth = Math.max(0, width - 4);
 	const agentLabel = agentDisplayLabel(row);
 	const elapsed = formatCompactMs(row.elapsedMs);
@@ -683,7 +686,12 @@ export function renderDispatchCard(
 		statusStr,
 		theme.fg("muted", `node ${row.node ?? "local"}`),
 		...(row.endpoint !== undefined
-			? [theme.fg("info", `slots ${options.endpointActive ?? 0}/${row.endpoint.limit} ${row.endpoint.label}`)]
+			? [
+					theme.fg(
+						"info",
+						`slots ${options.endpointActive ?? 0}/${row.endpoint.limit}${(options.endpointQueued ?? 0) > 0 ? ` +${options.endpointQueued} queued` : ""} ${row.endpoint.label}`,
+					),
+				]
 			: []),
 		...(row.gate !== undefined ? [theme.fg("info", `gate ${row.gate.role} c${row.gate.cycle}`)] : []),
 		...(row.rerouteCount !== undefined && row.rerouteCount > 0
@@ -709,24 +717,22 @@ export function renderDispatchCard(
 			contentWidth,
 		),
 		targetLine,
-		...(row.taskSummary
-			? [truncateToWidth(`${cardKvKey(theme, "task")}${theme.fg("muted", row.taskSummary)}`, contentWidth, "…", false)]
-			: []),
+		...(row.taskSummary ? cardWrappedValueLines(theme, "task", theme.fg("muted", row.taskSummary), contentWidth) : []),
 		cardUnitsLine(theme, "status", statusUnits, contentWidth),
 		...trustCardLines(theme, row, contentWidth),
 		...(row.budget !== undefined
 			? [
-					truncateToWidth(
-						`${cardKvKey(theme, "policy")}${theme.fg("muted", `${formatBudgetPolicy(row.budget)}; requested ${formatBudgetRequest(row.budget)}`)}`,
+					...cardWrappedValueLines(
+						theme,
+						"policy",
+						theme.fg("muted", `${formatBudgetPolicy(row.budget)}; requested ${formatBudgetRequest(row.budget)}`),
 						contentWidth,
-						"…",
-						false,
 					),
-					truncateToWidth(
-						`${cardKvKey(theme, "budget")}${theme.fg("muted", `${formatEffectiveBudget(row.budget)}; reason ${formatBudgetReasons(row.budget)}`)}`,
+					...cardWrappedValueLines(
+						theme,
+						"budget",
+						theme.fg("muted", `${formatEffectiveBudget(row.budget)}; reason ${formatBudgetReasons(row.budget)}`),
 						contentWidth,
-						"…",
-						false,
 					),
 				]
 			: []),
@@ -791,7 +797,7 @@ export function renderDispatchCard(
 		const proofLine = evidenceCardLine(theme, evidence, contentWidth);
 		if (proofLine !== null) bodyLines.push(proofLine);
 	}
-	if (detail !== null) bodyLines.push(`${cardKvKey(theme, "detail")}${theme.fg("dim", detail)}`);
+	if (detail !== null) bodyLines.push(...cardWrappedValueLines(theme, "detail", theme.fg("dim", detail), contentWidth));
 
 	return frame(theme, cardTitle, bodyLines, width, { rightMeta: elapsed });
 }
@@ -950,10 +956,7 @@ export type DispatchBoardItem = { kind: "run"; row: DispatchBoardRow } | { kind:
  * its first row and its remaining rows are consumed, so the board never shows a
  * member both inside its group and beside it.
  */
-export function dispatchBoardItems(
-	rows: ReadonlyArray<DispatchBoardRow>,
-	selectedRunId?: string | null,
-): DispatchBoardItem[] {
+function dispatchBoardItems(rows: ReadonlyArray<DispatchBoardRow>, selectedRunId?: string | null): DispatchBoardItem[] {
 	const byGroup = new Map<string, DispatchBoardRow[]>();
 	for (const row of rows) {
 		const group = row.council?.group;
@@ -978,14 +981,14 @@ export function dispatchBoardItems(
 }
 
 /** The framed council card: the member grid or stack, with the synthesis run full width under it. */
-export function renderCouncilCard(group: CouncilGroupView, width: number): string[] {
+function renderCouncilCard(group: CouncilGroupView, width: number): string[] {
 	const theme = clioTheme();
 	const contentWidth = Math.max(0, width - 4);
 	const title = `${theme.fg("info", "council")} ${theme.paint(group.group, { bold: true })}`;
 	return frame(theme, title, councilGroupBody(theme, group, contentWidth), width, { rightMeta: group.elapsed });
 }
 
-export function formatDispatchBoardLines(
+function formatDispatchBoardLines(
 	rows: ReadonlyArray<DispatchBoardRow>,
 	width = 76,
 	observability?: ObservabilitySnapshot,
@@ -1003,13 +1006,12 @@ export function formatDispatchBoardLines(
 	}
 
 	const endpointActive: Record<string, number> = { ...foregroundStreamUsage() };
+	const endpointQueued: Record<string, number> = {};
 	for (const row of rows) {
-		if (
-			row.endpoint !== undefined &&
-			(row.status === "running" || row.status === "stale" || row.status === "enqueued" || row.status === "cancelling")
-		) {
+		if (row.endpoint === undefined) continue;
+		if (row.status === "enqueued") endpointQueued[row.endpoint.key] = (endpointQueued[row.endpoint.key] ?? 0) + 1;
+		else if (row.status === "running" || row.status === "stale" || row.status === "cancelling")
 			endpointActive[row.endpoint.key] = (endpointActive[row.endpoint.key] ?? 0) + 1;
-		}
 	}
 
 	// A council is one question asked of several members, so its rows render as
@@ -1020,7 +1022,12 @@ export function formatDispatchBoardLines(
 			: renderDispatchCard(item.row, width, deriveRunEvidenceState(observability, item.row.runId), {
 					selected: item.row.runId === selectedRunId,
 					expanded: detailExpanded && item.row.runId === selectedRunId,
-					...(item.row.endpoint !== undefined ? { endpointActive: endpointActive[item.row.endpoint.key] ?? 0 } : {}),
+					...(item.row.endpoint !== undefined
+						? {
+								endpointActive: endpointActive[item.row.endpoint.key] ?? 0,
+								endpointQueued: endpointQueued[item.row.endpoint.key] ?? 0,
+							}
+						: {}),
 				}),
 	);
 	const body: string[] = [];
@@ -1712,7 +1719,7 @@ export function createDispatchBoardStore(
 					entry.ttftMs = Math.round(performance.now() - entry.startedAtClockMs);
 				}
 			}
-			if (type === "clio_write_record_downgraded") {
+			if (type === "clio_coder_write_record_downgraded") {
 				const rawPayload = (workerEvent as { payload?: unknown }).payload;
 				const payload =
 					typeof rawPayload === "object" && rawPayload !== null ? (rawPayload as Record<string, unknown>) : null;
@@ -1730,7 +1737,7 @@ export function createDispatchBoardStore(
 			// board says about what a worker is saying or touching comes from here,
 			// so the board and the transcript block cannot tell two stories.
 			entry.progress.observe(payload.event);
-			if (type === "clio_steer_received") {
+			if (type === "clio_coder_steer_received") {
 				const steerPayload = (workerEvent as { payload?: { chars?: unknown } }).payload;
 				entry.steerAcknowledgement = {
 					receivedAtMs: Date.now(),

package/src/interactive/editor-bash.ts

@@ -6,7 +6,28 @@ export interface EditorBashCommand {
 	excludeFromContext: boolean;
 }
 
+/**
+ * Invisible one-shot envelope used only between ClioEditor and its submit
+ * callback. Pi trims submitted text before invoking that callback, so a
+ * whitespace guard would disappear and re-arm a pasted `!` command. The
+ * controller removes this envelope before routing the text as an ordinary
+ * prompt; it is never persisted or sent to a model.
+ */
+export const PASTED_EDITOR_OPERATOR_GUARD = "\u2063";
+
+export function guardPastedEditorOperator(text: string): string {
+	return `${PASTED_EDITOR_OPERATOR_GUARD}${text}`;
+}
+
+export function unguardPastedEditorOperator(text: string): string {
+	return text.startsWith(PASTED_EDITOR_OPERATOR_GUARD) ? text.slice(PASTED_EDITOR_OPERATOR_GUARD.length) : text;
+}
+
 export function parseEditorBashCommand(text: string): EditorBashCommand | null {
+	// Commands are an editor-line operator, not a shell-script paste surface.
+	// The paste guard also makes a bracketed-pasted one-liner literal until it
+	// has crossed the editor submit boundary and been routed as a normal prompt.
+	if (text.startsWith(PASTED_EDITOR_OPERATOR_GUARD) || text.includes("\n") || text.includes("\r")) return null;
 	if (!text.startsWith("!")) return null;
 	const excludeFromContext = text.startsWith("!!");
 	const command = (excludeFromContext ? text.slice(2) : text.slice(1)).trim();

package/src/interactive/editor-steer.ts

@@ -4,8 +4,8 @@
  * `!` intercept in the editor submit path.
  *
  * The target token is deliberately a bare word (letters, digits, underscore,
- * hyphen). Inline file references (`@package.json`, `@src/x.ts`) contain dots
- * or slashes and never match, so prompt file expansion keeps working.
+ * hyphen). File completion consults the same predicate and quotes an otherwise
+ * ambiguous root-level extensionless reference before it reaches this parser.
  */
 
 export interface EditorSteerMention {
@@ -23,11 +23,16 @@ export type SteerTargetResolution =
 	| { kind: "ambiguous"; candidates: RunningDispatchRef[] }
 	| { kind: "none" };
 
-const STEER_MENTION = /^@([A-Za-z0-9][A-Za-z0-9_-]*)\s+(\S[\s\S]*)$/;
+const STEER_TARGET_TOKEN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+const STEER_MENTION = /^@(\S+)\s+(\S[\s\S]*)$/;
+
+export function isEditorSteerTargetToken(value: string): boolean {
+	return STEER_TARGET_TOKEN.test(value);
+}
 
 export function parseEditorSteerMention(text: string): EditorSteerMention | null {
 	const match = STEER_MENTION.exec(text.trim());
-	if (!match?.[1] || !match[2]) return null;
+	if (!match?.[1] || !match[2] || !isEditorSteerTargetToken(match[1])) return null;
 	return { target: match[1], text: match[2].trim() };
 }
 

package/src/interactive/editor-submit.ts

@@ -6,7 +6,7 @@ import type { SessionContract, SessionEntry } from "../domains/session/index.js"
 import { toolPresentationPolicy } from "../tools/presentation.js";
 import type { ChatLoop } from "./chat-loop.js";
 import type { ChatPanel } from "./chat-panel.js";
-import { bashExecutionEntryInput, parseEditorBashCommand } from "./editor-bash.js";
+import { bashExecutionEntryInput, parseEditorBashCommand, unguardPastedEditorOperator } from "./editor-bash.js";
 import {
 	formatSteerCandidates,
 	parseEditorSteerMention,
@@ -57,6 +57,8 @@ export interface EditorSubmitExpansion {
 
 export interface EditorSubmitEditor {
 	getText(): string;
+	/** Draft spelling for an immediate send, including any editor provenance envelope. */
+	getTextForSubmit(): string;
 	setText(text: string): void;
 	addToHistory(text: string): void;
 }
@@ -318,18 +320,19 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 		submitEditorSteerMention(mention) !== "unhandled";
 
 	const submitEditorText = (text: string): void => {
-		const trimmed = text.trim();
+		const literalText = unguardPastedEditorOperator(text);
+		const trimmed = literalText.trim();
 		if (trimmed.length === 0) return;
 		deps.collapseLaunchpadBeforeSubmit?.();
 		if (parseEditorBashCommand(text)) {
 			if (!deps.chat.isStreaming() && !activeEditorBash) {
-				deps.editor.addToHistory(text);
+				deps.editor.addToHistory(literalText);
 				deps.editor.setText("");
 			} else {
 				// Pi Editor clears the buffer before invoking onSubmit. A command
 				// refused by either admission guard is still a draft, so put it back
 				// for the operator instead of silently discarding it.
-				deps.editor.setText(text);
+				deps.editor.setText(literalText);
 			}
 			if (runEditorBash(text)) deps.ui.requestRender();
 			return;
@@ -339,12 +342,12 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			const submission = submitEditorSteerMention(steerMention);
 			if (submission !== "unhandled") {
 				if (submission === "accepted") {
-					deps.editor.addToHistory(text);
+					deps.editor.addToHistory(literalText);
 					deps.editor.setText("");
 				} else {
 					// Resolution and dispatch failures are correctable rejections. Pi
 					// has already cleared the editor, so explicitly restore the draft.
-					deps.editor.setText(text);
+					deps.editor.setText(literalText);
 				}
 				deps.ui.requestRender();
 				return;
@@ -352,18 +355,18 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 		}
 		const command = parseSlashCommand(trimmed);
 		if (isRejectedCommand(command)) {
-			deps.editor.setText(text);
+			deps.editor.setText(literalText);
 			deps.dispatchCommand(trimmed);
 		} else if (command.kind === "unknown-command") {
 			const result = deps.dispatchCommand(trimmed);
 			if (result === "rejected") {
-				deps.editor.setText(text);
+				deps.editor.setText(literalText);
 			} else {
-				deps.editor.addToHistory(text);
+				deps.editor.addToHistory(literalText);
 				deps.editor.setText("");
 			}
 		} else {
-			deps.editor.addToHistory(text);
+			deps.editor.addToHistory(literalText);
 			deps.editor.setText("");
 			deps.dispatchCommand(trimmed);
 		}
@@ -388,7 +391,8 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 	};
 
 	const admitCapturedText = async (text: string, signal?: AbortSignal): Promise<void> => {
-		const trimmed = text.trim();
+		const literalText = unguardPastedEditorOperator(text);
+		const trimmed = literalText.trim();
 		if (trimmed.length === 0) return;
 		signal?.throwIfAborted();
 		deps.collapseLaunchpadBeforeSubmit?.();
@@ -396,7 +400,7 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			while (deps.chat.isStreaming()) await awaitWithAbort(deps.chat.whenSettled(), signal);
 			while (activeEditorBashSettlement) await awaitWithAbort(activeEditorBashSettlement, signal);
 			signal?.throwIfAborted();
-			deps.editor.addToHistory(text);
+			deps.editor.addToHistory(literalText);
 			runEditorBash(text);
 			deps.ui.requestRender();
 			return;
@@ -408,7 +412,7 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 				if (submission === "rejected") {
 					throw new Error("queued boot steer was not admitted; preserving it for recovery");
 				}
-				deps.editor.addToHistory(text);
+				deps.editor.addToHistory(literalText);
 				deps.ui.requestRender();
 				return;
 			}
@@ -421,7 +425,7 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			deps.ui.requestRender();
 			throw new Error("queued boot command needs correction; preserving it for recovery");
 		}
-		deps.editor.addToHistory(text);
+		deps.editor.addToHistory(literalText);
 		signal?.throwIfAborted();
 		if (deps.dispatchCommandAsync) await deps.dispatchCommandAsync(trimmed, signal);
 		else deps.dispatchCommand(trimmed);
@@ -429,9 +433,10 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 	};
 
 	const queueFollowUpFromEditor = (): void => {
-		const text = deps.editor.getText().trim();
+		const streaming = deps.chat.isStreaming();
+		const text = (streaming ? deps.editor.getText() : deps.editor.getTextForSubmit()).trim();
 		if (text.length === 0) return;
-		if (!deps.chat.isStreaming()) {
+		if (!streaming) {
 			deps.editor.setText("");
 			submitEditorText(text);
 			deps.ui.requestRender();
@@ -458,9 +463,10 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 	};
 
 	const interruptFromEditor = (): void => {
-		const text = deps.editor.getText().trim();
+		const streaming = deps.chat.isStreaming();
+		const text = (streaming ? deps.editor.getText() : deps.editor.getTextForSubmit()).trim();
 		if (text.length === 0) return;
-		if (!deps.chat.isStreaming()) {
+		if (!streaming) {
 			deps.editor.setText("");
 			submitEditorText(text);
 			deps.ui.requestRender();

package/src/interactive/external-editor.ts

@@ -50,7 +50,7 @@ export function resolveExternalEditor(
 
 export function editTextExternally(initialText: string, command: string | null): ExternalEditResult {
 	if (!command) return { ok: false, error: "no external editor configured; set VISUAL or EDITOR" };
-	const tmpFile = join(tmpdir(), `clio-editor-${process.pid}-${randomUUID()}.md`);
+	const tmpFile = join(tmpdir(), `clio-coder-editor-${process.pid}-${randomUUID()}.md`);
 	try {
 		writeFileSync(tmpFile, initialText, "utf8");
 		const result = runEditor(command, tmpFile);