comisai 1.0.28 → 1.0.31

package/node_modules/@comis/cli/dist/wizard/steps/05-agent.js

@@ -11,20 +11,6 @@
  */
 import { updateState, sectionSeparator, validateAgentName, } from "../index.js";
 import { createModelCatalog } from "@comis/agent";
-// ---------- Recommended Models Per Provider ----------
-const RECOMMENDED_MODELS = {
-    anthropic: "claude-sonnet-4-5-20250929",
-    openai: "gpt-4o",
-    google: "gemini-2.0-flash",
-    groq: "llama-3.3-70b-versatile",
-    mistral: "mistral-large-latest",
-    deepseek: "deepseek-chat",
-    xai: "grok-2",
-    together: "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",
-    cerebras: "llama-3.3-70b",
-    openrouter: "anthropic/claude-sonnet-4-5-20250929",
-    ollama: "llama3",
-};
 // ---------- Helpers ----------
 function formatModelHint(m) {
     const parts = [];
@@ -67,8 +53,6 @@ export const agentStep = {
         catch {
             // Fallback: empty catalog, will use recommended default only
         }
-        const providerId = state.provider?.id ?? "";
-        const recommended = RECOMMENDED_MODELS[providerId];
         // 4. QuickStart flow -- use "default" so the daemon picks the model at runtime
         if (state.flow === "quickstart") {
             prompter.log.info("Model: default");
@@ -87,11 +71,13 @@ export const agentStep = {
                 label: "Custom model ID...",
                 hint: "Enter a model ID manually",
             });
+            // Initial value: state.model takes precedence; otherwise the
+            // first catalog entry. No hardcoded recommendation lookup --
+            // pi-ai's catalog ordering is the source of truth.
             const chosen = await prompter.select({
                 message: "Select a model",
                 options,
-                initialValue: state.model
-                    ?? (recommended && catalogModels.some((m) => m.modelId === recommended) ? recommended : undefined),
+                initialValue: state.model ?? catalogModels[0]?.modelId,
             });
             if (chosen === "__custom__") {
                 selectedModel = await prompter.text({
@@ -107,8 +93,8 @@ export const agentStep = {
             // Empty catalog -- go directly to custom text input
             selectedModel = await prompter.text({
                 message: "Model ID",
-                placeholder: recommended ?? "model-name",
-                defaultValue: state.model ?? recommended,
+                placeholder: state.model ?? "model-name",
+                defaultValue: state.model,
             });
         }
         return updateState(state, { agentName, model: selectedModel });

package/node_modules/@comis/cli/dist/wizard/types.d.ts

@@ -134,20 +134,6 @@ export type WizardResult = {
     envPath?: string;
     error?: WizardError;
 };
-/** Supported provider entry for selection prompts. */
-export type SupportedProvider = {
-    id: string;
-    label: string;
-    hint?: string;
-    category: "recommended" | "other" | "local" | "custom";
-};
-/**
- * All supported LLM providers, grouped by category.
- *
- * Categories: recommended (top picks), other (cloud APIs),
- * local (self-hosted), custom (user-defined endpoints).
- */
-export declare const SUPPORTED_PROVIDERS: readonly SupportedProvider[];
 /** Supported channel entry for selection prompts. */
 export type SupportedChannel = {
     type: ChannelConfig["type"];

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

@@ -9,30 +9,6 @@
  */
 /** Starting state for a new wizard run. */
 export const INITIAL_STATE = { completedSteps: [] };
-/**
- * All supported LLM providers, grouped by category.
- *
- * Categories: recommended (top picks), other (cloud APIs),
- * local (self-hosted), custom (user-defined endpoints).
- */
-export const SUPPORTED_PROVIDERS = [
-    // Recommended
-    { id: "anthropic", label: "Anthropic (Claude)", hint: "Recommended for agents", category: "recommended" },
-    { id: "openai", label: "OpenAI (GPT)", hint: "GPT-4o, o1, o3 models", category: "recommended" },
-    // Other Providers
-    { id: "google", label: "Google (Gemini)", hint: "Gemini models", category: "other" },
-    { id: "groq", label: "Groq", hint: "Fast inference (Llama, Mixtral)", category: "other" },
-    { id: "mistral", label: "Mistral", hint: "Mistral models", category: "other" },
-    { id: "deepseek", label: "DeepSeek", hint: "DeepSeek models", category: "other" },
-    { id: "xai", label: "xAI (Grok)", hint: "Grok models", category: "other" },
-    { id: "together", label: "Together AI", hint: "Open-source model hosting", category: "other" },
-    { id: "cerebras", label: "Cerebras", hint: "Fast inference", category: "other" },
-    { id: "openrouter", label: "OpenRouter", hint: "Multi-provider routing", category: "other" },
-    // Local
-    { id: "ollama", label: "Ollama (local)", hint: "No API key needed", category: "local" },
-    // Custom
-    { id: "custom", label: "Custom endpoint", hint: "OpenAI-compatible API", category: "custom" },
-];
 /** All supported chat channels with credential guidance. */
 export const SUPPORTED_CHANNELS = [
     { type: "telegram", label: "Telegram", credentialHint: "Bot token from @BotFather" },

package/node_modules/@comis/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/cli",
   "private": true,
-  "version": "1.0.28",
+  "version": "1.0.31",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Command-line interface for the Comis AI agent platform",

package/node_modules/@comis/core/dist/config/schema-agent.d.ts

@@ -397,7 +397,11 @@ export declare const ContextEngineConfigSchema: z.ZodObject<{
      *  triggers on model id / provider / api change (those checks are
      *  unconditional regardless of this idle threshold). Range: 1 min .. 24 h. */
     replayDriftIdleMs: z.ZodDefault<z.ZodNumber>;
-    /** Model for LLM compaction in "provider:modelId" format. Defaults to Haiku for cost efficiency. Empty string falls through to session model. */
+    /** Model for LLM compaction in "provider:modelId" format. Empty string
+     *  (the default) triggers runtime resolution against the agent's primary
+     *  provider via pi-ai catalog (fast-tier cost model). Avoids pinning a
+     *  hardcoded Anthropic literal that goes stale on pi-ai upgrades and
+     *  cross-routes background ops to Claude when primary is OpenRouter/Google/etc. */
     compactionModel: z.ZodDefault<z.ZodString>;
     /** Minimum age (in tool result positions) before content is eligible for dead content eviction. */
     evictionMinAge: z.ZodDefault<z.ZodNumber>;
@@ -1616,7 +1620,11 @@ export declare const PerAgentConfigSchema: z.ZodObject<{
          *  triggers on model id / provider / api change (those checks are
          *  unconditional regardless of this idle threshold). Range: 1 min .. 24 h. */
         replayDriftIdleMs: z.ZodDefault<z.ZodNumber>;
-        /** Model for LLM compaction in "provider:modelId" format. Defaults to Haiku for cost efficiency. Empty string falls through to session model. */
+        /** Model for LLM compaction in "provider:modelId" format. Empty string
+         *  (the default) triggers runtime resolution against the agent's primary
+         *  provider via pi-ai catalog (fast-tier cost model). Avoids pinning a
+         *  hardcoded Anthropic literal that goes stale on pi-ai upgrades and
+         *  cross-routes background ops to Claude when primary is OpenRouter/Google/etc. */
         compactionModel: z.ZodDefault<z.ZodString>;
         /** Minimum age (in tool result positions) before content is eligible for dead content eviction. */
         evictionMinAge: z.ZodDefault<z.ZodNumber>;
@@ -2309,7 +2317,11 @@ export declare const AgentsMapSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
          *  triggers on model id / provider / api change (those checks are
          *  unconditional regardless of this idle threshold). Range: 1 min .. 24 h. */
         replayDriftIdleMs: z.ZodDefault<z.ZodNumber>;
-        /** Model for LLM compaction in "provider:modelId" format. Defaults to Haiku for cost efficiency. Empty string falls through to session model. */
+        /** Model for LLM compaction in "provider:modelId" format. Empty string
+         *  (the default) triggers runtime resolution against the agent's primary
+         *  provider via pi-ai catalog (fast-tier cost model). Avoids pinning a
+         *  hardcoded Anthropic literal that goes stale on pi-ai upgrades and
+         *  cross-routes background ops to Claude when primary is OpenRouter/Google/etc. */
         compactionModel: z.ZodDefault<z.ZodString>;
         /** Minimum age (in tool result positions) before content is eligible for dead content eviction. */
         evictionMinAge: z.ZodDefault<z.ZodNumber>;

package/node_modules/@comis/core/dist/config/schema-agent.js

@@ -294,8 +294,12 @@ export const ContextEngineConfigSchema = z.strictObject({
      *  triggers on model id / provider / api change (those checks are
      *  unconditional regardless of this idle threshold). Range: 1 min .. 24 h. */
     replayDriftIdleMs: z.number().int().min(60_000).max(24 * 60 * 60_000).default(30 * 60_000),
-    /** Model for LLM compaction in "provider:modelId" format. Defaults to Haiku for cost efficiency. Empty string falls through to session model. */
-    compactionModel: z.string().default("anthropic:claude-haiku-4-5-20250929"),
+    /** Model for LLM compaction in "provider:modelId" format. Empty string
+     *  (the default) triggers runtime resolution against the agent's primary
+     *  provider via pi-ai catalog (fast-tier cost model). Avoids pinning a
+     *  hardcoded Anthropic literal that goes stale on pi-ai upgrades and
+     *  cross-routes background ops to Claude when primary is OpenRouter/Google/etc. */
+    compactionModel: z.string().default(""),
     /** Minimum age (in tool result positions) before content is eligible for dead content eviction. */
     evictionMinAge: z.number().int().min(3).max(50).default(15),
     // --- Pipeline mode ---

package/node_modules/@comis/core/dist/config/schema-integrations.d.ts

@@ -306,10 +306,10 @@ export declare const VisionConfigSchema: z.ZodObject<{
  * Link understanding configuration.
  *
  * Controls automatic URL detection, fetching, and content extraction
- * from inbound messages. Disabled by default for backward compatibility.
+ * from inbound messages.
  */
 export declare const LinkUnderstandingConfigSchema: z.ZodObject<{
-    /** Enable automatic link understanding (default: false) */
+    /** Enable automatic link understanding (default: true) */
     enabled: z.ZodDefault<z.ZodBoolean>;
     /** Maximum number of links to process per message (default: 3) */
     maxLinks: z.ZodDefault<z.ZodNumber>;
@@ -541,7 +541,7 @@ export declare const MediaConfigSchema: z.ZodObject<{
     }, z.core.$strict>>;
     /** Link understanding settings */
     linkUnderstanding: z.ZodDefault<z.ZodObject<{
-        /** Enable automatic link understanding (default: false) */
+        /** Enable automatic link understanding (default: true) */
         enabled: z.ZodDefault<z.ZodBoolean>;
         /** Maximum number of links to process per message (default: 3) */
         maxLinks: z.ZodDefault<z.ZodNumber>;
@@ -848,7 +848,7 @@ export declare const IntegrationsConfigSchema: z.ZodObject<{
         }, z.core.$strict>>;
         /** Link understanding settings */
         linkUnderstanding: z.ZodDefault<z.ZodObject<{
-            /** Enable automatic link understanding (default: false) */
+            /** Enable automatic link understanding (default: true) */
             enabled: z.ZodDefault<z.ZodBoolean>;
             /** Maximum number of links to process per message (default: 3) */
             maxLinks: z.ZodDefault<z.ZodNumber>;

package/node_modules/@comis/core/dist/config/schema-integrations.js

@@ -197,11 +197,11 @@ export const VisionConfigSchema = z.strictObject({
  * Link understanding configuration.
  *
  * Controls automatic URL detection, fetching, and content extraction
- * from inbound messages. Disabled by default for backward compatibility.
+ * from inbound messages.
  */
 export const LinkUnderstandingConfigSchema = z.strictObject({
-    /** Enable automatic link understanding (default: false) */
-    enabled: z.boolean().default(false),
+    /** Enable automatic link understanding (default: true) */
+    enabled: z.boolean().default(true),
     /** Maximum number of links to process per message (default: 3) */
     maxLinks: z.number().int().positive().default(3),
     /** Timeout for fetching each URL in milliseconds (default: 10000) */

package/node_modules/@comis/core/dist/config/schema-models.d.ts

@@ -34,10 +34,12 @@ export declare const ModelsConfigSchema: z.ZodObject<{
         modelId: z.ZodString;
     }, z.core.$strict>>>;
     /** Default model identifier. When a per-agent config sets model: "default", this value is used.
-     *  Falls back to "claude-sonnet-4-5-20250929" if empty. */
+     *  When empty (the default), runtime resolution picks the mid-tier cost
+     *  model from the resolved provider's pi-ai catalog (resolveOperationDefaults). */
     defaultModel: z.ZodDefault<z.ZodString>;
     /** Default provider. When a per-agent config sets provider: "default", this value is used.
-     *  Falls back to "anthropic" if empty. */
+     *  When empty (the default), runtime resolution picks the most-populated
+     *  native provider from the pi-ai catalog (heuristic). */
     defaultProvider: z.ZodDefault<z.ZodString>;
 }, z.core.$strict>;
 /** Inferred models configuration type. */

package/node_modules/@comis/core/dist/config/schema-models.js

@@ -28,9 +28,11 @@ export const ModelsConfigSchema = z.strictObject({
     /** Friendly model aliases (e.g., "claude" -> anthropic/claude-sonnet-4) */
     aliases: z.array(ModelAliasSchema).default([]),
     /** Default model identifier. When a per-agent config sets model: "default", this value is used.
-     *  Falls back to "claude-sonnet-4-5-20250929" if empty. */
+     *  When empty (the default), runtime resolution picks the mid-tier cost
+     *  model from the resolved provider's pi-ai catalog (resolveOperationDefaults). */
     defaultModel: z.string().default(""),
     /** Default provider. When a per-agent config sets provider: "default", this value is used.
-     *  Falls back to "anthropic" if empty. */
+     *  When empty (the default), runtime resolution picks the most-populated
+     *  native provider from the pi-ai catalog (heuristic). */
     defaultProvider: z.string().default(""),
 });

package/node_modules/@comis/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/core",
   "private": true,
-  "version": "1.0.28",
+  "version": "1.0.31",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Core domain types, ports, event bus, security, and config for Comis",

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

@@ -9,7 +9,7 @@ import { ok, err, suppressError } from "@comis/shared";
 import { createGatewayServer } from "@comis/gateway";
 import { setupLogging, setupObservability, setupHealth, setupMemory, setupAgents, setupSchedulers, setupChannels, setupMedia, setupCrossSession, setupMcp, setupTools, setupMonitoring, setupHeartbeat, setupTaskExtraction, setupShutdown, setupGateway, setupRpcBridge, setupDeliveryQueue, setupDeliveryMirror, setupNotifications, setupBackgroundTasks, } from "./wiring/index.js";
 import { setupSingleAgent } from "./wiring/setup-agents.js";
-import { createActiveRunRegistry, createModelCatalog, wireSessionStateCleanup, wireMcpDisconnectCleanup, createGeminiCacheManager, wireGeminiCacheCleanup, createSessionTrackerRegistry } from "@comis/agent";
+import { createActiveRunRegistry, createModelCatalog, wireSessionStateCleanup, wireMcpDisconnectCleanup, createGeminiCacheManager, wireGeminiCacheCleanup, createSessionTrackerRegistry, validateProviderOverrides } from "@comis/agent";
 import { detectSandboxProvider, createImageGenProvider, createImageGenRateLimiter, createFileStateTracker } from "@comis/skills";
 import { createGraphCoordinator, createNodeTypeRegistry } from "./graph/index.js";
 import { createChannelHealthMonitor } from "@comis/channels";
@@ -33,6 +33,7 @@ import { writeFile as fsWriteFile, rm } from "node:fs/promises";
 import { createExecGit } from "./config/exec-git.js";
 import { saveLastKnownGood, buildRollbackSuggestion, handleRestoreFlag } from "./config/last-known-good.js";
 import { createRestartContinuationTracker, loadContinuations, buildMcpStatusLine } from "./wiring/restart-continuation.js";
+import { createInboundMessageIdResolver } from "./wiring/inbound-message-id-resolver.js";
 import { logOperationModelDryRun } from "./wiring/startup-dry-run.js";
 import os from "node:os";
 import { join as pathJoin, dirname as pathDirname, resolve as pathResolve } from "node:path";
@@ -327,6 +328,11 @@ export async function main(overrides = {}) {
     if (approvalsWarning) {
         daemonLogger.warn({ hint: "Set approvals.enabled: true or remove unused rules", errorKind: "config" }, approvalsWarning);
     }
+    // 3.6. Validate PROVIDER_OVERRIDES vs live pi-ai catalog (Layer 3C -- 260501-07g).
+    // Emits one structured WARN per orphaned override key (provider listed in
+    // PROVIDER_OVERRIDES that pi-ai no longer ships). Fire-and-forget: never
+    // throws, daemon continues to boot with dead override entries.
+    validateProviderOverrides(agentLogger);
     // 4. Observability
     const { tokenTracker, latencyRecorder, sharedCostTracker, // needed for obs.reset billing clear
     diagnosticCollector, billingEstimator, channelActivityTracker, deliveryTracer, } = setupObservability({ eventBus: container.eventBus, _createTokenTracker, _createLatencyRecorder, logger: logLevelManager.getLogger("observability"), dataDir });
@@ -620,11 +626,20 @@ export async function main(overrides = {}) {
     // before setupTools completes).
     // Deferred notification session tracker ref: wired after setupNotifications returns.
     // The onMessageProcessed callback reads this at call time (not definition time),
-    // so it is always set before any message arrives.
+    // so it is always set before any message arrives. recordActivity MUST stay in
+    // the post-processing callback because the ref is wired AFTER setupChannels
+    // returns; tracker.track moved to onMessageReceived which has no such dep.
     const sessionTrackerRef = {};
     // eslint-disable-next-line @typescript-eslint/no-explicit-any -- matches assembleToolsForAgent signature from setup-tools.ts
     const toolAssemblerRef = {};
-    const { adaptersByType, channelManager, resolveAttachment, lifecycleReactors, channelPlugins, commandQueue } = await setupChannels({
+    // Resolver translating daemon UUIDs (NormalizedMessage.id) back to platform-
+    // native message ids (e.g. Telegram integer message_id) for the
+    // message.delete/edit/react RPC handlers. Built post-setupChannels (needs
+    // channelCapabilities from the return), captured by reference inside the
+    // onMessageReceived lambda below — safe because no inbound message can fire
+    // before channelManager.start() runs later.
+    let inboundMessageIdResolver;
+    const { adaptersByType, channelManager, resolveAttachment, lifecycleReactors, channelPlugins, channelCapabilities, commandQueue } = await setupChannels({
         container, executors, defaultAgentId, sessionManager, sessionStore,
         logger, channelsLogger,
         linkRunner,
@@ -654,8 +669,16 @@ export async function main(overrides = {}) {
         rpcCall,
         // Task extraction callback (gated by config.scheduler.tasks.enabled)
         onTaskExtraction: extractFromConversation,
-        // Restart continuation: track recently-active sessions for SIGUSR2 replay
-        onMessageProcessed: (msg, channelType) => {
+        // Restart continuation: track recently-active sessions for SIGUSR2 replay.
+        // Two-callback timing split (260430-s4m corrects the r4i-A flaw):
+        //   onMessageReceived fires BEFORE processInboundMessage so the tracker
+        //     Map is populated before any tool call could trigger SIGUSR2 mid-
+        //     execution. Without this, multi-restart chains saw 0 captured records
+        //     and the next instance had nothing to replay -> silent bot.
+        //   onMessageProcessed fires AFTER processing for sessionTrackerRef
+        //     because the ref is wired post-setupNotifications (deferred-ref
+        //     pattern); calling it pre-processing would fire on an undefined ref.
+        onMessageReceived: (msg, channelType) => {
             // Preserve channel-native chat type so post-restart synthetic messages
             // can frame group sessions correctly. Without this, group inbounds are
             // mis-framed as DMs on first turn after restart.
@@ -671,8 +694,16 @@ export async function main(overrides = {}) {
                 tenantId: container.config.tenantId,
                 timestamp: Date.now(),
             });
+            // Translate daemon UUID -> platform-native message id so message.delete/
+            // edit/react can call channel adapters with what they actually expect.
+            // Resolver is assigned just after setupChannels returns (below).
+            inboundMessageIdResolver?.record(msg, channelType);
+        },
+        onMessageProcessed: (msg, channelType) => {
             // Record session activity for notification channel resolution fallback.
-            // sessionTrackerRef is populated after setupNotifications() returns (below).
+            // sessionTrackerRef.ref is populated post-construction by
+            // setupNotifications (line 879 below), so this MUST stay in the
+            // after-processing callback -- moving it earlier would fire on undefined.
             sessionTrackerRef.ref?.recordActivity(defaultAgentId, channelType, msg.channelId);
         },
         // /approve and /deny chat command interception
@@ -687,6 +718,18 @@ export async function main(overrides = {}) {
     });
     // Populate channel plugins ref for per-message char limit resolution.
     channelPluginsRef.ref = channelPlugins;
+    // Build the inbound message id resolver now that we have channelCapabilities.
+    // Each enabled channel contributes its `replyToMetaKey` (e.g. "telegramMessageId")
+    // so the resolver knows which metadata field to read on inbound to capture
+    // the platform-native id. Safe to assign now: setupChannels has not started
+    // adapters yet, so no inbound message has fired the onMessageReceived lambda.
+    {
+        const metaKeyByChannel = new Map();
+        for (const [type, cap] of channelCapabilities) {
+            metaKeyByChannel.set(type, cap.replyToMetaKey);
+        }
+        inboundMessageIdResolver = createInboundMessageIdResolver({ metaKeyByChannel });
+    }
     // Populate channelAdapters ref now that setupChannels has returned.
     // The drain cycle needs adapters to re-deliver pending messages.
     for (const [type, adapter] of adaptersByType) {
@@ -1029,7 +1072,7 @@ export async function main(overrides = {}) {
         agentDataDir: pathJoin(container.config.dataDir ?? pathJoin(os.homedir(), ".comis"), "agents"),
         sessionStore: sessionStoreBridge,
         crossSessionSender, subAgentRunner, graphCoordinator, namedGraphStore, nodeTypeRegistry,
-        securityConfig: container.config.security, adaptersByType, visionRegistry,
+        securityConfig: container.config.security, adaptersByType, inboundMessageIdResolver, visionRegistry,
         mediaConfig: container.config.integrations.media, ttsAdapter, linkRunner,
         logger, container, configPaths, defaultConfigPaths: DEFAULT_CONFIG_PATHS,
         configGitManager,
@@ -1167,7 +1210,7 @@ export async function main(overrides = {}) {
                 errorKind: "dependency",
             }, "MCP connection failures detected during restart continuation replay");
         }
-        const baseText = "[system: daemon restarted after config change — session restored. Do NOT repeat, re-send, or re-execute anything from the previous conversation. Simply greet the user or wait for their next message.]";
+        const baseText = "[system: daemon restarted to apply a config change. The result of your previous tool call is in the conversation above — react to it naturally, confirm or surface any issue, then yield to the user.]";
         for (const record of continuations) {
             // Skip sessions that already received a message during this startup cycle
             // (e.g., Telegram webhook delivered before continuation replay ran).

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

@@ -18,6 +18,7 @@ import { resolveWorkspaceDir, resolveOperationModel, resolveProviderFamily, OPER
 import { persistToConfig } from "./persist-to-config.js";
 import { writeInlineWorkspaceFiles, } from "./agent-inline-workspace.js";
 import { probeProviderAuth } from "./probe-provider-auth.js";
+import { resolveProviderCredential } from "./credential-resolver.js";
 // ---------------------------------------------------------------------------
 // Factory
 // ---------------------------------------------------------------------------
@@ -68,6 +69,18 @@ export function createAgentHandlers(deps) {
             existingSkills.builtinTools = { ...DEFAULT_BUILTIN_TOOLS, ...existingBt };
             raw.skills = existingSkills;
             const parsedConfig = PerAgentConfigSchema.parse(config);
+            // Credential guard (260501-2pz): fail-loud if the new agent's
+            // provider has no resolvable API key. Mirrors agents.update guard
+            // ordering — runs BEFORE the in-memory commit so rejection prevents
+            // assignment, file persist, and hot-add. Same helper as the patch /
+            // update call sites for cross-handler consistency.
+            const credCheck = resolveProviderCredential(parsedConfig.provider, {
+                providerEntries: deps.providerEntries ?? {},
+                secretManager: deps.secretManager,
+            });
+            if (!credCheck.ok) {
+                throw new Error(credCheck.reason);
+            }
             deps.agents[agentId] = parsedConfig;
             // Best-effort persistence to config.yaml
             if (deps.persistDeps) {
@@ -207,18 +220,36 @@ export function createAgentHandlers(deps) {
             }
             const merged = { ...existing, ...config };
             const parsedConfig = PerAgentConfigSchema.parse(merged);
-            // Probe provider API key when provider or model changes
+            // Credential guard + probe (260501-2pz): when provider OR model
+            // changes, (a) GUARD — fail-loud if the resulting provider's API key
+            // is not resolvable from any source (no silent skip), then (b) PROBE
+            // — preexisting wire validation when an explicit providers.entries
+            // record with apiKeyName exists. Order matters: guard runs first
+            // (cheap, all paths), probe runs second (only when applicable).
             const providerChanging = config.provider !== undefined && config.provider !== existing.provider;
             const modelChanging = config.model !== undefined && config.model !== existing.model;
-            if ((providerChanging || modelChanging) && deps.providerEntries) {
+            if (providerChanging || modelChanging) {
                 const targetProvider = parsedConfig.provider;
-                const providerEntry = deps.providerEntries[targetProvider];
-                if (providerEntry?.apiKeyName && deps.secretManager) {
-                    const apiKey = deps.secretManager.get(providerEntry.apiKeyName);
-                    if (apiKey) {
-                        const probeResult = await probeProviderAuth(providerEntry.baseUrl, apiKey, parsedConfig.model);
-                        if (!probeResult.ok) {
-                            throw new Error(`Cannot switch agent "${agentId}" to provider "${targetProvider}": ${probeResult.error}`);
+                // (a) GUARD — fail-loud if no credential source resolves
+                const resolution = resolveProviderCredential(targetProvider, {
+                    providerEntries: deps.providerEntries ?? {},
+                    secretManager: deps.secretManager,
+                });
+                if (!resolution.ok) {
+                    throw new Error(resolution.reason);
+                }
+                // (b) PROBE — preexisting behavior, fires only when an explicit
+                // providers.entries record with apiKeyName exists and the secret
+                // is retrievable. Validates the key works against the wire.
+                if (deps.providerEntries) {
+                    const providerEntry = deps.providerEntries[targetProvider];
+                    if (providerEntry?.apiKeyName && deps.secretManager) {
+                        const apiKey = deps.secretManager.get(providerEntry.apiKeyName);
+                        if (apiKey) {
+                            const probeResult = await probeProviderAuth(providerEntry.baseUrl, apiKey, parsedConfig.model);
+                            if (!probeResult.ok) {
+                                throw new Error(`Cannot switch agent "${agentId}" to provider "${targetProvider}": ${probeResult.error}`);
+                            }
                         }
                     }
                 }

package/node_modules/@comis/daemon/dist/rpc/builtin-provider-guard.d.ts

@@ -0,0 +1,16 @@
+export type BuiltInProviderGuardResult = {
+    ok: true;
+} | {
+    ok: false;
+    reason: string;
+};
+/**
+ * Check whether a providers.create call would land a redundant custom
+ * entry that shadows pi-ai's dynamic catalog. Returns ok=true when the
+ * call is legitimate (genuine custom provider OR proxy with distinct
+ * baseUrl), ok=false with an actionable reason otherwise.
+ */
+export declare function checkBuiltInProviderRedundancy(providerId: string, config: {
+    baseUrl?: string;
+    apiKeyName?: string;
+}): BuiltInProviderGuardResult;

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

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * Built-in provider redundancy guard for providers.create (260501-gyy FIX 2).
+ *
+ * Rejects providers_manage create attempts that would shadow pi-ai's
+ * dynamic catalog with a redundant custom entry. A built-in provider
+ * (one in pi-ai's getProviders()) already has its full model list
+ * available via the catalog -- custom entries are only legitimate for
+ * proxies (different baseUrl) or non-SDK providers. Without this guard,
+ * an LLM agent that creates a catalog-shadowing entry with a stale or
+ * invented model id sets up downstream 404 / "model not found" failures
+ * (production: 2026-05-01 08:53-08:54 trace).
+ *
+ * Generic by construction: rejection message uses ${providerId} +
+ * ${apiKeyName} interpolation only -- no per-provider hardcoded names
+ * in the source template (catalog-agnostic). Pinned by source-grep
+ * regression test in builtin-provider-guard.test.ts.
+ *
+ * Mirrors credential-resolver.ts shape (260501-2pz precedent).
+ *
+ * @module
+ */
+import { getProviders, getModels } from "@mariozechner/pi-ai";
+/**
+ * Check whether a providers.create call would land a redundant custom
+ * entry that shadows pi-ai's dynamic catalog. Returns ok=true when the
+ * call is legitimate (genuine custom provider OR proxy with distinct
+ * baseUrl), ok=false with an actionable reason otherwise.
+ */
+export function checkBuiltInProviderRedundancy(providerId, config) {
+    const native = new Set(getProviders());
+    if (!native.has(providerId)) {
+        // Genuine custom provider -- never redundant.
+        return { ok: true };
+    }
+    const catalogBaseUrl = getModels(providerId)[0]?.baseUrl;
+    const userBaseUrl = config.baseUrl?.trim();
+    if (userBaseUrl && userBaseUrl !== catalogBaseUrl) {
+        // Legitimate proxy -- user pointed at a non-catalog URL.
+        return { ok: true };
+    }
+    // Built-in + catalog/absent baseUrl -> redundant.
+    return {
+        ok: false,
+        reason: buildRejectionMessage(providerId, config),
+    };
+}
+function buildRejectionMessage(providerId, config) {
+    const apiKeyName = config.apiKeyName ?? "<APIKEY_NAME>";
+    const lines = [];
+    lines.push(`Cannot create custom provider entry for "${providerId}": this provider is built-in to the pi-ai SDK with its full model catalog available dynamically. Custom entries are only needed for proxies (different baseUrl) or non-SDK providers.`);
+    lines.push("");
+    lines.push("To use this provider:");
+    lines.push(`  1. gateway env_set ${apiKeyName}=<your-key>   (find name via gateway env_list)`);
+    lines.push(`  2. gateway patch agents.<id>.provider = "${providerId}"`);
+    lines.push(`  3. gateway patch agents.<id>.model = "<model-id>"   (find available models via models_manage list provider:${providerId})`);
+    lines.push("");
+    lines.push(`If you intended a custom proxy with a different base URL, supply a distinct provider_id (e.g., "${providerId}-proxy") and your custom baseUrl.`);
+    return lines.join("\n");
+}

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

@@ -14,6 +14,39 @@ import { stringify as yamlStringify } from "yaml";
 import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
 import { dirname } from "node:path";
 import { z } from "zod";
+import { resolveProviderCredential } from "./credential-resolver.js";
+/**
+ * True when the patch key writes a provider/model field.
+ * Matches `<id>.provider` or `<id>.model` (leaf only — does not match
+ * nested paths like modelFailover.fallbackModels.0.provider, which is
+ * deliberately out-of-scope for the credential guard).
+ */
+function isAgentProviderOrModelKey(key) {
+    if (!key)
+        return false;
+    return /(^|\.)(provider|model)$/.test(key);
+}
+/**
+ * Resolve the provider value the patch is establishing.
+ * - For `.provider` patches, the new value IS the provider.
+ * - For `.model`-only patches, look up the agent's CURRENT provider
+ *   (validates that the agent's existing auth chain still resolves —
+ *   surfaces stale broken configs at patch time rather than at next chat).
+ * Returns undefined for paths the guard doesn't validate.
+ */
+function extractTargetProvider(key, newValue, currentConfig) {
+    if (key.endsWith(".provider")) {
+        return typeof newValue === "string" ? newValue : undefined;
+    }
+    if (key.endsWith(".model")) {
+        const agentId = key.split(".")[0];
+        if (!agentId)
+            return undefined;
+        // eslint-disable-next-line security/detect-object-injection -- agents map is typed Record; agentId from validated key
+        return currentConfig.agents?.[agentId]?.provider;
+    }
+    return undefined;
+}
 /**
  * Restore MCP server `env` from existing YAML when the UI patch
  * omits it (because config.read redacted secret values to "[REDACTED]").
@@ -419,6 +452,32 @@ export function createConfigHandlers(deps) {
                         : " This setting requires manual operator intervention via config files.";
                     throw new Error(`Config path "${key ? `${section}.${key}` : section}" is immutable and cannot be modified at runtime.${suffix}`);
                 }
+                // Credential guard (260501-2pz): when a patch targets an agent's
+                // provider/model field, verify the resulting provider's API key is
+                // resolvable from at least one source pi-coding-agent will consult
+                // at runtime. Fail-loud here rather than letting an unauthorized
+                // provider config persist and explode at the next chat turn.
+                // See `.planning/design/daemon-credential-guard/PLAN.md`.
+                if (section === "agents" && isAgentProviderOrModelKey(key)) {
+                    const targetProvider = extractTargetProvider(key, coercedValue, deps.container.config);
+                    if (targetProvider !== undefined) {
+                        const resolution = resolveProviderCredential(targetProvider, {
+                            providerEntries: deps.container.config.providers?.entries ?? {},
+                            secretManager: deps.container.secretManager,
+                        });
+                        if (!resolution.ok) {
+                            deps.logger.warn({
+                                method: "config.patch",
+                                section,
+                                key,
+                                targetProvider,
+                                hint: "Provider credential not resolvable",
+                                errorKind: "validation",
+                            }, "Config patch rejected: missing provider credential");
+                            throw new Error(resolution.reason);
+                        }
+                    }
+                }
                 // Build patch object (use coerced value for the actual data, keep original for audit)
                 let patch;
                 if (key) {

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

@@ -0,0 +1,17 @@
+import type { ProviderEntry } from "@comis/core";
+export interface CredentialResolverDeps {
+    /** Provider-entry map from comis config (providers.entries). */
+    providerEntries?: Record<string, ProviderEntry>;
+    /** Secret manager backing process.env / ~/.comis/.env. */
+    secretManager?: {
+        has(key: string): boolean;
+    };
+}
+export interface CredentialResolution {
+    ok: boolean;
+    /** When ok=false: actionable error message ready to throw. */
+    reason?: string;
+    /** When ok=true: which source resolved. Useful for debug logs. */
+    source?: "keyless" | "providers_entry" | "env_canonical";
+}
+export declare function resolveProviderCredential(targetProvider: string, deps: CredentialResolverDeps): CredentialResolution;