@prestyj/cli 5.30.0 → 5.30.2

package/dist/core/acceptance-checks.js

@@ -14,20 +14,14 @@ import { z } from "zod";
  */
 export const MAX_ACCEPTANCE_CHECKS = 10;
 export const AcceptanceCheckSchema = z.object({
-    type: z
-        .enum(["file_exists", "file_changed", "command_passed"])
-        .describe("file_exists: the path exists when the helper finishes. file_changed: the helper " +
-        "wrote or edited the path. command_passed: the helper ran this exact command and " +
-        "its last run exited 0 with no file edits after it."),
-    target: z.string().min(1).max(500).describe("The file path or the exact shell command"),
+    type: z.enum(["file_exists", "file_changed", "command_passed"]),
+    target: z.string().min(1).max(500).describe("Path or exact command"),
 });
 export const AcceptanceChecksParam = z
     .array(AcceptanceCheckSchema)
     .max(MAX_ACCEPTANCE_CHECKS)
     .optional()
-    .describe("Optional conditions the result must meet. Checked by code from the filesystem and the " +
-    "helper's real tool calls when it finishes, at no model cost, and reported as " +
-    "PASS / FAIL / UNVERIFIED alongside its answer.");
+    .describe("Verified by code on finish");
 const MUTATING_TOOLS = new Set(["write", "edit"]);
 /**
  * Parse checks arriving over a process boundary (the worker's stdin). Invalid

package/dist/core/acceptance-checks.js.map

@@ -1 +1 @@
-{"version":3,"file":"acceptance-checks.js","sourceRoot":"","sources":["../../src/core/acceptance-checks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acceptance-checks.js","sourceRoot":"","sources":["../../src/core/acceptance-checks.ts"],"names":[],"mappings":"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"}

package/dist/core/agent-session/helpers.d.ts

@@ -0,0 +1,26 @@
+import type { Message, Provider } from "@prestyj/ai";
+/**
+ * A run whose tool calls fail more often than this is thrashing, not
+ * progressing — refuse to extend its turn budget.
+ */
+export declare const TURN_EXTENSION_MAX_FAILURE_RATIO = 0.5;
+/** Resolve the per-result cap passed to the agent loop for the active transport. */
+export declare function resolveSessionToolResultCharLimit(model: string, provider: Provider, accountId?: string): number;
+/**
+ * Aggregate budget for ALL tool results produced in one assistant turn.
+ * Individual results are already capped, but wide parallel fan-outs (GPT-5.6's
+ * signature behavior) were observed injecting 100k+ uncached tokens in a single
+ * turn. ~15% of the context window in chars (1 token ≈ 3.5 chars), floored at
+ * 100KB so small windows still fit two full-size reads, ceilinged at 240KB so
+ * 1M-context models don't waive the budget entirely.
+ */
+export declare function resolveSessionTurnToolResultCharLimit(model: string, provider: Provider, accountId?: string): number;
+/** Marker the compactor prepends to the summary message it injects. */
+/**
+ * True when an assistant message ends a turn with tool calls still awaiting
+ * their results. Inserting a user message there would orphan the tool_use
+ * blocks and the provider rejects the next request.
+ */
+export declare function hasUnresolvedToolCalls(message: Message): boolean;
+/** Expand a leading `~` so `/import ~/.codex/...` works from any shell. */
+export declare function resolveHomePath(filePath: string): string;

package/dist/core/agent-session/helpers.js

@@ -0,0 +1,47 @@
+import { getContextWindow, getToolResultCharLimit } from "../model-registry.js";
+import os from "node:os";
+import path from "node:path";
+/**
+ * A run whose tool calls fail more often than this is thrashing, not
+ * progressing — refuse to extend its turn budget.
+ */
+export const TURN_EXTENSION_MAX_FAILURE_RATIO = 0.5;
+// ── Tool-result policy ─────────────────────────────────────
+/** Resolve the per-result cap passed to the agent loop for the active transport. */
+export function resolveSessionToolResultCharLimit(model, provider, accountId) {
+    return (getToolResultCharLimit(model, { provider, accountId }) ??
+        Math.floor(getContextWindow(model, { provider, accountId }) * 3.5 * 0.3));
+}
+/**
+ * Aggregate budget for ALL tool results produced in one assistant turn.
+ * Individual results are already capped, but wide parallel fan-outs (GPT-5.6's
+ * signature behavior) were observed injecting 100k+ uncached tokens in a single
+ * turn. ~15% of the context window in chars (1 token ≈ 3.5 chars), floored at
+ * 100KB so small windows still fit two full-size reads, ceilinged at 240KB so
+ * 1M-context models don't waive the budget entirely.
+ */
+export function resolveSessionTurnToolResultCharLimit(model, provider, accountId) {
+    const contextChars = getContextWindow(model, { provider, accountId }) * 3.5;
+    return Math.max(100_000, Math.min(Math.floor(contextChars * 0.15), 240_000));
+}
+/** Marker the compactor prepends to the summary message it injects. */
+/**
+ * True when an assistant message ends a turn with tool calls still awaiting
+ * their results. Inserting a user message there would orphan the tool_use
+ * blocks and the provider rejects the next request.
+ */
+export function hasUnresolvedToolCalls(message) {
+    if (typeof message.content === "string" || !Array.isArray(message.content))
+        return false;
+    return message.content.some((part) => part.type === "tool_call");
+}
+/** Expand a leading `~` so `/import ~/.codex/...` works from any shell. */
+export function resolveHomePath(filePath) {
+    if (filePath === "~")
+        return os.homedir();
+    if (filePath.startsWith("~/") || filePath.startsWith("~\\")) {
+        return path.join(os.homedir(), filePath.slice(2));
+    }
+    return filePath;
+}
+//# sourceMappingURL=helpers.js.map

package/dist/core/agent-session/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/core/agent-session/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;GAGG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAC;AAEpD,8DAA8D;AAE9D,oFAAoF;AACpF,MAAM,UAAU,iCAAiC,CAC/C,KAAa,EACb,QAAkB,EAClB,SAAkB;IAElB,OAAO,CACL,sBAAsB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CACzE,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qCAAqC,CACnD,KAAa,EACb,QAAkB,EAClB,SAAkB;IAElB,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,GAAG,GAAG,CAAC;IAC5E,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,uEAAuE;AACvE;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IACzF,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;AACnE,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,QAAQ,KAAK,GAAG;QAAE,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1C,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/core/agent-session/mcp-tools.d.ts

@@ -0,0 +1,68 @@
+import type { AgentTool } from "@prestyj/agent";
+import { MCPClientManager, type MCPElicitHandler } from "../mcp/index.js";
+import type { MCPServerConfig } from "../mcp/types.js";
+import type { ContextLimits } from "../context-limits.js";
+/**
+ * MCP tool wiring for one session: the client manager, the deferred
+ * `tool_search` catalog (shared with deferred built-ins), cached-catalog stubs
+ * and the live/cached reconcile maps.
+ *
+ * Never owns the tool array — it reads the session's CURRENT array through
+ * `getTools` (the session may filter-replace it) and only appends to it or
+ * swaps same-named entries in place, so the cached tool prefix stays stable.
+ */
+export declare class McpToolRegistry {
+    private readonly getTools;
+    private readonly getContextLimits;
+    manager?: MCPClientManager;
+    /** Deferred MCP tools awaiting discovery via tool_search. */
+    private catalog?;
+    /** Live (connected) MCP tools by name — the reconcile target for cached stubs. */
+    private readonly liveTools;
+    /** Server name for each cached-only tool, so a stub knows what to wait on. */
+    private readonly cachedToolServers;
+    private readonly catalogCache;
+    constructor(getTools: () => AgentTool[], getContextLimits: () => ContextLimits);
+    createManager(options: {
+        modernProtocol: boolean;
+        onElicit: MCPElicitHandler | undefined;
+    }): void;
+    private ensureCatalog;
+    /** Hold tools in the tool_search catalog and make sure tool_search exists. */
+    addDeferred(tools: AgentTool[]): void;
+    /** Pull named entries out of the catalog (empty when no catalog exists). */
+    promote(names: string[]): AgentTool[];
+    /** Forget every MCP tool before a provider-switch reconnect re-adds them. */
+    clearMcpTools(): void;
+    /**
+     * Route freshly connected MCP tools: deferred into the tool_search catalog
+     * (default — keeps ~8k tokens of schema out of every cache-miss turn) or
+     * pushed eagerly when `defer` is false.
+     * Promotion pushes onto the live tools array the running agent loop
+     * re-reads every turn, so promoted tools are callable on the next step.
+     */
+    addMcpTools(mcpTools: AgentTool[], defer: boolean): void;
+    /**
+     * Register `tool_search` once. Promotion of a cached-only entry waits for its
+     * server so the model is told immediately when that capability turns out to
+     * be unreachable, instead of promoting a tool that fails on first call.
+     *
+     * The catalog is created on demand rather than required up front: deferred
+     * built-in tools populate it with zero MCP servers connected, so gating
+     * registration on an existing catalog would leave those tools unreachable.
+     */
+    ensureToolSearchTool(): void;
+    /** Append tools, replacing any same-named entry (cached stub → live tool). */
+    private replaceOrPushTools;
+    /** Swap already-promoted cached stubs for their live equivalents, in place. */
+    private replaceLivePromotedTools;
+    /**
+     * Publish cached tool definitions into the deferred catalog so `tool_search`
+     * answers correctly on turn 1. A cached stub carries the real name, one-line
+     * description and input schema; calling it waits for the live connection and
+     * then dispatches against the real client, or returns a clear error when that
+     * server ultimately failed. Live tools replace stubs on connect.
+     */
+    seedFromCache(servers: MCPServerConfig[]): Promise<void>;
+    private buildCachedMcpTool;
+}

package/dist/core/agent-session/mcp-tools.js

@@ -0,0 +1,195 @@
+import { z } from "zod";
+import { log } from "../logger.js";
+import { MCPClientManager } from "../mcp/index.js";
+import { clampMcpToolDescription, DeferredToolCatalog } from "../mcp/deferred-catalog.js";
+import { McpCatalogCache } from "../mcp/catalog-cache.js";
+import { createToolSearchTool } from "../../tools/tool-search.js";
+/**
+ * MCP tool wiring for one session: the client manager, the deferred
+ * `tool_search` catalog (shared with deferred built-ins), cached-catalog stubs
+ * and the live/cached reconcile maps.
+ *
+ * Never owns the tool array — it reads the session's CURRENT array through
+ * `getTools` (the session may filter-replace it) and only appends to it or
+ * swaps same-named entries in place, so the cached tool prefix stays stable.
+ */
+export class McpToolRegistry {
+    getTools;
+    getContextLimits;
+    manager;
+    /** Deferred MCP tools awaiting discovery via tool_search. */
+    catalog;
+    /** Live (connected) MCP tools by name — the reconcile target for cached stubs. */
+    liveTools = new Map();
+    /** Server name for each cached-only tool, so a stub knows what to wait on. */
+    cachedToolServers = new Map();
+    catalogCache = new McpCatalogCache();
+    constructor(getTools, getContextLimits) {
+        this.getTools = getTools;
+        this.getContextLimits = getContextLimits;
+    }
+    createManager(options) {
+        this.manager = new MCPClientManager({
+            catalogCache: this.catalogCache,
+            modernProtocol: options.modernProtocol,
+            onElicit: options.onElicit,
+        });
+    }
+    ensureCatalog() {
+        this.catalog ??= new DeferredToolCatalog(this.getContextLimits());
+        return this.catalog;
+    }
+    /** Hold tools in the tool_search catalog and make sure tool_search exists. */
+    addDeferred(tools) {
+        this.ensureCatalog().add(tools);
+        this.ensureToolSearchTool();
+    }
+    /** Pull named entries out of the catalog (empty when no catalog exists). */
+    promote(names) {
+        return this.catalog?.promote(names) ?? [];
+    }
+    /** Forget every MCP tool before a provider-switch reconnect re-adds them. */
+    clearMcpTools() {
+        this.catalog?.removeWhere((name) => name.startsWith("mcp__"));
+        this.liveTools.clear();
+        this.cachedToolServers.clear();
+    }
+    /**
+     * Route freshly connected MCP tools: deferred into the tool_search catalog
+     * (default — keeps ~8k tokens of schema out of every cache-miss turn) or
+     * pushed eagerly when `defer` is false.
+     * Promotion pushes onto the live tools array the running agent loop
+     * re-reads every turn, so promoted tools are callable on the next step.
+     */
+    addMcpTools(mcpTools, defer) {
+        if (mcpTools.length === 0)
+            return;
+        for (const tool of mcpTools) {
+            this.liveTools.set(tool.name, tool);
+            this.cachedToolServers.delete(tool.name);
+        }
+        if (!defer) {
+            // Eager path bypasses the catalog, so budget descriptions here too.
+            this.replaceOrPushTools(mcpTools.map((tool) => clampMcpToolDescription(tool, this.getContextLimits())));
+            return;
+        }
+        // `add` is name-keyed, so live definitions replace cached stubs in place.
+        this.ensureCatalog().add(mcpTools);
+        // A stub the model already promoted lives in the tools array; swap it for
+        // the live tool so later calls dispatch directly instead of through the stub.
+        this.replaceLivePromotedTools(mcpTools);
+        this.ensureToolSearchTool();
+    }
+    /**
+     * Register `tool_search` once. Promotion of a cached-only entry waits for its
+     * server so the model is told immediately when that capability turns out to
+     * be unreachable, instead of promoting a tool that fails on first call.
+     *
+     * The catalog is created on demand rather than required up front: deferred
+     * built-in tools populate it with zero MCP servers connected, so gating
+     * registration on an existing catalog would leave those tools unreachable.
+     */
+    ensureToolSearchTool() {
+        const catalog = this.ensureCatalog();
+        if (this.getTools().some((t) => t.name === "tool_search"))
+            return;
+        this.getTools().push(createToolSearchTool(catalog, (promoted) => {
+            this.getTools().push(...promoted);
+        }, async (toolName) => {
+            if (this.liveTools.has(toolName))
+                return undefined;
+            const serverName = this.cachedToolServers.get(toolName);
+            if (!serverName)
+                return undefined;
+            const outcome = (await this.manager?.whenConnected(serverName)) ?? {
+                ok: false,
+                error: "MCP is disabled for this session",
+            };
+            return outcome.ok
+                ? { serverName, ok: true }
+                : { serverName, ok: false, error: outcome.error };
+        }, this.getContextLimits()));
+    }
+    /** Append tools, replacing any same-named entry (cached stub → live tool). */
+    replaceOrPushTools(tools) {
+        const live = this.getTools();
+        for (const tool of tools) {
+            const index = live.findIndex((t) => t.name === tool.name);
+            if (index >= 0)
+                live[index] = tool;
+            else
+                live.push(tool);
+        }
+    }
+    /** Swap already-promoted cached stubs for their live equivalents, in place. */
+    replaceLivePromotedTools(tools) {
+        const live = this.getTools();
+        for (const tool of tools) {
+            const index = live.findIndex((t) => t.name === tool.name);
+            if (index >= 0)
+                live[index] = tool;
+        }
+    }
+    /**
+     * Publish cached tool definitions into the deferred catalog so `tool_search`
+     * answers correctly on turn 1. A cached stub carries the real name, one-line
+     * description and input schema; calling it waits for the live connection and
+     * then dispatches against the real client, or returns a clear error when that
+     * server ultimately failed. Live tools replace stubs on connect.
+     */
+    async seedFromCache(servers) {
+        let entries;
+        try {
+            entries = await this.catalogCache.entriesFor(servers);
+        }
+        catch {
+            return;
+        }
+        const stubs = [];
+        for (const [serverName, entry] of entries) {
+            for (const cached of entry.tools) {
+                if (this.liveTools.has(cached.name))
+                    continue;
+                this.cachedToolServers.set(cached.name, serverName);
+                stubs.push(this.buildCachedMcpTool(serverName, cached));
+            }
+        }
+        if (stubs.length === 0)
+            return;
+        log("INFO", "mcp", "Seeded deferred tool catalog from cache", {
+            tools: String(stubs.length),
+            servers: String(entries.size),
+        });
+        // Catalog-only registration for cached stubs — never marks them live.
+        this.addDeferred(stubs);
+    }
+    buildCachedMcpTool(serverName, cached) {
+        return {
+            name: cached.name,
+            description: cached.description,
+            parameters: z.record(z.string(), z.unknown()),
+            rawInputSchema: cached.rawInputSchema,
+            execute: async (args, context) => {
+                const live = this.liveTools.get(cached.name);
+                if (live)
+                    return live.execute(args, context);
+                const outcome = (await this.manager?.whenConnected(serverName)) ?? {
+                    ok: false,
+                    error: "MCP is disabled for this session",
+                };
+                if (!outcome.ok) {
+                    return (`MCP tool ${cached.name} is unavailable: server "${serverName}" did not connect ` +
+                        `(${outcome.error}). This tool was offered from a cached catalog. ` +
+                        `Use a different approach or ask the user to check their MCP configuration.`);
+                }
+                const connected = this.liveTools.get(cached.name);
+                if (!connected) {
+                    return (`MCP tool ${cached.name} no longer exists: server "${serverName}" connected but ` +
+                        `does not expose it. The cached catalog entry was stale.`);
+                }
+                return connected.execute(args, context);
+            },
+        };
+    }
+}
+//# sourceMappingURL=mcp-tools.js.map

package/dist/core/agent-session/mcp-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-tools.js","sourceRoot":"","sources":["../../../src/core/agent-session/mcp-tools.ts"],"names":[],"mappings":"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"}

package/dist/core/agent-session/run-loop-monitor.d.ts

@@ -0,0 +1,63 @@
+import { CycleDetector, ToolCallProgressTracker, type CycleDetection, type LoopBreakDecision } from "../loop-breaker.js";
+import { type SemanticCallDigest, type SemanticLoopVerdict } from "../semantic-loop-check.js";
+/** LLM-judged loop detection state for one run. */
+export interface SemanticLoopRunState {
+    checksUsed: number;
+    lastCheckTurn: number;
+    pending: boolean;
+    verdict: SemanticLoopVerdict | null;
+    injected: boolean;
+}
+/**
+ * Per-run stuck-detection state (mirrors the TUI's useAgentLoop refs): tool
+ * stats, streamed text, progress/cycle trackers, the two-stage loop-breaker and
+ * the semantic loop judge's budget. Reset at the start of every run; observed
+ * from the event stream. Owns state and decisions only — logging, events and
+ * the judge call stay with the session.
+ */
+export declare class RunLoopMonitor {
+    stats: {
+        toolCalls: number;
+        toolFailures: number;
+        turns: number;
+    };
+    text: string;
+    consecutiveFailures: number;
+    repeatedNoProgressCalls: number;
+    readonly progressTracker: ToolCallProgressTracker;
+    readonly cycleDetector: CycleDetector;
+    cyclicPattern: CycleDetection | null;
+    /** 0 = none; 1 = first nudge sent; 2 = final stop-and-report injected. */
+    loopBreakInjected: 0 | 1 | 2;
+    /** Recent tool-call digests for the semantic loop judge — bounded ring. */
+    recentCalls: SemanticCallDigest[];
+    /** LLM-judged loop detection state. `verdict` holds a LOOP verdict awaiting
+     *  injection at the next steering poll; judge failures fail open (no
+     *  injection) and still consume budget + cooldown. Replaced (never mutated)
+     *  on reset so a late judge from an earlier run cannot write into it. */
+    semanticLoop: SemanticLoopRunState;
+    /** Clean slate for a new run. */
+    reset(): void;
+    recordText(text: string): void;
+    recordToolEnd(name: string, args: Record<string, unknown> | undefined, result: string, isError: boolean): void;
+    recordTurn(turn: number): void;
+    /** Deterministic stuck verdict from the current signals. */
+    evaluateLoopBreak(): LoopBreakDecision;
+    /**
+     * Two-stage loop-breaker: stage 1 nudges; a FRESH detection after that
+     * escalates to stage 2. Returns the stage to inject (signals reset so stage 2
+     * only fires on new evidence), or null when nothing should be injected.
+     */
+    takeLoopBreakStage(decision: LoopBreakDecision): 1 | 2 | null;
+    /** Consume a pending semantic LOOP verdict, exactly once per run. */
+    takeSemanticVerdict(): SemanticLoopVerdict | null;
+    shouldRunSemanticCheck(deterministicBreak: boolean): boolean;
+    /** Mark a judge call in flight; the returned run state is its stale-guard token. */
+    beginSemanticCheck(): SemanticLoopRunState;
+    /** Publish a judge verdict only if its run is still the current one. */
+    publishSemanticVerdict(runState: SemanticLoopRunState, verdict: SemanticLoopVerdict): void;
+    /** Settle a judge call: consume budget + cooldown, unless its run is stale. */
+    settleSemanticCheck(runState: SemanticLoopRunState): void;
+    /** Reasons to refuse a turn-budget extension; empty means grant. */
+    turnExtensionRefusals(): string[];
+}

package/dist/core/agent-session/run-loop-monitor.js

@@ -0,0 +1,164 @@
+import { evaluateLoopBreak, CycleDetector, ToolCallProgressTracker, detectTextRepetition, } from "../loop-breaker.js";
+import { MAX_SEMANTIC_LOOP_CALLS, shouldRunSemanticLoopCheck, } from "../semantic-loop-check.js";
+import { TURN_EXTENSION_MAX_FAILURE_RATIO } from "./helpers.js";
+function freshSemanticLoopState() {
+    return { checksUsed: 0, lastCheckTurn: 0, pending: false, verdict: null, injected: false };
+}
+/**
+ * Per-run stuck-detection state (mirrors the TUI's useAgentLoop refs): tool
+ * stats, streamed text, progress/cycle trackers, the two-stage loop-breaker and
+ * the semantic loop judge's budget. Reset at the start of every run; observed
+ * from the event stream. Owns state and decisions only — logging, events and
+ * the judge call stay with the session.
+ */
+export class RunLoopMonitor {
+    stats = { toolCalls: 0, toolFailures: 0, turns: 0 };
+    text = "";
+    consecutiveFailures = 0;
+    repeatedNoProgressCalls = 0;
+    progressTracker = new ToolCallProgressTracker();
+    cycleDetector = new CycleDetector();
+    cyclicPattern = null;
+    /** 0 = none; 1 = first nudge sent; 2 = final stop-and-report injected. */
+    loopBreakInjected = 0;
+    /** Recent tool-call digests for the semantic loop judge — bounded ring. */
+    recentCalls = [];
+    /** LLM-judged loop detection state. `verdict` holds a LOOP verdict awaiting
+     *  injection at the next steering poll; judge failures fail open (no
+     *  injection) and still consume budget + cooldown. Replaced (never mutated)
+     *  on reset so a late judge from an earlier run cannot write into it. */
+    semanticLoop = freshSemanticLoopState();
+    /** Clean slate for a new run. */
+    reset() {
+        this.stats = { toolCalls: 0, toolFailures: 0, turns: 0 };
+        this.text = "";
+        this.consecutiveFailures = 0;
+        this.repeatedNoProgressCalls = 0;
+        this.progressTracker.reset();
+        this.cycleDetector.reset();
+        this.cyclicPattern = null;
+        this.loopBreakInjected = 0;
+        this.recentCalls = [];
+        this.semanticLoop = freshSemanticLoopState();
+    }
+    recordText(text) {
+        this.text += text;
+    }
+    recordToolEnd(name, args, result, isError) {
+        this.stats.toolCalls += 1;
+        if (isError)
+            this.stats.toolFailures += 1;
+        this.consecutiveFailures = isError ? this.consecutiveFailures + 1 : 0;
+        this.repeatedNoProgressCalls = this.progressTracker.record(name, args, result, isError);
+        this.cyclicPattern = this.cycleDetector.record(name, args, result, isError);
+        // Semantic-loop judge input: a bounded digest of WHAT was attempted and
+        // HOW it came out. Args/results are sliced AT RECORD TIME — a write with
+        // a 50 KiB payload or a bash dump must never inflate the ring, and the
+        // judge needs shapes, not payloads.
+        this.recentCalls.push({
+            tool: name,
+            args: args === undefined ? "" : JSON.stringify(args).slice(0, 300),
+            ok: !isError,
+            result: result.slice(0, 400),
+        });
+        if (this.recentCalls.length > MAX_SEMANTIC_LOOP_CALLS) {
+            this.recentCalls.splice(0, this.recentCalls.length - MAX_SEMANTIC_LOOP_CALLS);
+        }
+    }
+    recordTurn(turn) {
+        this.stats.turns = turn;
+    }
+    /** Deterministic stuck verdict from the current signals. */
+    evaluateLoopBreak() {
+        return evaluateLoopBreak({
+            consecutiveFailures: this.consecutiveFailures,
+            repeatedNoProgressCalls: this.repeatedNoProgressCalls,
+            textRepetitionDetected: detectTextRepetition(this.text),
+            ...(this.cyclicPattern ? { cyclicPattern: this.cyclicPattern } : {}),
+        });
+    }
+    /**
+     * Two-stage loop-breaker: stage 1 nudges; a FRESH detection after that
+     * escalates to stage 2. Returns the stage to inject (signals reset so stage 2
+     * only fires on new evidence), or null when nothing should be injected.
+     */
+    takeLoopBreakStage(decision) {
+        if (this.loopBreakInjected >= 2)
+            return null;
+        if (!decision.shouldBreak)
+            return null;
+        const stage = this.loopBreakInjected === 0 ? 1 : 2;
+        this.loopBreakInjected = stage;
+        this.progressTracker.reset();
+        this.cycleDetector.reset();
+        this.cyclicPattern = null;
+        this.consecutiveFailures = 0;
+        this.repeatedNoProgressCalls = 0;
+        // The deterministic breaker owns this burst — a semantic verdict from
+        // the same burst must not double-correct on the next poll.
+        this.semanticLoop.verdict = null;
+        // Clear the text buffer too — otherwise a stage-1 text-repetition
+        // trigger still sees the same repeated tail on the next check and
+        // escalates to stage 2 on stale evidence.
+        this.text = "";
+        return stage;
+    }
+    /** Consume a pending semantic LOOP verdict, exactly once per run. */
+    takeSemanticVerdict() {
+        if (!this.semanticLoop.verdict || this.semanticLoop.injected)
+            return null;
+        const verdict = this.semanticLoop.verdict;
+        this.semanticLoop.injected = true;
+        this.semanticLoop.verdict = null;
+        // The judged burst has been addressed; a fresh burst must re-accumulate.
+        this.consecutiveFailures = 0;
+        return verdict;
+    }
+    shouldRunSemanticCheck(deterministicBreak) {
+        return shouldRunSemanticLoopCheck({
+            consecutiveFailures: this.consecutiveFailures,
+            totalFailures: this.stats.toolFailures,
+            turns: this.stats.turns,
+            lastCheckTurn: this.semanticLoop.lastCheckTurn,
+            checksUsed: this.semanticLoop.checksUsed,
+            checkPending: this.semanticLoop.pending,
+            deterministicBreak,
+        });
+    }
+    /** Mark a judge call in flight; the returned run state is its stale-guard token. */
+    beginSemanticCheck() {
+        const runState = this.semanticLoop;
+        runState.pending = true;
+        return runState;
+    }
+    /** Publish a judge verdict only if its run is still the current one. */
+    publishSemanticVerdict(runState, verdict) {
+        if (this.semanticLoop === runState)
+            runState.verdict = verdict;
+    }
+    /** Settle a judge call: consume budget + cooldown, unless its run is stale. */
+    settleSemanticCheck(runState) {
+        if (this.semanticLoop === runState) {
+            runState.pending = false;
+            runState.checksUsed += 1;
+            runState.lastCheckTurn = this.stats.turns;
+        }
+    }
+    /** Reasons to refuse a turn-budget extension; empty means grant. */
+    turnExtensionRefusals() {
+        const refusals = [];
+        const stuck = this.evaluateLoopBreak();
+        if (stuck.shouldBreak)
+            refusals.push(...stuck.reasons);
+        // Stage 2 means the loop-breaker already detected spinning twice and told
+        // the agent to stop and report. Do not overrule that with more turns.
+        if (this.loopBreakInjected >= 2)
+            refusals.push("loop-breaker already escalated");
+        const { toolCalls, toolFailures } = this.stats;
+        if (toolCalls > 0 && toolFailures / toolCalls > TURN_EXTENSION_MAX_FAILURE_RATIO) {
+            refusals.push(`${toolFailures}/${toolCalls} tool calls failed`);
+        }
+        return refusals;
+    }
+}
+//# sourceMappingURL=run-loop-monitor.js.map

package/dist/core/agent-session/run-loop-monitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-loop-monitor.js","sourceRoot":"","sources":["../../../src/core/agent-session/run-loop-monitor.ts"],"names":[],"mappings":"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"}