comisai 1.0.34 → 1.0.37

package/node_modules/@comis/agent/dist/workspace/data-env.js

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * Workspace-internal data env resolver.
+ *
+ * Returns environment variables for python/matplotlib subprocesses that
+ * derive ALL paths from `workspaceDir`. Avoids slow pip installs in the
+ * chart hot path and matplotlib Fontconfig errors from a non-writable
+ * default cache dir.
+ *
+ * This file contains no host-env reads. Subprocesses inheriting the
+ * daemon's full environment can pick up host paths (e.g.
+ * `/root/.cache/matplotlib`) that fail under read-only systemd hardening
+ * (`ProtectSystem=strict`) and leak host PATH into the agent's tool
+ * execution.
+ *
+ * matplotlib + python deps install into the agent workspace's `venv/`.
+ * The Dockerfile pre-warms the default workspace's venv at image build
+ * time so first-chart latency drops; subsequent chart calls reuse the
+ * venv. Full Docker image size goes up (acceptable trade-off).
+ *
+ * Mirrors workspace-resolver.ts's safePath + workspaceDir precedent
+ * (no path.join, no host-env reads).
+ *
+ * @module
+ */
+import { safePath } from "@comis/core";
+/**
+ * Resolve workspace-internal env vars for python/matplotlib subprocesses.
+ *
+ * The returned record is intended to be MERGED over an existing subprocess
+ * env at the call site (e.g. exec-tool's `{ ...baseEnv, ...resolveDataEnv(...) }`),
+ * so the workspace-internal values win on collision and the host PATH /
+ * cache dirs are not surfaced inside the subprocess.
+ *
+ * @param opts.workspaceDir - Absolute path to the agent workspace.
+ * @returns env-var record suitable for `child_process.spawn(..., { env })`.
+ */
+export function resolveDataEnv(opts) {
+    const venvBin = safePath(opts.workspaceDir, "venv", "bin");
+    const cacheDir = safePath(opts.workspaceDir, ".cache");
+    const mplDir = safePath(cacheDir, "matplotlib");
+    return {
+        // Python venv binaries on PATH (no host-PATH pollution).
+        PATH: venvBin,
+        // matplotlib config + cache dir (writable, workspace-internal).
+        MPLCONFIGDIR: mplDir,
+        // XDG cache spec -- fontconfig + other libs honor this.
+        XDG_CACHE_HOME: cacheDir,
+        // Force matplotlib to use a non-interactive backend (avoids
+        // Tkinter / X11 dependencies that would bloat the container image
+        // and otherwise crash on headless containers).
+        MPLBACKEND: "Agg",
+        // Disable pip's distrust of the (workspace-internal) venv path.
+        PIP_DISABLE_PIP_VERSION_CHECK: "1",
+    };
+}

package/node_modules/@comis/agent/dist/workspace/index.d.ts

@@ -1,6 +1,7 @@
 export { ensureWorkspace, getWorkspaceStatus, registerWorkspaceFilesInTracker, WORKSPACE_SUBDIRS, } from "./workspace-manager.js";
 export type { WorkspaceFiles, EnsureWorkspaceOptions, WorkspaceStatus, WorkspaceSeedTracker, RegisterWorkspaceResult, } from "./workspace-manager.js";
 export { resolveWorkspaceDir } from "./workspace-resolver.js";
+export { resolveDataEnv } from "./data-env.js";
 export { WORKSPACE_FILE_NAMES, DEFAULT_TEMPLATES } from "./templates.js";
 export type { WorkspaceFileName } from "./templates.js";
 export { isHeartbeatContentEffectivelyEmpty } from "./heartbeat-file.js";

package/node_modules/@comis/agent/dist/workspace/index.js

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 export { ensureWorkspace, getWorkspaceStatus, registerWorkspaceFilesInTracker, WORKSPACE_SUBDIRS, } from "./workspace-manager.js";
 export { resolveWorkspaceDir } from "./workspace-resolver.js";
+export { resolveDataEnv } from "./data-env.js";
 export { WORKSPACE_FILE_NAMES, DEFAULT_TEMPLATES } from "./templates.js";
 export { isHeartbeatContentEffectivelyEmpty } from "./heartbeat-file.js";
 export { isBootContentEffectivelyEmpty, BOOT_FILE_NAME } from "./boot-file.js";

package/node_modules/@comis/agent/dist/workspace/templates.js

@@ -203,7 +203,11 @@ Capture what matters. The system persists it automatically.
 ## Workspace Organization
 
 \`\`\`
-projects/    -- Code repos (each in its own subfolder, venvs inside as .venv)
+projects/    -- Code repos (each in its own subfolder, .venv per repo)
+venv/        -- Pre-warmed Python env (matplotlib, numpy, pandas on PATH).
+                Use venv/bin/python for chart/data work; venv/bin/pip
+                install <pkg> for extras. Per-project venvs go inside
+                projects/<name>/.venv (separate lifecycle).
 scripts/     -- Standalone reusable scripts
 documents/   -- Text docs, PDFs, spreadsheets, markdown
 media/       -- User-provided images, audio, video

package/node_modules/@comis/agent/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/agent",
   "private": true,
-  "version": "1.0.34",
+  "version": "1.0.37",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "AI agent executor, budget control, and session management for Comis",

package/node_modules/@comis/channels/dist/email/email-adapter.js

@@ -81,12 +81,12 @@ export function createEmailAdapter(deps) {
             const fromAddress = parsed.from?.value[0]?.address ?? "";
             // Skip automated senders
             if (isAutomatedSender(headers, fromAddress)) {
-                deps.logger.debug({ channelType, module: "email", fromAddress }, "Skipping automated sender");
+                deps.logger.debug({ channelType, submodule: "email", fromAddress }, "Skipping automated sender");
                 return;
             }
             // Sender allowlist
             if (!isAllowedSender(fromAddress, deps.allowFrom, deps.allowMode)) {
-                deps.logger.debug({ channelType, module: "email", fromAddress }, "Sender not in allowlist, skipping");
+                deps.logger.debug({ channelType, submodule: "email", fromAddress }, "Sender not in allowlist, skipping");
                 return;
             }
             // Map to NormalizedMessage — adapt mailparser's ParsedMail to our structural type
@@ -108,7 +108,7 @@ export function createEmailAdapter(deps) {
             }
         }
         catch (e) {
-            deps.logger.warn({ err: e, channelType, module: "email", hint: "Failed to process inbound email", errorKind: "parse" }, "Inbound email processing failed");
+            deps.logger.warn({ err: e, channelType, submodule: "email", hint: "Failed to process inbound email", errorKind: "parse" }, "Inbound email processing failed");
         }
     });
     // -----------------------------------------------------------------------
@@ -126,7 +126,7 @@ export function createEmailAdapter(deps) {
         const result = await imapLifecycle.start();
         if (result.ok) {
             connected = true;
-            deps.logger.info({ channelType, module: "email", channelId }, "Email adapter started");
+            deps.logger.info({ channelType, submodule: "email", channelId }, "Email adapter started");
         }
         return result;
     }
@@ -139,7 +139,7 @@ export function createEmailAdapter(deps) {
             transport.close();
             transport = undefined;
         }
-        deps.logger.info({ channelType, module: "email", channelId }, "Email adapter stopped");
+        deps.logger.info({ channelType, submodule: "email", channelId }, "Email adapter stopped");
         return imapResult;
     }
     async function sendMessage(recipient, text, options) {
@@ -172,7 +172,7 @@ export function createEmailAdapter(deps) {
             const error = mailResult.error instanceof Error
                 ? mailResult.error
                 : new Error(String(mailResult.error));
-            deps.logger.error({ err: error, channelType, module: "email", hint: "Check SMTP credentials and host", errorKind: "network" }, "Failed to send email");
+            deps.logger.error({ err: error, channelType, submodule: "email", hint: "Check SMTP credentials and host", errorKind: "network" }, "Failed to send email");
             return err(error);
         }
         const messageId = mailResult.value.messageId ?? "";

package/node_modules/@comis/channels/dist/email/imap-lifecycle.js

@@ -80,7 +80,7 @@ export function createImapLifecycle(opts) {
             }
         }
         catch (e) {
-            opts.logger.warn({ err: e, channelType: "email", module: "imap", hint: "Fetch failed, will retry on next event", errorKind: "network" }, "Failed to fetch new messages");
+            opts.logger.warn({ err: e, channelType: "email", submodule: "imap", hint: "Fetch failed, will retry on next event", errorKind: "network" }, "Failed to fetch new messages");
         }
     }
     function scheduleReconnect() {
@@ -89,7 +89,7 @@ export function createImapLifecycle(opts) {
         // Add jitter: random 0-500ms
         const jitter = Math.floor(Math.random() * 500);
         const delay = reconnectDelay + jitter;
-        opts.logger.info({ channelType: "email", module: "imap", delayMs: delay }, "Scheduling IMAP reconnect");
+        opts.logger.info({ channelType: "email", submodule: "imap", delayMs: delay }, "Scheduling IMAP reconnect");
         reconnectTimer = setTimeout(() => {
             if (stopped)
                 return;
@@ -109,20 +109,20 @@ export function createImapLifecycle(opts) {
         });
         client.on("close", () => {
             if (!stopped) {
-                opts.logger.info({ channelType: "email", module: "imap" }, "IMAP connection closed, scheduling reconnect");
+                opts.logger.info({ channelType: "email", submodule: "imap" }, "IMAP connection closed, scheduling reconnect");
                 scheduleReconnect();
             }
         });
         client.on("error", (e) => {
             // Check if this is an IDLE-related error for polling fallback
             if (e.message && /idle/i.test(e.message)) {
-                opts.logger.warn({ channelType: "email", module: "imap", hint: "Falling back to polling", errorKind: "capability" }, "IDLE not supported, switching to polling fallback");
+                opts.logger.warn({ channelType: "email", submodule: "imap", hint: "Falling back to polling", errorKind: "capability" }, "IDLE not supported, switching to polling fallback");
                 startPolling();
             }
         });
         const connectResult = await fromPromise(client.connect());
         if (!connectResult.ok) {
-            opts.logger.error({ err: connectResult.error, channelType: "email", module: "imap", hint: "Check IMAP credentials and host", errorKind: "network" }, "IMAP connection failed");
+            opts.logger.error({ err: connectResult.error, channelType: "email", submodule: "imap", hint: "Check IMAP credentials and host", errorKind: "network" }, "IMAP connection failed");
             scheduleReconnect();
             return err(connectResult.error instanceof Error ? connectResult.error : new Error(String(connectResult.error)));
         }
@@ -135,11 +135,11 @@ export function createImapLifecycle(opts) {
         }, STABLE_CONNECTION_MS + 1000);
         const lockResult = await fromPromise(client.getMailboxLock("INBOX"));
         if (!lockResult.ok) {
-            opts.logger.error({ err: lockResult.error, channelType: "email", module: "imap", hint: "Could not lock INBOX", errorKind: "network" }, "Failed to get INBOX lock");
+            opts.logger.error({ err: lockResult.error, channelType: "email", submodule: "imap", hint: "Could not lock INBOX", errorKind: "network" }, "Failed to get INBOX lock");
             return err(lockResult.error instanceof Error ? lockResult.error : new Error(String(lockResult.error)));
         }
         lock = lockResult.value;
-        opts.logger.info({ channelType: "email", module: "imap", host: opts.host }, "IMAP connected and listening");
+        opts.logger.info({ channelType: "email", submodule: "imap", host: opts.host }, "IMAP connected and listening");
         return ok(undefined);
     }
     function startPolling() {

package/node_modules/@comis/channels/dist/index.d.ts

@@ -99,7 +99,7 @@ export { evaluateAutoReply, isGroupMessage, isBotMentioned } from "./shared/auto
 export type { AutoReplyDecision } from "./shared/auto-reply-engine.js";
 export { audioPreflight } from "./shared/audio-preflight.js";
 export type { PreflightResult, PreflightDeps } from "./shared/audio-preflight.js";
-export { filterResponse, NO_REPLY_TOKEN } from "./shared/response-filter.js";
+export { filterResponse, NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN } from "./shared/response-filter.js";
 export type { FilterResult } from "./shared/response-filter.js";
 export { mimeToAttachmentType } from "./shared/media-utils.js";
 export { normalizeTelegramPollResult, normalizeDiscordPollResult, normalizeWhatsAppPollResult, } from "./shared/poll-normalizer.js";

package/node_modules/@comis/channels/dist/index.js

@@ -91,7 +91,7 @@ export { evaluateAutoReply, isGroupMessage, isBotMentioned } from "./shared/auto
 // Audio preflight
 export { audioPreflight } from "./shared/audio-preflight.js";
 // Response filter (NO_REPLY + HEARTBEAT_OK token suppression)
-export { filterResponse, NO_REPLY_TOKEN } from "./shared/response-filter.js";
+export { filterResponse, NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN } from "./shared/response-filter.js";
 // Media utilities (shared attachment type resolution)
 export { mimeToAttachmentType } from "./shared/media-utils.js";
 // Poll result normalizers (cross-platform)

package/node_modules/@comis/channels/dist/shared/channel-manager.d.ts

@@ -22,7 +22,7 @@ import type { DebounceBuffer } from "@comis/agent";
 import type { FollowupTrigger } from "@comis/agent";
 import type { PriorityScheduler } from "@comis/agent";
 import type { SessionLabelStore } from "@comis/agent";
-import type { ActiveRunRegistry } from "@comis/agent";
+import type { ActiveRunRegistry, BackgroundSessionResolver } from "@comis/agent";
 import type { ChannelPort, DeliveryQueuePort, NormalizedMessage, SessionKey, TypedEventBus } from "@comis/core";
 import type { StreamingConfig } from "@comis/core";
 import type { AutoReplyEngineConfig, SendPolicyConfig, QueueConfig, ElevatedReplyConfig, AckReactionConfig } from "@comis/core";
@@ -126,6 +126,12 @@ export interface ChannelManagerDeps {
     }, Error>>;
     /** Optional active run registry for SDK-native steer+followup message routing. When absent, all messages route through CommandQueue. */
     activeRunRegistry?: ActiveRunRegistry;
+    /**
+     * Optional composite-key resolver. When present, supersedes
+     * `activeRunRegistry.has/.get` for production lookups in the inbound
+     * pipeline.
+     */
+    sessionResolver?: BackgroundSessionResolver;
     /** Handle /config command. Returns response text or undefined if not a config command. */
     handleConfigCommand?: (args: string[], channelType: string) => Promise<string | undefined>;
     /** Optional callback for task extraction after successful agent execution. */
@@ -151,9 +157,9 @@ export interface ChannelManagerDeps {
     };
     /** Template context builder for response prefix variables. */
     buildTemplateContext?: (agentId: string, channelType: string, msg: NormalizedMessage) => Record<string, string>;
-    /** Optional approval gate for /approve and /deny chat commands (APPR-CHAT). When absent, approval commands pass through as plain text. */
+    /** Optional approval gate for /approve and /deny chat commands. When absent, approval commands pass through as plain text. */
     approvalGate?: InboundPipelineDeps["approvalGate"];
-    /** Handle general slash commands via command handler (CMD-WIRE). */
+    /** Handle general slash commands via command handler. */
     handleSlashCommand?: InboundPipelineDeps["handleSlashCommand"];
     /** Per-agent enforceFinalTag config lookup. */
     getEnforceFinalTag?: InboundPipelineDeps["getEnforceFinalTag"];

package/node_modules/@comis/channels/dist/shared/deliver-to-channel.js

@@ -302,10 +302,17 @@ export async function deliverToChannel(adapter, channelId, text, options, deps)
                 if (Object.keys(rest).length > 0)
                     sendOpts.extra = rest;
             }
-            // --- Queue: enqueue before send ---
+            // --- Queue: enqueue (in_flight lease) before send ---
+            // We insert with status='in_flight' so the recurring drainer's
+            // `WHERE status='pending'` filter does NOT race-pick this row mid-send.
+            // On successful send, ack flips
+            // 'in_flight' -> 'delivered'; on permanent failure, fail flips
+            // 'in_flight' -> 'failed'; on transient failure, nack flips
+            // 'in_flight' -> 'pending' for the drainer to retry. All ack/nack/fail
+            // statements are status-agnostic UPDATE-by-id, so no SQL change is needed.
             let entryId = null;
             if (deps?.deliveryQueue) {
-                const enqueueResult = await deps.deliveryQueue.enqueue({
+                const enqueueResult = await deps.deliveryQueue.enqueueInFlight({
                     text: chunk,
                     channelType: adapter.channelType,
                     channelId,
@@ -322,14 +329,9 @@ export async function deliverToChannel(adapter, channelId, text, options, deps)
                 });
                 if (enqueueResult.ok) {
                     entryId = enqueueResult.value;
-                    // Emit delivery:enqueued event
-                    deps.eventBus?.emit("delivery:enqueued", {
-                        entryId,
-                        channelId,
-                        channelType: adapter.channelType,
-                        origin: options?.origin ?? "unknown",
-                        timestamp: Date.now(),
-                    });
+                    // delivery:enqueued is now emitted by the adapter (SqliteDeliveryQueueAdapter
+                    // emits inside enqueueInFlight after the INSERT succeeds -- single source of
+                    // truth). No-op here.
                 }
                 // If enqueue fails, log and continue -- queue failure should not block delivery
             }

package/node_modules/@comis/channels/dist/shared/inbound-gate.d.ts

@@ -12,7 +12,7 @@ import type { ChannelPort, NormalizedMessage, SessionKey } from "@comis/core";
 import type { InboundPipelineDeps } from "./inbound-pipeline.js";
 import type { SendOverrideStore } from "./send-policy.js";
 /** Minimal deps needed for the gate phase. */
-export type GateDeps = Pick<InboundPipelineDeps, "logger" | "eventBus" | "sessionManager" | "autoReplyEngineConfig" | "groupHistoryBuffer" | "commandQueue" | "sessionLabelStore" | "getResetTriggers" | "greetingGenerator" | "loadPromptSkill" | "getUserInvocableSkillNames" | "approvalGate" | "handleConfigCommand" | "handleSlashCommand" | "activeRunRegistry">;
+export type GateDeps = Pick<InboundPipelineDeps, "logger" | "eventBus" | "sessionManager" | "autoReplyEngineConfig" | "groupHistoryBuffer" | "commandQueue" | "sessionLabelStore" | "getResetTriggers" | "greetingGenerator" | "loadPromptSkill" | "getUserInvocableSkillNames" | "approvalGate" | "handleConfigCommand" | "handleSlashCommand" | "activeRunRegistry" | "sessionResolver">;
 /** Gate decision: what should happen with this message. */
 export type GateDecision = {
     action: "process";

package/node_modules/@comis/channels/dist/shared/inbound-gate.js

@@ -152,7 +152,7 @@ export async function evaluateInboundGate(deps, adapter, processedMsg, sessionKe
         }
     }
     // -------------------------------------------------------------------
-    // /approve and /deny COMMAND INTERCEPTION (APPR-CHAT)
+    // /approve and /deny COMMAND INTERCEPTION
     // -------------------------------------------------------------------
     if (msg.text && deps.approvalGate) {
         const result = await handleApprovalCommand(deps, adapter, msg, sessionKey);
@@ -178,8 +178,15 @@ export async function evaluateInboundGate(deps, adapter, processedMsg, sessionKe
     if (msg.text) {
         const stopParsed = parseSlashCommand(msg.text);
         if (stopParsed.found && stopParsed.command === "stop") {
+            // Active-session lookup goes through the composite-key resolver.
+            // `formattedKey` is retained as a diagnostic log field so
+            // operators can correlate /stop-aborts with session traces.
             const formattedKey = formatSessionKey(sessionKey);
-            const runHandle = deps.activeRunRegistry?.get(formattedKey);
+            const runHandle = deps.sessionResolver?.resolveActiveSession({
+                agentId,
+                channelType: adapter.channelType,
+                channelId: msg.channelId,
+            });
             if (runHandle) {
                 try {
                     await runHandle.abort();
@@ -209,7 +216,7 @@ export async function evaluateInboundGate(deps, adapter, processedMsg, sessionKe
         }
     }
     // -------------------------------------------------------------------
-    // GENERAL SLASH COMMAND INTERCEPTION (CMD-WIRE)
+    // GENERAL SLASH COMMAND INTERCEPTION
     // -------------------------------------------------------------------
     if (msg.text && deps.handleSlashCommand) {
         const cmdResult = await deps.handleSlashCommand(msg.text, sessionKey, agentId);
@@ -294,7 +301,7 @@ export async function evaluateInboundGate(deps, adapter, processedMsg, sessionKe
             }
         }
     }
-    // Extract command directives from metadata (set by CMD-WIRE interception above)
+    // Extract command directives from metadata (set by general slash command interception above)
     const directives = msg.metadata?._commandDirectives;
     return { action: "process", processedMsg: msg, directives };
 }
@@ -353,13 +360,21 @@ async function handleApprovalCommand(deps, adapter, msg, sessionKey) {
             }
         }
         else {
-            // Single: resolve by request ID prefix match
+            // Single: resolve by request ID prefix match.
+            // Use filter+length check instead of first-match lookup — when the
+            // prefix is short and two pending requests share it, the operator
+            // must NOT silently get the first match. Warn and bail; the
+            // operator can re-issue with a longer prefix.
             const pending = gate.pending();
-            const match = pending.find((r) => r.requestId.startsWith(arg));
-            if (!match) {
+            const matches = pending.filter((r) => r.requestId.startsWith(arg));
+            if (matches.length === 0) {
                 await deliverToChannel(adapter, msg.channelId, `No pending approval found for ID: ${arg} (may have already been resolved or timed out).`, { skipChunking: true });
             }
+            else if (matches.length > 1) {
+                await deliverToChannel(adapter, msg.channelId, `Ambiguous prefix "${arg}" matches ${matches.length} pending approvals. Use a longer prefix.`, { skipChunking: true });
+            }
             else {
+                const match = matches[0];
                 gate.resolveApproval(match.requestId, isApprove, approvedBy);
                 const verb = isApprove ? "Approved" : "Denied";
                 await deliverToChannel(adapter, msg.channelId, `${verb}: ${match.toolName ?? match.action} (${match.requestId.slice(0, 8)})`, { skipChunking: true });

package/node_modules/@comis/channels/dist/shared/inbound-pipeline.d.ts

@@ -18,7 +18,7 @@ import type { DebounceBuffer } from "@comis/agent";
 import type { FollowupTrigger } from "@comis/agent";
 import type { PriorityScheduler } from "@comis/agent";
 import type { SessionLabelStore } from "@comis/agent";
-import type { ActiveRunRegistry } from "@comis/agent";
+import type { ActiveRunRegistry, BackgroundSessionResolver } from "@comis/agent";
 import type { ChannelPort, DeliveryQueuePort, NormalizedMessage, SessionKey, TypedEventBus } from "@comis/core";
 import type { StreamingConfig } from "@comis/core";
 import type { AutoReplyEngineConfig, SendPolicyConfig, QueueConfig, ElevatedReplyConfig, AckReactionConfig } from "@comis/core";
@@ -99,6 +99,13 @@ export interface InboundPipelineDeps {
     inFlightSends?: Set<Promise<unknown>>;
     /** Optional active run registry for SDK-native steer+followup. */
     activeRunRegistry?: ActiveRunRegistry;
+    /**
+     * Optional composite-key resolver for active-session lookup. When
+     * present, supersedes `activeRunRegistry.has/.get` for production
+     * lookups. Wired by the daemon as
+     * `createBackgroundSessionResolver({ activeRunRegistry })`.
+     */
+    sessionResolver?: BackgroundSessionResolver;
     /** Handle /config command. Returns response text or undefined if not a config command. */
     handleConfigCommand?: (args: string[], channelType: string) => Promise<string | undefined>;
     /** Optional callback for task extraction after successful agent execution. */
@@ -112,7 +119,7 @@ export interface InboundPipelineDeps {
     };
     /** Template context builder for response prefix variables. */
     buildTemplateContext?: (agentId: string, channelType: string, msg: NormalizedMessage) => Record<string, string>;
-    /** Optional approval gate for resolving /approve and /deny chat commands (APPR-CHAT). When absent, approval commands pass through as plain text. */
+    /** Optional approval gate for resolving /approve and /deny chat commands. When absent, approval commands pass through as plain text. */
     approvalGate?: {
         resolveApproval(requestId: string, approved: boolean, approvedBy: string, reason?: string): void;
         pending(): Array<{
@@ -126,7 +133,7 @@ export interface InboundPipelineDeps {
             sessionKey: string;
         } | undefined;
     };
-    /** Handle general slash commands via command handler (CMD-WIRE). Returns CommandResult or undefined if not a command. */
+    /** Handle general slash commands via command handler. Returns CommandResult or undefined if not a command. */
     handleSlashCommand?: (text: string, sessionKey: SessionKey, agentId: string) => Promise<{
         handled: boolean;
         response?: string;

package/node_modules/@comis/channels/dist/shared/inbound-route.d.ts

@@ -15,7 +15,7 @@ import type { BlockPacer } from "./block-pacer.js";
 import type { TypingLifecycleController } from "./typing-lifecycle-controller.js";
 import type { SendOverrideStore } from "./send-policy.js";
 /** Minimal deps needed for the routing phase. */
-export type RouteDeps = Pick<InboundPipelineDeps, "logger" | "eventBus" | "debounceBuffer" | "groupHistoryBuffer" | "sessionLabelStore" | "commandQueue" | "priorityScheduler" | "queueConfig" | "activeRunRegistry" | "streamingConfig" | "sendPolicyConfig" | "getElevatedReplyConfig" | "channelRegistry" | "retryEngine" | "deliveryQueue" | "inFlightSends" | "followupTrigger" | "followupConfig" | "assembleToolsForAgent" | "voiceResponsePipeline" | "parseOutboundMedia" | "outboundMediaFetch" | "onTaskExtraction" | "responsePrefixConfig" | "buildTemplateContext" | "getEnforceFinalTag">;
+export type RouteDeps = Pick<InboundPipelineDeps, "logger" | "eventBus" | "debounceBuffer" | "groupHistoryBuffer" | "sessionLabelStore" | "commandQueue" | "priorityScheduler" | "queueConfig" | "activeRunRegistry" | "sessionResolver" | "streamingConfig" | "sendPolicyConfig" | "getElevatedReplyConfig" | "channelRegistry" | "retryEngine" | "deliveryQueue" | "inFlightSends" | "followupTrigger" | "followupConfig" | "assembleToolsForAgent" | "voiceResponsePipeline" | "parseOutboundMedia" | "outboundMediaFetch" | "onTaskExtraction" | "responsePrefixConfig" | "buildTemplateContext" | "getEnforceFinalTag">;
 /**
  * Route an inbound message through debounce, group history, steer+followup,
  * or command queue. Falls back to direct execution when no queue is present.

package/node_modules/@comis/channels/dist/shared/inbound-route.js

@@ -120,12 +120,23 @@ export async function routeInboundMessage(deps, adapter, processedMsg, originalM
     // -------------------------------------------------------------------
     // STEER+FOLLOWUP ROUTING
     // -------------------------------------------------------------------
-    if (deps.activeRunRegistry && deps.queueConfig) {
+    // Active-session lookup goes through BackgroundSessionResolver:
+    // composite (agentId, channelType, channelId) supersedes the single-arg
+    // formatted-key lookup so multi-agent / multi-channel sessions are
+    // distinguishable. The original
+    // `formattedKey = formatSessionKey(sessionKey)` is retained ONLY for
+    // diagnostic log fields (the SessionKey may itself be richer than the
+    // resolver's composite triple).
+    if (deps.sessionResolver && deps.queueConfig) {
         const channelQueueConfig = deps.queueConfig.perChannel[adapter.channelType];
         const effectiveMode = channelQueueConfig?.mode ?? deps.queueConfig.defaultMode;
         if (effectiveMode === "steer+followup") {
             const formattedKey = formatSessionKey(sessionKey);
-            const runHandle = deps.activeRunRegistry.get(formattedKey);
+            const runHandle = deps.sessionResolver.resolveActiveSession({
+                agentId,
+                channelType: adapter.channelType,
+                channelId: msg.channelId,
+            });
             if (runHandle) {
                 const messageText = msg.text ?? "";
                 if (runHandle.isStreaming() && !runHandle.isCompacting()) {

package/node_modules/@comis/channels/dist/shared/response-filter.d.ts

@@ -2,40 +2,27 @@
  * Response Filter: Suppresses silent tokens and strips reply tags from
  * channel delivery.
  *
- * Detects NO_REPLY and HEARTBEAT_OK tokens in agent responses and
- * determines whether the response should be delivered to the user.
- * Only suppresses when the token is the ENTIRE response (after trimming
- * and stripping reply tags) or when the response is empty/whitespace.
- *
- * Also strips `<reply>` / `<reply to="...">` XML tags that the LLM uses
- * for channel routing, since these are not valid HTML for platform delivery.
- *
- * This filter operates in the channel-manager delivery path (outbound
- * to users), NOT in the scheduler's internal heartbeat classification
- * which uses HEARTBEAT_OK_TOKEN for a different purpose.
+ * Delegates the silent-token check to `isSilentResponse` from `@comis/shared` —
+ * the helper is documented as idempotent under `stripReplyTags + trim` (see
+ * `packages/shared/src/silent-tokens.ts` JSDoc contract).
  *
  * @module
  */
-/** Token that suppresses delivery for silent operations (e.g., memory flush) */
-export declare const NO_REPLY_TOKEN = "NO_REPLY";
-/** Result of filtering an agent response */
+import { NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN } from "@comis/shared";
+export { NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN };
+/** Regex retained for backward compatibility with downstream re-exports. */
+export declare const REPLY_TAG_RE: RegExp;
 export interface FilterResult {
-    /** Whether the response should be delivered to the user */
     shouldDeliver: boolean;
-    /** The cleaned response text (reply tags stripped, trimmed) */
     cleanedText: string;
-    /** Which token caused suppression (for observability) */
     suppressedBy?: "NO_REPLY" | "HEARTBEAT_OK" | "SILENT" | "empty";
 }
 /**
  * Check if an agent response should be delivered to the user.
  *
- * Processing order:
- * 1. Strip `<reply>` / `<reply to="...">` XML tags
- * 2. Trim whitespace
- * 3. Suppress if empty or exact silent token match
- *
- * Does NOT suppress when the token appears mid-sentence in
- * substantive content (e.g., "I used NO_REPLY in my example").
+ * The silent-token check delegates to `isSilentResponse(trimmed)` for
+ * self-documentation at the call site. The helper is idempotent under
+ * `stripReplyTags + trim`, so passing the already-stripped value is safe
+ * and explicit.
  */
 export declare function filterResponse(response: string): FilterResult;

package/node_modules/@comis/channels/dist/shared/response-filter.js

@@ -3,73 +3,45 @@
  * Response Filter: Suppresses silent tokens and strips reply tags from
  * channel delivery.
  *
- * Detects NO_REPLY and HEARTBEAT_OK tokens in agent responses and
- * determines whether the response should be delivered to the user.
- * Only suppresses when the token is the ENTIRE response (after trimming
- * and stripping reply tags) or when the response is empty/whitespace.
- *
- * Also strips `<reply>` / `<reply to="...">` XML tags that the LLM uses
- * for channel routing, since these are not valid HTML for platform delivery.
- *
- * This filter operates in the channel-manager delivery path (outbound
- * to users), NOT in the scheduler's internal heartbeat classification
- * which uses HEARTBEAT_OK_TOKEN for a different purpose.
+ * Delegates the silent-token check to `isSilentResponse` from `@comis/shared` —
+ * the helper is documented as idempotent under `stripReplyTags + trim` (see
+ * `packages/shared/src/silent-tokens.ts` JSDoc contract).
  *
  * @module
  */
-/** Token that suppresses delivery for silent operations (e.g., memory flush) */
-export const NO_REPLY_TOKEN = "NO_REPLY";
-/**
- * HEARTBEAT_OK token value. Defined as a string literal here (not imported
- * from @comis/scheduler) to avoid circular package dependencies.
- * Must match HEARTBEAT_OK_TOKEN in packages/scheduler/src/heartbeat/relevance-filter.ts.
- */
-const HEARTBEAT_OK_VALUE = "HEARTBEAT_OK";
-/** Tokens that suppress response delivery when they ARE the entire response */
-const SILENT_TOKENS = [NO_REPLY_TOKEN, HEARTBEAT_OK_VALUE];
-/** Regex to match `<reply>` or `<reply to="...">` opening tags and `</reply>` closing tags */
-const REPLY_TAG_RE = /<\/?reply(?:\s[^>]*)?>|<reply>/gi;
+import { isSilentResponse, stripReplyTags, NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN, } from "@comis/shared";
+// Preserve existing public exports for downstream @comis/channels consumers.
+export { NO_REPLY_TOKEN, HEARTBEAT_OK_TOKEN };
+/** Regex retained for backward compatibility with downstream re-exports. */
+export const REPLY_TAG_RE = /<\/?reply(?:\s[^>]*)?>|<reply>/gi;
 /**
  * Check if an agent response should be delivered to the user.
  *
- * Processing order:
- * 1. Strip `<reply>` / `<reply to="...">` XML tags
- * 2. Trim whitespace
- * 3. Suppress if empty or exact silent token match
- *
- * Does NOT suppress when the token appears mid-sentence in
- * substantive content (e.g., "I used NO_REPLY in my example").
+ * The silent-token check delegates to `isSilentResponse(trimmed)` for
+ * self-documentation at the call site. The helper is idempotent under
+ * `stripReplyTags + trim`, so passing the already-stripped value is safe
+ * and explicit.
  */
 export function filterResponse(response) {
-    // Empty or whitespace
     if (!response || !response.trim()) {
         return { shouldDeliver: false, cleanedText: "", suppressedBy: "empty" };
     }
-    // Strip <reply> / <reply to="..."> / </reply> tags
-    const stripped = response.replace(REPLY_TAG_RE, "");
-    const trimmed = stripped.trim();
-    // Empty after stripping tags
-    if (!trimmed) {
+    const trimmed = stripReplyTags(response);
+    if (!trimmed)
         return { shouldDeliver: false, cleanedText: "", suppressedBy: "empty" };
-    }
-    // [SILENT] prefix: suppress delivery when response starts with [SILENT] marker
+    // [SILENT] prefix branch — preserved verbatim from existing behavior.
+    // Resolves before the helper so we can return suppressedBy: "SILENT" cleanly.
     if (trimmed.toUpperCase().startsWith("[SILENT]")) {
-        return {
-            shouldDeliver: false,
-            cleanedText: "",
-            suppressedBy: "SILENT",
-        };
+        return { shouldDeliver: false, cleanedText: "", suppressedBy: "SILENT" };
     }
-    // Exact token match (entire response is the token)
-    for (const token of SILENT_TOKENS) {
-        if (trimmed === token) {
-            return {
-                shouldDeliver: false,
-                cleanedText: "",
-                suppressedBy: token === NO_REPLY_TOKEN ? "NO_REPLY" : "HEARTBEAT_OK",
-            };
-        }
+    // Pass the already-stripped value. isSilentResponse is documented as
+    // idempotent under stripReplyTags + trim (see silent-tokens.ts JSDoc).
+    // Self-documenting at the call site.
+    if (isSilentResponse(trimmed)) {
+        const tokenMatch = trimmed === NO_REPLY_TOKEN ? "NO_REPLY"
+            : trimmed === HEARTBEAT_OK_TOKEN ? "HEARTBEAT_OK"
+                : "SILENT";
+        return { shouldDeliver: false, cleanedText: "", suppressedBy: tokenMatch };
     }
-    // Substantive response -- deliver cleaned text
     return { shouldDeliver: true, cleanedText: trimmed };
 }

package/node_modules/@comis/channels/dist/telegram/telegram-adapter.js

@@ -318,7 +318,7 @@ export function createTelegramAdapter(deps) {
                     }, "Callback query failed");
                 }
             });
-            // Start polling (webhook mode deferred to Phase 6/9)
+            // Start polling (webhook mode deferred)
             if (!deps.webhookUrl) {
                 runnerHandle = run(bot);
             }