comisai 1.0.28 → 1.0.30

package/node_modules/@comis/daemon/dist/rpc/message-handlers.js

@@ -14,6 +14,27 @@ import { relative } from "node:path";
 import { deliverToChannel, formatForChannel } from "@comis/channels";
 import { resolveAdapter, authorizeChannelAccess } from "../wiring/daemon-utils.js";
 // ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+/**
+ * Translate the agent's `message_id` argument to the platform-native id when
+ * it matches a recently-received inbound message UUID. Returns the original
+ * value when no match (already-native id from message.send, expired UUID,
+ * cross-channel mismatch). Always returns a string.
+ */
+function resolveMessageId(resolver, messageId, channelType, channelId) {
+    if (!resolver)
+        return messageId;
+    const record = resolver.resolve(messageId);
+    if (!record)
+        return messageId;
+    if (record.channelType !== channelType)
+        return messageId;
+    if (record.channelId !== channelId)
+        return messageId;
+    return record.nativeId;
+}
+// ---------------------------------------------------------------------------
 // Capability guard — maps RPC methods to ChannelCapability feature flags.
 // When channelPlugins is provided, unsupported actions are rejected before
 // reaching the adapter, saving a tool call and producing a clear error.
@@ -79,7 +100,7 @@ export function createMessageHandlers(deps) {
             const channelType = params.channel_type;
             const channelId = params.channel_id;
             const text = params.text;
-            const messageId = params.message_id;
+            const messageId = resolveMessageId(deps.inboundMessageIdResolver, params.message_id, channelType, channelId);
             authorizeChannelAccess(params._originChannelId, channelId, params._trustLevel);
             const adapter = resolveAdapter(channelType, deps.adaptersByType);
             const extra = {
@@ -103,7 +124,7 @@ export function createMessageHandlers(deps) {
             const channelType = params.channel_type;
             assertCapability("message.react", channelType, deps.channelPlugins);
             const channelId = params.channel_id;
-            const messageId = params.message_id;
+            const messageId = resolveMessageId(deps.inboundMessageIdResolver, params.message_id, channelType, channelId);
             const emoji = params.emoji;
             authorizeChannelAccess(params._originChannelId, channelId, params._trustLevel);
             const adapter = resolveAdapter(channelType, deps.adaptersByType);
@@ -118,7 +139,7 @@ export function createMessageHandlers(deps) {
             const channelType = params.channel_type;
             assertCapability("message.edit", channelType, deps.channelPlugins);
             const channelId = params.channel_id;
-            const messageId = params.message_id;
+            const messageId = resolveMessageId(deps.inboundMessageIdResolver, params.message_id, channelType, channelId);
             const text = params.text;
             authorizeChannelAccess(params._originChannelId, channelId, params._trustLevel);
             const adapter = resolveAdapter(channelType, deps.adaptersByType);
@@ -132,7 +153,7 @@ export function createMessageHandlers(deps) {
             const channelType = params.channel_type;
             assertCapability("message.delete", channelType, deps.channelPlugins);
             const channelId = params.channel_id;
-            const messageId = params.message_id;
+            const messageId = resolveMessageId(deps.inboundMessageIdResolver, params.message_id, channelType, channelId);
             authorizeChannelAccess(params._originChannelId, channelId, params._trustLevel);
             const adapter = resolveAdapter(channelType, deps.adaptersByType);
             const result = await adapter.deleteMessage(channelId, messageId);

package/node_modules/@comis/daemon/dist/rpc/model-handlers.d.ts

@@ -1,9 +1,10 @@
 /**
  * Model management RPC handler module.
  * Handles model catalog query methods:
- *   models.list -- List available models (optionally filtered by provider)
- *   models.test -- Check provider configuration and catalog status
- * Both handlers are read-only -- no approval gate required.
+ *   models.list           -- List available models (optionally filtered by provider)
+ *   models.test           -- Check provider configuration and catalog status
+ *   models.list_providers -- Live native pi-ai catalog provider list (Layer 1F)
+ * All handlers are read-only -- no approval gate required.
  * @module
  */
 import type { ModelCatalog } from "@comis/agent";

package/node_modules/@comis/daemon/dist/rpc/model-handlers.js

@@ -2,11 +2,13 @@
 /**
  * Model management RPC handler module.
  * Handles model catalog query methods:
- *   models.list -- List available models (optionally filtered by provider)
- *   models.test -- Check provider configuration and catalog status
- * Both handlers are read-only -- no approval gate required.
+ *   models.list           -- List available models (optionally filtered by provider)
+ *   models.test           -- Check provider configuration and catalog status
+ *   models.list_providers -- Live native pi-ai catalog provider list (Layer 1F)
+ * All handlers are read-only -- no approval gate required.
  * @module
  */
+import { getProviders } from "@mariozechner/pi-ai";
 // ---------------------------------------------------------------------------
 // Factory
 // ---------------------------------------------------------------------------
@@ -62,6 +64,22 @@ export function createModelHandlers(deps) {
             };
         },
         // -----------------------------------------------------------------------
+        // List native pi-ai catalog providers (Layer 1F -- 260430-vwt)
+        //
+        // Live self-discovery for the agent: returns the de-duplicated, sorted
+        // list of provider names from the pi-ai native catalog. Pairs with the
+        // tool-descriptions auto-promote guidance so the agent can verify
+        // which provider_id values trigger promotion in providers.create.
+        // -----------------------------------------------------------------------
+        "models.list_providers": async (params) => {
+            const trustLevel = params._trustLevel;
+            if (trustLevel !== "admin") {
+                throw new Error("Admin access required");
+            }
+            const providers = [...new Set(getProviders())].sort();
+            return { providers, count: providers.length };
+        },
+        // -----------------------------------------------------------------------
         // Test provider configuration and availability
         // -----------------------------------------------------------------------
         "models.test": async (params) => {

package/node_modules/@comis/daemon/dist/rpc/provider-handlers.js

@@ -16,6 +16,8 @@
  * @module
  */
 import { ProviderEntrySchema } from "@comis/core";
+import { getModels, getProviders } from "@mariozechner/pi-ai";
+import { checkBuiltInProviderRedundancy } from "./builtin-provider-guard.js";
 import { persistToConfig } from "./persist-to-config.js";
 import { probeProviderAuth } from "./probe-provider-auth.js";
 // ---------------------------------------------------------------------------
@@ -68,6 +70,48 @@ function formatReferenceMessage(refs) {
     }
     return parts.join("; ");
 }
+/**
+ * Auto-promote a Partial<ProviderEntry> when the `providerId` matches a
+ * native pi-ai catalog entry AND the user has not expressed clear intent
+ * to deviate from the native shape.
+ *
+ * The agent's tool guide currently shows `type:"openai"` as the example
+ * for any OpenAI-compatible provider. Without promotion, registering
+ * "openrouter" by name with that example shape lands a `type:"openai"`
+ * entry that bypasses the OpenRouter native catalog (no costs, wrong
+ * context window, single explicit model).
+ *
+ * Promotion fires when:
+ *   1. providerId is in the live pi-ai native catalog, AND
+ *   2. config.type is missing or set to "openai" (the passthrough sentinel), AND
+ *   3. config.baseUrl is missing or matches the native catalog's baseUrl.
+ *
+ * Conservatism: a user pointing at a custom proxy whose URL differs from
+ * the native one keeps their explicit `type:"openai"` shape -- the URL
+ * mismatch is the opt-out signal.
+ *
+ * Logged at INFO with the original_type / promoted_type so operators can
+ * see which entries were rewritten on the way in.
+ */
+function normalizeProviderEntry(providerId, config, logger) {
+    const native = new Set(getProviders());
+    if (!native.has(providerId))
+        return config;
+    const catalog = getModels(providerId);
+    const nativeBaseUrl = catalog[0]?.baseUrl;
+    const isPassthroughType = !config.type || config.type === "openai";
+    const userBaseUrlMatchesNative = !config.baseUrl || config.baseUrl === nativeBaseUrl;
+    if (isPassthroughType && userBaseUrlMatchesNative) {
+        logger?.info({
+            providerId,
+            original_type: config.type,
+            promoted_type: providerId,
+            hint: "Auto-promoted to native pi-ai catalog provider",
+        }, "providers.create: type promoted to native");
+        return { ...config, type: providerId };
+    }
+    return config;
+}
 // ---------------------------------------------------------------------------
 // Factory
 // ---------------------------------------------------------------------------
@@ -152,7 +196,22 @@ export function createProviderHandlers(deps) {
                 throw new Error(`Provider already exists: ${providerId}`);
             }
             const config = params.config ?? {};
-            const parsedConfig = ProviderEntrySchema.parse(config);
+            // 260501-gyy: reject redundant catalog-shadowing entries before
+            // promotion / probe / persist. A built-in provider with a catalog
+            // (or absent) baseUrl is structurally redundant -- pi-ai's dynamic
+            // catalog already provides its model list. Production trace
+            // 2026-05-01 08:53 showed an LLM agent creating
+            // providers.entries.openrouter with an invented model id, leading
+            // to a downstream 404.
+            const guardResult = checkBuiltInProviderRedundancy(providerId, config);
+            if (!guardResult.ok) {
+                throw new Error(guardResult.reason);
+            }
+            // Layer 1C (260430-vwt): auto-promote type to native catalog name
+            // when the providerId matches a pi-ai catalog entry AND the user has
+            // not opted out via a custom baseUrl.
+            const normalizedConfig = normalizeProviderEntry(providerId, config, deps.persistDeps?.logger);
+            const parsedConfig = ProviderEntrySchema.parse(normalizedConfig);
             // Probe provider API key before committing config
             if (parsedConfig.apiKeyName && deps.secretManager) {
                 const apiKey = deps.secretManager.get(parsedConfig.apiKeyName);
@@ -164,11 +223,15 @@ export function createProviderHandlers(deps) {
                 }
             }
             deps.providerEntries[providerId] = parsedConfig;
-            // Best-effort persistence to config.yaml
+            // Best-effort persistence to config.yaml. Persist the normalized
+            // config (post-Layer-1C promotion) so the YAML reflects the
+            // promoted type -- otherwise the daemon would re-promote on every
+            // restart, or worse, the persisted type:"openai" would override the
+            // runtime promoted type on subsequent loads.
             if (deps.persistDeps) {
                 const ctx = params._context;
                 const persistResult = await persistToConfig(deps.persistDeps, {
-                    patch: { providers: { entries: { [providerId]: config } } },
+                    patch: { providers: { entries: { [providerId]: normalizedConfig } } },
                     actionType: "providers.create",
                     entityId: providerId,
                     actingUser: ctx?.userId ?? params._agentId,
@@ -197,12 +260,25 @@ export function createProviderHandlers(deps) {
             // Capture user-provided fields BEFORE merge -- persistToConfig does deepMerge internally,
             // so we only persist the user's partial patch (not the fully merged config).
             const userPatch = params.config ? structuredClone(params.config) : {};
+            // Layer 1C (260430-vwt): on update, only auto-promote when the user
+            // is actively changing the `type` field. If `type` is absent from
+            // the patch, the user is editing other fields and we must not
+            // rewrite their existing type silently.
+            let normalizedPatch = config;
+            if (config.type !== undefined) {
+                normalizedPatch = normalizeProviderEntry(providerId, config, deps.persistDeps?.logger);
+                // Mirror the promotion into both the in-memory merge and the persisted patch
+                // so the YAML matches the runtime view.
+                if (normalizedPatch.type !== config.type) {
+                    userPatch.type = normalizedPatch.type;
+                }
+            }
             // Headers: shallow merge per-key (preserve existing keys, overlay new ones)
-            if (config.headers && existing.headers) {
-                config.headers = { ...existing.headers, ...config.headers };
+            if (normalizedPatch.headers && existing.headers) {
+                normalizedPatch.headers = { ...existing.headers, ...normalizedPatch.headers };
             }
             // models[] and capabilities: replaced wholesale via spread (no merge needed)
-            const merged = { ...existing, ...config };
+            const merged = { ...existing, ...normalizedPatch };
             const parsedConfig = ProviderEntrySchema.parse(merged);
             deps.providerEntries[providerId] = parsedConfig;
             // Best-effort persistence to config.yaml -- persist userPatch NOT merged config

package/node_modules/@comis/daemon/dist/rpc/rpc-dispatch.d.ts

@@ -77,6 +77,10 @@ export interface RpcDispatchDeps {
         };
     };
     adaptersByType: Map<string, ChannelPort>;
+    /** Resolves daemon NormalizedMessage.id UUIDs back to platform-native
+     *  message ids for message.delete/edit/react. Optional for backward compat
+     *  with daemon configs that disable channel adapters entirely. */
+    inboundMessageIdResolver?: import("../wiring/inbound-message-id-resolver.js").InboundMessageIdResolver;
     visionRegistry?: Map<string, VisionProvider>;
     mediaConfig: {
         imageAnalysis: {

package/node_modules/@comis/daemon/dist/wiring/inbound-message-id-resolver.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Resolves daemon-internal `NormalizedMessage.id` UUIDs to platform-native
+ * message ids (e.g. Telegram's integer `message_id`) for inbound messages.
+ *
+ * The agent's tools see `message_id` as the daemon UUID (from session
+ * preamble metadata), but channel adapters need the platform-native id when
+ * calling APIs like `bot.api.deleteMessage`. Without translation, those calls
+ * fail with `400: Bad Request: message identifier is not specified` (Telegram
+ * rejects `Number("e60f9634-...")` → `NaN`).
+ *
+ * Populated lazily on inbound via `record(msg, channelType)`. The native id
+ * is read from `msg.metadata[metaKey]` where metaKey comes from the
+ * per-channel `replyToMetaKey` capability. Backed by a TTL cache so stale
+ * entries don't accumulate.
+ *
+ * @module
+ */
+import type { NormalizedMessage } from "@comis/core";
+/** A single resolved inbound message record. */
+export interface InboundIdRecord {
+    channelType: string;
+    channelId: string;
+    nativeId: string;
+}
+/** UUID → native message-id resolver for cross-channel inbound messages. */
+export interface InboundMessageIdResolver {
+    /** Record an inbound message's UUID → native id mapping. No-op if the
+     *  channel has no registered metadata key or the metadata is missing. */
+    record(msg: NormalizedMessage, channelType: string): void;
+    /** Look up native id by daemon UUID. Returns undefined if not found. */
+    resolve(uuid: string): InboundIdRecord | undefined;
+}
+/** Options for the resolver factory. */
+export interface InboundMessageIdResolverOpts {
+    /** Per-channel metadata key carrying the native id, e.g. {"telegram": "telegramMessageId"}. */
+    metaKeyByChannel: Map<string, string>;
+    /** Time-to-live in ms for cached entries. Defaults to 1 h. */
+    ttlMs?: number;
+    /** Max entries before LRU eviction. Defaults to 10_000. */
+    maxEntries?: number;
+}
+/**
+ * Create an inbound-message-id resolver backed by a TTL cache.
+ *
+ * @param opts Configuration including the per-channel metadata key map.
+ * @returns A resolver that records on inbound and resolves UUIDs on lookup.
+ */
+export declare function createInboundMessageIdResolver(opts: InboundMessageIdResolverOpts): InboundMessageIdResolver;

package/node_modules/@comis/daemon/dist/wiring/inbound-message-id-resolver.js

@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * Resolves daemon-internal `NormalizedMessage.id` UUIDs to platform-native
+ * message ids (e.g. Telegram's integer `message_id`) for inbound messages.
+ *
+ * The agent's tools see `message_id` as the daemon UUID (from session
+ * preamble metadata), but channel adapters need the platform-native id when
+ * calling APIs like `bot.api.deleteMessage`. Without translation, those calls
+ * fail with `400: Bad Request: message identifier is not specified` (Telegram
+ * rejects `Number("e60f9634-...")` → `NaN`).
+ *
+ * Populated lazily on inbound via `record(msg, channelType)`. The native id
+ * is read from `msg.metadata[metaKey]` where metaKey comes from the
+ * per-channel `replyToMetaKey` capability. Backed by a TTL cache so stale
+ * entries don't accumulate.
+ *
+ * @module
+ */
+import { createTTLCache } from "@comis/shared";
+// ---------------------------------------------------------------------------
+// Factory
+// ---------------------------------------------------------------------------
+/**
+ * Create an inbound-message-id resolver backed by a TTL cache.
+ *
+ * @param opts Configuration including the per-channel metadata key map.
+ * @returns A resolver that records on inbound and resolves UUIDs on lookup.
+ */
+export function createInboundMessageIdResolver(opts) {
+    const ttlMs = opts.ttlMs ?? 60 * 60 * 1000;
+    const maxEntries = opts.maxEntries ?? 10_000;
+    const cache = createTTLCache({ ttlMs, maxEntries });
+    return {
+        record(msg, channelType) {
+            const metaKey = opts.metaKeyByChannel.get(channelType);
+            if (!metaKey)
+                return;
+            const meta = msg.metadata;
+            // metaKey comes from our internal channelCapabilities map (set at adapter
+            // bootstrap, not user-controlled), so dynamic access is safe.
+            // eslint-disable-next-line security/detect-object-injection
+            const raw = meta?.[metaKey];
+            if (raw == null)
+                return;
+            const nativeId = typeof raw === "number"
+                ? String(raw)
+                : typeof raw === "string"
+                    ? raw
+                    : null;
+            if (nativeId == null || nativeId.length === 0)
+                return;
+            cache.set(msg.id, { channelType, channelId: msg.channelId, nativeId });
+        },
+        resolve(uuid) {
+            return cache.get(uuid);
+        },
+    };
+}

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

@@ -164,12 +164,24 @@ export declare function setupAgents(deps: {
     backgroundNotifyFn?: import("@comis/agent").NotifyFn;
 }): Promise<AgentsResult>;
 /**
- * Resolve "default" model/provider placeholders to global defaults.
- * Called once per agent at daemon startup so executors always receive concrete values.
- * Resolution order for model:
- *   1. modelsConfig.defaultModel (from YAML models.defaultModel)
- *   2. DEFAULT_MODEL_PER_PROVIDER[resolvedProvider]
- *   3. DEFAULT_MODEL_PER_PROVIDER["anthropic"] (ultimate fallback)
+ * Resolve "default" model/provider placeholders to concrete values from the
+ * pi-ai catalog. Called once per agent at daemon startup so executors always
+ * receive concrete values.
+ *
+ * Resolution sources, in priority order:
+ *   1. Per-agent explicit value (agentConfig.model / .provider not "default")
+ *   2. YAML models.defaultModel / models.defaultProvider (operator override)
+ *   3. Catalog heuristic for provider: most-populated native pi-ai provider
+ *      (e.g. openrouter at 249 models > anthropic at 23). Single source of
+ *      truth — no env var, no hardcoded FALLBACK_PROVIDER. If users want
+ *      a specific default, they set models.defaultProvider in YAML.
+ *   4. Catalog heuristic for model: resolveOperationDefaults(provider).mid
+ *      (mid-tier cost), falling back to getModels(provider)[0].id.
+ *
+ * Throws when the pi-ai catalog is empty (zero providers / zero models for
+ * the resolved provider) — the caller is asking for a default and we can't
+ * synthesize one. Operators can recover by setting models.defaultProvider /
+ * models.defaultModel explicitly.
  */
 export declare function resolveAgentModel(agentConfig: {
     model: string;

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

@@ -12,7 +12,8 @@ import { createHmac } from "node:crypto";
 import { homedir } from "node:os";
 import { existsSync, mkdirSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
-import { createCircuitBreaker, createBudgetGuard, createCostTracker, createStepCounter, createSessionLifecycle, ensureWorkspace, resolveWorkspaceDir, createPiExecutor, createComisSessionManager, cleanupStaleLocks, createAuthStorageAdapter, createModelRegistryAdapter, registerCustomProviders, createProviderHealthMonitor, createLastKnownModelTracker, createAuthProfileManager, createAuthRotationAdapter, setSanitizeLogger, setToolNormalizationLogger, LEAN_TOOL_DESCRIPTIONS, resolveDescription, } from "@comis/agent";
+import { getModels, getProviders } from "@mariozechner/pi-ai";
+import { createCircuitBreaker, createBudgetGuard, createCostTracker, createStepCounter, createSessionLifecycle, ensureWorkspace, resolveWorkspaceDir, createPiExecutor, createComisSessionManager, cleanupStaleLocks, createAuthStorageAdapter, createModelRegistryAdapter, registerCustomProviders, createProviderHealthMonitor, createLastKnownModelTracker, createAuthProfileManager, createAuthRotationAdapter, setSanitizeLogger, setToolNormalizationLogger, resolveOperationDefaults, resolveCompactionModel, LEAN_TOOL_DESCRIPTIONS, resolveDescription, } from "@comis/agent";
 import { agentToolsToToolDefinitions, createSkillRegistry, createRuntimeEligibilityContext, TOOL_PROFILES, } from "@comis/skills";
 // ---------------------------------------------------------------------------
 // Single-agent setup (extracted for hot-add reuse)
@@ -28,7 +29,14 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
     // Validate agent config with Zod before any runtime setup
     const agentConfig = PerAgentConfigSchema.parse(rawAgentConfig);
     const { container, memoryAdapter, agentLogger, resolvedAgentDir } = deps;
-    // Resolve "default" model/provider to global defaults (MODELS-DEFAULT)
+    // Resolve "default" model/provider to global defaults (MODELS-DEFAULT).
+    // Resolution sources, in priority order:
+    //   1. Per-agent explicit value (agentConfig.model / .provider)
+    //   2. modelsConfig.defaultModel / .defaultProvider (YAML models.* section)
+    //   3. Pi-ai catalog: most-populated native provider (heuristic), mid-tier
+    //      cost model from resolveOperationDefaults
+    // Surfaces resolution source at INFO once per agent so operators can see
+    // which model got picked without having to read the resolver source.
     const modelsConfig = container.config.models;
     const resolved = resolveAgentModel(agentConfig, modelsConfig);
     const effectiveConfig = { ...agentConfig, model: resolved.model, provider: resolved.provider };
@@ -37,8 +45,34 @@ export async function setupSingleAgent(agentId, rawAgentConfig, deps) {
     // see the resolved model/provider instead of the placeholder "default".
     container.config.agents[agentId] = effectiveConfig;
     if (agentConfig.model !== resolved.model || agentConfig.provider !== resolved.provider) {
-        agentLogger.debug({ agentId, originalModel: agentConfig.model, resolvedModel: resolved.model,
-            originalProvider: agentConfig.provider, resolvedProvider: resolved.provider }, "Resolved default model/provider for agent");
+        const source = modelsConfig.defaultModel || modelsConfig.defaultProvider
+            ? "explicit_yaml"
+            : "catalog_heuristic";
+        agentLogger.info({
+            agentId,
+            originalModel: agentConfig.model,
+            resolvedModel: resolved.model,
+            originalProvider: agentConfig.provider,
+            resolvedProvider: resolved.provider,
+            source,
+        }, "Resolved default model/provider for agent");
+    }
+    // Resolve contextEngine.compactionModel if it was left at the empty-string
+    // schema default. The resolved value is informational — actual compaction
+    // routing flows through resolveOperationModel(operationType: "compaction")
+    // at execute-time. Logging at INFO once per agent at startup gives
+    // operators a visible record of which model would back background ops.
+    const ceCompactionRaw = effectiveConfig.contextEngine?.compactionModel ?? "";
+    if (ceCompactionRaw.length === 0) {
+        const resolvedCompaction = resolveCompactionModel(ceCompactionRaw, resolved.provider);
+        if (resolvedCompaction.length > 0) {
+            agentLogger.info({
+                agentId,
+                primaryProvider: resolved.provider,
+                resolvedCompactionModel: resolvedCompaction,
+                source: "catalog_heuristic",
+            }, "Resolved compactionModel from pi-ai catalog");
+        }
     }
     // Each agent gets a dedicated workspace folder:
     //   default agent -> ~/.comis/workspace
@@ -423,50 +457,68 @@ export async function setupAgents(deps) {
 // Helpers
 // ---------------------------------------------------------------------------
 /**
- * Default model ID per provider, mirroring @mariozechner/pi-coding-agent's
- * defaultModelPerProvider. Used when model: "default" and no
- * models.defaultModel is configured.
- */
-const DEFAULT_MODEL_PER_PROVIDER = {
-    "amazon-bedrock": "us.anthropic.claude-opus-4-6-v1",
-    anthropic: "claude-opus-4-6",
-    openai: "gpt-5.1-codex",
-    "azure-openai-responses": "gpt-5.2",
-    "openai-codex": "gpt-5.3-codex",
-    google: "gemini-2.5-pro",
-    "google-gemini-cli": "gemini-2.5-pro",
-    "google-antigravity": "gemini-3-pro-high",
-    "google-vertex": "gemini-3-pro-preview",
-    "github-copilot": "gpt-4o",
-    openrouter: "openai/gpt-5.1-codex",
-    "vercel-ai-gateway": "anthropic/claude-opus-4-6",
-    xai: "grok-4-fast-non-reasoning",
-    groq: "openai/gpt-oss-120b",
-    cerebras: "zai-glm-4.6",
-    zai: "glm-4.6",
-    mistral: "devstral-medium-latest",
-    minimax: "MiniMax-M2.7",
-    "minimax-cn": "MiniMax-M2.7",
-    huggingface: "moonshotai/Kimi-K2.5",
-    opencode: "claude-opus-4-6",
-    "kimi-coding": "kimi-k2-thinking",
-};
-const FALLBACK_PROVIDER = "anthropic";
-/**
- * Resolve "default" model/provider placeholders to global defaults.
- * Called once per agent at daemon startup so executors always receive concrete values.
- * Resolution order for model:
- *   1. modelsConfig.defaultModel (from YAML models.defaultModel)
- *   2. DEFAULT_MODEL_PER_PROVIDER[resolvedProvider]
- *   3. DEFAULT_MODEL_PER_PROVIDER["anthropic"] (ultimate fallback)
+ * Resolve "default" model/provider placeholders to concrete values from the
+ * pi-ai catalog. Called once per agent at daemon startup so executors always
+ * receive concrete values.
+ *
+ * Resolution sources, in priority order:
+ *   1. Per-agent explicit value (agentConfig.model / .provider not "default")
+ *   2. YAML models.defaultModel / models.defaultProvider (operator override)
+ *   3. Catalog heuristic for provider: most-populated native pi-ai provider
+ *      (e.g. openrouter at 249 models > anthropic at 23). Single source of
+ *      truth — no env var, no hardcoded FALLBACK_PROVIDER. If users want
+ *      a specific default, they set models.defaultProvider in YAML.
+ *   4. Catalog heuristic for model: resolveOperationDefaults(provider).mid
+ *      (mid-tier cost), falling back to getModels(provider)[0].id.
+ *
+ * Throws when the pi-ai catalog is empty (zero providers / zero models for
+ * the resolved provider) — the caller is asking for a default and we can't
+ * synthesize one. Operators can recover by setting models.defaultProvider /
+ * models.defaultModel explicitly.
  */
 export function resolveAgentModel(agentConfig, modelsConfig) {
-    const provider = agentConfig.provider.toLowerCase() === "default"
-        ? (modelsConfig.defaultProvider || FALLBACK_PROVIDER)
-        : agentConfig.provider;
-    const model = agentConfig.model.toLowerCase() === "default"
-        ? (modelsConfig.defaultModel || DEFAULT_MODEL_PER_PROVIDER[provider] || DEFAULT_MODEL_PER_PROVIDER[FALLBACK_PROVIDER])
-        : agentConfig.model;
+    const providerIsDefault = agentConfig.provider.toLowerCase() === "default";
+    const modelIsDefault = agentConfig.model.toLowerCase() === "default";
+    // Step 1: resolve provider
+    let provider;
+    if (!providerIsDefault) {
+        provider = agentConfig.provider;
+    }
+    else if (modelsConfig.defaultProvider) {
+        provider = modelsConfig.defaultProvider;
+    }
+    else {
+        // Catalog heuristic: most-populated native provider wins.
+        const allProviders = getProviders();
+        if (allProviders.length === 0) {
+            throw new Error("Pi-ai catalog returned zero providers. " +
+                "Install or upgrade @mariozechner/pi-ai, or set models.defaultProvider explicitly.");
+        }
+        provider = allProviders
+            .map((p) => ({ p, n: getModels(p).length }))
+            .sort((a, b) => b.n - a.n)[0].p;
+    }
+    // Step 2: resolve model
+    let model;
+    if (!modelIsDefault) {
+        model = agentConfig.model;
+    }
+    else if (modelsConfig.defaultModel) {
+        model = modelsConfig.defaultModel;
+    }
+    else {
+        // Catalog read: prefer mid-tier from resolveOperationDefaults
+        // (catalog-derived, cost-aware), fall back to first model id when
+        // resolveOperationDefaults returns {} (custom YAML providers).
+        const tier = resolveOperationDefaults(provider);
+        const firstId = getModels(provider)[0]?.id;
+        const candidate = tier.mid ?? firstId;
+        if (!candidate) {
+            throw new Error(`No models found for provider "${provider}" in pi-ai catalog. ` +
+                "Set models.defaultModel explicitly or upgrade @mariozechner/pi-ai.");
+        }
+        model = candidate;
+    }
     return { model, provider };
 }
 /**

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

@@ -36,6 +36,11 @@ export interface ChannelsResult {
     approvalNotifier?: ApprovalNotifier;
     /** Full plugin objects keyed by channel type for capabilities RPC */
     channelPlugins: Map<string, ChannelPluginPort>;
+    /** Per-channel capability info (notably `replyToMetaKey` — the metadata
+     *  field carrying the platform-native message id). Used by the inbound
+     *  UUID resolver so message.delete/edit/react can translate daemon UUIDs
+     *  back to native ids before calling the channel adapter. */
+    channelCapabilities: Map<string, import("./setup-channels-adapters.js").ChannelCapabilityInfo>;
     /** The command queue instance for parent session TTL extension during graph execution. */
     commandQueue?: CommandQueue;
 }
@@ -106,7 +111,14 @@ export interface ChannelsDeps {
     rpcCall?: RpcCall;
     /** Optional callback for task extraction after successful agent execution (gated by config.scheduler.tasks.enabled). */
     onTaskExtraction?: (conversationText: string, sessionKey: string, agentId: string) => Promise<void>;
-    /** Optional callback fired after each successful inbound message processing. Used by restart continuation tracker. */
+    /**
+     * Optional callback fired BEFORE each inbound message is dispatched to the
+     * executor. Used by the restart continuation tracker so the session is
+     * visible in tracker state before any tool call could trigger SIGUSR2.
+     * Bypassed for early-return paths (no-adapter, graph-report intercept).
+     */
+    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). */
     approvalGate?: import("@comis/core").ApprovalGate;

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

@@ -486,6 +486,7 @@ export async function setupChannels(deps) {
             } : undefined,
             // Task extraction callback (gated by config.scheduler.tasks.enabled)
             onTaskExtraction: deps.onTaskExtraction,
+            onMessageReceived: deps.onMessageReceived,
             onMessageProcessed: deps.onMessageProcessed,
             // Graph report button callback intercept: deliver full report as .md file attachment
             onGraphReportRequest: async (graphId, _channelType, channelId, adapter, threadId) => {
@@ -755,5 +756,5 @@ export async function setupChannels(deps) {
     const resolveAttachmentByUrl = async (url) => {
         return resolveAttachment({ url, type: "file" });
     };
-    return { adaptersByType, channelManager, compositeResolver, resolveAttachment: resolveAttachmentByUrl, lifecycleReactors, approvalNotifier, channelPlugins, commandQueue };
+    return { adaptersByType, channelManager, compositeResolver, resolveAttachment: resolveAttachmentByUrl, lifecycleReactors, approvalNotifier, channelPlugins, channelCapabilities, commandQueue };
 }

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

@@ -153,7 +153,7 @@ export function registerRpcMethods(deps) {
     // -------------------------------------------------------------------------
     // Model management admin methods
     // -------------------------------------------------------------------------
-    registerRpcPassthrough(dynamicRouter, rpcCall, ["models.list", "models.test"], "admin");
+    registerRpcPassthrough(dynamicRouter, rpcCall, ["models.list", "models.list_providers", "models.test"], "admin");
     // -------------------------------------------------------------------------
     // Token management admin methods
     // -------------------------------------------------------------------------

package/node_modules/@comis/daemon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/daemon",
   "private": true,
-  "version": "1.0.28",
+  "version": "1.0.30",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Background daemon and orchestrator for the Comis platform",
@@ -45,6 +45,6 @@
     "test": "vitest run"
   },
   "optionalDependencies": {
-    "sd-notify": "^2.8.0"
+    "sd-notify": "2.8.0"
   }
 }