@xopcai/xopc 0.0.388 → 0.0.390

package/dist/src/agent/mcp/connection-setup.js

@@ -1,34 +1,44 @@
+import { createLogger } from "../../utils/logger/index.js";
+import { init_logger } from "../../utils/logger.js";
 import { isManagedConnectorServer } from "../../connectors/materialize.js";
 import { prepareNativeMcpConfig } from "./native-mcp.js";
+import { classifyMcpConnectionError } from "./connection-errors.js";
 import { McpAuthenticationRequiredError, discoverMcpTools, signInNativeMcp } from "./tool-catalog.js";
 import { createHash, randomUUID } from "node:crypto";
 //#region src/agent/mcp/connection-setup.ts
+init_logger();
+const log = createLogger("McpConnectionSetup");
 function httpUrl(value) {
 	const url = new URL(value);
 	if (!["http:", "https:"].includes(url.protocol) || url.username || url.password) throw new Error("Use an HTTP or HTTPS MCP address without embedded credentials.");
 	return url;
 }
-async function metadata(url) {
+async function metadata(url, signal) {
 	try {
 		const response = await fetch(url, {
-			signal: AbortSignal.timeout(5e3),
+			signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(5e3)]) : AbortSignal.timeout(5e3),
 			redirect: "error",
 			headers: { Accept: "application/json" }
 		});
 		if (!response.ok) return;
 		const result = await response.json();
 		if (result && typeof result === "object" && !Array.isArray(result)) return result;
-	} catch {}
+	} catch {
+		signal?.throwIfAborted();
+	}
 }
 /** A 401 alone is not evidence that a service supports OAuth. */
-async function advertisesOAuth(config, workspace, serverId) {
-	const entry = (await prepareNativeMcpConfig(config, workspace)).servers.find((server) => server.name === serverId);
+async function advertisesOAuth(config, workspace, serverId, signal) {
+	signal?.throwIfAborted();
+	const loaded = await prepareNativeMcpConfig(config, workspace);
+	signal?.throwIfAborted();
+	const entry = loaded.servers.find((server) => server.name === serverId);
 	if (!entry || !("url" in entry.config)) return false;
 	const url = httpUrl(entry.config.url);
 	if (Object.keys(entry.config.headers ?? {}).some((name) => name.toLowerCase() === "authorization")) return false;
 	const response = await fetch(url, {
 		method: "POST",
-		signal: AbortSignal.timeout(1e4),
+		signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(1e4)]) : AbortSignal.timeout(1e4),
 		redirect: "error",
 		headers: {
 			Accept: "application/json, text/event-stream",
@@ -58,7 +68,8 @@ async function advertisesOAuth(config, workspace, serverId) {
 		new URL("/.well-known/oauth-protected-resource", url)
 	];
 	for (const candidate of candidates) {
-		const data = await metadata(candidate);
+		signal?.throwIfAborted();
+		const data = await metadata(candidate, signal);
 		if (data && typeof data.resource === "string" && data.resource === url.href && Array.isArray(data.authorization_servers) && data.authorization_servers.some((value) => {
 			try {
 				return typeof value === "string" && Boolean(httpUrl(value));
@@ -68,30 +79,39 @@ async function advertisesOAuth(config, workspace, serverId) {
 		})) return true;
 	}
 	if (!/\bBearer\b/i.test(challenge)) return false;
-	const legacy = await metadata(new URL("/.well-known/oauth-authorization-server", url));
+	const legacy = await metadata(new URL("/.well-known/oauth-authorization-server", url), signal);
 	return Boolean(legacy && legacy.issuer === url.origin && typeof legacy.authorization_endpoint === "string" && typeof legacy.token_endpoint === "string");
 }
-async function probeMcpConnection(config, workspace, serverId) {
+async function probeMcpConnection(config, workspace, serverId, options) {
 	try {
 		return {
 			state: "connected",
-			toolCount: (await discoverMcpTools(config, workspace, serverId)).length
+			toolCount: (await discoverMcpTools(config, workspace, serverId, options)).length
 		};
 	} catch (error) {
-		if (error instanceof McpAuthenticationRequiredError) try {
-			return { state: await advertisesOAuth(config, workspace, serverId) ? "oauth_required" : "token_required" };
-		} catch (error) {
+		const failed = (cause) => {
+			const errorCode = classifyMcpConnectionError(cause);
+			log.warn({
+				serverId,
+				errorCode
+			}, `MCP connection check failed: ${errorCode}`);
 			return {
 				state: "error",
-				error: error instanceof Error ? error.message : String(error)
+				error: cause instanceof Error ? cause.message : String(cause),
+				errorCode
 			};
-		}
-		const server = config.mcp?.servers?.[serverId];
-		if (server?.url && Object.keys(server.headers ?? {}).some((name) => name.toLowerCase() === "authorization") && /401|403|unauthorized|forbidden/i.test(String(error))) return { state: "token_required" };
-		return {
-			state: "error",
-			error: error instanceof Error ? error.message : String(error)
 		};
+		const server = config.mcp?.servers?.[serverId];
+		const rejectedCredential = /\b401\b|unauthorized|invalid_token/i.test(String(error));
+		const hasCredentials = server?.auth || Object.keys(server?.headers ?? {}).some((name) => name.toLowerCase() === "authorization");
+		if (error instanceof McpAuthenticationRequiredError || server?.url && rejectedCredential && !hasCredentials) try {
+			options?.signal?.throwIfAborted();
+			return { state: await advertisesOAuth(config, workspace, serverId, options?.signal) ? "oauth_required" : "token_required" };
+		} catch (cause) {
+			return failed(cause);
+		}
+		if (server?.url && hasCredentials && /\b(?:401|403)\b|unauthorized|forbidden/i.test(String(error))) return { state: "token_required" };
+		return failed(error);
 	}
 }
 const attempts = /* @__PURE__ */ new Map();
@@ -117,15 +137,17 @@ function cancel(attempt) {
 	}
 }
 /** A UI bridge to native pi's login command; no host-owned OAuth client or token store. */
-function startMcpAuthorization(config, workspace, serverId, owner) {
+function startMcpAuthorization(config, workspace, serverId, owner, options) {
 	const server = config.mcp?.servers?.[serverId];
 	if (!server?.url || server.enabled === false || isManagedConnectorServer(server) && server.xopcConnector.enabled === false) throw new Error("An enabled HTTP MCP server is required.");
 	httpUrl(server.url);
 	if (server.auth || Object.keys(server.headers ?? {}).some((name) => name.toLowerCase() === "authorization")) throw new Error("This server uses configured credentials. Remove Authorization before using OAuth.");
-	for (const attempt of attempts.values()) if (attempt.owner === owner && attempt.result.serverId === serverId) cancel(attempt);
+	const scope = options?.authorizationScope ?? serverId;
+	for (const attempt of attempts.values()) if (attempt.owner === owner && attempt.scope === scope) cancel(attempt);
 	if (attempts.size >= 100) throw new Error("Too many pending sign-ins. Try again later.");
 	const attempt = {
 		owner,
+		scope,
 		fingerprint: fingerprint(config, serverId),
 		controller: new AbortController(),
 		result: {
@@ -159,7 +181,7 @@ function startMcpAuthorization(config, workspace, serverId, owner) {
 				attempt.dispose = () => signal?.removeEventListener("abort", stop);
 			});
 		}
-	}).then((tools) => {
+	}, options).then((tools) => {
 		if (!attempt.controller.signal.aborted) {
 			attempt.result.state = "connected";
 			attempt.result.toolCount = tools.length;

package/dist/src/agent/mcp/credential-store.d.ts

@@ -0,0 +1,6 @@
+import type { McpExtensionOptions } from '@earendil-works/pi-coding-agent';
+export type NativeMcpCredentials = NonNullable<McpExtensionOptions['credentials']>;
+/** Use pi's own stores; never change PI_CODING_AGENT_DIR for an individual connection. */
+export declare function createNativeMcpCredentials(memory?: boolean): Promise<NativeMcpCredentials>;
+/** Credential identity may change on commit without changing the public tool namespace. */
+export declare function routeNativeMcpCredentials(store: NativeMcpCredentials, aliases: ReadonlyMap<string, string>): NativeMcpCredentials;

package/dist/src/agent/mcp/credential-store.js

@@ -0,0 +1,24 @@
+//#region src/agent/mcp/credential-store.ts
+/** Use pi's own stores; never change PI_CODING_AGENT_DIR for an individual connection. */
+async function createNativeMcpCredentials(memory = false) {
+	const root = import.meta.resolve("@earendil-works/pi-coding-agent");
+	const { McpOAuthCredentialStore } = await import(new URL("./extensions/mcp/oauth.js", root).href);
+	if (!memory) return new McpOAuthCredentialStore();
+	const { InMemoryAuthStorageBackend } = await import(new URL("./core/auth-storage.js", root).href);
+	return new McpOAuthCredentialStore(new InMemoryAuthStorageBackend());
+}
+/** Credential identity may change on commit without changing the public tool namespace. */
+function routeNativeMcpCredentials(store, aliases) {
+	const forServer = store.forServer.bind(store), tokens = store.tokens.bind(store), remove = store.remove.bind(store);
+	store.forServer = (name, url) => forServer(aliases.get(name) ?? name, url);
+	store.tokens = (name, url) => tokens(aliases.get(name) ?? name, url);
+	store.remove = (name, url) => {
+		const alias = aliases.get(name);
+		if (!alias) return remove(name, url);
+		forServer(alias, url).save({ serverUrl: url });
+		return true;
+	};
+	return store;
+}
+//#endregion
+export { createNativeMcpCredentials, routeNativeMcpCredentials };

package/dist/src/agent/mcp/native-mcp.d.ts

@@ -1,6 +1,11 @@
 import { type LoadedMcpConfig } from '@earendil-works/pi-coding-agent';
 import { type Config } from '../../config/schema.js';
+import { type NativeMcpCredentials } from './credential-store.js';
 /** One process-wide pi directory: sessions share native OAuth credentials, never swap roots per turn. */
 export declare function getNativePiAgentDir(): string;
+export type NativeMcpConfig = LoadedMcpConfig & {
+    credentials?: NativeMcpCredentials;
+    credentialAliases?: Record<string, string>;
+};
 /** Only projects host configuration and secret references; all MCP execution belongs to pi. */
-export declare function prepareNativeMcpConfig(config: Config, workspaceDir: string): Promise<LoadedMcpConfig>;
+export declare function prepareNativeMcpConfig(config: Config, workspaceDir: string): Promise<NativeMcpConfig>;

package/dist/src/agent/mcp/native-mcp.js

@@ -1,6 +1,7 @@
 import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
 import { McpServerSchema, init_schema } from "../../config/schema.js";
 import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
+import { createNativeMcpCredentials, routeNativeMcpCredentials } from "./credential-store.js";
 import { loadMergedMcpConfig } from "./config.js";
 import { join } from "node:path";
 import { mkdirSync } from "node:fs";
@@ -67,6 +68,11 @@ async function prepareNativeMcpConfig(config, workspaceDir) {
 			scope: "extension"
 		});
 	}
+	const aliases = new Map(Object.entries(config.mcp?.servers ?? {}).filter(([, value]) => typeof value.xopcOAuthCredentialId === "string").map(([name, value]) => [name, value.xopcOAuthCredentialId]));
+	if (aliases.size) {
+		result.credentials = routeNativeMcpCredentials(await createNativeMcpCredentials(), aliases);
+		result.credentialAliases = Object.fromEntries(aliases);
+	}
 	return result;
 }
 //#endregion

package/dist/src/agent/mcp/tool-catalog.d.ts

@@ -1,4 +1,5 @@
 import type { Config } from '../../config/schema.js';
+import type { NativeMcpCredentials } from './credential-store.js';
 export type McpCatalogTool = {
     name: string;
     description: string;
@@ -12,7 +13,11 @@ export type McpLoginInteraction = {
     onAuthorizationUrl: (url: string) => void;
     requestRedirectUrl: (signal?: AbortSignal) => Promise<string | undefined>;
 };
+export type McpSessionOptions = {
+    credentials?: NativeMcpCredentials;
+    signal?: AbortSignal;
+};
 /** A short-lived native session discovers tools without making a model request. */
-export declare function discoverMcpTools(config: Config, workspaceDir: string, serverId: string): Promise<McpCatalogTool[]>;
+export declare function discoverMcpTools(config: Config, workspaceDir: string, serverId: string, options?: McpSessionOptions): Promise<McpCatalogTool[]>;
 /** Native pi owns PKCE, registration, callbacks, token storage and refresh. */
-export declare function signInNativeMcp(config: Config, workspaceDir: string, serverId: string, interaction: McpLoginInteraction): Promise<McpCatalogTool[]>;
+export declare function signInNativeMcp(config: Config, workspaceDir: string, serverId: string, interaction: McpLoginInteraction, options?: McpSessionOptions): Promise<McpCatalogTool[]>;

package/dist/src/agent/mcp/tool-catalog.js

@@ -6,15 +6,19 @@ import { DefaultResourceLoader, ModelRuntime, SessionManager, SettingsManager, c
 //#region src/agent/mcp/tool-catalog.ts
 var McpAuthenticationRequiredError = class extends Error {};
 /** A short-lived native session discovers tools without making a model request. */
-async function discoverMcpTools(config, workspaceDir, serverId) {
-	return runNativeMcpSession(config, workspaceDir, serverId);
+async function discoverMcpTools(config, workspaceDir, serverId, options) {
+	return runNativeMcpSession(config, workspaceDir, serverId, void 0, options);
 }
 /** Native pi owns PKCE, registration, callbacks, token storage and refresh. */
-async function signInNativeMcp(config, workspaceDir, serverId, interaction) {
-	return runNativeMcpSession(config, workspaceDir, serverId, interaction);
+async function signInNativeMcp(config, workspaceDir, serverId, interaction, options) {
+	return runNativeMcpSession(config, workspaceDir, serverId, interaction, options);
 }
-async function runNativeMcpSession(config, workspaceDir, serverId, interaction) {
-	const entry = (await prepareNativeMcpConfig(config, workspaceDir)).servers.find((server) => server.name === serverId);
+async function runNativeMcpSession(config, workspaceDir, serverId, interaction, options) {
+	const signal = interaction?.signal ?? options?.signal;
+	signal?.throwIfAborted();
+	const loaded = await prepareNativeMcpConfig(config, workspaceDir);
+	signal?.throwIfAborted();
+	const entry = loaded.servers.find((server) => server.name === serverId);
 	if (!entry) throw new Error(`MCP server "${serverId}" is not configured or has invalid configuration.`);
 	if (entry.config.enabled === false) throw new Error(`MCP server "${serverId}" is disabled.`);
 	const agentDir = getNativePiAgentDir();
@@ -32,6 +36,7 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 		noThemes: true,
 		noContextFiles: true,
 		extensionFactories: [createToolSearchExtension(), createMcpExtension({
+			credentials: options?.credentials ?? loaded.credentials,
 			loadConfig: () => ({
 				servers: [entry],
 				errors: [],
@@ -42,18 +47,21 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 		})]
 	});
 	await loader.reload();
+	signal?.throwIfAborted();
 	const provider = "url" in entry.config ? entry.config.auth?.provider : void 0;
+	const modelRuntime = provider ? await createEmbeddedModelRuntime(provider) : await ModelRuntime.create({
+		credentials: new InMemoryCredentialStore(),
+		modelsStore: new InMemoryModelsStore(),
+		modelsPath: null,
+		refreshOnCreate: false
+	});
+	signal?.throwIfAborted();
 	const { session } = await createAgentSession({
 		cwd: workspaceDir,
 		agentDir,
 		resourceLoader: loader,
 		settingsManager,
-		modelRuntime: provider ? await createEmbeddedModelRuntime(provider) : await ModelRuntime.create({
-			credentials: new InMemoryCredentialStore(),
-			modelsStore: new InMemoryModelsStore(),
-			modelsPath: null,
-			refreshOnCreate: false
-		}),
+		modelRuntime,
 		sessionManager: SessionManager.inMemory(),
 		noTools: "builtin"
 	});
@@ -70,6 +78,8 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 	try {
 		const runner = session.extensionRunner;
 		if (!runner) throw new Error("Native MCP extension is unavailable.");
+		signal?.throwIfAborted();
+		signal?.addEventListener("abort", abort, { once: true });
 		await session.bindExtensions({ uiContext: {
 			...runner.getUIContext(),
 			notify(message) {
@@ -81,8 +91,7 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 				return interaction?.requestRedirectUrl(options?.signal) ?? Promise.resolve(void 0);
 			}
 		} });
-		interaction?.signal.addEventListener("abort", abort, { once: true });
-		if (interaction?.signal.aborted) throw new Error("MCP sign-in cancelled.");
+		if (signal?.aborted) throw new Error("MCP sign-in cancelled.");
 		let timer;
 		try {
 			await Promise.race([session.prompt("/mcp"), new Promise((_resolve, reject) => {
@@ -100,6 +109,7 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 			if (/needs sign-in|needs-auth/.test(failure)) throw new McpAuthenticationRequiredError(failure);
 			throw new Error(failure);
 		}
+		if (signal?.aborted) throw new Error("MCP connection check cancelled.");
 		const namespace = `mcp__${serverId.replace(/-/g, "_")}`;
 		return session.getAllTools().filter((tool) => tool.namespace?.name === namespace).map((tool) => ({
 			name: tool.name,
@@ -109,7 +119,7 @@ async function runNativeMcpSession(config, workspaceDir, serverId, interaction)
 		})).sort((a, b) => a.name.localeCompare(b.name));
 	} finally {
 		try {
-			interaction?.signal.removeEventListener("abort", abort);
+			signal?.removeEventListener("abort", abort);
 			await close();
 		} finally {
 			session.dispose();

package/dist/src/agent/memory/compaction.js

@@ -2,6 +2,7 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_compaction_types, isCompactionHandover } from "../../session/compaction-types.js";
 import { buildSessionContextForLlm, init_session_context_for_llm, isTranscriptCompactionEntry } from "../../session/session-context-for-llm.js";
+import { getModelUsageOrigin, init_model_usage, isProviderUsageScopeError } from "../../providers/model-usage.js";
 import { completeWithResolvedCredentials } from "../../providers/model-call.js";
 import { estimateMessagesTokens, estimateTextTokens } from "./context-budget.js";
 import { applyCompactionHandoverDelta, consolidateCompactionHandover, handoverForPrompt, renderCompactionHandover } from "./compaction-ledger.js";
@@ -11,6 +12,7 @@ import { CompactionChunkCursor } from "./compaction-chunks.js";
 import { COMPACTION_REPAIR_RESERVE, CompactionRequestError, compactionOutputLimit, compactionPayloadGuard, compactionPromptFits, initialCompactionOutputLimit, isPermanentCompactionError } from "./compaction-request.js";
 import { createHash } from "node:crypto";
 //#region src/agent/memory/compaction.ts
+init_model_usage();
 init_session_context_for_llm();
 init_compaction_types();
 init_logger();
@@ -397,6 +399,7 @@ Return a valid JSON delta only.`;
 				auditModelRef: reviewed.modelRef
 			};
 		} catch (error) {
+			if (isProviderUsageScopeError(error)) throw error;
 			signal?.throwIfAborted();
 			log.warn({
 				err: error,
@@ -521,7 +524,7 @@ Return a JSON delta containing only missing facts, using {"upserts":[]}. Include
 					}, void 0, {
 						operation: "session.compact",
 						conversationId: callContext.conversationId,
-						trigger: attempt === 0 && modelIndex === 0 ? "system" : "retry"
+						trigger: attempt === 0 && modelIndex === 0 ? getModelUsageOrigin() === "interactive" ? "agent" : "system" : "retry"
 					});
 					parentSignal?.throwIfAborted();
 					if (linked.timedOut()) throw new CompactionRequestError("timeout", "Compaction handover timed out");
@@ -554,6 +557,7 @@ Return a JSON delta containing only missing facts, using {"upserts":[]}. Include
 						modelRef: `${model.provider}/${model.id}`
 					};
 				} catch (error) {
+					if (isProviderUsageScopeError(error)) throw error;
 					parentSignal?.throwIfAborted();
 					lastError = linked.timedOut() ? new CompactionRequestError("timeout", `Compaction handover timed out after ${this.config.summaryTimeoutMs}ms`) : error;
 					const kind = lastError instanceof CompactionRequestError ? lastError.kind : "provider";

package/dist/src/agent/memory/context-budget.js

@@ -1,5 +1,5 @@
-import { getToolResultTextLength, truncateToolResultMessage } from "../embedded/tool-result-truncation.js";
 import { readAgentMessageContent } from "./agent-message-access.js";
+import { getToolResultTextLength, truncateToolResultMessage } from "../embedded/tool-result-truncation.js";
 //#region src/agent/memory/context-budget.ts
 const MESSAGE_OVERHEAD_TOKENS = 12;
 const REQUEST_OVERHEAD_TOKENS = 256;

package/dist/src/agent/memory/context-recovery.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { evaluateContextBudget, projectContextForModel, stringifyMessagesForBudget } from "./context-budget.js";
 import { stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
+import { evaluateContextBudget, projectContextForModel, stringifyMessagesForBudget } from "./context-budget.js";
 //#region src/agent/memory/context-recovery.ts
 init_logger();
 const log = createLogger("ContextRecovery");

package/dist/src/agent/memory/idle-compaction-scheduler.js

@@ -1,6 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { init_model_usage, withModelUsageOrigin } from "../../providers/model-usage.js";
 //#region src/agent/memory/idle-compaction-scheduler.ts
+init_model_usage();
 init_logger();
 const log = createLogger("IdleCompaction");
 /** Generation checks protect commits even when a provider ignores cancellation. */
@@ -89,7 +91,7 @@ var IdleCompactionScheduler = class {
 			state.deadline = timeout;
 			timeout.unref?.();
 		});
-		const operation = Promise.resolve().then(() => job(controller.signal, isCurrent));
+		const operation = Promise.resolve().then(() => withModelUsageOrigin("background", () => job(controller.signal, isCurrent)));
 		Promise.race([operation, deadline]).then((outcome) => {
 			this.metrics[outcome]++;
 			if (outcome === "committed") state.eligibleAt = Date.now() + options.cooldownMs;

package/dist/src/agent/memory/index.js

@@ -1,6 +1,6 @@
-import { buildUserContextBlock, sanitizeUserContextFenceEscapes } from "./context-fence.js";
 import { isMemorySubsystemEnabled } from "./memory-config.js";
 import { extractAgentUserPlainText } from "./user-message-text.js";
+import { buildUserContextBlock, sanitizeUserContextFenceEscapes } from "./context-fence.js";
 import { MemoryManager } from "./manager.js";
 import { discoverMemoryPlugins } from "./plugin-discovery.js";
 import { createMemoryManagerFromConfig } from "./create-memory-manager.js";

package/dist/src/agent/models/manager.d.ts

@@ -62,6 +62,7 @@ export declare class ModelManager {
      * Get model for session, checking session override first
      */
     getModelForSession(conversationId: string): string;
+    hasSessionModelOverride(conversationId: string): boolean;
     /**
      * Apply model to agent if different from current
      */

package/dist/src/agent/models/manager.js

@@ -42,8 +42,7 @@ var ModelManager = class {
 	setSessionProfileDefault(conversationId, modelRef, fallbacks = []) {
 		this.sessionProfileDefaults.set(conversationId, modelRef);
 		const cleanFallbacks = fallbacks.map((ref) => ref.trim()).filter(Boolean);
-		if (cleanFallbacks.length > 0) this.sessionProfileFallbacks.set(conversationId, cleanFallbacks);
-		else this.sessionProfileFallbacks.delete(conversationId);
+		this.sessionProfileFallbacks.set(conversationId, cleanFallbacks);
 	}
 	/**
 	* Register the profile model and return the model that should initialize the
@@ -117,6 +116,9 @@ var ModelManager = class {
 		if (profileDefault) return profileDefault;
 		return this.defaultModel;
 	}
+	hasSessionModelOverride(conversationId) {
+		return this.sessionModels.has(conversationId);
+	}
 	/**
 	* Apply model to agent if different from current
 	*/

package/dist/src/agent/orchestration/agent-orchestrator.d.ts

@@ -1,9 +1,3 @@
-/**
- * Agent Orchestrator - Coordinates Agent execution flow
- *
- * Manages the complete agent execution pipeline from message processing
- * to response generation.
- */
 import type { Config } from '../../config/schema.js';
 import type { InboundMessage } from '../../infra/bus/index.js';
 import type { SessionConfigStore, SessionStore } from '../../session/index.js';
@@ -52,6 +46,7 @@ export declare class AgentOrchestrator {
      * Process a message through the agent orchestration pipeline
      */
     process(msg: InboundMessage, context: SessionContext): Promise<void>;
+    private processScoped;
     /**
      * Get the current agent model ID
      */

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { init_model_usage, modelUsageOriginFromTurn, withModelUsageOrigin } from "../../providers/model-usage.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { persistInboundAttachments } from "../../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, clearPendingTranscriptUserMessage, hydrateUserTurnForLlm, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
@@ -13,6 +14,7 @@ import { randomUUID } from "node:crypto";
 * Manages the complete agent execution pipeline from message processing
 * to response generation.
 */
+init_model_usage();
 init_logger();
 const log = createLogger("AgentOrchestrator");
 var AgentOrchestrator = class {
@@ -42,6 +44,9 @@ var AgentOrchestrator = class {
 	* Process a message through the agent orchestration pipeline
 	*/
 	async process(msg, context) {
+		return withModelUsageOrigin(modelUsageOriginFromTurn(context.origin), () => this.processScoped(msg, context));
+	}
+	async processScoped(msg, context) {
 		const { conversationId } = context;
 		log.debug({ conversationId }, "Processing message through agent orchestrator");
 		await this.sessionHydrator.workspace(conversationId);

package/dist/src/agent/orchestration/llm-turn-retry.js

@@ -1,6 +1,6 @@
 import { isTransientProviderErrorMessage } from "../../providers/model-response.js";
-import { canResumeAfterModelFailure } from "./turn-recovery.js";
 import { isContextOverflowError } from "./context-overflow.js";
+import { canResumeAfterModelFailure } from "./turn-recovery.js";
 //#region src/agent/orchestration/llm-turn-retry.ts
 function isTransientLlmErrorMessage(message) {
 	return isTransientProviderErrorMessage(message);

package/dist/src/agent/prompt/response-language.js

@@ -2,9 +2,9 @@ import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { getSessionConfig } from "../../storage/sqlite/config-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
 import { resolveTaskLocale } from "../../tasks/task-language.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
 //#region src/agent/prompt/response-language.ts
 init_response_language();
 init_sqlite();

package/dist/src/agent/prompt/service-prompt-builder.js

@@ -6,14 +6,14 @@ import { getInteractionState } from "../../storage/sqlite/interaction-state-repo
 import { DEFAULT_USER_TRUST_LEVEL, init_trust_policy } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { appendStablePromptSection } from "./cache-boundary.js";
 import { getUserTimezone } from "../../user-model/repository.js";
 import "../../user-model/index.js";
-import { appendStablePromptSection } from "./cache-boundary.js";
-import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
-import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
 import { resolveSystemPromptBuildParams } from "./system-prompt-params.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { resolveResponseLanguageForSession } from "./response-language.js";
+import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
+import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 //#region src/agent/prompt/service-prompt-builder.ts
 init_sqlite();
 init_interaction_state();

package/dist/src/agent/sandbox/exec-policy.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { prepareSafeToolEnv } from "./sanitize-env-vars.js";
 import { validatePath, validateWritePath } from "./path-policy.js";
+import { prepareSafeToolEnv } from "./sanitize-env-vars.js";
 import { auditCommand, validateCommand } from "./command-validator.js";
 import { DEFAULT_SANDBOX_CONFIG } from "./types.js";
 import { resolve } from "node:path";

package/dist/src/agent/service/direct-turn-helpers.js

@@ -1,17 +1,17 @@
 import { getClarificationResumeInput, init_clarification_wait_repository } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
+import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
+import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
+import { buildDelegatedTaskDirective, buildTaskExecutionDirective } from "../../tasks/task-context-assembler.js";
+import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { parseSlashCommand } from "../../chat-commands/command-parse.js";
 import { personalCommandRejection } from "../../chat-commands/personal-command-policy.js";
 import { commandRegistry } from "../../chat-commands/registry.js";
 import "../../chat-commands/index.js";
-import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
-import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
-import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { getTaskContinuation } from "../../tasks/task-continuation.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
 import { injectSourceContextsIntoUserMessage } from "../source-context/injector.js";
-import { buildDelegatedTaskDirective, buildTaskExecutionDirective } from "../../tasks/task-context-assembler.js";
 import crypto from "node:crypto";
 //#region src/agent/service/direct-turn-helpers.ts
 /**

package/dist/src/agent/service/process-direct-one-shot.js

@@ -1,13 +1,18 @@
+import { init_model_usage, modelUsageOriginFromTurn, withModelUsageOrigin } from "../../providers/model-usage.js";
 import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
 import "../../session/index.js";
 import { buildDirectUserMessageContent } from "./build-direct-message-content.js";
 import { hydratePerTurnState, runDirectAgentTurn, tryRunSlashCommand } from "./direct-turn-helpers.js";
 //#region src/agent/service/process-direct-one-shot.ts
+init_model_usage();
 function isReviewOutput(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value) && value.type === "review";
 }
 async function runProcessDirect(deps, input) {
+	return withModelUsageOrigin(modelUsageOriginFromTurn(input.origin), () => runProcessDirectInner(deps, input));
+}
+async function runProcessDirectInner(deps, input) {
 	deps.sessionStore?.idleCompaction?.interrupt(input.conversationId);
 	const { channel, chatId } = await deps.resolveSessionEndpoint(input.conversationId);
 	deps.initSessionContext(input.conversationId, channel, chatId, input.origin);

package/dist/src/agent/service/process-direct-streaming.d.ts

@@ -77,4 +77,5 @@ export type ProcessDirectStreamEvent = {
     type: string;
     [key: string]: unknown;
 };
+/** Bind each generator advancement so independent streams retain their own origin. */
 export declare function runProcessDirectStreaming(deps: ProcessDirectStreamingDeps, input: ProcessDirectStreamingInput): AsyncGenerator<ProcessDirectStreamEvent, void, unknown>;