comisai 1.0.34 → 1.0.37

package/node_modules/@comis/agent/dist/executor/tool-deferral.d.ts

@@ -101,13 +101,16 @@ export declare function resolveModelTier(contextWindow: number): ModelTier;
  */
 export declare function resolveToolCallingTemperature(modelTier: ModelTier): number;
 /**
- * Anthropic models that support server-side tool_search_tool_regex
- * (defer_loading). Sonnet 4.x+, Opus 4.x+; NOT Haiku.
+ * Anthropic models that support server-side tool-search via defer_loading.
+ * Sonnet 4.x+, Opus 4.x+; NOT Haiku.
  *
- * When this returns true, request-body-injector strips client-side
- * `discover_tools` from the API payload and appends `tool_search_tool_regex`
- * instead -- so any model-facing teaching string about `discover_tools`
- * contradicts the actual tool list and must be suppressed (260428-oyc).
+ * **Surviving caller:** `request-body-injector.ts` (the
+ * `if (supportsToolSearch(model.id)) {...}` gate inside the Anthropic
+ * `onPayload` handler). Used to gate the API-payload reshape that strips
+ * the client-side discovery tool, appends the server-side tool-search
+ * regex tool, and marks deferred tools `defer_loading: true`. This is a
+ * runtime API-payload concern, distinct from the deferred-tool prompt
+ * teaching emitted by `buildDeferredToolsContext`.
  *
  * Lowercase-normalize so provider-prefixed model ids
  * (`anthropic/claude-sonnet-4`, `bedrock/anthropic.claude-opus-4`) resolve
@@ -135,31 +138,19 @@ export declare function resolveToolDescription(tool: ToolDefinition): string;
  * Lists deferred tool names and descriptions so the LLM knows what's
  * available behind a discovery mechanism.
  *
- * The third line (the instruction line) is conditional on `useToolSearch`:
- *
- * - `useToolSearch=false` (default, every non-Anthropic provider + Haiku):
- *   teaches the model to call the client-side `discover_tools` tool, which
- *   IS present in those payloads.
- *
- * - `useToolSearch=true` (Anthropic Sonnet/Opus 4.x): the API payload no
- *   longer contains a client-side `discover_tools` tool -- the
- *   request-body-injector replaces it with the server-side
- *   `tool_search_tool_regex` and marks deferred tools `defer_loading: true`,
- *   meaning Anthropic auto-loads them on first direct invocation. The
- *   teaching string therefore points at direct invocation + tool-search by
- *   regex, never at `discover_tools`. Without this conditional, the model
- *   reads its own preamble ("call discover_tools") against a tool list that
- *   doesn't contain that tool and gives up (260428-oyc production repro).
+ * The instruction line is mechanism-neutral: it tells the model these
+ * tools are available but not loaded, and points it at "the discovery
+ * mechanism available in your active toolspace" without naming a specific
+ * tool. Provider-specific payload reshaping (stripping the client-side
+ * discovery tool and appending the server-side tool-search regex tool for
+ * Anthropic Sonnet/Opus 4.x) lives entirely in `request-body-injector.ts`
+ * and is gated by `supportsToolSearch(modelId)`. This separation is
+ * enforced by architecture-grep tests.
  *
  * @param entries - Deferred tool entries (remaining after discovery re-inclusion)
- * @param options - Optional flags. `useToolSearch=true` switches the third
- *   line to the tool-search-aware variant. Defaults to false (backward-
- *   compatible with the discover_tools teaching).
  * @returns XML block string, or empty string when no entries
  */
-export declare function buildDeferredToolsContext(entries: DeferredToolEntry[], options?: {
-    useToolSearch?: boolean;
-}): string;
+export declare function buildDeferredToolsContext(entries: DeferredToolEntry[]): string;
 /**
  * Apply unified tool deferral: rule-based, budget-based, small-model,
  * lifecycle merge, and operator overrides.

package/node_modules/@comis/agent/dist/executor/tool-deferral.js

@@ -15,7 +15,7 @@
  * @module
  */
 import { getToolMetadata } from "@comis/core";
-import { extractMcpServerName } from "../bridge/bridge-event-handlers.js";
+import { extractMcpServerName } from "@comis/shared";
 import { PRIVILEGED_TOOL_NAMES } from "../bootstrap/sections/tooling-sections.js";
 import { LEAN_TOOL_DESCRIPTIONS } from "../bootstrap/sections/tool-descriptions.js";
 // ---------------------------------------------------------------------------
@@ -96,13 +96,16 @@ export function resolveToolCallingTemperature(modelTier) {
     return modelTier === "small" ? 0.0 : 0.1;
 }
 /**
- * Anthropic models that support server-side tool_search_tool_regex
- * (defer_loading). Sonnet 4.x+, Opus 4.x+; NOT Haiku.
+ * Anthropic models that support server-side tool-search via defer_loading.
+ * Sonnet 4.x+, Opus 4.x+; NOT Haiku.
  *
- * When this returns true, request-body-injector strips client-side
- * `discover_tools` from the API payload and appends `tool_search_tool_regex`
- * instead -- so any model-facing teaching string about `discover_tools`
- * contradicts the actual tool list and must be suppressed (260428-oyc).
+ * **Surviving caller:** `request-body-injector.ts` (the
+ * `if (supportsToolSearch(model.id)) {...}` gate inside the Anthropic
+ * `onPayload` handler). Used to gate the API-payload reshape that strips
+ * the client-side discovery tool, appends the server-side tool-search
+ * regex tool, and marks deferred tools `defer_loading: true`. This is a
+ * runtime API-payload concern, distinct from the deferred-tool prompt
+ * teaching emitted by `buildDeferredToolsContext`.
  *
  * Lowercase-normalize so provider-prefixed model ids
  * (`anthropic/claude-sonnet-4`, `bedrock/anthropic.claude-opus-4`) resolve
@@ -169,32 +172,21 @@ export function resolveToolDescription(tool) {
  * Lists deferred tool names and descriptions so the LLM knows what's
  * available behind a discovery mechanism.
  *
- * The third line (the instruction line) is conditional on `useToolSearch`:
- *
- * - `useToolSearch=false` (default, every non-Anthropic provider + Haiku):
- *   teaches the model to call the client-side `discover_tools` tool, which
- *   IS present in those payloads.
- *
- * - `useToolSearch=true` (Anthropic Sonnet/Opus 4.x): the API payload no
- *   longer contains a client-side `discover_tools` tool -- the
- *   request-body-injector replaces it with the server-side
- *   `tool_search_tool_regex` and marks deferred tools `defer_loading: true`,
- *   meaning Anthropic auto-loads them on first direct invocation. The
- *   teaching string therefore points at direct invocation + tool-search by
- *   regex, never at `discover_tools`. Without this conditional, the model
- *   reads its own preamble ("call discover_tools") against a tool list that
- *   doesn't contain that tool and gives up (260428-oyc production repro).
+ * The instruction line is mechanism-neutral: it tells the model these
+ * tools are available but not loaded, and points it at "the discovery
+ * mechanism available in your active toolspace" without naming a specific
+ * tool. Provider-specific payload reshaping (stripping the client-side
+ * discovery tool and appending the server-side tool-search regex tool for
+ * Anthropic Sonnet/Opus 4.x) lives entirely in `request-body-injector.ts`
+ * and is gated by `supportsToolSearch(modelId)`. This separation is
+ * enforced by architecture-grep tests.
  *
  * @param entries - Deferred tool entries (remaining after discovery re-inclusion)
- * @param options - Optional flags. `useToolSearch=true` switches the third
- *   line to the tool-search-aware variant. Defaults to false (backward-
- *   compatible with the discover_tools teaching).
  * @returns XML block string, or empty string when no entries
  */
-export function buildDeferredToolsContext(entries, options) {
+export function buildDeferredToolsContext(entries) {
     if (entries.length === 0)
         return "";
-    const useToolSearch = options?.useToolSearch === true;
     // Separate MCP tools (group by server) from non-MCP tools (individual listing)
     const mcpByServer = new Map();
     const nonMcpEntries = [];
@@ -220,9 +212,9 @@ export function buildDeferredToolsContext(entries, options) {
         const shortNames = tools.map(t => t.name.startsWith(prefix) ? t.name.slice(prefix.length) : t.name);
         lines.push(`[${server}] (${tools.length} tools): ${shortNames.join(", ")}`);
     }
-    const instruction = useToolSearch
-        ? "These tools auto-load on first invocation -- call them directly by name with the right arguments. To preview a tool's schema before calling, use tool_search_tool_regex with a regex matching the tool name (e.g., tool_search_tool_regex(pattern: \"agents_manage\"))."
-        : "Call discover_tools to search by keyword or server name (e.g., discover_tools(\"yfinance\")).";
+    const instruction = "These tools are connected but not currently loaded into your active context. " +
+        "To use one, invoke the discovery mechanism available in your active toolspace, " +
+        "then call the loaded tool with the appropriate arguments.";
     return [
         "<deferred-tools>",
         "The following tools are available but not loaded.",
@@ -257,7 +249,7 @@ export function applyToolDeferral(tools, _contextWindow, deferralContext, logger
     for (const t of tools) {
         originalToolMap.set(t.name, t);
     }
-    // Phase 1: Rule-based deferral
+    // Rule-based deferral
     for (const rule of DEFERRAL_RULES) {
         if (!rule.activeWhen(deferralContext)) {
             for (const toolName of rule.tools) {
@@ -267,7 +259,7 @@ export function applyToolDeferral(tools, _contextWindow, deferralContext, logger
             }
         }
     }
-    // Phase 2: MCP tools deferred by default (only for providers with mid-turn injection)
+    // MCP tools deferred by default (only for providers with mid-turn injection)
     // Providers without mid-turn injection (OpenAI, xAI, etc.) get MCP tools from the start,
     // because sub-agents only call execute() once and there is no "next execution" for
     // discovered tools to appear in.
@@ -282,7 +274,7 @@ export function applyToolDeferral(tools, _contextWindow, deferralContext, logger
             }
         }
     }
-    // Phase 3: Small model aggressive deferral
+    // Small model aggressive deferral
     if (deferralContext.modelTier === "small") {
         for (const t of tools) {
             if (!deferredSet.has(t.name) && !CORE_TOOLS.has(t.name) && !deferralContext.recentlyUsedToolNames.has(t.name)) {
@@ -290,7 +282,7 @@ export function applyToolDeferral(tools, _contextWindow, deferralContext, logger
             }
         }
     }
-    // Phase 4: Merge lifecycle-demoted tools into deferral set for unified discover_tools
+    // Merge lifecycle-demoted tools into deferral set for unified discover_tools
     // Clear discovery state for lifecycle-demoted tools (prevents appearing
     // in both discoveredTools and deferredEntries simultaneously)
     if (deferralContext.lifecycleDemotedNames) {
@@ -301,7 +293,7 @@ export function applyToolDeferral(tools, _contextWindow, deferralContext, logger
             }
         }
     }
-    // Phase 5: Operator overrides (neverDefer / alwaysDefer from DeferredToolsConfigSchema)
+    // Operator overrides (neverDefer / alwaysDefer from DeferredToolsConfigSchema)
     if (deferralContext.neverDefer) {
         for (const name of deferralContext.neverDefer) {
             deferredSet.delete(name);
@@ -428,7 +420,7 @@ function structuredSearch(deferredTools, query, maxResults) {
         if (prefixMatches.length > 0)
             return prefixMatches;
     }
-    // Mode 4: Server name match (e.g., "yfinance" -> all mcp__yfinance--* tools)
+    // Mode 4: Server name match (e.g., bare server token -> all mcp__<server>--* tools)
     const serverPrefix = `mcp__${q}--`;
     const serverMatches = deferredTools.filter(t => t.name.toLowerCase().startsWith(serverPrefix));
     if (serverMatches.length > 0)
@@ -622,7 +614,7 @@ export function createDiscoverTool(deferredEntries, logger, embeddingPort, score
                 return {
                     content: [{
                             type: "text",
-                            text: "No matching tools found. Try an exact tool name, MCP server name (e.g. 'yfinance'), or select:tool1,tool2 syntax.",
+                            text: "No matching tools found. Try an exact tool name, MCP server name, or select:tool1,tool2 syntax.",
                         }],
                     isError: false,
                     details: undefined,
@@ -648,12 +640,11 @@ export function createDiscoverTool(deferredEntries, logger, embeddingPort, score
  * Match modes (checked in order, first non-empty wins):
  * 1. Exact name match (case-insensitive) against the full query.
  * 2. `mcp__` / `mcp:` prefix match against the full query.
- * 3. Bare server-name match on full query (`"yfinance"` -> all `mcp__yfinance--*`).
+ * 3. Bare server-name match on full query (e.g., bare server token -> all `mcp__<server>--*`).
  * 4. Per-token server-name fallback: for multi-word queries like
- *    `"yfinance get_stock"`, check each whitespace-separated token as a
- *    potential MCP server name. Catches the srv1593437 08:06:39Z scenario
- *    where the agent emits `{query: "yfinance get_stock"}` rather than just
- *    `{query: "yfinance"}`.
+ *    `"<server> <verb>"`, check each whitespace-separated token as a
+ *    potential MCP server name. Catches the case where the agent emits
+ *    `{query: "<server> <verb>"}` rather than just `{query: "<server>"}`.
  */
 function findActiveToolMatches(query, activeToolNames) {
     const q = query.toLowerCase().trim();
@@ -679,7 +670,7 @@ function findActiveToolMatches(query, activeToolNames) {
     // Mode 4: per-token server fallback for multi-word queries.
     // Each whitespace-separated token is probed as a server name. The first
     // token that resolves to >= 1 active tool wins. This handles the common
-    // "{server} {verb}" pattern like "yfinance get_stock".
+    // "<server> <verb>" pattern like "<bare-server-token> <verb>".
     const tokens = q.split(/\s+/).filter(t => /^[a-z0-9_-]+$/.test(t));
     for (const token of tokens) {
         const tokenServerPrefix = `mcp__${token}--`;

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

@@ -50,6 +50,23 @@ export { createModelScanner } from "./model/model-scanner.js";
 export type { ScanResult, ModelScanner, ModelScannerDeps } from "./model/model-scanner.js";
 export { createOAuthTokenManager } from "./model/oauth-token-manager.js";
 export type { OAuthTokenManager, OAuthTokenManagerDeps, OAuthError } from "./model/oauth-token-manager.js";
+export { resolveProviderApiKey } from "./model/resolve-provider-api-key.js";
+export type { ResolveProviderApiKeyDeps } from "./model/resolve-provider-api-key.js";
+export { decodeCodexJwtPayload, resolveCodexAuthIdentity, resolveCodexStableSubject, resolveCodexAccessTokenExpiry, redactEmailForLog } from "./model/oauth-identity.js";
+export { createOAuthCredentialStoreFile } from "./model/oauth-credential-store-file.js";
+export type { OAuthCredentialStoreFileConfig } from "./model/oauth-credential-store-file.js";
+export { selectOAuthCredentialStore } from "./model/oauth-credential-store-selector.js";
+export type { SelectOAuthCredentialStoreInput, OAuthStorageMode, } from "./model/oauth-credential-store-selector.js";
+export { isRemoteEnvironment } from "./model/oauth-env.js";
+export type { IsRemoteEnvironmentInput } from "./model/oauth-env.js";
+export { loginOpenAICodexOAuth } from "./model/oauth-login-runner.js";
+export type { LoginError, LoginRunnerSuccess, LoginRunnerParams, RunnerPrompter, } from "./model/oauth-login-runner.js";
+export { loginOpenAICodexDeviceCode } from "./model/oauth-device-code.js";
+export type { DeviceCodeVerificationPrompt, LoginOpenAICodexDeviceCodeOptions, } from "./model/oauth-device-code.js";
+export { runOAuthTlsPreflight } from "./model/oauth-tls-preflight.js";
+export type { TlsPreflightResult, TlsPreflightFailureKind, RunOAuthTlsPreflightOptions, } from "./model/oauth-tls-preflight.js";
+export { rewriteOAuthError } from "./model/oauth-errors.js";
+export type { OAuthErrorCode, RewrittenOAuthError, } from "./model/oauth-errors.js";
 export { createAuthUsageTracker } from "./model/auth-usage-tracker.js";
 export type { AuthUsageTracker, ProfileStats, ProfileUsageInput } from "./model/auth-usage-tracker.js";
 export { createLastKnownModelTracker } from "./model/last-known-model.js";

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

@@ -26,7 +26,7 @@ export { createAuthProvider } from "./model/auth-provider.js";
 export { createAuthProfileManager } from "./model/auth-profile.js";
 // Auth rotation adapter (key rotation with cooldown)
 export { createAuthRotationAdapter } from "./model/auth-rotation-adapter.js";
-// Image-aware model routing (existing + image fallback chain from 62-05)
+// Image-aware model routing (existing + image fallback chain)
 export { resolveModelForMessage, isVisionCapable, createImageFallbackChain } from "./model/image-router.js";
 // Model allowlist
 export { createModelAllowlist } from "./model/model-allowlist.js";
@@ -40,9 +40,30 @@ export { createModelCatalog, resolveModelPricing, ZERO_COST } from "./model/mode
 export { getCacheProviderInfo } from "./executor/cache-usage-helpers.js";
 // Model scanner
 export { createModelScanner } from "./model/model-scanner.js";
-// OAuth token manager (from 62-03)
+// OAuth token manager
 export { createOAuthTokenManager } from "./model/oauth-token-manager.js";
-// Auth usage tracker (from 62-05)
+// Per-LLM-call OAuth dispatch helper — shared helper used by PiExecutor.execute()
+// pre-hook and the two compaction getApiKey callbacks. Re-exported so the
+// integration test can drive the same resolver hook the executor uses.
+export { resolveProviderApiKey } from "./model/resolve-provider-api-key.js";
+// OAuth identity — pure-function JWT decoder + identity resolver + redaction helper
+export { decodeCodexJwtPayload, resolveCodexAuthIdentity, resolveCodexStableSubject, resolveCodexAccessTokenExpiry, redactEmailForLog } from "./model/oauth-identity.js";
+// OAuth credential store — file adapter (plaintext file-backed adapter with atomic write + per-profile lock + schema versioning)
+export { createOAuthCredentialStoreFile } from "./model/oauth-credential-store-file.js";
+// OAuth credential store selector — lives here so the CLI process can
+// instantiate the same adapter the daemon uses
+export { selectOAuthCredentialStore } from "./model/oauth-credential-store-selector.js";
+// OAuth env detection — pure function for VPS/headless heuristic
+export { isRemoteEnvironment } from "./model/oauth-env.js";
+// OAuth login runner — interactive login orchestrator
+export { loginOpenAICodexOAuth } from "./model/oauth-login-runner.js";
+// Device-code OAuth flow
+export { loginOpenAICodexDeviceCode } from "./model/oauth-device-code.js";
+// OAuth TLS preflight
+export { runOAuthTlsPreflight } from "./model/oauth-tls-preflight.js";
+// OAuth error catalogue
+export { rewriteOAuthError } from "./model/oauth-errors.js";
+// Auth usage tracker
 export { createAuthUsageTracker } from "./model/auth-usage-tracker.js";
 // Last-known-working model tracker (auth-failure fallback)
 export { createLastKnownModelTracker } from "./model/last-known-model.js";
@@ -107,15 +128,15 @@ export { withPromptTimeout, withResettablePromptTimeout, PromptTimeoutError } fr
 // Error classification (user-safe error messages)
 export { classifyError, classifyPromptTimeout } from "./executor/error-classifier.js";
 export { composeStreamWrappers, createConfigResolver, createRequestBodyInjector, createCacheTraceWriter, createApiPayloadTraceWriter, createToolResultSizeBouncer, clearSessionRenderedToolCache } from "./executor/stream-wrappers/index.js";
-// Active run registry (-- tracks running sessions for mid-stream steering)
+// Active run registry (tracks running sessions for mid-stream steering)
 export { createActiveRunRegistry } from "./executor/active-run-registry.js";
 // Cache break detection
 export { clearCacheBreakDetectorSession, extractGeminiPromptState } from "./executor/cache-break-detection.js";
-// Cache break diff writer ()
+// Cache break diff writer
 export { createCacheBreakDiffWriter } from "./executor/cache-break-diff-writer.js";
 // Gemini cache injector
 export { createGeminiCacheInjector } from "./executor/gemini-cache-injector.js";
-// Gemini cache manager ()
+// Gemini cache manager
 export { createGeminiCacheManager, computeCacheContentHash } from "./executor/gemini-cache-manager.js";
 // Gemini cache lifecycle
 export { wireGeminiCacheCleanup } from "./executor/gemini-cache-lifecycle.js";
@@ -166,24 +187,24 @@ export { createResultCondenser } from "./spawn/index.js";
 export { createNarrativeCaster } from "./spawn/index.js";
 export { createLifecycleHooks, deriveSubagentContextEngineConfig } from "./spawn/index.js";
 export { createEphemeralComisSessionManager } from "./spawn/index.js";
-// Context engine (, )
+// Context engine
 export { createContextEngine } from "./context-engine/index.js";
 export { createThinkingBlockCleaner } from "./context-engine/index.js";
 export { computeTokenBudget } from "./context-engine/index.js";
-// DAG reconciliation, compaction, integrity, and assembler (Phases 411-414)
+// DAG reconciliation, compaction, integrity, and assembler
 export { reconcileJsonlToDag, installDagIngestionHook, createDagContextEngine, runLeafPass, runCondensedPass, resolveFreshTailBoundary, shouldCompact, markAncestorsDirty, recomputeDescendantCounts, runDagCompaction, checkIntegrity, CHARS_PER_TOKEN_RATIO, } from "./context-engine/index.js";
 // Provider capabilities
 export { DEFAULTS as PROVIDER_CAPABILITY_DEFAULTS, resolveProviderCapabilities, normalizeProviderId, isAnthropicFamily, isOpenAiFamily, shouldDropThinkingBlocks, resolveToolCallIdMode, validateProviderOverrides, } from "./provider/capabilities.js";
 // Model compatibility auto-detection (xAI compat flags)
 export { normalizeModelCompat } from "./provider/model-compat.js";
-// Model ID normalization ()
+// Model ID normalization
 export { normalizeModelId } from "./provider/model-id-normalize.js";
 // Response sanitization pipeline
 export { sanitizeAssistantResponse, setSanitizeLogger, extractFinalTagContent } from "./provider/response/sanitize-pipeline.js";
-// Response filter utilities ( -- used by ThinkingTagFilter)
+// Response filter utilities (used by ThinkingTagFilter)
 export { stripReasoningTagsFromText } from "./response-filter/reasoning-tags.js";
 export { findCodeRegions, isInsideCode } from "./response-filter/code-regions.js";
-// Thinking tag filter ( -- moved from @comis/channels)
+// Thinking tag filter (moved from @comis/channels)
 export { createThinkingTagFilter } from "./response-filter/thinking-tag-filter.js";
 // Operation model resolver
 export { resolveOperationModel, resolveProviderFamily } from "./model/operation-model-resolver.js";

package/node_modules/@comis/agent/dist/model/auth-provider.d.ts

@@ -12,7 +12,8 @@
  */
 import type { AuthStorage } from "@mariozechner/pi-coding-agent";
 import type { SecretManager } from "@comis/core";
-import type { TypedEventBus } from "@comis/core";
+import type { TypedEventBus, OAuthCredentialStorePort } from "@comis/core";
+import type { ComisLogger } from "@comis/infra";
 import { type AuthProfileManager, type AuthProfile, type OrderingStrategy } from "./auth-profile.js";
 import { type AuthRotationAdapter } from "./auth-rotation-adapter.js";
 import { type AuthUsageTracker } from "./auth-usage-tracker.js";
@@ -35,10 +36,32 @@ export interface AuthProviderConfig {
     cooldownCapMs?: number;
     /** OAuth configuration. When provided, creates an OAuthTokenManager. */
     oauth?: {
-        /** EventBus for emitting auth:token_rotated events. */
+        /** EventBus for emitting auth events (token_rotated, profile_bootstrapped, refresh_failed). */
         eventBus: TypedEventBus;
+        /** Credential store for persistent refresh — REQUIRED. */
+        credentialStore: OAuthCredentialStorePort;
+        /** Logger for OAuth log events — REQUIRED. */
+        logger: ComisLogger;
+        /** Data directory for lock-file path resolution — REQUIRED. */
+        dataDir: string;
         /** Prefix for SecretManager key names (default: "OAUTH_"). */
         keyPrefix?: string;
+        /**
+         * Absolute path to auth-profiles.json for the chokidar watcher. When set,
+         * OAuthTokenManager registers a file watcher that invalidates its in-memory
+         * cache on external rewrites (CLI auth login). Pass `undefined` for
+         * encrypted-store mode (documented limitation).
+         */
+        watchPath?: string;
+        /**
+         * Getter for the agent's oauthProfiles map. Called fresh on every
+         * OAuthTokenManager.getApiKey() invocation. Optional — falls back to a
+         * no-agent-level-preference contract when absent. The closure implementation
+         * should dereference the daemon's stable
+         * `container.config.agents[agentId]?.oauthProfiles` so the value is observed
+         * across `agents.update` reference-replacements without a daemon restart.
+         */
+        getAgentOauthProfiles?: () => Record<string, string> | undefined;
     };
 }
 /** Unified auth provider exposing all composed auth modules. */

package/node_modules/@comis/agent/dist/model/auth-provider.js

@@ -69,7 +69,13 @@ export function createAuthProvider(config) {
         const oauthDeps = {
             secretManager,
             eventBus: oauth.eventBus,
+            credentialStore: oauth.credentialStore,
+            logger: oauth.logger,
+            dataDir: oauth.dataDir,
             keyPrefix: oauth.keyPrefix,
+            watchPath: oauth.watchPath,
+            // Thread the agent oauthProfiles getter through.
+            getAgentOauthProfiles: oauth.getAgentOauthProfiles,
         };
         oauthManager = createOAuthTokenManager(oauthDeps);
     }

package/node_modules/@comis/agent/dist/model/compaction-model-resolver.d.ts

@@ -10,9 +10,9 @@
  *   still routed to Claude Haiku, defeating the cost-tiering intent and
  *   causing cross-provider auth confusion (no Anthropic API key configured).
  *
- *   Phase 2C-2 changes the schema default to "" and resolves at runtime:
- *   pick the fast-tier model from `resolveOperationDefaults(primaryProvider)`,
- *   with `getModels(primaryProvider)[0]` as the catalog-fallback.
+ *   The schema default is "" and the value is resolved at runtime: pick the
+ *   fast-tier model from `resolveOperationDefaults(primaryProvider)`, with
+ *   `getModels(primaryProvider)[0]` as the catalog-fallback.
  *
  *   Note: explicit `compactionModel` values from existing YAML configs win
  *   unchanged (length > 0 short-circuits the resolver). No backward-compat

package/node_modules/@comis/agent/dist/model/compaction-model-resolver.js

@@ -11,9 +11,9 @@
  *   still routed to Claude Haiku, defeating the cost-tiering intent and
  *   causing cross-provider auth confusion (no Anthropic API key configured).
  *
- *   Phase 2C-2 changes the schema default to "" and resolves at runtime:
- *   pick the fast-tier model from `resolveOperationDefaults(primaryProvider)`,
- *   with `getModels(primaryProvider)[0]` as the catalog-fallback.
+ *   The schema default is "" and the value is resolved at runtime: pick the
+ *   fast-tier model from `resolveOperationDefaults(primaryProvider)`, with
+ *   `getModels(primaryProvider)[0]` as the catalog-fallback.
  *
  *   Note: explicit `compactionModel` values from existing YAML configs win
  *   unchanged (length > 0 short-circuits the resolver). No backward-compat

package/node_modules/@comis/agent/dist/model/model-registry-adapter.js

@@ -113,7 +113,7 @@ export function registerCustomProviders(registry, entries, secretManager, logger
         if (isBuiltInType && providerName !== entry.type) {
             providerAliases.set(providerName, entry.type);
         }
-        // Layer 1B (260430-vwt): catalog-aware model enrichment.
+        // Catalog-aware model enrichment.
         //
         // Before computing customModels, decide whether to inherit the full
         // pi-ai catalog or to enrich the user's sparse list with catalog

package/node_modules/@comis/agent/dist/model/model-scanner.js

@@ -14,7 +14,7 @@
  */
 import { getModels, getProviders } from "@mariozechner/pi-ai";
 // ---------------------------------------------------------------------------
-// Catalog-driven endpoint resolution (Layer 1E -- 260430-vwt)
+// Catalog-driven endpoint resolution
 // ---------------------------------------------------------------------------
 /**
  * Native pi-ai providers from the live catalog. Used to source baseUrls

package/node_modules/@comis/agent/dist/model/oauth-credential-store-file.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Plaintext file-backed OAuthCredentialStorePort adapter.
+ *
+ * Default storage backend for OAuth credentials (derives from existing
+ * dataDir, no separate config key). Stores all profiles in a single JSON
+ * file at ${dataDir}/auth-profiles.json with mode 0o600.
+ *
+ * Atomic write sequence (full POSIX crash safety on ext4):
+ *   write tmp 0o600 → fsync(tmpFd) → close(tmpFd) → rename(tmp, canonical)
+ *   → fsync(parentDirFd) → close(parentDirFd)
+ *
+ * cron-store.ts does NOT fsync the parent directory; this adapter MUST
+ * because OAuth credentials are security-critical (a lost rename due to
+ * power-loss-after-data-write would silently log the user out).
+ *
+ * Per-profile-ID locking via withExecutionLock: different providers and
+ * different identities for the same provider can refresh in parallel.
+ *
+ * Schema versioning: single integer version at top level. Hard-fail on
+ * mismatch — pre-1.0 software, no migration plumbing.
+ *
+ * @module
+ */
+import { type OAuthCredentialStorePort } from "@comis/core";
+export interface OAuthCredentialStoreFileConfig {
+    /** Comis data directory (e.g. ~/.comis). The adapter writes to ${dataDir}/auth-profiles.json. */
+    dataDir: string;
+}
+/**
+ * Create a plaintext file-backed OAuthCredentialStorePort adapter.
+ *
+ * Atomic, lock-protected, version-validated. Lifecycle:
+ * - On factory call: ensures dataDir exists (mkdir 0o700 recursive); cleans up stale .tmp files.
+ * - On every set/delete: per-profile-ID file lock → load → mutate → atomic-write.
+ * - On every get/has/list: load (no lock — readers see snapshot per POSIX rename atomicity).
+ */
+export declare function createOAuthCredentialStoreFile(config: OAuthCredentialStoreFileConfig): OAuthCredentialStorePort;