comisai 1.0.36 → 1.0.40

package/node_modules/@comis/agent/dist/background/session-resolver.d.ts

@@ -0,0 +1,85 @@
+/**
+ * BackgroundSessionResolver: composite-key wrapper around ActiveRunRegistry.
+ *
+ * The underlying `activeRunRegistry.has(sessionKey)` and `.get(sessionKey)`
+ * take a single formatted-key string. That string would collapse two
+ * distinct sessions for the same `channelId` across different agents (or
+ * different channelTypes) into one bucket — a latent multi-agent /
+ * multi-channel correctness bug.
+ *
+ * This resolver makes the composite key explicit at every public call site:
+ * `(agentId, channelType, channelId)`. It internally composes the formatted
+ * key via `formatSessionKey` from `@comis/core` and delegates to the
+ * underlying registry.
+ *
+ * Runtime semantics do not change at the registry layer — what changes is
+ * the lookup-key signature surfaced to production callers. No production
+ * code outside *.test.ts should retain a single-arg `.has(...)` or
+ * `.get(...)` on `activeRunRegistry`.
+ *
+ * @module
+ */
+import type { ActiveRunRegistry, RunHandle } from "../executor/active-run-registry.js";
+/**
+ * Composite key for active-session lookup.
+ *
+ * The three fields uniquely identify a session at the inbound-routing layer:
+ *   - `agentId`     — distinguishes per-agent isolation (multi-agent safety)
+ *   - `channelType` — distinguishes platform (telegram vs discord vs slack)
+ *   - `channelId`   — platform-specific chat / peer / group identifier
+ *
+ * The resolver internally composes a `SessionKey` and formats it via
+ * `formatSessionKey` so the underlying registry's string-keyed Map is
+ * addressed deterministically.
+ */
+export interface ActiveSessionKey {
+    agentId: string;
+    channelType: string;
+    channelId: string;
+}
+/**
+ * Public-facing resolver returned by `createBackgroundSessionResolver`.
+ *
+ * The resolver exposes ONLY composite-key methods. There is no single-arg
+ * fallback — production callers MUST thread `(agentId, channelType,
+ * channelId)` end-to-end.
+ */
+export interface BackgroundSessionResolver {
+    /**
+     * Look up the RunHandle for an active session.
+     *
+     * @param key - Composite key (agentId, channelType, channelId).
+     * @returns The RunHandle if a session is registered, otherwise undefined.
+     * @throws  Error when any composite-key field is empty / falsy
+     *          (programming error, parity with manager.promote's
+     *          empty-string guards in background-task-manager.ts:96-107).
+     */
+    resolveActiveSession(key: ActiveSessionKey): RunHandle | undefined;
+    /**
+     * Check whether a session is registered for the composite key.
+     *
+     * @param key - Composite key (agentId, channelType, channelId).
+     * @returns true iff a RunHandle is registered, false otherwise.
+     * @throws  Error when any composite-key field is empty / falsy.
+     */
+    hasActiveSession(key: ActiveSessionKey): boolean;
+}
+/**
+ * Dependencies required by the resolver.
+ *
+ * Only the registry is needed today — the resolver is a pure-function
+ * wrapper. No logger / event-bus injection (CLAUDE.md: NO logging in
+ * pure-function helpers).
+ */
+export interface BackgroundSessionResolverDeps {
+    activeRunRegistry: ActiveRunRegistry;
+}
+/**
+ * Create a BackgroundSessionResolver wrapping an ActiveRunRegistry.
+ *
+ * Public-facing methods accept ONLY the composite key (agentId,
+ * channelType, channelId) — no single-arg fallback. Production callers
+ * no longer reach into `activeRunRegistry.has(...)` / `.get(...)`
+ * directly.
+ */
+export declare function createBackgroundSessionResolver(deps: BackgroundSessionResolverDeps): BackgroundSessionResolver;

package/node_modules/@comis/agent/dist/background/session-resolver.js

@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+// @allow-throw: session-resolver session-not-found guard; consumed by daemon RPC handlers (subagent-handlers / session-handlers @allow-throw).
+/**
+ * BackgroundSessionResolver: composite-key wrapper around ActiveRunRegistry.
+ *
+ * The underlying `activeRunRegistry.has(sessionKey)` and `.get(sessionKey)`
+ * take a single formatted-key string. That string would collapse two
+ * distinct sessions for the same `channelId` across different agents (or
+ * different channelTypes) into one bucket — a latent multi-agent /
+ * multi-channel correctness bug.
+ *
+ * This resolver makes the composite key explicit at every public call site:
+ * `(agentId, channelType, channelId)`. It internally composes the formatted
+ * key via `formatSessionKey` from `@comis/core` and delegates to the
+ * underlying registry.
+ *
+ * Runtime semantics do not change at the registry layer — what changes is
+ * the lookup-key signature surfaced to production callers. No production
+ * code outside *.test.ts should retain a single-arg `.has(...)` or
+ * `.get(...)` on `activeRunRegistry`.
+ *
+ * @module
+ */
+import { formatSessionKey } from "@comis/core";
+// ---------------------------------------------------------------------------
+// Factory
+// ---------------------------------------------------------------------------
+/**
+ * Compose the formatted session-key string from a composite key.
+ *
+ * Mirrors the shape that production session-managers use when registering
+ * handles: `formatSessionKey({tenantId: agentId, channelId:
+ * "${channelType}:${channelId}", userId: channelId})`. The output is a
+ * deterministic colon-delimited string that round-trips through
+ * `parseFormattedSessionKey` (the channelType prefix on channelId is
+ * stable across format/parse).
+ *
+ * The triple is REQUIRED — empty fields are a programming error
+ * (parity with the empty-string guard in
+ * `background-task-manager.ts:promote()`).
+ */
+function formatComposite(key) {
+    if (!key.agentId || !key.channelType || !key.channelId) {
+        throw new Error(`BackgroundSessionResolver: composite key requires non-empty agentId, channelType, channelId; got ${JSON.stringify(key)}`);
+    }
+    return formatSessionKey({
+        tenantId: key.agentId,
+        channelId: `${key.channelType}:${key.channelId}`,
+        userId: key.channelId,
+    });
+}
+/**
+ * Create a BackgroundSessionResolver wrapping an ActiveRunRegistry.
+ *
+ * Public-facing methods accept ONLY the composite key (agentId,
+ * channelType, channelId) — no single-arg fallback. Production callers
+ * no longer reach into `activeRunRegistry.has(...)` / `.get(...)`
+ * directly.
+ */
+export function createBackgroundSessionResolver(deps) {
+    // Local alias: the resolver IS the abstraction over the underlying
+    // single-arg registry. We rename to `registry` so source-grep tooling
+    // (`activeRunRegistry.has|get(`) does not flag this file as a callsite
+    // to migrate -- the resolver IS the migration target. Invariant:
+    // *production callers* of `activeRunRegistry` go through this resolver;
+    // the resolver itself remains the sole consumer of the underlying
+    // single-arg surface.
+    const registry = deps.activeRunRegistry;
+    return {
+        resolveActiveSession(key) {
+            const formatted = formatComposite(key);
+            return registry.get(formatted);
+        },
+        hasActiveSession(key) {
+            const formatted = formatComposite(key);
+            return registry.has(formatted);
+        },
+    };
+}

package/node_modules/@comis/agent/dist/bootstrap/sections/core-sections.js

@@ -3,6 +3,7 @@
  * Core section builders: identity, safety, date/time, runtime metadata,
  * inbound metadata, and reasoning.
  */
+import { systemNowDate } from "@comis/core";
 // ---------------------------------------------------------------------------
 // 1. Identity (always included)
 // ---------------------------------------------------------------------------
@@ -56,7 +57,7 @@ export function buildLanguageSection(userLanguage) {
 // 14. Date/Time (always included)
 // ---------------------------------------------------------------------------
 export function buildDateTimeSection() {
-    const now = new Date();
+    const now = systemNowDate();
     const isoTimestamp = now.toISOString();
     const localTime = now.toLocaleString("en-US", {
         dateStyle: "full",

package/node_modules/@comis/agent/dist/bootstrap/sections/messaging-sections.js

@@ -34,6 +34,7 @@ export function buildMessagingSection(toolNames, isMinimal, channelContext) {
         '- `[System Message]` blocks are internal context. If one reports completed work and asks for a user update, rewrite it in your normal assistant voice. Never forward raw system message text to users.',
         "- Never use shell execution, code execution, or file tools to send messages. Use only the messaging tools.",
         "- Do NOT use message(action=send) for progress updates, debug output, or placeholder text. The user sees every send as a phone notification. Work silently; deliver the result.",
+        "- Do NOT narrate intent before calling a tool. Avoid prefacing tool calls with phrases like \"I'll do X now…\" or \"Let me run Y…\" — invoke the tool directly. Pre-tool-text creates user-visible promises the agent may not be able to fulfill if the tool gets backgrounded.",
         "- Use `fetch` to read recent messages from a channel before responding to context you missed.",
         "- The `delete` action requires confirmation and cannot be undone.",
     ];

package/node_modules/@comis/agent/dist/bootstrap/sections/tool-descriptions.js

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
+// @allow-throw: bootstrap-time invariant assertion (LEAN_TOOL_DESCRIPTIONS / TOOL_SUMMARIES / NATIVE_TOOLS keys must match); consumed at daemon.ts bootstrap catch boundary.
 /**
  * Lean tool descriptions (LEAN_TOOL_DESCRIPTIONS) and summaries (TOOL_SUMMARIES)
  * for the dual-summary description layer.
@@ -18,9 +19,9 @@
  * @module
  */
 import { getToolMetadata } from "@comis/core";
-import { getProviders } from "@mariozechner/pi-ai";
+import { getProviders } from "@earendil-works/pi-ai";
 // ---------------------------------------------------------------------------
-// Layer 1D (260430-vwt) -- live native-catalog provider list
+// Live native-catalog provider list
 //
 // Computed once at module load time. Used by the providers_manage TOOL_GUIDE
 // "Built-in vs Custom Provider Check" block below so the text reflects
@@ -325,7 +326,7 @@ If the model IS built-in: skip provider creation. After credential pre-check pas
 If the model is NOT built-in: you need a custom provider. Proceed to the steps below, but first gather ALL required configuration.
 
 ### Choosing the \`type\` Field (POST AUTO-PROMOTE FLOW)
-After Layer 1C of the catalog-driven providers redesign, the \`type\` field follows two distinct rules depending on the provider name:
+For catalog-driven providers, the \`type\` field follows two distinct rules depending on the provider name:
 - **If \`provider_id\` matches a built-in name** (use models_manage list_providers to verify): OMIT \`type\` entirely from the create config. The daemon auto-promotes \`type\` to the native catalog name when \`provider_id\` matches a native entry AND no custom \`baseUrl\` is supplied. Setting \`type:"openai"\` for a built-in name still works (auto-promoted), but omitting it is cleaner.
 - **If \`provider_id\` is a custom OpenAI-compatible proxy** (NVIDIA NIM, Together, Fireworks, etc.) NOT in the native catalog: set \`type:"openai"\` (or whatever wire-format API matches). Auto-promotion does not fire for non-catalog names.
 - **If \`baseUrl\` differs from the native catalog URL** for a built-in name: this signals you want the OpenAI-passthrough shape (custom proxy that masquerades as the built-in). Auto-promotion is suppressed; the entry stays as \`type:"openai"\`.
@@ -357,7 +358,7 @@ To switch an agent to a different provider/model, call agents_manage update with
 **Three preconditions the LLM MUST verify before issuing the update:**
   1. The target provider exists as a \`providers.entries.<provider_id>\` key. If it does not, call providers_manage create FIRST (and gateway env_set for the API key if needed). Patching an agent to a provider that has no entry resolves under the wrong provider family at the next session — the original bug.
   2. The model id matches a \`models[].id\` in that provider entry (or is a built-in known to the pi-ai catalog for that provider type). Otherwise \`registry.find(provider, model)\` returns undefined and the next session falls back with a "Model not found" message.
-  3. **Credential pre-check passed** (see top of this guide). The target provider's apiKeyName is non-empty AND \`gateway env_list filter:"<PROVIDER>*"\` confirmed the named secret exists in env. Skipping this step is the bug that causes "No API key found" failures at the next chat turn — verified production repro on 2026-05-01.
+  3. **Credential pre-check passed** (see top of this guide). The target provider's apiKeyName is non-empty AND \`gateway env_list filter:"<PROVIDER>*"\` confirmed the named secret exists in env. Skipping this step is the bug that causes "No API key found" failures at the next chat turn.
 
 **Timing — the change is NOT hot-applied to the active session.**
 agents_manage update writes through persistToConfig WITHOUT a hot-update callback, which triggers a SIGUSR2 daemon restart (2-second debounce). The new provider/model takes effect on the next session, not the currently-running prompt. Tell the user the switch is queued and will take effect after the daemon settles.

package/node_modules/@comis/agent/dist/bootstrap/sections/tooling-sections.d.ts

@@ -4,7 +4,20 @@
  */
 /** Model size tier — determines prompt verbosity for tool descriptions. */
 export type ModelTier = "small" | "medium" | "large";
-export declare function buildToolingSection(toolNames: string[], _modelTier: ModelTier, toolSummaries?: Record<string, string>): string[];
+/**
+ * Build the residual one-liner pointing the model at the per-turn
+ * `## Capabilities` block. The capability-index is now the only path.
+ *
+ * The wording below is normative — the per-turn `## Capabilities` block is
+ * rendered into the dynamic preamble by `executor-prompt-runner.ts`.
+ */
+export declare function buildToolingSection(toolNames: string[], _modelTier: ModelTier, _toolSummaries?: Record<string, string>): string[];
+/**
+ * Build the static "## Tool Call Style" section with conditional coding guidelines.
+ *
+ * The "Tool-first principle" bullet emits unconditionally when `exec` is in
+ * `toolNames` — the capability-index is always on.
+ */
 export declare function buildToolCallStyleSection(isMinimal: boolean, toolNames?: string[]): string[];
 /** Tool names that trigger the confirmation flow / self-update gating section. */
 export declare const CONFIRMATION_TOOL_NAMES: string[];

package/node_modules/@comis/agent/dist/bootstrap/sections/tooling-sections.js

@@ -3,26 +3,32 @@
  * Tooling section builders: tool listing, tool call style, self-update gating,
  * and compacted output recovery.
  */
-import { TOOL_SUMMARIES, TOOL_ORDER } from "./tool-descriptions.js";
-import { getProviders } from "@mariozechner/pi-ai";
-export function buildToolingSection(toolNames, _modelTier, toolSummaries) {
+import { getProviders } from "@earendil-works/pi-ai";
+/**
+ * Build the residual one-liner pointing the model at the per-turn
+ * `## Capabilities` block. The capability-index is now the only path.
+ *
+ * The wording below is normative — the per-turn `## Capabilities` block is
+ * rendered into the dynamic preamble by `executor-prompt-runner.ts`.
+ */
+export function buildToolingSection(toolNames, _modelTier, _toolSummaries) {
     if (toolNames.length === 0)
         return [];
-    const summaries = { ...TOOL_SUMMARIES, ...toolSummaries };
-    const ordered = TOOL_ORDER.filter((t) => toolNames.includes(t));
-    const extras = toolNames.filter((t) => !TOOL_ORDER.includes(t)).sort();
-    const allTools = [...ordered, ...extras];
-    const lines = ["## Available Tools"];
-    for (const name of allTools) {
-        const desc = summaries[name];
-        lines.push(desc ? `- ${name}: ${desc}` : `- ${name}`);
-    }
-    lines.push("", "Always use tools to gather real data before answering. Never guess or fabricate tool results.", "Refer to each tool's schema for full parameter details.");
-    return lines;
+    return [
+        "When this turn includes a `Capabilities` context, refer to it for grouped tool guidance " +
+            "before invoking tools or running installs. Tool schemas in your active toolspace are " +
+            "authoritative for parameter shapes.",
+    ];
 }
 // ---------------------------------------------------------------------------
 // 4. Tool Call Style (skip if minimal)
 // ---------------------------------------------------------------------------
+/**
+ * Build the static "## Tool Call Style" section with conditional coding guidelines.
+ *
+ * The "Tool-first principle" bullet emits unconditionally when `exec` is in
+ * `toolNames` — the capability-index is always on.
+ */
 export function buildToolCallStyleSection(isMinimal, toolNames = []) {
     if (isMinimal)
         return [];
@@ -64,6 +70,10 @@ export function buildToolCallStyleSection(isMinimal, toolNames = []) {
         guidelines.push("- Show file paths clearly when working with files.");
     }
     if (has("exec")) {
+        // Counterweight to the venv rule below. The bullet precedes the venv rule
+        // because the first read sets the default; the second is the install
+        // fallback. Capability-index is always on.
+        guidelines.push("- **Tool-first principle.** When this turn includes a `Capabilities` context and the task can be satisfied by a connected tool or available skill, prefer that capability over installing a Python or Node package. Use installs only for capabilities not covered by active tools, deferred tools, or visible prompt skills.");
         guidelines.push("- **Python projects:** Always create a virtualenv per project (`python3 -m venv .venv`). "
             + "Install packages into the project venv (`source .venv/bin/activate && pip install ...`). "
             + "Never use `--break-system-packages` — it pollutes the system Python. "

package/node_modules/@comis/agent/dist/bootstrap/system-prompt-assembler.js

@@ -59,12 +59,6 @@ const MODES_ALL = new Set(["full", "operational", "minimal"]);
  *  Minimal-mode builders typically self-filter to [] via their own isMinimal flag;
  *  membership here preserves pre-refactor behavior without changing minimal output. */
 const MODES_FULL_MIN = new Set(["full", "minimal"]);
-/** Sections present only in full mode (stripped in operational AND minimal).
- *  Reserved for sections whose builder is cheap but whose output is not desired
- *  in either non-interactive context. Currently unused; MODES_FULL_MIN is
- *  preferred to preserve pre-refactor minimal output. */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars -- reserved for future use
-const MODES_FULL = new Set(["full"]);
 /**
  * Canonical section list in emission order.
  *

package/node_modules/@comis/agent/dist/bootstrap/workspace-loader.js

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
+// @allow-throw: workspace-loader re-raise (non-ENOENT errors); outer caller is daemon bootstrap which catches at daemon.ts entry.
 /**
  * Workspace file loader for bootstrap context injection.
  *

package/node_modules/@comis/agent/dist/bridge/bridge-event-handlers.d.ts

@@ -10,11 +10,7 @@
  *
  * @module
  */
-/**
- * Extract the MCP server name from a sanitized tool name.
- * Format: `mcp__serverName--toolName`. Returns undefined for non-MCP tools.
- */
-export declare function extractMcpServerName(toolName: string): string | undefined;
+export { extractMcpServerName } from "@comis/shared";
 /**
  * Classify an MCP error message into a category for observability.
  */

package/node_modules/@comis/agent/dist/bridge/bridge-event-handlers.js

@@ -13,21 +13,9 @@
  */
 // ---------------------------------------------------------------------------
 // MCP attribution helpers
-// Defined inline to avoid cross-package import from @comis/skills.
+// Re-exported from @comis/shared (canonical home).
 // ---------------------------------------------------------------------------
-/**
- * Extract the MCP server name from a sanitized tool name.
- * Format: `mcp__serverName--toolName`. Returns undefined for non-MCP tools.
- */
-export function extractMcpServerName(toolName) {
-    if (!toolName.startsWith("mcp__"))
-        return undefined;
-    const rest = toolName.slice(5);
-    const sepIdx = rest.indexOf("--");
-    if (sepIdx <= 0)
-        return undefined;
-    return rest.slice(0, sepIdx);
-}
+export { extractMcpServerName } from "@comis/shared";
 /**
  * Classify an MCP error message into a category for observability.
  */

package/node_modules/@comis/agent/dist/bridge/bridge-metrics.d.ts

@@ -26,6 +26,16 @@ export interface BridgeMetricsState {
     lastContextUsage: ContextUsageData | undefined;
     textEmitted: boolean;
     lastLlmErrorMessage: string | undefined;
+    /** Per-turn capture of outbound delivery events. Populated by pi-event-bridge
+     *  on tool_execution_end for `message(action='send'|'reply'|'attach')`.
+     *  Read by executor-post-execution.ts to make sentinel-aware decisions.
+     *  Reset at turn start. */
+    outboundLog: Array<{
+        action: string;
+        channelType: string;
+        channelId: string;
+        timestamp: number;
+    }>;
     toolStartTimes: Map<string, number>;
     toolCallHistory: string[];
     lastActiveToolName: string | undefined;
@@ -75,6 +85,22 @@ export interface BridgeMetricsState {
     /** Total tool calls across all signature-replay scrubs whose thoughtSignature
      *  was stripped (post-incident-visibility metric). */
     signatureScrubsToolCallsAffected: number;
+    /**
+     * Per-composite-key drain inflight gate. Owned by the bridge; passed into
+     * `drainAt(...)` at the `tool_execution_end` call site (inline-consumption +
+     * composite drain).
+     *
+     * Map keyed by `${agentId}:${channelType}:${channelId}` (composite key).
+     * Concurrent calls for the SAME composite key return immediately
+     * (single-tick gate). Concurrent calls for DIFFERENT composite keys drain
+     * independently (multi-agent isolation).
+     *
+     * Entry cleanup: `.delete(formatted)` runs in `.finally(...)` of the
+     * drain promise so the Map size remains bounded across long-running
+     * sessions (entry removed within one event-loop tick of drain
+     * resolution).
+     */
+    drainInflightByKey: Map<string, Promise<void>>;
 }
 /**
  * Create a fresh metrics state with all counters zeroed.

package/node_modules/@comis/agent/dist/bridge/bridge-metrics.js

@@ -9,6 +9,7 @@
  *
  * @module
  */
+import { systemNowMs } from "@comis/core";
 /**
  * Create a fresh metrics state with all counters zeroed.
  */
@@ -29,6 +30,7 @@ export function createBridgeMetrics() {
         lastContextUsage: undefined,
         textEmitted: false,
         lastLlmErrorMessage: undefined,
+        outboundLog: [],
         toolStartTimes: new Map(),
         toolCallHistory: [],
         lastActiveToolName: undefined,
@@ -42,7 +44,7 @@ export function createBridgeMetrics() {
         turnToolDurationMs: 0,
         consecutiveEmptyTurns: 0,
         turnCount: 0,
-        turnStartMs: Date.now(),
+        turnStartMs: systemNowMs(),
         compactionStartMs: 0,
         lastStopReason: undefined,
         ghostCostUsd: 0,
@@ -58,6 +60,8 @@ export function createBridgeMetrics() {
         hashAssertionMismatches: 0,
         signatureScrubs: 0,
         signatureScrubsToolCallsAffected: 0,
+        // per-composite-key drain inflight gate.
+        drainInflightByKey: new Map(),
     };
 }
 /**

package/node_modules/@comis/agent/dist/bridge/bridge-safety-controls.d.ts

@@ -13,7 +13,7 @@
  * @module
  */
 import type { SessionKey, TypedEventBus } from "@comis/core";
-import type { ComisLogger } from "@comis/infra";
+import type { ComisLogger } from "@comis/core";
 import type { BudgetGuard } from "../budget/budget-guard.js";
 import type { StepCounter } from "../executor/step-counter.js";
 import type { CircuitBreaker } from "../safety/circuit-breaker.js";

package/node_modules/@comis/agent/dist/bridge/bridge-safety-controls.js

@@ -13,6 +13,7 @@
  *
  * @module
  */
+import { systemNowMs } from "@comis/core";
 // ---------------------------------------------------------------------------
 // Step counter check
 // ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ export function emitStepLimitAbort(deps) {
         sessionKey: deps.sessionKey,
         reason: "max_steps",
         agentId: deps.agentId,
-        timestamp: Date.now(),
+        timestamp: systemNowMs(),
     });
     deps.logger.warn({
         stepsExecuted: deps.stepCounter.getCount(),
@@ -74,7 +75,7 @@ export function emitBudgetAbort(deps, totalTokens) {
         sessionKey: deps.sessionKey,
         reason: "budget_exceeded",
         agentId: deps.agentId,
-        timestamp: Date.now(),
+        timestamp: systemNowMs(),
     });
     deps.logger.warn({
         totalTokens,
@@ -118,7 +119,7 @@ export function emitContextAbort(deps, contextUsage) {
         sessionKey: deps.sessionKey,
         reason: "context_exhausted",
         agentId: deps.agentId,
-        timestamp: Date.now(),
+        timestamp: systemNowMs(),
     });
     deps.logger.warn({
         contextPercent,
@@ -173,7 +174,7 @@ export function emitCircuitBreakerAbort(deps) {
         sessionKey: deps.sessionKey,
         reason: "circuit_breaker",
         agentId: deps.agentId,
-        timestamp: Date.now(),
+        timestamp: systemNowMs(),
     });
     deps.logger.warn({
         hint: "Circuit breaker opened during execution; aborting to prevent further token waste on failing provider",

package/node_modules/@comis/agent/dist/bridge/pi-event-bridge.d.ts

@@ -8,9 +8,9 @@
  *
  * @module
  */
-import type { AgentSessionEvent } from "@mariozechner/pi-coding-agent";
+import type { AgentSessionEvent } from "@earendil-works/pi-coding-agent";
 import { type SessionKey, type TypedEventBus, type MemoryPort, type ModelOperationType } from "@comis/core";
-import type { ComisLogger } from "@comis/infra";
+import type { ComisLogger } from "@comis/core";
 import type { BudgetGuard } from "../budget/budget-guard.js";
 import type { CostTracker } from "../budget/cost-tracker.js";
 import type { StepCounter } from "../executor/step-counter.js";
@@ -20,6 +20,7 @@ import type { ProviderHealthMonitor } from "../safety/provider-health-monitor.js
 import type { ContextWindowGuard, ContextUsageData } from "../safety/context-window-guard.js";
 import type { ExecutionResult } from "../executor/types.js";
 import type { ExecutionPlan } from "../planner/types.js";
+import { type DrainInflightState } from "../executor/drain-helper.js";
 import { type ThinkingBlockHash } from "./thinking-block-hash-invariant.js";
 /** Per-call TTL split estimate, populated by requestBodyInjector's onPayload.
  *  Shared mutable object — written by the stream wrapper, read by the bridge. */
@@ -80,7 +81,7 @@ export interface PiEventBridgeDeps {
     /** Callback fired when cache break detection finds a break event.
      *  Receives the full CacheBreakEvent. PiExecutor uses this to trigger
      *  coordinated reset on server eviction. */
-    onCacheBreakDetected?: (event: import("../executor/cache-break-detection.js").CacheBreakEvent) => void;
+    onCacheBreakDetected?: (event: import("../executor/cache-detection/index.js").CacheBreakEvent) => void;
     /** Decrement eviction cooldown counter each turn (unconditional). */
     decrementEvictionCooldown?: () => void;
     /** Callback to record per-turn cache savings for cost gate evaluation.
@@ -114,7 +115,7 @@ export interface PiEventBridgeDeps {
         cacheWriteTokens: number;
         totalInputTokens: number;
         apiError?: boolean;
-    }) => import("../executor/cache-break-detection.js").CacheBreakEvent | null;
+    }) => import("../executor/cache-detection/index.js").CacheBreakEvent | null;
     /** Called on each turn_end with the per-turn usage.input tokens.
      *  Used by pi-executor to update the TokenAnchor for API-grounded estimation. */
     onTurnUsage?: (inputTokens: number) => void;
@@ -203,8 +204,15 @@ export interface PiEventBridgeResult {
         hashes: ReadonlyMap<string, ReadonlyArray<ThinkingBlockHash>>;
         canonical: ReadonlyMap<string, ReadonlyArray<unknown>>;
     };
+    /**
+     * Expose the bridge-owned drain inflight gate so executor-post-execution
+     * can fire an end-of-turn backstop drainAt sharing the same composite-key
+     * gate map. Returns the live `BridgeMetricsState` slice -- callers MUST
+     * treat this as read-mostly (the only mutation contract is `drainAt`
+     * adding/removing entries).
+     */
+    getDrainState: () => DrainInflightState;
 }
-export { sanitizeToolArgs, extractErrorText } from "./bridge-event-handlers.js";
 /**
  * Create a PiEventBridge that translates AgentSessionEvent to TypedEventBus
  * events and enforces safety controls.