@iowarp/clio-coder 0.4.9 → 0.5.0

package/src/domains/session/context-ledger.ts

@@ -12,8 +12,8 @@
  *  - the decomposed estimate (sum of every category we can name), and
  *  - the live anchored total (provider-measured usage when one exists).
  * When the measured total exceeds the decomposition, the delta is attributed
- * to Messages — the only category that grows turn over turn — mirroring the
- * proportional reconciliation the footer bar already performs.
+ * to Messages as an unclassified conversation/framing residual. Tool-result
+ * estimates are tracked separately; provider totals do not measure category splits.
  */
 
 import type { BackendCacheVerdict, BackendCompletionTimings } from "../../core/cache-telemetry.js";
@@ -24,6 +24,7 @@ import { DEFAULT_COMPACTION_THRESHOLD } from "./compaction/auto.js";
 export type ContextLedgerCategory =
 	| "system"
 	| "tools"
+	| "toolResults"
 	| "agents"
 	| "skills"
 	| "memory"
@@ -58,6 +59,8 @@ export interface BuildContextLedgerInput {
 	systemPromptTokens?: number;
 	/** Serialized active tool-schema token estimate (the JSON the provider sees). */
 	toolSchemaTokens?: number;
+	/** Conversation tool-result content, separate from schemas. */
+	toolResultTokens?: number;
 	/** Number of active tool schemas this turn. */
 	toolCount?: number;
 	/** Conversation message token estimate. */
@@ -236,6 +239,7 @@ const SEGMENT_CATEGORY: Readonly<Record<string, ContextLedgerCategory>> = {
 export const CONTEXT_CATEGORY_LABEL: Readonly<Record<ContextLedgerCategory, string>> = {
 	system: "System prompt",
 	tools: "Tool definitions",
+	toolResults: "Tool results",
 	agents: "Agent fleet",
 	skills: "Skills",
 	memory: "Memory",
@@ -244,7 +248,7 @@ export const CONTEXT_CATEGORY_LABEL: Readonly<Record<ContextLedgerCategory, stri
 	pending: "Pending input",
 	reserve: "Autocompact reserve",
 	free: "Free space",
-	streaming: "Streaming output",
+	streaming: "Assistant output",
 };
 
 /** Display order for the content categories and the meter. */
@@ -256,6 +260,7 @@ const CONTENT_ORDER: ReadonlyArray<ContextLedgerCategory> = [
 	"memory",
 	"project",
 	"messages",
+	"toolResults",
 	"pending",
 	"streaming",
 ];
@@ -288,6 +293,7 @@ export function buildContextLedger(input: BuildContextLedgerInput): ContextLedge
 	const raw: Record<ContextLedgerCategory, number> = {
 		system: 0,
 		tools: 0,
+		toolResults: 0,
 		agents: 0,
 		skills: 0,
 		memory: 0,
@@ -309,6 +315,7 @@ export function buildContextLedger(input: BuildContextLedgerInput): ContextLedge
 	}
 	raw.tools += finiteNonNegative(input.toolSchemaTokens);
 	raw.messages += finiteNonNegative(input.messageTokens);
+	raw.toolResults += finiteNonNegative(input.toolResultTokens);
 	raw.pending += finiteNonNegative(input.pendingTokens);
 	raw.streaming += finiteNonNegative(input.streamingTokens);
 	raw.agents += finiteNonNegative(input.agentsTokens);

package/src/domains/session/entries.ts

@@ -459,6 +459,8 @@ export interface WorkerRunRuntime {
  * as ordinary text.
  */
 export interface WorkerRunEntry extends BaseSessionEntry {
+	helper?: true;
+	task?: string;
 	kind: "workerRun";
 	/** Logical work item. Retries and failovers of one run share it. */
 	assignmentId: string;
@@ -860,6 +862,8 @@ export function isSessionEntry(value: unknown): value is SessionEntry {
 			);
 		case "workerRun":
 			return (
+				(v.helper === undefined || v.helper === true) &&
+				isOptionalString(v.task) &&
 				isString(v.assignmentId) &&
 				isString(v.runId) &&
 				isOneOf(v.origin, WORKER_RUN_ORIGINS) &&

package/src/domains/session/history.ts

@@ -94,7 +94,7 @@ function extractMessageText(payload: unknown): string | null {
  * `operatorText`; older ones drop the leading scaffolding. Null when nothing
  * operator-authored remains, so the caller moves on to the next turn.
  */
-function operatorTextOfUserPayload(payload: unknown): string | null {
+export function operatorTextOfUserPayload(payload: unknown): string | null {
 	// An expansion (prompt template, command) replaced the typed input. The
 	// typed input is the title; the expansion starts with generated scaffolding.
 	if (payload && typeof payload === "object" && typeof (payload as { displayText?: unknown }).displayText === "string") {

package/src/domains/session/prompt-cache.ts

@@ -64,6 +64,7 @@ function cacheVerdict(value: unknown): BackendCacheVerdict | null {
 		case "partial":
 		case "cold":
 		case "small":
+		case "unknown":
 			return value;
 		default:
 			return null;

package/src/domains/session/prompt-manifest.ts

@@ -21,13 +21,15 @@ import type { SessionMeta } from "./contract.js";
  * 2: stable-prefix-first ordering with one `# Memory` header, and
  *    `contextWindowSource` recorded alongside the window the prompt states
  *    (issue #249).
+ * 3: immutable identity/constitution prefix, separate harness-awareness,
+ *    conditional capability guidance and a final typed task-scope layer.
  *
  * A record without a `version` field predates the field and is read as 1, so a
  * 0.3.8 manifest still parses. Bump this whenever the compiled text moves for a
  * reason other than its inputs: a resumed session then has the version in hand
  * to explain the one `promptRecompiled` entry its first compile writes.
  */
-export const PROMPT_MANIFEST_VERSION = 2;
+export const PROMPT_MANIFEST_VERSION = 3;
 
 export interface PromptManifestSection {
 	id: string;

package/src/domains/session/retry.ts

@@ -10,7 +10,7 @@
  *
  * This module is the pure building block for the Clio equivalent. It:
  *   1. Declares the RetrySettings shape and sensible defaults.
- *   2. Routes generic provider classification through pi-ai 0.84's
+ *   2. Routes generic provider classification through pi-ai 0.86.1's
  *      `isRetryableAssistantError`, retaining only Clio's local-model delta.
  *   3. Computes the backoff delay for a given attempt (`computeRetryDelayMs`)
  *      with the cap the settings declare; callers schedule the wait.
@@ -18,7 +18,7 @@
  *      and cancel a pending retry on `Esc` without coupling to a specific
  *      timer abstraction.
  *
- * No I/O. The only engine dependency is the classifier re-exported by
+ * No I/O. The engine dependencies are the classifier and backoff re-exported by
  * `src/engine/ai.ts`. The chat-loop wiring (which decides whether an
  * agent_end with stopReason "error" triggers a retry) lives in
  * `src/interactive/chat-loop.ts` and consumes this module; keeping the two
@@ -28,7 +28,7 @@
 
 import { performance } from "node:perf_hooks";
 import type { RetrySettings } from "../../core/defaults.js";
-import { isEngineRetryableAssistantError } from "../../engine/ai.js";
+import { engineRetryDelayMs, isEngineRetryableAssistantError } from "../../engine/ai.js";
 
 export type { RetrySettings } from "../../core/defaults.js";
 
@@ -103,9 +103,7 @@ export function computeRetryDelayMs(
 	errorMessage?: string | null,
 ): number {
 	const safeAttempt = Math.max(1, Math.floor(attempt));
-	const raw = settings.baseDelayMs * 2 ** (safeAttempt - 1);
-	const base =
-		!Number.isFinite(raw) || raw <= 0 ? Math.max(0, settings.baseDelayMs) : Math.min(raw, settings.maxDelayMs);
+	const base = engineRetryDelayMs(settings.baseDelayMs, settings.maxDelayMs, safeAttempt);
 	// A model load does not finish faster because the retry schedule was
 	// written for a rate limit. `maxDelayMs` still caps it, so an operator who
 	// wants short waits keeps them.

package/src/domains/session/task-board.ts

@@ -62,9 +62,15 @@ export interface TaskBoardCounts {
 	open: number;
 }
 
+interface TaskBoardInitialState {
+	/** A proposal can be recorded without briefly creating runnable work. */
+	initialStatus?: "pending" | "blocked";
+	reason?: string;
+}
+
 export type TaskBoardMutation =
-	| { op: "plan"; title: string; tasks: ReadonlyArray<string> }
-	| { op: "add"; tasks: ReadonlyArray<string> }
+	| ({ op: "plan"; title: string; tasks: ReadonlyArray<string> } & TaskBoardInitialState)
+	| ({ op: "add"; tasks: ReadonlyArray<string> } & TaskBoardInitialState)
 	| { op: "pick"; title: string; userTaskId: string; verification?: ReadonlyArray<{ check: string; timeoutMs: number }> }
 	| { op: "start"; id: string }
 	| { op: "done"; id: string; evidence: string }
@@ -358,6 +364,13 @@ function applyMutation(
 	board: TaskBoardSnapshot | null,
 	mutation: TaskBoardMutation,
 ): { board: TaskBoardSnapshot; notes: string[] } | { error: string } {
+	if (
+		(mutation.op === "plan" || mutation.op === "add") &&
+		mutation.initialStatus === "blocked" &&
+		!mutation.reason?.trim()
+	) {
+		return { error: "blocked tasks require a reason naming the pending decision or dependency" };
+	}
 	if (mutation.op === "plan") {
 		const titles = normalizeTitles(mutation.tasks);
 		if (mutation.title.trim().length === 0) return { error: "plan requires a non-empty title" };
@@ -379,7 +392,8 @@ function applyMutation(
 					...titles.map((title, index) => ({
 						id: `t${start + index}`,
 						title,
-						status: "pending" as const,
+						status: mutation.initialStatus ?? "pending",
+						...(mutation.initialStatus === "blocked" ? { reason: (mutation.reason ?? "").trim() } : {}),
 						origin: "agent" as const,
 					})),
 				],
@@ -438,7 +452,8 @@ function applyMutation(
 		const added = titles.map((title, index) => ({
 			id: `t${start + index}`,
 			title,
-			status: "pending" as const,
+			status: mutation.initialStatus ?? "pending",
+			...(mutation.initialStatus === "blocked" ? { reason: (mutation.reason ?? "").trim() } : {}),
 			origin: "agent" as const,
 		}));
 		return { board: { ...board, tasks: [...board.tasks, ...added] }, notes: [] };

package/src/domains/session/tree/preview.ts

@@ -14,6 +14,7 @@
  */
 import type { ClioTurnRecord } from "../../../engine/session.js";
 import { stripTokenizerSentinels } from "../../../engine/strip-tokenizer-sentinels.js";
+import { operatorTextOfUserPayload } from "../history.js";
 
 /**
  * Maximum characters for the inline preview slice. Keeps a row readable on
@@ -202,8 +203,8 @@ export function buildTurnPreview(turn: TurnPreviewInput, max: number = TURN_PREV
 	const budget = Math.max(1, max);
 	switch (turn.kind) {
 		case "user": {
-			const text = extractPlainText(turn.payload);
-			return text === null ? "(empty)" : clamp(text, budget);
+			const text = operatorTextOfUserPayload(turn.payload);
+			return text === null ? "(empty)" : clamp(sanitize(text), budget);
 		}
 		case "assistant": {
 			const stop = assistantStopMarker(turn.payload);