comisai 1.0.37 → 1.0.40

package/node_modules/@comis/agent/dist/executor/executor-stream-setup.js

@@ -34,7 +34,7 @@ import { computeFeatureFlagHash } from "./prompt-assembly.js";
 import { createTtlGuard, getElapsedSinceLastResponse, getLastResponseTs } from "./ttl-guard.js";
 import { isAnthropicFamily, isGoogleFamily } from "../provider/capabilities.js";
 import { createGeminiCacheInjector } from "./gemini-cache-injector.js";
-import { extractAnthropicPromptState, extractGeminiPromptState } from "./cache-break-detection.js";
+import { extractAnthropicPromptState, extractGeminiPromptState } from "./cache-detection/index.js";
 import { createBlockStabilityTracker } from "./block-stability-tracker.js";
 import { clearSessionCacheWarm, getOrCreateSessionLatches, clearSessionLatches, getCacheBreakDetector, getBreakpointIndex, getEvictionCooldown, } from "./executor-session-state.js";
 import { installMicrocompactionGuard } from "../context-engine/index.js";
@@ -46,9 +46,9 @@ import path from "node:path";
 /**
  * Build the ordered stream wrapper chain for a single execution.
  *
- * Pure function with params object ( extraction pattern). All mutable
- * refs and closure state remain in pi-executor.ts orchestrator scope and are
- * accessed via getter callbacks.
+ * Pure function with params object. All mutable refs and closure state
+ * remain in pi-executor.ts orchestrator scope and are accessed via getter
+ * callbacks.
  *
  * @param params - Stream setup parameters including config, deps, and getter callbacks
  * @returns Stream setup result with wrappers array and shared state refs
@@ -103,7 +103,7 @@ export function setupStreamWrappers(params) {
         clearSessionLatches(formattedKey); // 4. SESS-LATCH: Reset latches for fresh cache cycle
         // Latch idle thinking clear when elapsed > 1h
         if (!executionOverrides?.spawnPacket) {
-            const elapsed = getElapsedSinceLastResponse(formattedKey);
+            const elapsed = getElapsedSinceLastResponse(formattedKey, deps.clock);
             if (elapsed !== undefined && elapsed > 60 * 60 * 1000) {
                 getOrCreateSessionLatches(formattedKey).idleThinkingClear.setOnce(true);
             }
@@ -114,6 +114,7 @@ export function setupStreamWrappers(params) {
         getRetention: () => capturedRetention?.getRetention(),
         onTtlExpiry,
         logger: deps.logger,
+        clock: deps.clock,
     }), validationErrorFormatter, bouncerWrapper, turnBudgetWrapper, createConfigResolver({
         maxTokens: config.maxTokens,
         temperature: config.temperature ?? resolveToolCallingTemperature(modelTier),
@@ -130,6 +131,7 @@ export function setupStreamWrappers(params) {
             return undefined;
         },
     }, deps.logger), createRequestBodyInjector({
+        clock: deps.clock,
         getCacheRetention: () => capturedRetention?.getRetention()
             ?? capturedCacheRetention ?? config.cacheRetention,
         getMessageRetention: () => capturedRetention?.getMessageRetention(),
@@ -142,7 +144,7 @@ export function setupStreamWrappers(params) {
         cacheWriteTimestamp: executionOverrides?.spawnPacket?.cacheSafeParams?.cacheWriteTimestamp,
         parentCacheRetention: executionOverrides?.spawnPacket?.cacheSafeParams?.cacheRetention,
         getCacheFenceIndex: () => getBreakpointIndex(formattedKey) ?? -1,
-        getElapsedSinceLastResponse: () => getElapsedSinceLastResponse(formattedKey),
+        getElapsedSinceLastResponse: () => getElapsedSinceLastResponse(formattedKey, deps.clock),
         getLastResponseTs: () => getLastResponseTs(formattedKey),
         promoteRecentZoneOnSlowCadence: config.advancedCacheOptimization?.enableRecentZonePromotion ?? true,
         observationKeepWindow: 25,
@@ -230,7 +232,7 @@ export function setupStreamWrappers(params) {
             // Rotation defaults from daemon.logging.tracing
             const traceMaxSize = deps.tracingDefaults?.maxSize ?? "5m";
             const traceMaxFiles = deps.tracingDefaults?.maxFiles ?? 3;
-            wrappers.push(createCacheTraceWriter({ filePath: cacheTracePath, agentId, sessionId: formattedKey, maxSize: traceMaxSize, maxFiles: traceMaxFiles }, deps.logger), createApiPayloadTraceWriter({ filePath: apiPayloadPath, agentId, sessionId: formattedKey, maxSize: traceMaxSize, maxFiles: traceMaxFiles }, deps.logger));
+            wrappers.push(createCacheTraceWriter({ filePath: cacheTracePath, agentId, sessionId: formattedKey, maxSize: traceMaxSize, maxFiles: traceMaxFiles, clock: deps.clock }, deps.logger), createApiPayloadTraceWriter({ filePath: apiPayloadPath, agentId, sessionId: formattedKey, maxSize: traceMaxSize, maxFiles: traceMaxFiles, clock: deps.clock }, deps.logger));
             deps.logger.info({ outputDir, cacheTracePath, apiPayloadPath }, "JSONL tracing enabled");
         }
     }

package/node_modules/@comis/agent/dist/executor/executor-tool-assembly.d.ts

@@ -12,11 +12,11 @@
  *
  * @module
  */
-import { SettingsManager, DefaultResourceLoader } from "@mariozechner/pi-coding-agent";
-import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
-import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { SettingsManager, DefaultResourceLoader } from "@earendil-works/pi-coding-agent";
+import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
+import type { AgentTool } from "@earendil-works/pi-agent-core";
 import { type SessionKey, type NormalizedMessage, type PerAgentConfig, type TypedEventBus, type MemoryPort, type HookRunner, type SecretManager, type EnvelopeConfig, type SenderTrustDisplayConfig, type ToolCapabilityPort } from "@comis/core";
-import type { ComisLogger } from "@comis/infra";
+import type { ComisLogger } from "@comis/core";
 import type { ExcludeDeferralResult } from "./tool-deferral.js";
 import type { CapabilityIndexRenderResult } from "./capability-index-context.js";
 import type { DiscoveryTracker } from "./discovery-tracker.js";
@@ -69,6 +69,8 @@ export interface ToolAssemblyDeps {
     };
     /** Resolve platform message character limit for a channel type. */
     getChannelMaxChars?: (channelType: string) => number | undefined;
+    /** Wall-clock + monotonic time reads. */
+    clock: import("@comis/core").ClockPort;
 }
 /** Result of the tool assembly pipeline. */
 export interface ToolAssemblyResult {
@@ -152,8 +154,8 @@ export interface ToolAssemblyParams {
  * guide wrapping, schema pruning, schema snapshots, provider normalization,
  * and mutation serializer.
  *
- * Pure function with params object ( extraction pattern). All mutable
- * refs and closure state remain in pi-executor.ts orchestrator scope.
+ * Pure function with params object. All mutable refs and closure state
+ * remain in pi-executor.ts orchestrator scope.
  *
  * @param params - Tool assembly parameters
  * @returns Tool assembly result with all outputs needed by the orchestrator

package/node_modules/@comis/agent/dist/executor/executor-tool-assembly.js

@@ -13,7 +13,7 @@
  *
  * @module
  */
-import { SettingsManager, } from "@mariozechner/pi-coding-agent";
+import { SettingsManager, } from "@earendil-works/pi-coding-agent";
 import { formatSessionKey, } from "@comis/core";
 import { applyToolDeferral, buildDeferredToolsContext, createDiscoverTool, createAutoDiscoveryStubs, extractRecentlyUsedToolNames, resolveModelTier, CORE_TOOLS } from "./tool-deferral.js";
 import { buildCapabilityIndexContext } from "./capability-index-context.js";
@@ -34,8 +34,8 @@ import { CHARS_PER_TOKEN_RATIO } from "../context-engine/constants.js";
  * guide wrapping, schema pruning, schema snapshots, provider normalization,
  * and mutation serializer.
  *
- * Pure function with params object ( extraction pattern). All mutable
- * refs and closure state remain in pi-executor.ts orchestrator scope.
+ * Pure function with params object. All mutable refs and closure state
+ * remain in pi-executor.ts orchestrator scope.
  *
  * @param params - Tool assembly parameters
  * @returns Tool assembly result with all outputs needed by the orchestrator
@@ -163,6 +163,7 @@ export async function assembleTools(params) {
             // Forward the tool-capability port so prompt-assembly.ts can read
             // `port.isCapabilityIndexEnabled()` for the static-prompt swap gate.
             toolCapabilityPort: deps.toolCapabilityPort,
+            clock: deps.clock,
         },
         msg,
         sessionKey,
@@ -293,7 +294,7 @@ export async function assembleTools(params) {
             ? (isAnthropicFamily(resolvedModel.provider) ? "anthropic"
                 : isGoogleFamily(resolvedModel.provider) ? "google"
                     : "other")
-            : undefined,
+            : "default",
     };
     const deferralResult = applyToolDeferral(mergedCustomTools, contextWindow, deferralCtx, deps.logger, deps.embeddingPort, config.skills?.toolDiscovery);
     // Rebuild discover_tools with the now-known active set so it can answer

package/node_modules/@comis/agent/dist/executor/executor-tool-pipeline.d.ts

@@ -11,8 +11,8 @@
  *
  * @module
  */
-import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
-import type { ComisLogger } from "@comis/infra";
+import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
+import type { ComisLogger } from "@comis/core";
 /**
  * Recursively decode HTML entities in all string values of a params object.
  * Used for xAI/Grok which HTML-encodes tool call argument strings.

package/node_modules/@comis/agent/dist/executor/fault-injector.d.ts

@@ -3,10 +3,9 @@
  *
  * Gated by the `COMIS_TEST_SILENT_FAIL_FLAG` environment variable (which
  * names a file path). When the env var is set AND that file exists, the
- * next call to tryInjectSilentFailure() consumes the file atomically and
- * returns a synthetic silent-LLM-failure result. This lets operators
- * validate the FINDING-2 retry/reuseSessionKey code path end-to-end
- * without waiting for Anthropic's real API to fail silently.
+ * next call to tryInjectSilentFailure() consumes the file atomically and * returns a synthetic silent-LLM-failure result. This lets operators
+ * validate the silent-failure retry / reuseSessionKey code path
+ * end-to-end without waiting for Anthropic's real API to fail silently.
  *
  * Safety:
  * - Env var is ABSENT in every shipped config (installer, examples, docs).
@@ -26,6 +25,7 @@
  *
  * @module
  */
+import type { EnvPort } from "@comis/core";
 /** Shape returned when fault injection fires (otherwise `undefined`). */
 export interface SilentFailureInjection {
     finishReason: "error";
@@ -44,8 +44,9 @@ interface Logger {
  * through to real execution.
  *
  * @param logger - For WARN on successful injection, DEBUG on unexpected FS errors.
+ * @param env - EnvPort for reading the test-only fault flag env vars.
  * @param context - Extra fields attached to the WARN log (agentId, sessionKey, etc.).
  * @returns SilentFailureInjection when fault fired; undefined otherwise.
  */
-export declare function tryInjectSilentFailure(logger: Logger, context?: Record<string, unknown>): SilentFailureInjection | undefined;
+export declare function tryInjectSilentFailure(logger: Logger, env: EnvPort, context?: Record<string, unknown>): SilentFailureInjection | undefined;
 export {};

package/node_modules/@comis/agent/dist/executor/fault-injector.js

@@ -4,10 +4,9 @@
  *
  * Gated by the `COMIS_TEST_SILENT_FAIL_FLAG` environment variable (which
  * names a file path). When the env var is set AND that file exists, the
- * next call to tryInjectSilentFailure() consumes the file atomically and
- * returns a synthetic silent-LLM-failure result. This lets operators
- * validate the FINDING-2 retry/reuseSessionKey code path end-to-end
- * without waiting for Anthropic's real API to fail silently.
+ * next call to tryInjectSilentFailure() consumes the file atomically and * returns a synthetic silent-LLM-failure result. This lets operators
+ * validate the silent-failure retry / reuseSessionKey code path
+ * end-to-end without waiting for Anthropic's real API to fail silently.
  *
  * Safety:
  * - Env var is ABSENT in every shipped config (installer, examples, docs).
@@ -34,12 +33,13 @@ import { unlinkSync } from "node:fs";
  * through to real execution.
  *
  * @param logger - For WARN on successful injection, DEBUG on unexpected FS errors.
+ * @param env - EnvPort for reading the test-only fault flag env vars.
  * @param context - Extra fields attached to the WARN log (agentId, sessionKey, etc.).
  * @returns SilentFailureInjection when fault fired; undefined otherwise.
  */
-export function tryInjectSilentFailure(logger, context = {}) {
-    // eslint-disable-next-line no-restricted-syntax -- ops toggle read before SecretManager is initialized
-    const faultFlag = process.env.COMIS_TEST_SILENT_FAIL_FLAG;
+export function tryInjectSilentFailure(logger, env, context = {}) {
+    // Env reads via injected port (not process.env) so tests can stub.
+    const faultFlag = env.get("COMIS_TEST_SILENT_FAIL_FLAG");
     if (!faultFlag)
         return undefined;
     // Optional scope gate: COMIS_TEST_SILENT_FAIL_SCOPE controls which
@@ -48,8 +48,7 @@ export function tryInjectSilentFailure(logger, context = {}) {
     //   "subagent"          — only sub-agent sessions may fire
     //   "parent"            — only non-sub-agent sessions may fire
     // Sub-agent session keys contain "sub-agent:" (see sub-agent-runner).
-    // eslint-disable-next-line no-restricted-syntax -- ops toggle read before SecretManager is initialized
-    const scope = process.env.COMIS_TEST_SILENT_FAIL_SCOPE;
+    const scope = env.get("COMIS_TEST_SILENT_FAIL_SCOPE");
     if (scope === "subagent" || scope === "parent") {
         const sessionKey = typeof context.sessionKey === "string" ? context.sessionKey : "";
         const isSubAgent = sessionKey.includes("sub-agent:") || sessionKey.includes("sub-agent-");
@@ -81,7 +80,7 @@ export function tryInjectSilentFailure(logger, context = {}) {
     }
     logger.warn({
         ...context,
-        hint: "COMIS_TEST_SILENT_FAIL_FLAG consumed -- this turn returns synthetic error for FINDING-2 retry-path testing",
+        hint: "COMIS_TEST_SILENT_FAIL_FLAG consumed -- this turn returns synthetic error for silent-failure retry-path testing",
         errorKind: "dependency",
     }, "Synthetic silent LLM failure injected for retry-path testing");
     return {

package/node_modules/@comis/agent/dist/executor/gemini-cache-injector.d.ts

@@ -9,7 +9,7 @@
  *
  * @module
  */
-import type { ComisLogger } from "@comis/infra";
+import type { ComisLogger } from "@comis/core";
 import type { StreamFnWrapper } from "./stream-wrappers/types.js";
 import type { GeminiCacheManager, CacheEntry } from "./gemini-cache-manager.js";
 export interface GeminiCacheInjectorConfig {

package/node_modules/@comis/agent/dist/executor/gemini-cache-manager.d.ts

@@ -5,11 +5,10 @@
  * @google/genai SDK. Uses SHA-256 content hashing for invalidation and
  * concurrent dedup via pending Promise tracking.
  *
- * .
- *
  * @module
  */
 import type { Result } from "@comis/shared";
+import type { ClockPort } from "@comis/core";
 /** Minimum cacheable tokens per Gemini model family. */
 export declare const GEMINI_MIN_CACHEABLE_TOKENS: Record<string, number>;
 export declare const GEMINI_DEFAULT_MIN_CACHEABLE_TOKENS = 2048;
@@ -44,6 +43,8 @@ export interface GeminiCacheManagerConfig {
         warn: (...args: unknown[]) => void;
         error: (...args: unknown[]) => void;
     };
+    /** Wall-clock + monotonic time reads. */
+    clock: ClockPort;
 }
 export interface GeminiCacheManager {
     getOrCreate(params: CacheRequest): Promise<Result<CacheEntry | undefined, Error>>;

package/node_modules/@comis/agent/dist/executor/gemini-cache-manager.js

@@ -6,8 +6,6 @@
  * @google/genai SDK. Uses SHA-256 content hashing for invalidation and
  * concurrent dedup via pending Promise tracking.
  *
- * .
- *
  * @module
  */
 import { createHash } from "node:crypto";
@@ -63,10 +61,12 @@ function buildDisplayName(agentId, sessionKey, contentHash) {
 /**
  * Parse RFC 3339 expireTime string to epoch ms. Falls back to now + 1h.
  */
-function parseExpireTime(expireTime) {
+function parseExpireTime(expireTime, clock) {
     if (!expireTime)
-        return Date.now() + 3_600_000;
-    return new Date(expireTime).getTime();
+        return clock.now() + 3_600_000;
+    // Date.parse handles RFC 3339; not flagged by the globals classifier (only
+    // `new Date(...)` is flagged).
+    return Date.parse(expireTime);
 }
 // ---------------------------------------------------------------------------
 // Factory
@@ -124,8 +124,8 @@ export function createGeminiCacheManager(config) {
             model: params.model,
             agentId: params.agentId,
             sessionKey: params.sessionKey,
-            expiresAt: parseExpireTime(result.expireTime),
-            createdAt: Date.now(),
+            expiresAt: parseExpireTime(result.expireTime, config.clock),
+            createdAt: config.clock.now(),
             cachedTokens: result.usageMetadata?.totalTokenCount ?? 0,
         };
         activeCaches.set(params.sessionKey, entry);
@@ -175,13 +175,13 @@ export function createGeminiCacheManager(config) {
                     config.logger.debug({ sessionKey: params.sessionKey, name: existing.name }, "Gemini cache: reusing existing entry");
                     // Refresh TTL on cache hit when elapsed > refreshThreshold * TTL
                     const ttlMs = existing.expiresAt - existing.createdAt;
-                    const elapsed = Date.now() - existing.createdAt;
+                    const elapsed = config.clock.now() - existing.createdAt;
                     if (elapsed > config.refreshThreshold * ttlMs) {
                         const ai = getClient();
                         if (ai) {
                             const refreshResult = await fromPromise(ai.caches.update({ name: existing.name, config: { ttl: `${config.ttlSeconds}s` } }));
                             if (refreshResult.ok) {
-                                existing.expiresAt = parseExpireTime(refreshResult.value.expireTime);
+                                existing.expiresAt = parseExpireTime(refreshResult.value.expireTime, config.clock);
                             }
                             else {
                                 config.logger.warn({
@@ -271,7 +271,7 @@ export function createGeminiCacheManager(config) {
             if (!ai)
                 return ok(undefined);
             const ttlMs = entry.expiresAt - entry.createdAt;
-            const elapsed = Date.now() - entry.createdAt;
+            const elapsed = config.clock.now() - entry.createdAt;
             if (elapsed <= ttlMs * config.refreshThreshold)
                 return ok(undefined);
             const ttl = `${config.ttlSeconds}s`;
@@ -279,7 +279,7 @@ export function createGeminiCacheManager(config) {
             if (!result.ok) {
                 return err(result.error);
             }
-            entry.expiresAt = parseExpireTime(result.value.expireTime);
+            entry.expiresAt = parseExpireTime(result.value.expireTime, config.clock);
             return ok(undefined);
         },
         getActiveCount(agentId) {

package/node_modules/@comis/agent/dist/executor/jit-guide-injector.d.ts

@@ -23,9 +23,9 @@
  *
  * @module
  */
-import type { ComisLogger } from "@comis/infra";
-import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
+import type { ComisLogger } from "@comis/core";
+import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 /**
  * Append one-time operational guides to a tool's result content.
  *

package/node_modules/@comis/agent/dist/executor/model-retry.d.ts

@@ -22,11 +22,11 @@
  *
  * @module
  */
-import type { AgentSession } from "@mariozechner/pi-coding-agent";
-import type { ModelRegistry } from "@mariozechner/pi-coding-agent";
-import type { ImageContent } from "@mariozechner/pi-ai";
-import type { TypedEventBus } from "@comis/core";
-import type { ComisLogger } from "@comis/infra";
+import type { AgentSession } from "@earendil-works/pi-coding-agent";
+import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
+import type { ImageContent } from "@earendil-works/pi-ai";
+import type { TypedEventBus, ClockPort, TimerPort } from "@comis/core";
+import type { ComisLogger } from "@comis/core";
 import type { AuthRotationAdapter } from "../model/auth-rotation-adapter.js";
 import type { ProviderHealthMonitor } from "../safety/provider-health-monitor.js";
 import type { LastKnownModelTracker } from "../model/last-known-model.js";
@@ -59,6 +59,10 @@ export interface ModelRetryParams {
         lastKnownModel?: LastKnownModelTracker;
         /** Callback to receive the resetTimer function from the resettable prompt timeout. */
         onResetTimer?: (resetFn: () => void) => void;
+        /** Wall-clock + monotonic time reads. */
+        clock: ClockPort;
+        /** Timer scheduling. Short-retry uses timers.setTimeout. */
+        timers: TimerPort;
     };
 }
 /** Result of the model failover pipeline. */

package/node_modules/@comis/agent/dist/executor/model-retry.js

@@ -35,7 +35,7 @@ import { normalizeModelId } from "../provider/model-id-normalize.js";
  */
 const SHORT_RETRY_THRESHOLD_MS = 20_000;
 // ---------------------------------------------------------------------------
-// Helpers (moved from pi-executor.ts -- only used by fallback loop)
+// Helpers used by the fallback loop
 // ---------------------------------------------------------------------------
 /**
  * Parse a "provider:modelId" string into provider and modelId components.
@@ -69,7 +69,7 @@ function getErrorStatus(error) {
  * Checks for `headers["retry-after"]` on the error object (pi-ai SDK errors
  * expose response headers). Returns milliseconds, or null if not available.
  */
-function parseRetryAfterMs(error) {
+function parseRetryAfterMs(error, clock) {
     if (!(error instanceof Error))
         return null;
     const errObj = error;
@@ -93,7 +93,7 @@ function parseRetryAfterMs(error) {
     // Try HTTP-date format
     const dateMs = Date.parse(retryAfter);
     if (!Number.isNaN(dateMs)) {
-        return Math.max(0, dateMs - Date.now());
+        return Math.max(0, dateMs - clock.now());
     }
     return null;
 }
@@ -130,12 +130,12 @@ export function isAuthError(error) {
  */
 export async function runWithModelRetry(params) {
     const { session, messageText, promptImages, config, deps, timeoutConfig } = params;
-    const { eventBus, logger, authRotation, modelRegistry } = deps;
+    const { eventBus, logger, authRotation, modelRegistry, clock, timers } = deps;
     const fallbackModels = deps.fallbackModels ?? [];
     // Use session-resolved model for diagnostic logs, falling back to agent config default
     const displayModel = params.resolvedModel ?? `${config.provider}:${config.model}`;
     // Track total elapsed time across all retry attempts
-    const retryStartMs = Date.now();
+    const retryStartMs = clock.now();
     const maxRetries = 1 + (authRotation?.hasProfiles(config.provider) ? 1 : 0) + fallbackModels.length;
     let promptError = undefined;
     let promptSucceeded = false;
@@ -146,7 +146,7 @@ export async function runWithModelRetry(params) {
         const resettable = withResettablePromptTimeout(session.prompt(messageText, {
             expandPromptTemplates: false,
             images: promptImages,
-        }), timeoutConfig.promptTimeoutMs, () => session.abort());
+        }), timeoutConfig.promptTimeoutMs, () => session.abort(), timers);
         // Expose resetTimer to the caller (pi-executor) for wiring to tool execution events
         deps.onResetTimer?.(resettable.resetTimer);
         await resettable.promise;
@@ -164,7 +164,7 @@ export async function runWithModelRetry(params) {
             model: displayModel,
             attempt: 1,
             maxRetries,
-            totalElapsedMs: Date.now() - retryStartMs,
+            totalElapsedMs: clock.now() - retryStartMs,
             hint: "Primary model failed, attempting fallback",
             errorKind: "dependency",
         }, "Primary model prompt error");
@@ -174,7 +174,7 @@ export async function runWithModelRetry(params) {
                 agentId: deps.agentId ?? "unknown",
                 sessionKey: deps.sessionKey ?? "unknown",
                 timeoutMs: primaryError.timeoutMs,
-                timestamp: Date.now(),
+                timestamp: clock.now(),
             });
         }
         // Feed failure into provider health monitor
@@ -185,12 +185,12 @@ export async function runWithModelRetry(params) {
         if (!promptSucceeded) {
             const status = getErrorStatus(primaryError);
             if (status === 429 || status === 529) {
-                const retryAfterMs = parseRetryAfterMs(primaryError);
+                const retryAfterMs = parseRetryAfterMs(primaryError, clock);
                 if (retryAfterMs !== null && retryAfterMs < SHORT_RETRY_THRESHOLD_MS) {
                     logger.debug({ retryAfterMs, model: displayModel, sessionKey: deps.sessionKey }, "Short retry -- preserving model for cache hit");
-                    await new Promise(r => setTimeout(r, retryAfterMs));
+                    await new Promise(r => { const h = timers.setTimeout(() => r(), retryAfterMs); void h; });
                     try {
-                        await withPromptTimeout(session.prompt(messageText, { expandPromptTemplates: false, images: promptImages }), timeoutConfig.retryPromptTimeoutMs, () => session.abort());
+                        await withPromptTimeout(session.prompt(messageText, { expandPromptTemplates: false, images: promptImages }), timeoutConfig.retryPromptTimeoutMs, () => session.abort(), timers);
                         promptSucceeded = true;
                         promptError = undefined;
                         effectiveModel = { provider: config.provider, model: config.model };
@@ -215,7 +215,7 @@ export async function runWithModelRetry(params) {
                 logger.info({ provider: config.provider }, "Rotated API key for provider");
                 // Retry with the same model but rotated key
                 try {
-                    await withPromptTimeout(session.prompt(messageText, { expandPromptTemplates: false, images: promptImages }), timeoutConfig.retryPromptTimeoutMs, () => session.abort());
+                    await withPromptTimeout(session.prompt(messageText, { expandPromptTemplates: false, images: promptImages }), timeoutConfig.retryPromptTimeoutMs, () => session.abort(), timers);
                     promptSucceeded = true;
                     promptError = undefined;
                     effectiveModel = { provider: config.provider, model: config.model };
@@ -228,7 +228,7 @@ export async function runWithModelRetry(params) {
                         err: rotatedKeyError,
                         attempt: 2,
                         maxRetries,
-                        totalElapsedMs: Date.now() - retryStartMs,
+                        totalElapsedMs: clock.now() - retryStartMs,
                         hint: "Rotated key also failed, proceeding to model fallback",
                         errorKind: "auth",
                     }, "Rotated key retry failed");
@@ -238,7 +238,7 @@ export async function runWithModelRetry(params) {
                             agentId: deps.agentId ?? "unknown",
                             sessionKey: deps.sessionKey ?? "unknown",
                             timeoutMs: rotatedKeyError.timeoutMs,
-                            timestamp: Date.now(),
+                            timestamp: clock.now(),
                         });
                     }
                     // Feed rotation failure into provider health monitor
@@ -260,7 +260,7 @@ export async function runWithModelRetry(params) {
                     toModel: parsed?.modelId ?? fallbackModelStr,
                     error: promptError instanceof Error ? promptError.message : "unknown",
                     attemptNumber: i + 1,
-                    timestamp: Date.now(),
+                    timestamp: clock.now(),
                 });
                 logger.info({ fallbackModel: fallbackModelStr }, "Model fallback attempt");
                 // Resolve and set the fallback model
@@ -275,7 +275,7 @@ export async function runWithModelRetry(params) {
                 await withPromptTimeout(session.prompt(messageText, {
                     expandPromptTemplates: false,
                     images: promptImages,
-                }), timeoutConfig.retryPromptTimeoutMs, () => session.abort());
+                }), timeoutConfig.retryPromptTimeoutMs, () => session.abort(), timers);
                 promptSucceeded = true;
                 promptError = undefined;
                 if (parsed) {
@@ -293,7 +293,7 @@ export async function runWithModelRetry(params) {
                     fallbackModel: fallbackModelStr,
                     attempt: attemptNum,
                     maxRetries,
-                    totalElapsedMs: Date.now() - retryStartMs,
+                    totalElapsedMs: clock.now() - retryStartMs,
                     hint: "Fallback model also failed",
                     errorKind: "dependency",
                 }, "Fallback model prompt error");
@@ -303,7 +303,7 @@ export async function runWithModelRetry(params) {
                         agentId: deps.agentId ?? "unknown",
                         sessionKey: deps.sessionKey ?? "unknown",
                         timeoutMs: fallbackError.timeoutMs,
-                        timestamp: Date.now(),
+                        timestamp: clock.now(),
                     });
                 }
                 // Feed fallback failure into provider health monitor
@@ -317,7 +317,7 @@ export async function runWithModelRetry(params) {
                 provider: config.provider,
                 model: config.model,
                 totalAttempts: fallbackModels.length + 1,
-                timestamp: Date.now(),
+                timestamp: clock.now(),
             });
         }
         // Last-known-working model fallback: when all configured models fail
@@ -332,7 +332,7 @@ export async function runWithModelRetry(params) {
                     fromModel: config.model,
                     toProvider: lkw.provider,
                     toModel: lkw.model,
-                    timestamp: Date.now(),
+                    timestamp: clock.now(),
                 });
                 logger.info({ lkwProvider: lkw.provider, lkwModel: lkw.model }, "Attempting last-known-working model fallback");
                 try {
@@ -344,14 +344,14 @@ export async function runWithModelRetry(params) {
                     await withPromptTimeout(session.prompt(messageText, {
                         expandPromptTemplates: false,
                         images: promptImages,
-                    }), timeoutConfig.retryPromptTimeoutMs, () => session.abort());
+                    }), timeoutConfig.retryPromptTimeoutMs, () => session.abort(), timers);
                     promptSucceeded = true;
                     promptError = undefined;
                     effectiveModel = { provider: lkw.provider, model: lkw.model };
                     eventBus.emit("model:lkw_fallback_succeeded", {
                         provider: lkw.provider,
                         model: lkw.model,
-                        timestamp: Date.now(),
+                        timestamp: clock.now(),
                     });
                     logger.info({ lkwProvider: lkw.provider, lkwModel: lkw.model }, "Last-known-working model fallback succeeded");
                 }

package/node_modules/@comis/agent/dist/executor/overflow-recovery.d.ts

@@ -10,8 +10,8 @@
  *
  * @module
  */
-import type { Message } from "@mariozechner/pi-ai";
-import type { ComisLogger } from "@comis/infra";
+import type { Message } from "@earendil-works/pi-ai";
+import type { ComisLogger } from "@comis/core";
 import type { StreamFnWrapper } from "./stream-wrappers/types.js";
 export interface OverflowRecoveryConfig {
     /** Max total context chars (from agent config). Used to compute 30% truncation target. */

package/node_modules/@comis/agent/dist/executor/pi-executor/before-tool-call-guard.d.ts

@@ -0,0 +1,29 @@
+/**
+ * createBeforeToolCallGuard — proactive tool-call safety guard.
+ *
+ * Takes 5 typed parameters (StepCounter, BudgetGuard, CircuitBreaker,
+ * ToolRetryBreaker?, MessageSendLimiter?) — does not follow the
+ * closure-extraction `state` first-param contract because it operates
+ * at the top level of the executor.
+ *
+ * @module
+ */
+import type { BudgetGuard } from "../../budget/budget-guard.js";
+import type { StepCounter } from "../step-counter.js";
+import type { CircuitBreaker } from "../../safety/circuit-breaker.js";
+import type { ToolRetryBreaker } from "../../safety/tool-retry-breaker.js";
+import type { MessageSendLimiter } from "../../safety/message-send-limiter.js";
+/**
+ * Create a beforeToolCall guard that proactively blocks tool execution when
+ * safety limits are already reached: step counter exhausted, budget exceeded,
+ * or circuit breaker open.
+ *
+ * Layering: beforeToolCall is PRIMARY (prevents execution).
+ * Bridge's reactive checks on tool_execution_end (step counter) and
+ * turn_end (budget/circuit breaker) are FALLBACK for limits crossed
+ * during execution (e.g., budget consumed by the LLM call that
+ * triggered the tool, not the tool itself).
+ *
+ * Extracted as a named function for independent unit testing.
+ */
+export declare function createBeforeToolCallGuard(stepCounter: StepCounter, budgetGuard: BudgetGuard, circuitBreaker: CircuitBreaker, toolRetryBreaker?: ToolRetryBreaker, messageSendLimiter?: MessageSendLimiter): (context: unknown, _signal?: AbortSignal) => Promise<import("../../safety/message-send-limiter.js").MessageSendVerdict | undefined>;