@iowarp/clio-coder 0.3.3 → 0.3.6

package/src/interactive/session-transcript.ts

@@ -3,7 +3,7 @@ import { collectSessionEntries } from "../domains/session/compaction/session-ent
 import type { SessionContract, SessionEntry } from "../domains/session/index.js";
 import { openSession, sessionPaths } from "../engine/session.js";
 import type { ChatLoop } from "./chat-loop.js";
-import { buildReplayAgentMessagesFromTurns } from "./chat-renderer.js";
+import { buildModelReplayAgentMessagesFromTurns } from "./model-session-replay.js";
 
 type SessionOwner = Pick<SessionContract, "create" | "current">;
 type SessionChat = Pick<ChatLoop, "resetForSession">;
@@ -87,7 +87,7 @@ export function createSessionTranscript(deps: SessionTranscriptDeps): SessionTra
 		const turns = deps.readSessionEntries();
 		deps.chat.resetForSession(
 			leafTurnId,
-			buildReplayAgentMessagesFromTurns(turns, {
+			buildModelReplayAgentMessagesFromTurns(turns, {
 				...(leafTurnId ? { activeLeafTurnId: leafTurnId } : {}),
 			}),
 		);

package/src/interactive/session-usage-reseed.ts

@@ -14,6 +14,11 @@
  * only the sink wiring between that fold and the observability projection.
  */
 
+import {
+	addResponseModelIdObservationCount,
+	emptyResponseModelIdObservationCounts,
+	type ResponseModelIdObservationCounts,
+} from "../core/response-model-id.js";
 import { ledgerUsageCalls, type SessionEntry, type SessionUsageDefaults } from "../domains/session/index.js";
 import { filterEntriesToActivePath } from "../domains/session/tree/active-path.js";
 
@@ -22,7 +27,7 @@ export interface SessionUsageSink {
 	resetSession(): void;
 	recordTokens(
 		providerId: string,
-		modelId: string,
+		attributedModelId: string,
 		tokens: number,
 		costUsd?: number,
 		breakdown?: {
@@ -35,6 +40,10 @@ export interface SessionUsageSink {
 			apiCalls?: number;
 		},
 		costProvenance?: never,
+		modelIdFacts?: {
+			requestedModelIds: ReadonlyArray<string>;
+			responseModelIdObservationCounts: Readonly<ResponseModelIdObservationCounts>;
+		},
 	): void;
 }
 
@@ -61,14 +70,31 @@ export function reseedSessionUsageFromLedger(
 	sink.resetSession();
 	const scoped = filterEntriesToActivePath(entries, activeLeafTurnId ?? undefined);
 	for (const call of ledgerUsageCalls(scoped, defaults)) {
-		sink.recordTokens(call.providerId, call.modelId, call.totalTokens, call.costUsd, {
-			input: call.input,
-			output: call.output,
-			cacheRead: call.cacheRead,
-			cacheWrite: call.cacheWrite,
-			reasoningTokens: call.reasoningTokens,
-			totalTokens: call.totalTokens,
-			apiCalls: call.apiCalls ?? 1,
-		});
+		const responseModelIdObservationCounts = emptyResponseModelIdObservationCounts();
+		addResponseModelIdObservationCount(
+			responseModelIdObservationCounts,
+			call.responseModelIdObservation,
+			call.apiCalls ?? 1,
+		);
+		sink.recordTokens(
+			call.providerId,
+			call.attributedModelId,
+			call.totalTokens,
+			call.costUsd,
+			{
+				input: call.input,
+				output: call.output,
+				cacheRead: call.cacheRead,
+				cacheWrite: call.cacheWrite,
+				reasoningTokens: call.reasoningTokens,
+				totalTokens: call.totalTokens,
+				apiCalls: call.apiCalls ?? 1,
+			},
+			undefined,
+			{
+				requestedModelIds: [call.requestedModelId],
+				responseModelIdObservationCounts,
+			},
+		);
 	}
 }

package/src/interactive/slash-commands.ts

@@ -44,6 +44,8 @@ type SlashCommandVariant =
 	| { kind: "init"; options: InitCommandOptions }
 	| { kind: "context-clear"; options: ContextClearCommandOptions }
 	| { kind: "context-refresh" }
+	/** `ref` is the turnId an `[evicted ...]` marker names. */
+	| { kind: "context-recall"; ref: string }
 	| { kind: "skill-selector" }
 	| { kind: "skill-invocation"; text: string }
 	| { kind: "prompts" }
@@ -343,6 +345,13 @@ export interface SlashCommandContext {
 	 * Optional until the host wires onContextRefresh.
 	 */
 	runContextRefresh?: () => void;
+	/**
+	 * Read an evicted tool-result body back into the transcript by ref, and
+	 * record the `contextRecall` entry. Transcript-only: an operator recall
+	 * answers the person, so the body never becomes model context. Optional
+	 * until the host wires a session.
+	 */
+	runContextRecall?: (ref: string) => void;
 	openSkillsHub?: () => void;
 	listPrompts: () => ResourceList<PromptTemplate>;
 	/**
@@ -384,7 +393,7 @@ export interface SlashCommandContext {
 		done(id: string): UserTask;
 		drop(id: string): UserTask;
 	};
-	/** Open the read-only `/memory` overlay: approved lessons and the live task bank. */
+	/** Open `/memory` for approved lessons, the live task bank, and reviewed promotion. */
 	openMemory: () => void;
 	/** Opt-in import from the newest structured handoff; absent when the host has no task bank. */
 	seedTaskMemory?: () => TaskMemorySeedCommandResult;
@@ -481,6 +490,13 @@ const COMPACT_POSITIONALS: ReadonlyArray<CommandPositionalSpec> = [
 	{ name: "instructions", required: false, rest: true },
 ];
 
+/**
+ * `/context recall <ref>` takes exactly one ref, not a rest tail: a ref is a
+ * single turnId, and a second token is a mistake worth reporting rather than
+ * text to fold into the first.
+ */
+const RECALL_POSITIONALS: ReadonlyArray<CommandPositionalSpec> = [{ name: "ref", required: true }];
+
 /**
  * A registered command whose arguments do not parse is a mistake to report,
  * not a chat message to send. Falling through to `unknown` submitted the raw
@@ -859,11 +875,12 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 	},
 	{
 		name: "context",
-		description: "Context hub: window overlay plus compact, init, refresh, and reset",
+		description: "Context hub: window overlay plus compact, recall, init, refresh, and reset",
 		group: "Inspect",
-		kinds: ["context-view", "compact", "init", "context-clear", "context-refresh"],
+		kinds: ["context-view", "compact", "context-recall", "init", "context-clear", "context-refresh"],
 		subcommandDescriptions: {
 			compact: "Compact session context",
+			recall: "Recall an evicted result",
 			init: "Initialize project context",
 			refresh: "Refresh project context",
 			reset: "Reset project context",
@@ -871,6 +888,7 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 		args: {
 			subcommands: {
 				compact: { positionals: [...COMPACT_POSITIONALS] },
+				recall: { positionals: [...RECALL_POSITIONALS] },
 				init: {},
 				refresh: {},
 				reset: {},
@@ -881,6 +899,8 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 			switch (parsed.subcommand) {
 				case "compact":
 					return { kind: "compact", instructions: parsed.rest };
+				case "recall":
+					return { kind: "context-recall", ref: parsed.positionals[0] ?? "" };
 				case "init":
 					return { kind: "init", options: {} };
 				case "refresh":
@@ -899,6 +919,13 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 				case "compact":
 					ctx.runCompact(command.instructions);
 					return;
+				case "context-recall":
+					if (ctx.runContextRecall) {
+						ctx.runContextRecall(command.ref);
+					} else {
+						ctx.notice("error", "context recall is not wired; no session is bound to this process");
+					}
+					return;
 				case "init":
 					ctx.runInit(command.options);
 					return;
@@ -1009,7 +1036,7 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 	},
 	{
 		name: "memory",
-		description: "Inspect task memory or seed it from the newest handoff",
+		description: "Inspect, promote, or seed task memory",
 		group: "Inspect",
 		kinds: ["memory", "memory-seed"],
 		subcommandDescriptions: { seed: "Seed the task bank from the newest handoff" },

package/src/interactive/status/summary.ts

@@ -1,3 +1,4 @@
+import { responseModelIdObservationFromRecord } from "../../core/response-model-id.js";
 import { estimateReasoningTextTokens, extractReasoningTokens } from "../../domains/session/context-accounting.js";
 import type { AgentMessage } from "../../engine/types.js";
 import type { ReasoningTokenProvenance, RunTally, TurnStopReason, TurnSummary, WatchdogTier } from "./types.js";
@@ -65,6 +66,7 @@ export function emptyRunTally(): RunTally {
 		hadEstimatedReasoning: false,
 		toolCount: 0,
 		toolErrorCount: 0,
+		responseModelIdObservation: { state: "not-observed" },
 	};
 }
 
@@ -85,8 +87,10 @@ export function foldMessageIntoRunTally(tally: RunTally, message: AgentMessage):
 	}
 	if (message.role !== "assistant") return tally;
 	const usage = (message as { usage?: UsageLike }).usage;
+	const record = message as unknown as Record<string, unknown>;
 	const next: RunTally = {
 		...tally,
+		responseModelIdObservation: responseModelIdObservationFromRecord(record, "not-observed"),
 		inputTokens: tally.inputTokens + (usage ? finite(usage.input) : 0),
 		outputTokens: tally.outputTokens + (usage ? finite(usage.output) : 0),
 		cacheReadTokens: tally.cacheReadTokens + (usage ? finite(usage.cacheRead) : 0),
@@ -145,6 +149,7 @@ export function summaryFromRunTally(tally: RunTally, input: SummaryFromTallyInpu
 		...(input.stopDetail !== undefined ? { stopDetail: input.stopDetail } : {}),
 		watchdogPeak: input.watchdogPeak,
 		truncated: input.truncated === true,
+		responseModelIdObservation: tally.responseModelIdObservation,
 	};
 	if (tally.hadProviderReasoning || tally.hadEstimatedReasoning) {
 		summary.reasoningTokens = tally.reasoningTokens;

package/src/interactive/status/types.ts

@@ -1,4 +1,5 @@
 import type { StatusPhase, WatchdogTier } from "../../core/bus-events.js";
+import type { ResponseModelIdObservation } from "../../core/response-model-id.js";
 
 // StatusPhase, WatchdogTier, and AgentStatusChangedPayload moved to
 // src/core/bus-events.ts (the phase taxonomy rides the agent.status.changed
@@ -29,6 +30,8 @@ export interface DispatchOverlay {
 export interface TurnSummary {
 	elapsedMs: number;
 	modelId: string;
+	/** Direct response model-id observation for the last API call in the turn. */
+	responseModelIdObservation: ResponseModelIdObservation;
 	targetId: string;
 	inputTokens: number;
 	outputTokens: number;
@@ -70,6 +73,8 @@ export interface RunTally {
 	hadEstimatedReasoning: boolean;
 	toolCount: number;
 	toolErrorCount: number;
+	/** Direct response model-id observation for the last assistant call folded. */
+	responseModelIdObservation: ResponseModelIdObservation;
 }
 
 export interface OverlayFrame {

package/src/interactive/terminal-lease.ts

@@ -189,6 +189,7 @@ export function createProcessTerminalLease(options: CreateProcessTerminalLeaseOp
 		getModelLabel: () => editorChrome.getModelLabel(),
 		getThinkingLabel: () => editorChrome.getThinkingLabel(),
 		isStreaming: () => editorChrome.isStreaming?.() ?? false,
+		isAwaitingApproval: () => editorChrome.isAwaitingApproval?.() ?? false,
 		willEnterSteer: (text) => editorChrome.willEnterSteer?.(text) ?? false,
 		getSubmitKeyLabel: () => editorChrome.getSubmitKeyLabel?.() ?? "Enter",
 		getNewlineKeyLabel: () => editorChrome.getNewlineKeyLabel?.() ?? "Shift+Enter",