comisai 1.0.34 → 1.0.36

package/node_modules/@comis/agent/dist/model/operation-model-defaults.d.ts

@@ -12,9 +12,10 @@
  *    (because the old map was Anthropic/OpenAI/Google only).
  *
  * Tier picking: filter to text-capable models with non-zero cost, sort
- * ascending by total cost (input + output), pick 10th-percentile = `fast`,
- * 50th-percentile = `mid`. All-free-models providers (e.g. local Ollama,
- * Z.AI most models) fall back to "first text-capable id" for both slots.
+ * ascending by total cost (input + output), pick top-of-cohort (lex-greatest
+ * within the cost bucket) at the 10th-percentile = `fast`, 50th-percentile =
+ * `mid`. All-free-models providers (e.g. local Ollama, Z.AI most models)
+ * fall back to "first text-capable id" for both slots.
  *
  * @module
  */
@@ -32,7 +33,11 @@ import type { ModelOperationType } from "@comis/core";
  *   3. Filter to non-zero cost (eliminates free/local-only models from
  *      ranking — they won't be reachable in production).
  *   4. Sort ascending by total cost.
- *   5. `fast` = 10th percentile, `mid` = 50th percentile.
+ *   5. `fast` and `mid` are top-of-cohort at the 10th and 50th percentile
+ *      respectively (lex-greatest ID within the cost bucket the percentile
+ *      lands in). Cost ties broken by lex-greatest ID — avoids picking a
+ *      model purely because of catalog iteration order (e.g. 9 Anthropic
+ *      Sonnets all at $18/MTok).
  *   6. If post-filter set is empty (all-free provider), use the first
  *      text-capable model id for both slots.
  *

package/node_modules/@comis/agent/dist/model/operation-model-defaults.js

@@ -13,9 +13,10 @@
  *    (because the old map was Anthropic/OpenAI/Google only).
  *
  * Tier picking: filter to text-capable models with non-zero cost, sort
- * ascending by total cost (input + output), pick 10th-percentile = `fast`,
- * 50th-percentile = `mid`. All-free-models providers (e.g. local Ollama,
- * Z.AI most models) fall back to "first text-capable id" for both slots.
+ * ascending by total cost (input + output), pick top-of-cohort (lex-greatest
+ * within the cost bucket) at the 10th-percentile = `fast`, 50th-percentile =
+ * `mid`. All-free-models providers (e.g. local Ollama, Z.AI most models)
+ * fall back to "first text-capable id" for both slots.
  *
  * @module
  */
@@ -29,6 +30,31 @@ const _nativeProviderSet = new Set(getProviders());
 function totalCost(m) {
     return (m.cost?.input ?? 0) + (m.cost?.output ?? 0);
 }
+/**
+ * Pick the "top of cohort" model from a cost-ascending list.
+ *
+ * Identifies the cost bucket the given percentile lands in, then returns
+ * the lex-greatest ID within that bucket. Lex-greatest is a deterministic
+ * proxy for "newest/highest version" across the providers we ship — for
+ * dated IDs (YYYY-MM-DD, YYMM) and semver-ish IDs (claude-sonnet-4-6 >
+ * claude-sonnet-4-5) the lex order matches recency.
+ *
+ * Why not just take `sortedAsc[idx]`? JavaScript's stable sort preserves
+ * original-array order within a cost-tied block, so the previous algorithm
+ * picked whatever the catalog happened to enumerate first. With 9 priced
+ * Anthropic Sonnets all at $18/MTok, that was `claude-sonnet-4-5` — picked
+ * by accident, not by quality signal.
+ *
+ * Module-internal — not exported.
+ */
+function pickFromCohort(sortedAsc, percentile) {
+    if (sortedAsc.length === 0)
+        return undefined;
+    const idx = Math.min(sortedAsc.length - 1, Math.floor(sortedAsc.length * percentile));
+    const cohortCost = totalCost(sortedAsc[idx]);
+    const cohort = sortedAsc.filter((m) => totalCost(m) === cohortCost);
+    return [...cohort].sort((a, b) => b.id.localeCompare(a.id))[0]?.id;
+}
 /**
  * Resolve cost-tier model defaults for a given native pi-ai provider.
  *
@@ -42,7 +68,11 @@ function totalCost(m) {
  *   3. Filter to non-zero cost (eliminates free/local-only models from
  *      ranking — they won't be reachable in production).
  *   4. Sort ascending by total cost.
- *   5. `fast` = 10th percentile, `mid` = 50th percentile.
+ *   5. `fast` and `mid` are top-of-cohort at the 10th and 50th percentile
+ *      respectively (lex-greatest ID within the cost bucket the percentile
+ *      lands in). Cost ties broken by lex-greatest ID — avoids picking a
+ *      model purely because of catalog iteration order (e.g. 9 Anthropic
+ *      Sonnets all at $18/MTok).
  *   6. If post-filter set is empty (all-free provider), use the first
  *      text-capable model id for both slots.
  *
@@ -67,12 +97,9 @@ export function resolveOperationDefaults(provider) {
         const fallback = textCapable[0]?.id;
         return { fast: fallback, mid: fallback };
     }
-    // Math.min clamp guards single-element arrays (10% of 1 -> 0).
-    const fastIdx = Math.min(priced.length - 1, Math.floor(priced.length * 0.1));
-    const midIdx = Math.min(priced.length - 1, Math.floor(priced.length * 0.5));
     return {
-        fast: priced[fastIdx].id,
-        mid: priced[midIdx].id,
+        fast: pickFromCohort(priced, 0.1),
+        mid: pickFromCohort(priced, 0.5),
     };
 }
 // ---------------------------------------------------------------------------

package/node_modules/@comis/agent/dist/model/resolve-provider-api-key.d.ts

@@ -0,0 +1,48 @@
+/**
+ * resolveProviderApiKey: shared dispatch helper that routes OAuth-eligible
+ * providers through the OAuthTokenManager + AuthStorage.setRuntimeApiKey
+ * side-effect, and non-OAuth providers through the existing authStorage path.
+ *
+ * Single attachment surface for the per-LLM-call OAuth dispatch
+ * hook. Used by PiExecutor.execute() pre-hook (primary LLM call) and the two
+ * compaction getApiKey callbacks in executor-context-engine-setup.ts.
+ *
+ * Return shape is `Promise<string>` (NOT `Result<T,E>`) because the helper
+ * bridges Comis's Result-typed manager with pi-coding-agent's
+ * `AuthStorage.getApiKey` contract; the throw mirrors pi-coding-agent's own
+ * throw-on-failure shape. On OAuthError the helper propagates a thrown Error —
+ * no env-var fallback, no retry, no silent rotation. Outer callers
+ * (PiExecutor.execute, gateway routes) surface the throw to the user via their
+ * existing error-handling path.
+ *
+ * @module
+ */
+import type { AuthStorage } from "@mariozechner/pi-coding-agent";
+import type { PerAgentConfig } from "@comis/core";
+import type { OAuthTokenManager } from "./oauth-token-manager.js";
+/** Dependencies for the resolveProviderApiKey helper. */
+export interface ResolveProviderApiKeyDeps {
+    /** pi-coding-agent AuthStorage instance for non-OAuth providers and the
+     *  runtime-override target on the OAuth path. */
+    authStorage: AuthStorage;
+    /** OAuthTokenManager from auth-provider.ts. When undefined the helper
+     *  defensively falls through to authStorage even for OAuth-eligible
+     *  providers — matches the "OAuth wiring not yet provided" boot path. */
+    oauthManager?: OAuthTokenManager;
+    /** Per-agent config carrying optional `oauthProfiles` map. Forwarded to
+     *  `OAuthTokenManager.getApiKey` as the agentContext argument so the
+     *  manager's resolver chain (agent-config -> lastGood -> first available)
+     *  observes per-agent profile preference on every call. */
+    agentConfig?: PerAgentConfig;
+}
+/**
+ * Resolve the API key for a provider, routing OAuth-eligible providers
+ * through the OAuthTokenManager and writing the resolved token into
+ * pi-coding-agent's runtime-override Map via setRuntimeApiKey.
+ *
+ * @param providerId - The provider id (e.g. "openai-codex", "anthropic").
+ * @param deps - Dispatch dependencies (authStorage, optional oauthManager, optional agentConfig).
+ * @returns The API key string.
+ * @throws Error containing the OAuthError.message when manager.getApiKey returns err().
+ */
+export declare function resolveProviderApiKey(providerId: string, deps: ResolveProviderApiKeyDeps): Promise<string>;

package/node_modules/@comis/agent/dist/model/resolve-provider-api-key.js

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * resolveProviderApiKey: shared dispatch helper that routes OAuth-eligible
+ * providers through the OAuthTokenManager + AuthStorage.setRuntimeApiKey
+ * side-effect, and non-OAuth providers through the existing authStorage path.
+ *
+ * Single attachment surface for the per-LLM-call OAuth dispatch
+ * hook. Used by PiExecutor.execute() pre-hook (primary LLM call) and the two
+ * compaction getApiKey callbacks in executor-context-engine-setup.ts.
+ *
+ * Return shape is `Promise<string>` (NOT `Result<T,E>`) because the helper
+ * bridges Comis's Result-typed manager with pi-coding-agent's
+ * `AuthStorage.getApiKey` contract; the throw mirrors pi-coding-agent's own
+ * throw-on-failure shape. On OAuthError the helper propagates a thrown Error —
+ * no env-var fallback, no retry, no silent rotation. Outer callers
+ * (PiExecutor.execute, gateway routes) surface the throw to the user via their
+ * existing error-handling path.
+ *
+ * @module
+ */
+import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
+/**
+ * Resolve the API key for a provider, routing OAuth-eligible providers
+ * through the OAuthTokenManager and writing the resolved token into
+ * pi-coding-agent's runtime-override Map via setRuntimeApiKey.
+ *
+ * @param providerId - The provider id (e.g. "openai-codex", "anthropic").
+ * @param deps - Dispatch dependencies (authStorage, optional oauthManager, optional agentConfig).
+ * @returns The API key string.
+ * @throws Error containing the OAuthError.message when manager.getApiKey returns err().
+ */
+export async function resolveProviderApiKey(providerId, deps) {
+    const oauthProvider = getOAuthProvider(providerId);
+    if (oauthProvider && deps.oauthManager) {
+        const result = await deps.oauthManager.getApiKey(providerId, {
+            oauthProfiles: deps.agentConfig?.oauthProfiles,
+        });
+        if (result.ok) {
+            // setRuntimeApiKey carries the token into pi-coding-agent's outbound
+            // LLM request via the runtime-override priority path — runtime
+            // overrides take HIGHEST priority.
+            deps.authStorage.setRuntimeApiKey(providerId, result.value);
+            return result.value;
+        }
+        // Decide whether to fall back to the plain API-key path. Two conditions
+        // must hold:
+        //   1. The OAuth result is "no credentials anywhere" (NO_CREDENTIALS),
+        //      not a real failure (REFRESH_FAILED, STORE_FAILED, …) which we
+        //      propagate fail-loud.
+        //   2. The agent did NOT explicitly request an OAuth profile via
+        //      `oauthProfiles[providerId]`. An explicit profile request that the
+        //      store cannot satisfy is a real failure — never silently fall back
+        //      to a different key (security keystone).
+        const noCredentials = result.error.code === "NO_CREDENTIALS";
+        const requestedProfile = deps.agentConfig?.oauthProfiles?.[providerId];
+        if (!noCredentials || requestedProfile !== undefined) {
+            // Propagate as throw — outer callers (PiExecutor.execute, gateway
+            // routes) lift the throw into a user-facing error result.
+            throw new Error(result.error.message);
+        }
+        // Fall through to authStorage — providers like anthropic accept both
+        // OAuth and direct API keys; without an OAuth profile, the plain key
+        // (ANTHROPIC_API_KEY etc.) is the valid path.
+    }
+    return (await deps.authStorage.getApiKey(providerId)) ?? "";
+}

package/node_modules/@comis/agent/dist/provider/capabilities.d.ts

@@ -4,7 +4,7 @@
  * Resolution order:
  *   1. DEFAULTS -- complete ProviderCapabilities with safe fallback values
  *   2. PROVIDER_OVERRIDES[normalizeProviderId(provider)] -- built-in overrides
- *      for known providers (12 entries covering Anthropic, OpenAI, Google, Mistral)
+ *      for known providers (8 entries covering Anthropic, OpenAI, Google, Mistral)
  *   3. userOverrides -- user-supplied config from YAML `providers.entries.*.capabilities`
  *
  * Providers NOT in PROVIDER_OVERRIDES (cerebras, groq, xai, etc.) get clean
@@ -35,23 +35,23 @@ export declare function normalizeProviderId(provider: string): string;
 export declare function resolveProviderCapabilities(provider: string, userOverrides?: Partial<ProviderCapabilities>): ProviderCapabilities;
 /**
  * Check if a provider belongs to the Anthropic family.
- * True for: anthropic, anthropic-vertex, amazon-bedrock (and their aliases).
+ * True for: anthropic, amazon-bedrock (and their aliases).
  */
 export declare function isAnthropicFamily(provider: string): boolean;
 /**
  * Check if a provider belongs to the OpenAI family.
- * True for: openai, azure-openai, azure-openai-responses, openai-codex (and their aliases).
+ * True for: openai, azure-openai-responses, openai-codex (and their aliases).
  */
 export declare function isOpenAiFamily(provider: string): boolean;
 /**
  * Check if a provider belongs to the Google family.
- * True for: google, google-gemini-cli, google-antigravity, google-vertex (and their aliases).
+ * True for: google, google-vertex (and their aliases).
  */
 export declare function isGoogleFamily(provider: string): boolean;
 /**
  * Check if a provider is Google AI Studio (api.google.dev, NOT Vertex AI).
  * True for: "google" only (and aliases: "gcp", "gemini").
- * Excludes: google-vertex, google-gemini-cli, google-antigravity.
+ * Excludes: google-vertex.
  *
  * Only Google AI Studio supports the Caches API used by GeminiCacheManager.
  */

package/node_modules/@comis/agent/dist/provider/capabilities.js

@@ -5,7 +5,7 @@
  * Resolution order:
  *   1. DEFAULTS -- complete ProviderCapabilities with safe fallback values
  *   2. PROVIDER_OVERRIDES[normalizeProviderId(provider)] -- built-in overrides
- *      for known providers (12 entries covering Anthropic, OpenAI, Google, Mistral)
+ *      for known providers (8 entries covering Anthropic, OpenAI, Google, Mistral)
  *   3. userOverrides -- user-supplied config from YAML `providers.entries.*.capabilities`
  *
  * Providers NOT in PROVIDER_OVERRIDES (cerebras, groq, xai, etc.) get clean
@@ -27,10 +27,10 @@ export const DEFAULTS = {
 /**
  * Built-in overrides for providers that differ from DEFAULTS.
  *
- * 12 entries covering:
- * - Anthropic family (3): anthropic, anthropic-vertex, amazon-bedrock
- * - OpenAI family (4): openai, azure-openai, azure-openai-responses, openai-codex
- * - Google family (4): google, google-gemini-cli, google-antigravity, google-vertex
+ * 8 entries covering:
+ * - Anthropic family (2): anthropic, amazon-bedrock
+ * - OpenAI family (3): openai, azure-openai-responses, openai-codex
+ * - Google family (2): google, google-vertex
  * - Mistral (1): strict9 tool call ID mode with 7 model hints
  *
  * Providers NOT in this map fall through to DEFAULTS via spread.
@@ -38,17 +38,13 @@ export const DEFAULTS = {
 const PROVIDER_OVERRIDES = {
     // Anthropic family
     "anthropic": { providerFamily: "anthropic", dropThinkingBlockModelHints: ["claude"] },
-    "anthropic-vertex": { providerFamily: "anthropic", dropThinkingBlockModelHints: ["claude"] },
     "amazon-bedrock": { providerFamily: "anthropic", dropThinkingBlockModelHints: ["claude"] },
     // OpenAI family
     "openai": { providerFamily: "openai" },
-    "azure-openai": { providerFamily: "openai" },
     "azure-openai-responses": { providerFamily: "openai" },
     "openai-codex": { providerFamily: "openai" },
     // Google family
     "google": { providerFamily: "google" },
-    "google-gemini-cli": { providerFamily: "google" },
-    "google-antigravity": { providerFamily: "google" },
     "google-vertex": { providerFamily: "google" },
     // Mistral -- strict9 tool call ID normalization
     "mistral": {
@@ -62,24 +58,15 @@ const PROVIDER_OVERRIDES = {
 /**
  * Provider ID alias table. Maps user-friendly shorthand names to canonical
  * provider IDs used in PROVIDER_OVERRIDES.
- *
- * AMBIGUITY NOTE: "vertex" maps to "anthropic-vertex" (Anthropic API via
- * Google Cloud), NOT "google-vertex". Users targeting Google Vertex AI
- * should use "google-vertex" or "gcp-vertex".
  */
 const ALIASES = {
     "aws-bedrock": "amazon-bedrock",
     "bedrock": "amazon-bedrock",
-    "vertex": "anthropic-vertex",
-    "vertex-ai": "anthropic-vertex",
-    "azure": "azure-openai",
     "azure-responses": "azure-openai-responses",
     "codex": "openai-codex",
     "gcp": "google",
     "gcp-vertex": "google-vertex",
     "gemini": "google",
-    "gemini-cli": "google-gemini-cli",
-    "antigravity": "google-antigravity",
     "grok": "xai",
 };
 /**
@@ -109,21 +96,21 @@ export function resolveProviderCapabilities(provider, userOverrides) {
 }
 /**
  * Check if a provider belongs to the Anthropic family.
- * True for: anthropic, anthropic-vertex, amazon-bedrock (and their aliases).
+ * True for: anthropic, amazon-bedrock (and their aliases).
  */
 export function isAnthropicFamily(provider) {
     return resolveProviderCapabilities(provider).providerFamily === "anthropic";
 }
 /**
  * Check if a provider belongs to the OpenAI family.
- * True for: openai, azure-openai, azure-openai-responses, openai-codex (and their aliases).
+ * True for: openai, azure-openai-responses, openai-codex (and their aliases).
  */
 export function isOpenAiFamily(provider) {
     return resolveProviderCapabilities(provider).providerFamily === "openai";
 }
 /**
  * Check if a provider belongs to the Google family.
- * True for: google, google-gemini-cli, google-antigravity, google-vertex (and their aliases).
+ * True for: google, google-vertex (and their aliases).
  */
 export function isGoogleFamily(provider) {
     return resolveProviderCapabilities(provider).providerFamily === "google";
@@ -131,7 +118,7 @@ export function isGoogleFamily(provider) {
 /**
  * Check if a provider is Google AI Studio (api.google.dev, NOT Vertex AI).
  * True for: "google" only (and aliases: "gcp", "gemini").
- * Excludes: google-vertex, google-gemini-cli, google-antigravity.
+ * Excludes: google-vertex.
  *
  * Only Google AI Studio supports the Caches API used by GeminiCacheManager.
  */
@@ -183,7 +170,7 @@ export function validateProviderOverrides(logger) {
                 provider: key,
                 hint: "Provider override exists for unknown pi-ai provider; remove from PROVIDER_OVERRIDES on next bump",
                 errorKind: "config",
-                module: "agent.capabilities",
+                submodule: "capabilities",
             }, "Capability override has no matching pi-ai provider");
         }
     }

package/node_modules/@comis/agent/dist/safety/tool-output-safety.js

@@ -74,15 +74,15 @@ export function sanitizeToolOutput(text, maxChars = DEFAULT_MAX_CHARS, options)
     if (containsTagBlockChars(text)) {
         options?.onTagBlockDetected?.();
     }
-    // Phase 1: Normalize for pattern matching (NFKC + strip zero-width + tag block)
+    // Normalize for pattern matching (NFKC + strip zero-width + tag block)
     let sanitized = normalizeForMatching(text);
-    // Phase 2: Redact injection patterns (on normalized text)
+    // Redact injection patterns (on normalized text)
     for (const pattern of INSTRUCTION_PATTERNS) {
         // Reset lastIndex for sticky/global regexes across multiple calls
         pattern.lastIndex = 0;
         sanitized = sanitized.replace(pattern, "[REDACTED]");
     }
-    // Phase 3: Truncate oversized output
+    // Truncate oversized output
     if (sanitized.length > maxChars) {
         const cutPoint = Math.floor(maxChars * 0.95);
         const lastNewline = sanitized.lastIndexOf("\n", cutPoint);

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

@@ -105,7 +105,7 @@ export interface ComisSessionManager {
      */
     writeSessionMetadata(sessionKey: SessionKey, metadata: SessionMetadata): void;
     /**
-     * 260428-iag: Resolve the absolute JSONL session file path for a session key.
+     * Resolve the absolute JSONL session file path for a session key.
      *
      * Thin synchronous wrapper around `sessionKeyToPath(sessionKey, deps.sessionBaseDir)`
      * that exposes the path resolver to the wire-edge diagnostic in pi-event-bridge.

package/node_modules/@comis/agent/dist/session/comis-session-manager.js

@@ -71,7 +71,7 @@ export function createComisSessionManager(deps) {
             }, { retries: 10, retryMinTimeout: 500 });
         },
         getSessionPath(sessionKey) {
-            // 260428-iag wire-edge diagnostic: pure delegation to sessionKeyToPath
+            // wire-edge diagnostic: pure delegation to sessionKeyToPath
             // (which uses safePath internally). No I/O, no logging.
             return sessionKeyToPath(sessionKey, deps.sessionBaseDir);
         },

package/node_modules/@comis/agent/dist/spawn/narrative-caster.d.ts

@@ -34,6 +34,16 @@ export interface CastParams {
     /** Sub-agent session key for reference. */
     sessionKey: string;
 }
+/**
+ * Trailing instruction appended to every announcement.
+ * MUST start with "Inform the user about this completed background task."
+ * for AnnouncementBatcher.stripSystemPrefix() compatibility.
+ *
+ * Exported so packages/agent/src/background/completion-formatter.ts can
+ * reuse the byte-identical string. Do NOT change the string
+ * without updating both consumers AND announcement-batcher.ts:81.
+ */
+export declare const TRAILING_INSTRUCTION = "Inform the user about this completed background task. Summarize the result in your own voice. If no user notification is needed, respond with NO_REPLY.";
 /**
  * Create a NarrativeCaster with the given configuration.
  *

package/node_modules/@comis/agent/dist/spawn/narrative-caster.js

@@ -20,8 +20,12 @@ const MAX_LABEL_LENGTH = 100;
  * Trailing instruction appended to every announcement.
  * MUST start with "Inform the user about this completed background task."
  * for AnnouncementBatcher.stripSystemPrefix() compatibility.
+ *
+ * Exported so packages/agent/src/background/completion-formatter.ts can
+ * reuse the byte-identical string. Do NOT change the string
+ * without updating both consumers AND announcement-batcher.ts:81.
  */
-const TRAILING_INSTRUCTION = "Inform the user about this completed background task. Summarize the result in your own voice. If no user notification is needed, respond with NO_REPLY.";
+export const TRAILING_INSTRUCTION = "Inform the user about this completed background task. Summarize the result in your own voice. If no user notification is needed, respond with NO_REPLY.";
 /** Human-readable names for condensation levels. */
 const LEVEL_NAMES = {
     1: "Passthrough",

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

@@ -1,7 +1,7 @@
 {
   "name": "@comis/agent",
   "private": true,
-  "version": "1.0.34",
+  "version": "1.0.36",
   "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/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/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);
             }

package/node_modules/@comis/channels/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/channels",
   "private": true,
-  "version": "1.0.34",
+  "version": "1.0.36",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Chat platform adapters — Discord, Telegram, Slack, WhatsApp, Signal, iMessage, IRC, LINE",

package/node_modules/@comis/cli/dist/cli.js

@@ -12,6 +12,7 @@
 import { createRequire } from "node:module";
 import { Command } from "commander";
 import { registerAgentCommand } from "./commands/agent.js";
+import { registerAuthCommand } from "./commands/auth.js";
 import { registerChannelCommand } from "./commands/channel.js";
 import { registerConfigCommand } from "./commands/config.js";
 import { registerDaemonCommand } from "./commands/daemon.js";
@@ -38,6 +39,7 @@ program.name("comis").description("Comis AI agent management CLI").version(cliPk
 registerDaemonCommand(program);
 registerConfigCommand(program);
 registerAgentCommand(program);
+registerAuthCommand(program);
 registerChannelCommand(program);
 registerMemoryCommand(program);
 registerSecurityCommand(program);

package/node_modules/@comis/cli/dist/commands/agent.d.ts

@@ -1,8 +1,8 @@
 /**
- * Agent management commands: list, create, configure, delete, models.
+ * Agent management commands: list, create, configure, delete, models, set-oauth-profile.
  *
- * Provides `comis agent [list|create|configure|delete|models]` subcommands
- * for managing agent configurations via the daemon RPC interface.
+ * Provides `comis agent [list|create|configure|delete|models|set-oauth-profile]`
+ * subcommands for managing agent configurations via the daemon RPC interface.
  *
  * @module
  */