comisai 1.0.36 → 1.0.37

package/node_modules/@comis/daemon/dist/sub-agent-runner.js

@@ -22,6 +22,34 @@ import { classifyAbortReason, buildAnnouncementMessage, deliverAnnouncement, del
  *  Parent agents may call slow tools (image generation at 120s, web search, etc.)
  *  in response to announcements. 30s caused premature fallback + duplicate delivery. */
 export const ANNOUNCE_PARENT_TIMEOUT_MS = 300_000;
+/**
+ * Build the composite-key triple from a SubAgentRun for resolver lookups
+ * (R3, B37). Sub-agent runs only carry a formatted `sessionKey` string +
+ * `agentId` + optional announce-channel context, so:
+ *   - agentId    -> run.agentId
+ *   - channelType-> run.announceChannelType ?? "sub-agent"
+ *   - channelId  -> run.announceChannelId
+ *                   ?? parseFormattedSessionKey(run.sessionKey)?.channelId
+ *                   ?? run.sessionKey  (last-resort: the formatted key
+ *                                       itself; never empty so the
+ *                                       resolver's empty-field guard
+ *                                       does not trip)
+ *
+ * The "sub-agent" channelType fallback acknowledges that production
+ * SubAgentRun does not carry the original inbound channelType -- the
+ * abort path is best-effort regardless (the SDK session may already be
+ * in cleanup), so a no-op when the resolver does not find a handle is
+ * acceptable. There is a runtime semantic gap (deviation: composite-key
+ * triple vs registered formatted-key shape).
+ */
+function deriveCompositeForRun(run) {
+    const parsed = parseFormattedSessionKey(run.sessionKey);
+    return {
+        agentId: run.agentId,
+        channelType: run.announceChannelType ?? "sub-agent",
+        channelId: run.announceChannelId ?? parsed?.channelId ?? run.sessionKey,
+    };
+}
 // Re-export extracted result processor types and functions for backward compatibility
 export { classifyAbortReason, buildAnnouncementMessage, deliverFailureNotification, sweepResultFiles, persistFailureRecord, validateOutputs } from "./sub-agent-result-processor.js";
 // ---------------------------------------------------------------------------
@@ -181,9 +209,9 @@ export function createSubAgentRunner(deps) {
                     runtimeMs: runningDurationMs,
                 }, deps.logger), "ghost-sweep-failure-record");
             }
-            // Abort SDK session (best-effort)
-            if (deps.activeRunRegistry) {
-                const handle = deps.activeRunRegistry.get(run.sessionKey);
+            // Abort SDK session (best-effort, R3 / B37 -- composite-key resolver)
+            if (deps.sessionResolver) {
+                const handle = deps.sessionResolver.resolveActiveSession(deriveCompositeForRun(run));
                 if (handle) {
                     // eslint-disable-next-line no-restricted-syntax -- intentional fire-and-forget
                     handle.abort().catch(() => { });
@@ -1000,9 +1028,12 @@ export function createSubAgentRunner(deps) {
                     runtimeMs,
                 }, deps.logger), "watchdog-failure-record");
             }
-            // Abort SDK session (keyed by sessionKey, NOT runId)
-            if (deps.activeRunRegistry) {
-                const handle = deps.activeRunRegistry.get(run.sessionKey);
+            // Abort SDK session via composite-key resolver (R3 / B37). The
+            // previous lookup keyed on the formatted sessionKey only; the
+            // resolver makes the `(agentId, channelType, channelId)` triple
+            // explicit so multi-agent collisions are distinguishable.
+            if (deps.sessionResolver) {
+                const handle = deps.sessionResolver.resolveActiveSession(deriveCompositeForRun(run));
                 if (handle) {
                     handle.abort().catch((abortErr) => {
                         deps.logger?.debug({ runId, err: abortErr }, "Watchdog SDK abort best-effort failed");
@@ -1133,9 +1164,10 @@ export function createSubAgentRunner(deps) {
                 runtimeMs: run.completedAt - run.startedAt,
             }, deps.logger), "kill-failure-record");
         }
-        // Abort the in-flight SDK session to stop LLM API calls (best-effort)
-        if (deps.activeRunRegistry) {
-            const handle = deps.activeRunRegistry.get(run.sessionKey);
+        // Abort the in-flight SDK session via composite-key resolver
+        // (R3 / B37, best-effort).
+        if (deps.sessionResolver) {
+            const handle = deps.sessionResolver.resolveActiveSession(deriveCompositeForRun(run));
             if (handle) {
                 handle.abort().catch((abortErr) => {
                     deps.logger?.debug({ runId, err: abortErr }, "Sub-agent SDK abort best-effort failed");

package/node_modules/@comis/daemon/dist/wiring/index.d.ts

@@ -19,3 +19,5 @@ export { setupNotifications, type NotificationContext } from "./setup-notificati
 export { setupBackgroundTasks, type BackgroundTasksContext } from "./setup-background-tasks.js";
 export { setupBackgroundCompletionRunner } from "./setup-background-completion-runner.js";
 export type { BackgroundCompletionRunnerContext, SetupBackgroundCompletionRunnerDeps, } from "./setup-background-completion-runner.js";
+export { setupOutputRetention, validateOutputRetentionConfig, } from "./setup-output-retention.js";
+export type { SetupOutputRetentionDeps, SetupOutputRetentionHandle, } from "./setup-output-retention.js";

package/node_modules/@comis/daemon/dist/wiring/index.js

@@ -17,3 +17,4 @@ export { setupDeliveryQueue, setupDeliveryMirror } from "./setup-delivery.js";
 export { setupNotifications } from "./setup-notifications.js";
 export { setupBackgroundTasks } from "./setup-background-tasks.js";
 export { setupBackgroundCompletionRunner } from "./setup-background-completion-runner.js";
+export { setupOutputRetention, validateOutputRetentionConfig, } from "./setup-output-retention.js";

package/node_modules/@comis/daemon/dist/wiring/setup-agents.d.ts

@@ -3,14 +3,23 @@
  * dependencies (circuit breaker, budget guard, cost tracker, step counter),
  * and PiExecutor creation.
  * All agents use PiExecutor (pi-coding-agent AgentSession wrapper).
+ *
+ * The live ToolCapabilityPort adapter is constructed inside setupSingleAgent
+ * (this function), NOT at a higher composition site (daemon.ts). Rationale:
+ * skillRegistry is per-agent and the skill-allow/deny precedence chain is
+ * per-agent; a daemon-global adapter cannot satisfy this without breaking
+ * the port interface (would require adding agentId to every method). The
+ * per-agent port is exposed via AgentsResult.toolCapabilityPorts and threaded
+ * into setupTools via the getCapabilityPortForAgent closure on ToolsDeps.
+ *
  * @module
  */
-import { type AppContainer, type InjectionRateLimiter, type OAuthCredentialStorePort, type SecretsCrypto, type PerAgentConfig } from "@comis/core";
+import { type AppContainer, type InjectionRateLimiter, type OAuthCredentialStorePort, type SecretsCrypto, type PerAgentConfig, type ToolCapabilityPort } from "@comis/core";
 import type { ComisLogger } from "@comis/infra";
 import type Database from "better-sqlite3";
 import type { SqliteMemoryAdapter, createSessionStore } from "@comis/memory";
 import { createBudgetGuard, createCostTracker, createStepCounter, createSessionLifecycle, createComisSessionManager, type AgentExecutor, type ActiveRunRegistry, type ProviderHealthMonitor, type LastKnownModelTracker } from "@comis/agent";
-import { type SkillRegistry, type SkillWatcherHandle } from "@comis/skills";
+import { type SkillRegistry, type SkillWatcherHandle, type McpClientManager } from "@comis/skills";
 type PiSessionAdapter = ReturnType<typeof createComisSessionManager>;
 /** Shared dependencies computed once before the agent loop and passed to each
  *  setupSingleAgent() call. Exposed on AgentsResult so daemon.ts can capture
@@ -86,6 +95,12 @@ export interface SingleAgentDeps {
      * shares the secretsDb connection).
      */
     oauthCredentialStore: OAuthCredentialStorePort;
+    /**
+     * Daemon-global MCP client manager. Live-runtime view consumed by the
+     * per-agent ToolCapabilityPort adapter constructed inside setupSingleAgent.
+     * Threaded from daemon.ts; setupMcp runs before setupAgents.
+     */
+    mcpClientManager: McpClientManager;
 }
 /** Per-agent outputs from setupSingleAgent(), matching the Maps in AgentsResult. */
 export interface SingleAgentResult {
@@ -97,6 +112,12 @@ export interface SingleAgentResult {
     piSessionAdapter: PiSessionAdapter;
     skillWatcherHandle?: SkillWatcherHandle;
     skillRegistry: SkillRegistry;
+    /**
+     * Per-agent live ToolCapabilityPort. Constructed via
+     * createToolCapabilityAdapter using this agent's skillRegistry and the
+     * daemon-global mcpClientManager.
+     */
+    toolCapabilityPort: ToolCapabilityPort;
 }
 /** All services produced by the per-agent executor setup phase. */
 export interface AgentsResult {
@@ -124,6 +145,13 @@ export interface AgentsResult {
     skillWatcherHandles: Map<string, SkillWatcherHandle>;
     /** Per-agent skill registries for skills.list RPC method. */
     skillRegistries: Map<string, SkillRegistry>;
+    /**
+     * Per-agent ToolCapabilityPort instances. Consumed by setupTools via the
+     * getCapabilityPortForAgent closure on ToolsDeps; mutated by hot-add /
+     * hot-remove in daemon.ts to keep the parallel map consistent with
+     * skillRegistries.
+     */
+    toolCapabilityPorts: Map<string, ToolCapabilityPort>;
     /** Periodic lock cleanup timer (cleared on shutdown). */
     lockCleanupTimer: ReturnType<typeof setInterval>;
     /** Shared single-agent dependencies for hot-add closure capture. */
@@ -207,6 +235,12 @@ export declare function setupAgents(deps: {
      * `appConfig.oauth.storage === "encrypted"` mode.
      */
     secretsDb?: Database.Database;
+    /**
+     * Daemon-global MCP client manager. setupSingleAgent constructs a
+     * per-agent ToolCapabilityPort adapter that closes over this manager.
+     * daemon.ts threads it in after running setupMcp before setupAgents.
+     */
+    mcpClientManager: McpClientManager;
 }): Promise<AgentsResult>;
 /**
  * Resolve "default" model/provider placeholders to concrete values from the

package/node_modules/@comis/daemon/dist/wiring/setup-agents.js

@@ -4,9 +4,19 @@
  * dependencies (circuit breaker, budget guard, cost tracker, step counter),
  * and PiExecutor creation.
  * All agents use PiExecutor (pi-coding-agent AgentSession wrapper).
+ *
+ * The live ToolCapabilityPort adapter is constructed inside setupSingleAgent
+ * (this function), NOT at a higher composition site (daemon.ts). Rationale:
+ * skillRegistry is per-agent and the skill-allow/deny precedence chain is
+ * per-agent; a daemon-global adapter cannot satisfy this without breaking
+ * the port interface (would require adding agentId to every method). The
+ * per-agent port is exposed via AgentsResult.toolCapabilityPorts and threaded
+ * into setupTools via the getCapabilityPortForAgent closure on ToolsDeps.
+ *
  * @module
  */
 import { safePath, SkillsConfigSchema, createScopedSecretManager, createOutputGuard, generateCanaryToken, createInputSecurityGuard, validateInput, PerAgentConfigSchema } from "@comis/core";
+import { createToolCapabilityAdapter } from "./tool-capability-adapter.js";
 import { suppressError } from "@comis/shared";
 import { createHmac } from "node:crypto";
 import { homedir } from "node:os";
@@ -154,18 +164,22 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
             // Closure-stability: the closure dereferences
             // container.config.agents[agentId]?.oauthProfiles on every call.
             // This is the only correct shape because:
-            //   1. Line ~222 above writes effectiveConfig (a NEW object built
-            //      from { ...agentConfig, model, provider }) into
-            //      container.config.agents[agentId]. The local `agentConfig`
-            //      parameter diverges from the daemon's map immediately at
-            //      startup — capturing it would observe the wrong value.
+            //   1. The `container.config.agents[agentId] = effectiveConfig`
+            //      writeback above (search for that assignment in this file)
+            //      stores a NEW object built from
+            //      { ...agentConfig, model, provider } into the daemon's map.
+            //      The local `agentConfig` parameter diverges from the map
+            //      immediately at startup — capturing it would observe the
+            //      wrong value.
             //   2. agents.update at agent-handlers.ts:341 executes
             //      `deps.agents[agentId] = parsedConfig`, REPLACING the
             //      reference at that key with a new validated object. Capturing
             //      the local agentConfig parameter would miss this hot-update.
-            //   3. daemon.ts:594, 634 confirm `deps.agents` and
-            //      `container.config.agents` are THE SAME map object — the
-            //      daemon's single per-process Container.config instance.
+            //   3. daemon.ts confirms `deps.agents` and `container.config.agents`
+            //      are THE SAME map object — search for
+            //      `agents: container.config.agents` in the RpcDispatchDeps
+            //      construction. The daemon holds a single per-process
+            //      Container.config instance.
             // The map identity is stable; only the value at the agent key
             // changes. The closure-evaluated dereference observes (1) at
             // startup AND (2) on every agents.update without an event-bus
@@ -222,6 +236,16 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
     };
     const skillRegistry = createSkillRegistry(resolvedSkillsConfig, container.eventBus, { agentId, tenantId: container.config.tenantId, userId: "system" }, perAgentLogger, eligibilityContext);
     skillRegistry.init();
+    // Per-agent ToolCapabilityPort adapter. Construction sits here so the
+    // adapter can close over this agent's skillRegistry; the adapter is
+    // reused by pi-executor (capability-index renderer) AND by exec/process
+    // tools (install-detour parser via setupTools.getCapabilityPortForAgent).
+    const toolCapabilityPort = createToolCapabilityAdapter({
+        toolingConfig: container.config.tooling,
+        skillRegistry,
+        mcpClientManager: deps.mcpClientManager,
+        logger: perAgentLogger,
+    });
     // Opt-in file watching for automatic skill reload
     let skillWatcherHandle;
     if (skillsConfig.watchEnabled) {
@@ -349,6 +373,7 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
             : undefined,
         embeddingEnqueue: deps.embeddingQueue?.enqueue.bind(deps.embeddingQueue),
         embeddingPort: deps.embeddingPort, // Semantic search in discover_tools
+        toolCapabilityPort, // Live adapter constructed above from container.config.tooling + skillRegistry + mcpClientManager.
         // DAG context engine deps (optional -- only when context engine version is dag)
         contextStore: deps.contextStore,
         db: deps.db,
@@ -376,6 +401,7 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
         piSessionAdapter: sessionAdapter,
         skillWatcherHandle,
         skillRegistry,
+        toolCapabilityPort, // Exposed for AgentsResult.toolCapabilityPorts map
     };
 }
 // ---------------------------------------------------------------------------
@@ -446,6 +472,9 @@ export async function setupAgents(deps) {
     const piSessionAdapters = new Map();
     const skillWatcherHandles = new Map();
     const skillRegistries = new Map();
+    // Per-agent live ToolCapabilityPort adapters, parallel to skillRegistries;
+    // mutated in lockstep by hot-add/hot-remove.
+    const toolCapabilityPorts = new Map();
     // Resolve sub-agent tool names from config for delegation awareness
     const subAgentToolGroups = container.config.security?.agentToAgent?.subAgentToolGroups ?? [];
     const subAgentToolNames = subAgentToolGroups.length === 0 || subAgentToolGroups.includes("full")
@@ -509,6 +538,10 @@ export async function setupAgents(deps) {
         // Daemon-level OAuth credential store handle (constructed once above,
         // reused per-agent + threaded into RPC deps).
         oauthCredentialStore,
+        // Daemon-global MCP client manager. Threaded through so each
+        // setupSingleAgent invocation can construct a per-agent
+        // ToolCapabilityPort adapter that closes over the live MCP state.
+        mcpClientManager: deps.mcpClientManager,
     };
     for (const [agentId, agentConfig] of Object.entries(agents)) {
         const result = await setupSingleAgent(agentId, agentConfig, singleAgentDeps);
@@ -521,6 +554,7 @@ export async function setupAgents(deps) {
         if (result.skillWatcherHandle)
             skillWatcherHandles.set(agentId, result.skillWatcherHandle);
         skillRegistries.set(agentId, result.skillRegistry);
+        toolCapabilityPorts.set(agentId, result.toolCapabilityPort);
     }
     const defaultAgentId = routingConfig.defaultAgentId;
     const defaultWorkspaceDir = workspaceDirs.get(defaultAgentId);
@@ -562,6 +596,9 @@ export async function setupAgents(deps) {
         piSessionAdapters,
         skillWatcherHandles,
         skillRegistries,
+        // daemon.ts threads this Map into setupTools via
+        // getCapabilityPortForAgent and mutates it on hot-add/hot-remove.
+        toolCapabilityPorts,
         lockCleanupTimer,
         singleAgentDeps,
         providerHealth,

package/node_modules/@comis/daemon/dist/wiring/setup-background-completion-runner.d.ts

@@ -1,18 +1,20 @@
 /**
- * Background completion runner wiring for daemon startup.
+ * Background completion dispatcher + runner wiring for daemon startup.
  *
- * Subscribes the runner to background_task:{completed,failed} events after
- * the notification service has been wired (so fallbackNotifyFn is live),
- * and returns a shutdown handle for the daemon's system:shutdown sequence
- * to await before tearing down the executor.
+ * Subscribes the dispatcher BEFORE the runner so its synchronous
+ * `transitionDispatchState` runs first; the runner's handler then reads
+ * the updated `task.dispatchState` and skips when state is "notified"
+ * (the dispatcher already fired fallback). Subscription order matters
+ * because the event bus fires handlers in registration order; the
+ * dispatcher MUST come first.
  *
  * Per AGENTS §2.4: composition root + factories. This wiring lives in
- * @comis/daemon (composition root); the actual factory body is in
+ * @comis/daemon (composition root); the actual factory bodies live in
  * @comis/agent.
  *
  * @module
  */
-import { type BackgroundCompletionRunner, type BackgroundTaskManager, type NotifyFn } from "@comis/agent";
+import { type BackgroundCompletionRunner, type BackgroundTaskManager, type CompletionDispatcher, type NotifyFn } from "@comis/agent";
 import type { TypedEventBus } from "@comis/core";
 import type { ComisLogger } from "@comis/infra";
 import type { AgentExecutor } from "@comis/agent";
@@ -20,12 +22,25 @@ import type { RunnerSessionStore } from "@comis/agent";
 /** Result of setupBackgroundCompletionRunner -- exposed to the daemon for shutdown. */
 export interface BackgroundCompletionRunnerContext {
     runner: BackgroundCompletionRunner;
+    dispatcher: CompletionDispatcher;
 }
+/**
+ * The taskManager arg widened to require `transitionDispatchState` so the
+ * dispatcher can persist state-machine transitions.
+ *
+ * The runner only consumes `getTask` (existing contract); the dispatcher
+ * consumes both `getTask` and `transitionDispatchState`. Daemon callers
+ * pass the full BackgroundTaskManager so structural subtyping covers both.
+ */
 export interface SetupBackgroundCompletionRunnerDeps {
     eventBus: TypedEventBus;
     getExecutor: (agentId: string) => AgentExecutor;
     sessionStore: RunnerSessionStore;
-    taskManager: Pick<BackgroundTaskManager, "getTask">;
+    /**
+     * Must support `transitionDispatchState`; the dispatcher persists state
+     * machine transitions through it. The runner only needs `getTask`.
+     */
+    taskManager: Pick<BackgroundTaskManager, "getTask" | "transitionDispatchState">;
     /** bgNotifyFn closure used when the originating session is gone. */
     fallbackNotifyFn: NotifyFn;
     /** From config.backgroundTasks.maxBackgroundHops (default 3). NOT config.workflow.*. */
@@ -33,7 +48,11 @@ export interface SetupBackgroundCompletionRunnerDeps {
     logger: ComisLogger;
 }
 /**
- * Wire the background completion runner from daemon-level dependencies.
+ * Wire the dispatcher + completion runner from daemon-level dependencies.
  * Call this AFTER setupNotifications so fallbackNotifyFn is wired.
+ *
+ * Subscription order: dispatcher first (synchronous transition), runner
+ * second (reads updated state). Reverse-order shutdown so the runner
+ * stops accepting events before the dispatcher tears down.
  */
 export declare function setupBackgroundCompletionRunner(deps: SetupBackgroundCompletionRunnerDeps): BackgroundCompletionRunnerContext;

package/node_modules/@comis/daemon/dist/wiring/setup-background-completion-runner.js

@@ -1,24 +1,41 @@
 // SPDX-License-Identifier: Apache-2.0
 /**
- * Background completion runner wiring for daemon startup.
+ * Background completion dispatcher + runner wiring for daemon startup.
  *
- * Subscribes the runner to background_task:{completed,failed} events after
- * the notification service has been wired (so fallbackNotifyFn is live),
- * and returns a shutdown handle for the daemon's system:shutdown sequence
- * to await before tearing down the executor.
+ * Subscribes the dispatcher BEFORE the runner so its synchronous
+ * `transitionDispatchState` runs first; the runner's handler then reads
+ * the updated `task.dispatchState` and skips when state is "notified"
+ * (the dispatcher already fired fallback). Subscription order matters
+ * because the event bus fires handlers in registration order; the
+ * dispatcher MUST come first.
  *
  * Per AGENTS §2.4: composition root + factories. This wiring lives in
- * @comis/daemon (composition root); the actual factory body is in
+ * @comis/daemon (composition root); the actual factory bodies live in
  * @comis/agent.
  *
  * @module
  */
-import { createBackgroundCompletionRunner, } from "@comis/agent";
+import { createBackgroundCompletionRunner, createCompletionDispatcher, } from "@comis/agent";
 /**
- * Wire the background completion runner from daemon-level dependencies.
+ * Wire the dispatcher + completion runner from daemon-level dependencies.
  * Call this AFTER setupNotifications so fallbackNotifyFn is wired.
+ *
+ * Subscription order: dispatcher first (synchronous transition), runner
+ * second (reads updated state). Reverse-order shutdown so the runner
+ * stops accepting events before the dispatcher tears down.
  */
 export function setupBackgroundCompletionRunner(deps) {
+    // Dispatcher subscribes FIRST so its synchronous transitionDispatchState
+    // runs before the runner's handler reads task.dispatchState within the
+    // same event-bus tick.
+    const dispatcher = createCompletionDispatcher({
+        eventBus: deps.eventBus,
+        sessionStore: deps.sessionStore,
+        taskManager: deps.taskManager,
+        fallbackNotifyFn: deps.fallbackNotifyFn,
+        maxBackgroundHops: deps.maxBackgroundHops,
+        logger: deps.logger,
+    });
     const runner = createBackgroundCompletionRunner({
         eventBus: deps.eventBus,
         getExecutor: deps.getExecutor,
@@ -28,5 +45,15 @@ export function setupBackgroundCompletionRunner(deps) {
         maxBackgroundHops: deps.maxBackgroundHops,
         logger: deps.logger,
     });
-    return { runner };
+    return {
+        runner: {
+            // Reverse-order shutdown: runner first (stops accepting events), then
+            // dispatcher (ensures the at-most-once gate is the last to tear down).
+            async shutdown() {
+                await runner.shutdown();
+                await dispatcher.shutdown();
+            },
+        },
+        dispatcher,
+    };
 }

package/node_modules/@comis/daemon/dist/wiring/setup-background-tasks.js

@@ -5,7 +5,7 @@
  * daemon runs, and starts periodic cleanup of stale completed/failed tasks.
  * @module
  */
-import { createBackgroundTaskManager } from "@comis/agent";
+import { createBackgroundTaskManager, TASK_DIR_NAME } from "@comis/agent";
 import { safePath } from "@comis/core";
 /**
  * Wire the background task subsystem from daemon-level dependencies.
@@ -24,7 +24,7 @@ import { safePath } from "@comis/core";
  */
 export function setupBackgroundTasks(deps) {
     const manager = createBackgroundTaskManager({
-        dataDir: safePath(deps.dataDir, "background-tasks"),
+        dataDir: safePath(deps.dataDir, TASK_DIR_NAME),
         eventBus: deps.eventBus,
         logger: deps.logger,
     });

package/node_modules/@comis/daemon/dist/wiring/setup-channels.d.ts

@@ -10,7 +10,7 @@
  */
 import type { AppContainer, ChannelPort, ChannelPluginPort, NormalizedMessage, SessionKey, TranscriptionPort, TTSPort, ImageAnalysisPort, FileExtractionPort, FileExtractionConfig, MemoryPort, QueueConfig } from "@comis/core";
 import type { ComisLogger } from "@comis/infra";
-import type { AgentExecutor, createSessionLifecycle, ActiveRunRegistry } from "@comis/agent";
+import type { AgentExecutor, createSessionLifecycle, ActiveRunRegistry, BackgroundSessionResolver } from "@comis/agent";
 import type { createSessionStore } from "@comis/memory";
 import { type CommandQueue } from "@comis/agent";
 import { type ChannelManager, type ApprovalNotifier } from "@comis/channels";
@@ -107,6 +107,13 @@ export interface ChannelsDeps {
     deliveryQueue?: import("@comis/core").DeliveryQueuePort;
     /** Optional active run registry for SDK-native steer+followup inbound routing */
     activeRunRegistry?: ActiveRunRegistry;
+    /**
+     * Optional composite-key resolver. Wired by the daemon as
+     * `createBackgroundSessionResolver({ activeRunRegistry })`; supersedes
+     * `activeRunRegistry.has/.get` for production lookups in the inbound
+     * pipeline.
+     */
+    sessionResolver?: BackgroundSessionResolver;
     /** RPC call dispatcher for /config chat commands (deferred dispatch -- safe to pass before wireDispatch). */
     rpcCall?: RpcCall;
     /** Optional callback for task extraction after successful agent execution (gated by config.scheduler.tasks.enabled). */
@@ -120,7 +127,7 @@ export interface ChannelsDeps {
     onMessageReceived?: (msg: NormalizedMessage, channelType: string) => void;
     /** Optional callback fired AFTER each successful inbound message processing. Used by post-processing state (e.g. notification session activity recording). */
     onMessageProcessed?: (msg: NormalizedMessage, channelType: string) => void;
-    /** Optional approval gate for /approve and /deny chat commands in inbound pipeline (APPR-CHAT). */
+    /** Optional approval gate for /approve and /deny chat commands in inbound pipeline. */
     approvalGate?: import("@comis/core").ApprovalGate;
     /** Per-agent PI session adapters for session stats/destroy in slash commands (CMD-WIRE). */
     piSessionAdapters?: Map<string, {

package/node_modules/@comis/daemon/dist/wiring/setup-channels.js

@@ -11,9 +11,8 @@
  */
 import { readdir, readFile, stat } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
-import { join } from "node:path";
 import { formatSessionKey, runWithContext, createDeliveryOrigin, safePath } from "@comis/core";
-import { createMessageRouter, createCommandQueue, createCommandHandler, parseSlashCommand, sanitizeAssistantResponse, resolveOperationModel, resolveProviderFamily, runMemoryReview } from "@comis/agent";
+import { createMessageRouter, createCommandQueue, createCommandHandler, parseSlashCommand, sanitizeAssistantResponse, resolveOperationModel, resolveProviderFamily, runMemoryReview, classifyError } from "@comis/agent";
 import { createChannelManager, createRetryEngine, createApprovalNotifier, deliverToChannel, filterResponse, } from "@comis/channels";
 import { RetryConfigSchema } from "@comis/core";
 import { shouldAutoTts, resolveOutputFormat, parseOutboundMedia, applyToolPolicy, } from "@comis/skills";
@@ -372,9 +371,10 @@ export async function setupChannels(deps) {
             logger.warn({ channelType: deliveryTarget.channelType, jobName, hint: "Ensure the target channel adapter is started", errorKind: "config" }, "No adapter found for job suspension notification");
             return;
         }
+        const classified = classifyError(lastError);
         const message = [
             `Scheduled task "${jobName}" was suspended after ${consecutiveErrors} consecutive failures.`,
-            `Last error: ${lastError.slice(0, 200)}`,
+            `Reason: ${classified.userMessage}`,
             `Re-enable with /cron enable ${jobId}`,
         ].join("\n");
         try {
@@ -464,6 +464,7 @@ export async function setupChannels(deps) {
             voiceResponsePipeline,
             parseOutboundMedia,
             activeRunRegistry: deps.activeRunRegistry,
+            sessionResolver: deps.sessionResolver,
             queueConfig: deps.queueConfig,
             getElevatedReplyConfig: (agentId) => {
                 const agentConfig = agents[agentId];
@@ -517,8 +518,13 @@ export async function setupChannels(deps) {
                         return;
                     }
                     let graphDir;
+                    // Two-step safePath composition matches the canonical daemon-wiring
+                    // pattern in setup-output-retention.ts. Both safePath calls throw on
+                    // traversal; the surrounding catch handles either failure with a
+                    // single operator-facing WARN.
                     try {
-                        graphDir = safePath(join(dataDir, "graph-runs"), graphId);
+                        const graphRunsDir = safePath(dataDir, "graph-runs");
+                        graphDir = safePath(graphRunsDir, graphId);
                     }
                     catch {
                         channelsLogger.warn({ graphId, hint: "Path traversal attempt in graphId", errorKind: "validation" }, "Graph report request rejected");
@@ -529,7 +535,7 @@ export async function setupChannels(deps) {
                         await stat(graphDir);
                     }
                     catch {
-                        channelsLogger.warn({ graphId, graphDir, hint: "Graph run directory not found", errorKind: "not_found" }, "Graph report directory missing");
+                        channelsLogger.warn({ graphId, graphDir, hint: "Graph run directory not found", errorKind: "validation" }, "Graph report directory missing");
                         await adapter.sendMessage(channelId, "Report not available \u2014 graph run data not found.", threadId ? { extra: { threadId } } : undefined);
                         return;
                     }
@@ -543,7 +549,7 @@ export async function setupChannels(deps) {
                     // Try to identify leaf nodes from metadata
                     let leafOutputFile;
                     try {
-                        const metadataRaw = await readFile(join(graphDir, "_run-metadata.json"), "utf8");
+                        const metadataRaw = await readFile(safePath(graphDir, "_run-metadata.json"), "utf8");
                         const metadata = JSON.parse(metadataRaw);
                         const completedNodes = Object.entries(metadata.nodes)
                             .filter(([, v]) => v.status === "completed")
@@ -553,7 +559,7 @@ export async function setupChannels(deps) {
                         for (const f of outputFiles) {
                             const nodeId = f.replace(/-output\.md$/, "");
                             if (completedNodes.includes(nodeId)) {
-                                const fileStat = await stat(join(graphDir, f));
+                                const fileStat = await stat(safePath(graphDir, f));
                                 if (fileStat.size > maxSize) {
                                     maxSize = fileStat.size;
                                     leafOutputFile = f;
@@ -568,7 +574,7 @@ export async function setupChannels(deps) {
                         // Fallback: pick largest output file
                         let maxSize = 0;
                         for (const f of outputFiles) {
-                            const fileStat = await stat(join(graphDir, f));
+                            const fileStat = await stat(safePath(graphDir, f));
                             if (fileStat.size > maxSize) {
                                 maxSize = fileStat.size;
                                 leafOutputFile = f;
@@ -579,7 +585,7 @@ export async function setupChannels(deps) {
                         await adapter.sendMessage(channelId, "Report not available \u2014 could not identify output file.", threadId ? { extra: { threadId } } : undefined);
                         return;
                     }
-                    const filePath = join(graphDir, leafOutputFile);
+                    const filePath = safePath(graphDir, leafOutputFile);
                     const nodeId = leafOutputFile.replace(/-output\.md$/, "");
                     const caption = `Full report \u2014 ${nodeId} (graph ${graphId.slice(0, 8)})`;
                     await adapter.sendAttachment(channelId, {

package/node_modules/@comis/daemon/dist/wiring/setup-cross-session.d.ts

@@ -1,9 +1,9 @@
 /**
  * Cross-session messaging setup: cross-session sender and sub-agent runner.
- * Extracted from daemon.ts step 6.6.9 to isolate cross-session service
- * creation from the main wiring sequence. The three callback closures
- * (executeInSession, sendToChannel, executeSubAgent) are built internally
- * from injected dependencies (assembleToolsForAgent, getExecutor, adaptersByType).
+ * Isolates cross-session service creation from the main wiring sequence.
+ * The three callback closures (executeInSession, sendToChannel,
+ * executeSubAgent) are built internally from injected dependencies
+ * (assembleToolsForAgent, getExecutor, adaptersByType).
  * @module
  */
 import type { SessionKey } from "@comis/core";
@@ -14,7 +14,7 @@ import { createCrossSessionSender } from "../cross-session-sender.js";
 import { createSubAgentRunner } from "../sub-agent-runner.js";
 import { createAnnouncementBatcher } from "../announcement-batcher.js";
 import { createAnnouncementDeadLetterQueue } from "../announcement-dead-letter.js";
-/** All services produced by the cross-session messaging setup phase. */
+/** All services produced by the cross-session messaging setup. */
 export interface CrossSessionResult {
     /** Cross-session message sender for agent-to-agent communication. */
     crossSessionSender: ReturnType<typeof createCrossSessionSender>;
@@ -103,6 +103,21 @@ export declare function setupCrossSession(deps: {
             abort(): Promise<void>;
         } | undefined;
     };
+    /**
+     * Optional composite-key resolver. Threaded into sub-agent-runner so abort
+     * paths use `(agentId, channelType, channelId)` instead of a single-arg
+     * formatted-key lookup. Daemon builds it via
+     * `createBackgroundSessionResolver({activeRunRegistry})`.
+     */
+    sessionResolver?: {
+        resolveActiveSession(key: {
+            agentId: string;
+            channelType: string;
+            channelId: string;
+        }): {
+            abort(): Promise<void>;
+        } | undefined;
+    };
     /** Delivery queue for crash-safe persistence */
     deliveryQueue?: import("@comis/core").DeliveryQueuePort;
 }): CrossSessionResult;