npm - @xopcai/xopc - Versions diffs - 0.0.251 → 0.0.253 - Mend

@xopcai/xopc 0.0.251 → 0.0.253

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (376) hide show

package/dist/gateway/static/root/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260713-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260713-1" />
     <title>XOPC — Keep what matters moving.</title>
-    <script type="module" crossorigin src="/assets/index-BHrpyJ4t.js"></script>
+    <script type="module" crossorigin src="/assets/index-C7RDs6S-.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -25,13 +25,13 @@
     <link rel="modulepreload" crossorigin href="/assets/download-Dk-ZjtO6.js">
     <link rel="modulepreload" crossorigin href="/assets/plus-Q2yW6OE7.js">
     <link rel="modulepreload" crossorigin href="/assets/x-B_N4OPjy.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-Cf5hpZE6.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-CF4erhjB.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-C72stReU.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-BkeaPZpn.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-BHS7bo06.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-CV4pDOtG.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/markdown-view-CQvzsE24.js">
+    <link rel="modulepreload" crossorigin href="/assets/markdown-view-Ca7BRBLL.js">
     <link rel="modulepreload" crossorigin href="/assets/dist-DLmwHyAh.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-swr-BIWyz7Rc.js">
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
@@ -48,15 +48,15 @@
     <link rel="modulepreload" crossorigin href="/assets/files-BArWTfr7.js">
     <link rel="modulepreload" crossorigin href="/assets/tool-activity-R8V9l6nk.js">
     <link rel="modulepreload" crossorigin href="/assets/button-CtTvuElV.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CR7Xg8As.js">
-    <link rel="modulepreload" crossorigin href="/assets/registry-api-BsRBlji7.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-DAq74TZe.js">
+    <link rel="modulepreload" crossorigin href="/assets/registry-api-CviQoUBf.js">
     <link rel="modulepreload" crossorigin href="/assets/config-reload-event-Bjh2zoKp.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-CMNbl0FZ.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-BW3Bx-aV.js">
     <link rel="modulepreload" crossorigin href="/assets/electron-env-DH5wF8X8.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-DfBjTSo9.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-BOgkc_9D.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-CeS1bgXP.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-BtkaVpMm.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-view-Y68dCxuc.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-B7CX4Qob.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-Cu8xqZQ9.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/package.js CHANGED Viewed

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.251";
+var version = "0.0.253";
 //#endregion
 export { version };

package/dist/packages/gateway-contract/src/new-session.js CHANGED Viewed

@@ -11,6 +11,7 @@ function createDefaultNewSessionPreferences() {
 	return {
 		version: 1,
 		modelByAgent: {},
+		executionModeByProject: {},
 		lastChatScope: noProjectScope()
 	};
 }
@@ -43,6 +44,13 @@ function parseModelPreferences(value) {
 	}
 	return result;
 }
+function parseExecutionModePreferences(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+	return Object.fromEntries(Object.entries(value).flatMap(([rawProjectId, rawMode]) => {
+		const projectId = normalized(rawProjectId);
+		return projectId && (rawMode === "local_checkout" || rawMode === "managed_worktree") ? [[projectId, rawMode]] : [];
+	}));
+}
 function parseNewSessionPreferences(value) {
 	const fallback = createDefaultNewSessionPreferences();
 	if (!value || typeof value !== "object" || Array.isArray(value)) return fallback;
@@ -53,6 +61,7 @@ function parseNewSessionPreferences(value) {
 		version: 1,
 		...selectedAgentId ? { selectedAgentId } : {},
 		modelByAgent: parseModelPreferences(record.modelByAgent),
+		executionModeByProject: parseExecutionModePreferences(record.executionModeByProject),
 		lastChatScope: parseProjectScope(record.lastChatScope) ?? noProjectScope()
 	};
 }

package/dist/packages/realtime-protocol/src/voice.js CHANGED Viewed

@@ -159,8 +159,13 @@ z.discriminatedUnion("type", [
 	serverEnvelope("response.clarification", z.strictObject({
 		responseId: z.string().min(1).max(160),
 		requestId: z.string().min(1).max(160),
+		kind: z.enum(["input", "approval"]),
 		question: z.string().min(1).max(8e3),
-		choices: z.array(z.string().max(1e3)).max(20).optional()
+		choices: z.array(z.string().max(1e3)).max(20).optional(),
+		suggestedAnswer: z.string().max(1e3).optional(),
+		version: z.number().int().positive(),
+		createdAt: z.number().nonnegative(),
+		expiresAt: z.number().nonnegative().optional()
 	})),
 	serverEnvelope("response.text.delta", z.strictObject({
 		responseId: z.string().min(1).max(160),

package/dist/src/agent/agent-manager.d.ts CHANGED Viewed

@@ -94,7 +94,8 @@ export interface AgentManagerConfig {
     };
     /** Gateway: exposes AutomationService for the `automation` tool. */
     getAutomationService?: () => AutomationService | undefined;
-    getBrowserRecipeService?: () => import('../browser/recipes/index.js').BrowserRecipeService | undefined;
+    getBrowserAutomationService?: () => import('../browser/automations/index.js').BrowserAutomationService | undefined;
+    emitBrowserEvent?: (type: string, payload: unknown) => void;
     /** Gateway: exposes first-class xopc product objects for the `xopc_use` tool. */
     getNotesService?: () => NotesService | undefined;
     getProjectService?: () => ProjectService | undefined;

package/dist/src/agent/agent-manager.js CHANGED Viewed

@@ -2,25 +2,27 @@ import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
+import { consumeClarificationApproval } from "../storage/sqlite/clarification-wait-repository.js";
 import { getInteractionState } from "../storage/sqlite/interaction-state-repository.js";
 import { getSessionMetadata } from "../storage/sqlite/session-repository.js";
 import "../storage/sqlite/index.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_agent_scope, resolveAgentProfileDir } from "./agent-scope.js";
-import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
-import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { init_session_key, parseSessionKey } from "../routing/session-key.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
+import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
+import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
-import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
 import { resolveBootstrapContextSync } from "./bootstrap/bootstrap-files.js";
 import { loadProjectAgentsContextFile } from "./bootstrap/project-agents-context.js";
+import { getEmbeddedExecutionRunId } from "./embedded/execution-context.js";
 import { parseExternalToolRef } from "./external-tools/refs.js";
 import { mcpToolPolicyId } from "./mcp/bundle-mcp-policy.js";
 import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForSessionKey } from "./mcp/bundle-mcp-runtime.js";
@@ -47,6 +49,7 @@ import { maybeRequestChannelExecApproval } from "../channels/exec-approval-runti
 import { SkillFilesystemWatcher } from "./skills/filesystem-watcher.js";
 import { ProjectTrustStore, hasTrustRequiringProjectResources } from "../project-trust/trust-store.js";
 import { basename, resolve, sep } from "node:path";
+import { createHash } from "node:crypto";
 import { Agent } from "@earendil-works/pi-agent-core";
 //#region src/agent/agent-manager.ts
 /**
@@ -245,7 +248,8 @@ var AgentManager = class {
 			getSessionStore: this.config.getSessionStore,
 			gatewayClarify: this.config.gatewayClarify,
 			getAutomationService: this.config.getAutomationService,
-			getBrowserRecipeService: this.config.getBrowserRecipeService,
+			getBrowserAutomationService: this.config.getBrowserAutomationService,
+			emitBrowserEvent: this.config.emitBrowserEvent,
 			getNotesService: this.config.getNotesService,
 			getProjectService: this.config.getProjectService,
 			getLocalAppService: this.config.getLocalAppService,
@@ -1067,12 +1071,26 @@ var AgentManager = class {
 	async requestToolConfirmation(sessionKey, toolName, detail) {
 		const request = this.config.gatewayClarify?.requestClarification;
 		if (!request) return false;
-		return await request(sessionKey, {
+		const approvalKey = createHash("sha256").update(`${toolName}\0${detail}`).digest("hex");
+		const existing = consumeClarificationApproval(sessionKey, approvalKey);
+		if (existing) return existing === "approved";
+		const runId = getEmbeddedExecutionRunId();
+		if (!runId) return false;
+		const result = await request({
+			sessionKey,
+			runId,
+			toolCallId: `approval:${approvalKey}`
+		}, {
 			kind: "approval",
 			question: `Allow ${toolName} to run once?\n${detail.slice(0, 500)}`,
 			choices: ["Allow once", "Deny"],
-			default: "Deny"
-		}).catch(() => "Deny") === "Allow once";
+			suggestedAnswer: "Deny",
+			approvalKey
+		}).catch(() => ({
+			status: "answered",
+			answer: "Deny"
+		}));
+		return result.status === "answered" && result.answer === "Allow once";
 	}
 	refreshDynamicContextIfChanged(instance) {
 		const nextProjectContext = this.buildExecutionScopeContext(instance.sessionKey);

package/dist/src/agent/background-review/run-background-review.js CHANGED Viewed

@@ -4,10 +4,10 @@ import { finishContextExtractionRun } from "../../storage/sqlite/context-extract
 import { getSessionMetadata } from "../../storage/sqlite/session-repository.js";
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import "../../storage/sqlite/index.js";
+import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { extractTextContent } from "../context/workspace.js";
 import { listUserAssertions } from "../../user-model/repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";

package/dist/src/agent/coding/repository-instructions.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { execFile } from "node:child_process";
 import { readFile, realpath, stat } from "node:fs/promises";
 import { promisify } from "node:util";
 //#region src/agent/coding/repository-instructions.ts
-const exec$1 = promisify(execFile);
+const exec = promisify(execFile);
 function inside(root, path) {
 	const rel = relative(root, path);
 	return rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
@@ -27,7 +27,7 @@ var RepositoryInstructions = class RepositoryInstructions {
 		} catch {}
 		const canonicalWorkspace = root;
 		try {
-			root = await realpath((await exec$1("git", ["rev-parse", "--show-toplevel"], {
+			root = await realpath((await exec("git", ["rev-parse", "--show-toplevel"], {
 				cwd: root,
 				timeout: 5e3
 			})).stdout.trim());

package/dist/src/agent/coding/workspace-revision.js CHANGED Viewed

@@ -4,11 +4,11 @@ import { createHash } from "node:crypto";
 import { lstat, readFile, readlink, realpath } from "node:fs/promises";
 import { promisify } from "node:util";
 //#region src/agent/coding/workspace-revision.ts
-const exec$1 = promisify(execFile);
+const exec = promisify(execFile);
 /** A content fingerprint, including user changes and untracked files, without changing Git state. */
 async function readWorkspaceRevision(workspace) {
 	let cwd = workspace;
-	const git = async (args) => (await exec$1("git", [
+	const git = async (args) => (await exec("git", [
 		"-c",
 		"core.fsmonitor=false",
 		...args

package/dist/src/agent/commands/command-isolation.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { execFile } from "node:child_process";
 import { realpath } from "node:fs/promises";
 import { promisify } from "node:util";
 //#region src/agent/commands/command-isolation.ts
-const exec$1 = promisify(execFile);
+const exec = promisify(execFile);
 /** Docker is opt-in and never falls back to host execution or pulls an image implicitly. */
 async function isolatedCommand(input) {
 	if (!input.isolation || input.isolation.mode === "host") return {
@@ -59,7 +59,7 @@ async function isolatedCommand(input) {
 }
 async function removeCommandContainer(name) {
 	if (!/^xopc-command-[a-f0-9-]{36}$/.test(name)) throw new Error("Invalid command container name");
-	await exec$1("docker", [
+	await exec("docker", [
 		"rm",
 		"--force",
 		name

package/dist/src/agent/embedded/execution-context.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
-export declare function runWithEmbeddedExecutionSession<T>(sessionKey: string, run: () => T): T;
+export declare function runWithEmbeddedExecutionSession<T>(sessionKey: string, run: () => T, runId?: string): T;
 export declare function getEmbeddedExecutionSession(): string | undefined;
+export declare function getEmbeddedExecutionRunId(): string | undefined;

package/dist/src/agent/embedded/execution-context.js CHANGED Viewed

@@ -1,11 +1,17 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/agent/embedded/execution-context.ts
 const executionSessionStorage = new AsyncLocalStorage();
-function runWithEmbeddedExecutionSession(sessionKey, run) {
-	return executionSessionStorage.run(sessionKey, run);
+function runWithEmbeddedExecutionSession(sessionKey, run, runId) {
+	return executionSessionStorage.run({
+		sessionKey,
+		runId
+	}, run);
 }
 function getEmbeddedExecutionSession() {
-	return executionSessionStorage.getStore();
+	return executionSessionStorage.getStore()?.sessionKey;
+}
+function getEmbeddedExecutionRunId() {
+	return executionSessionStorage.getStore()?.runId;
 }
 //#endregion
-export { getEmbeddedExecutionSession, runWithEmbeddedExecutionSession };
+export { getEmbeddedExecutionRunId, getEmbeddedExecutionSession, runWithEmbeddedExecutionSession };

package/dist/src/agent/embedded/index.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ export { installSessionToolResultGuard, guardSessionManager, getRawSessionAppend
 export { repairAssistantUsageInSessionManager } from './session-manager-init.js';
 export { openSqliteHydratingSessionManager } from './sqlite-hydrating-session-manager.js';
 export { createSqliteTranscriptRuntime, InMemoryTranscriptRuntime, type EmbeddedTranscriptRuntime, } from './transcript-runtime.js';
-export { getEmbeddedExecutionSession, runWithEmbeddedExecutionSession } from './execution-context.js';
+export { getEmbeddedExecutionRunId, getEmbeddedExecutionSession, runWithEmbeddedExecutionSession, } from './execution-context.js';
 export { acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, isEmbeddedSessionRunnerEnabled, resetEmbeddedSessionRunnerForTest, } from './session-runner.js';
 export { DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, resolveLiveToolResultMaxChars, truncateToolResultMessage, } from './tool-result-truncation.js';
 export { runXopcEmbeddedTurn, abortEmbeddedRun, queueEmbeddedSteer } from './run-turn.js';

package/dist/src/agent/embedded/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { getEmbeddedExecutionSession, runWithEmbeddedExecutionSession } from "./execution-context.js";
+import { getEmbeddedExecutionRunId, getEmbeddedExecutionSession, runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { abortEmbeddedRun, getEmbeddedRunBySessionKey, queueEmbeddedSteer } from "./runs.js";
 import { DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { getRawSessionAppendMessage, guardSessionManager, installSessionToolResultGuard } from "./session-tool-result-guard.js";
@@ -9,4 +9,4 @@ import { InMemoryTranscriptRuntime, createSqliteTranscriptRuntime } from "./tran
 import { runXopcEmbeddedTurn } from "./run-turn.js";
 import { runEmbeddedTurnForSession } from "./run-for-session.js";
 import { CURRENT_SESSION_VERSION, PiTranscriptManager } from "./pi-transcript.js";
-export { CURRENT_SESSION_VERSION, DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, InMemoryTranscriptRuntime, PiTranscriptManager, abortEmbeddedRun, acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, createSqliteTranscriptRuntime, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedExecutionSession, getEmbeddedRunBySessionKey, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, getRawSessionAppendMessage, guardSessionManager, installSessionToolResultGuard, isEmbeddedSessionRunnerEnabled, openSqliteHydratingSessionManager, queueEmbeddedSteer, repairAssistantUsageInSessionManager, resetEmbeddedSessionRunnerForTest, resolveLiveToolResultMaxChars, runEmbeddedTurnForSession, runWithEmbeddedExecutionSession, runXopcEmbeddedTurn, truncateToolResultMessage };
+export { CURRENT_SESSION_VERSION, DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, InMemoryTranscriptRuntime, PiTranscriptManager, abortEmbeddedRun, acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, createSqliteTranscriptRuntime, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedExecutionRunId, getEmbeddedExecutionSession, getEmbeddedRunBySessionKey, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, getRawSessionAppendMessage, guardSessionManager, installSessionToolResultGuard, isEmbeddedSessionRunnerEnabled, openSqliteHydratingSessionManager, queueEmbeddedSteer, repairAssistantUsageInSessionManager, resetEmbeddedSessionRunnerForTest, resolveLiveToolResultMaxChars, runEmbeddedTurnForSession, runWithEmbeddedExecutionSession, runXopcEmbeddedTurn, truncateToolResultMessage };

package/dist/src/agent/embedded/model-runtime.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { init_paths, resolveModelsJsonPath } from "../../config/paths.js";
-import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
+import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../../auth/model-credential-store.js";
 import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "../../providers/register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "../../providers/register-runtime-providers.js";

package/dist/src/agent/embedded/run-for-session.js CHANGED Viewed

@@ -1,8 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
-import { init_providers, resolveModel } from "../../providers/index.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
+import { init_providers, resolveModel } from "../../providers/index.js";
+import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
 import { evaluateContextBudget } from "../memory/context-budget.js";
@@ -27,7 +28,7 @@ async function runEmbeddedTurnForSession(params) {
 		parentSignal: params.abortSignal
 	});
 	const finish = async (result) => {
-		if (result.stopReason === "connection_required") return result;
+		if (result.stopReason === "connection_required" || result.stopReason === "clarification_required") return result;
 		try {
 			const rows = await sessionStore.loadTranscriptRows(sessionKey);
 			const hasTurn = rows.some((source) => {
@@ -180,7 +181,7 @@ async function runEmbeddedTurnForSession(params) {
 				total: resolvedCandidates.length
 			}, "Agent model fallback started");
 			try {
-				const turnResult = await runXopcEmbeddedTurn({
+				const turnResult = await runWithEmbeddedExecutionSession(sessionKey, () => runXopcEmbeddedTurn({
 					sessionKey,
 					runId,
 					userMessage: userMessageForTurn,
@@ -199,7 +200,7 @@ async function runEmbeddedTurnForSession(params) {
 					onEvent: params.onEvent,
 					onAgentEvent: (event) => agentManager.emitRuntimeEvent(sessionKey, event),
 					resumeLastUserMessage
-				});
+				}), runId);
 				if (turnResult.ok) {
 					if (isFallbackAttempt) log.info({
 						sessionKey,

package/dist/src/agent/embedded/run-turn.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { getClarificationResumeInput, isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
 import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.js";
 import { lastAssistantPlainText, subscribeEmbeddedSessionEvents } from "./subscribe-session.js";
@@ -235,6 +236,7 @@ async function runXopcEmbeddedTurn(params) {
 		});
 		let policyStopped = false;
 		let connectionStopped = false;
+		let clarificationStopped = false;
 		params.turnPolicy?.reset();
 		session.agent.beforeToolCall = async (context, signal) => {
 			if (connectionStopped) return {
@@ -242,6 +244,11 @@ async function runXopcEmbeddedTurn(params) {
 				reason: "Waiting for the user to connect an app.",
 				terminate: true
 			};
+			if (clarificationStopped) return {
+				block: true,
+				reason: "Waiting for the user to answer.",
+				terminate: true
+			};
 			const decision = await params.turnPolicy?.beforeToolCall(context, signal);
 			if (decision?.block) {
 				policyStopped ||= decision.terminate === true;
@@ -259,6 +266,7 @@ async function runXopcEmbeddedTurn(params) {
 		};
 		session.agent.afterToolCall = async (context) => {
 			connectionStopped ||= isConnectionSuspended(sessionKey, runId);
+			clarificationStopped ||= isClarificationSuspended(sessionKey, runId);
 			const scoped = context.toolCall.name === "read_file" ? await instructions.forTool(context.toolCall.name, context.args) : "";
 			const checked = await verification.afterTool(context);
 			if (scoped) checked.result.content.unshift({
@@ -273,7 +281,7 @@ async function runXopcEmbeddedTurn(params) {
 		};
 		session.agent.shouldStopAfterTurn = (context) => {
 			policyStopped ||= params.turnPolicy?.shouldStopAfterTurn(context) ?? false;
-			return policyStopped || connectionStopped;
+			return policyStopped || connectionStopped || clarificationStopped;
 		};
 		unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {
 			if (event.type === "message_end" && event.message.role === "assistant") recordPromptCacheTouch(sessionKey, resolvedModel, event.message.usage);
@@ -290,11 +298,17 @@ async function runXopcEmbeddedTurn(params) {
 		try {
 			await runAgentTurnWithTimeout(session.agent, async () => {
 				const connectionResume = getConnectionResumeInput(sessionKey, runId);
+				const clarificationResume = getClarificationResumeInput(sessionKey, runId);
 				if (connectionResume) await session.sendCustomMessage({
 					customType: "connection_resume",
 					content: connectionResume.content,
 					display: false
 				}, { triggerTurn: true });
+				else if (clarificationResume) await session.sendCustomMessage({
+					customType: "clarification_resume",
+					content: clarificationResume.content,
+					display: false
+				}, { triggerTurn: true });
 				else if (params.resumeLastUserMessage) await session.agent.continue();
 				else {
 					const text = userMessageToPromptText(userMessage);
@@ -302,7 +316,8 @@ async function runXopcEmbeddedTurn(params) {
 					await session.prompt(text, images.length > 0 ? { images } : void 0);
 				}
 				await session.agent.waitForIdle();
-				if (connectionStopped) return;
+				clarificationStopped ||= isClarificationSuspended(sessionKey, runId);
+				if (connectionStopped || clarificationStopped) return;
 				await maybeRetryTurnAfterTransientLlmFailure(session.agent, {
 					sessionKey,
 					log,
@@ -330,6 +345,10 @@ async function runXopcEmbeddedTurn(params) {
 				runId,
 				sessionKey
 			});
+			if (clarificationStopped) runner.piSm.appendCustomEntry("clarification_required", {
+				runId,
+				sessionKey
+			});
 			runner.piSm.appendCustomEntry("coding_verification", {
 				runId,
 				workspace: workspaceDir,
@@ -356,7 +375,7 @@ async function runXopcEmbeddedTurn(params) {
 			});
 			return {
 				ok: true,
-				...connectionStopped ? { stopReason: "connection_required" } : {},
+				...connectionStopped ? { stopReason: "connection_required" } : clarificationStopped ? { stopReason: "clarification_required" } : {},
 				lastAssistantText: lastAssistantPlainText(session)
 			};
 		} finally {

package/dist/src/agent/embedded/types.d.ts CHANGED Viewed

@@ -89,7 +89,7 @@ export type RunXopcEmbeddedTurnParams = {
 };
 export type RunXopcEmbeddedTurnResult = {
     ok: boolean;
-    stopReason?: 'connection_required';
+    stopReason?: 'connection_required' | 'clarification_required';
     /** False for harness failures that must not trigger another model attempt. */
     retryable?: boolean;
     errorMessage?: string;

package/dist/src/agent/external-tools/composio-provider.d.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export declare class ComposioToolProvider implements ExternalToolProvider {
     private readonly deps;
     readonly source: "composio";
     private readonly adapter;
+    private readonly unavailableToolkits;
     constructor(deps: ComposioToolProviderDeps);
     search(query: string): Promise<ExternalToolSearchHit[]>;
     describe(toolRef: string): Promise<ExternalToolDescriptor | undefined>;

package/dist/src/agent/external-tools/composio-provider.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { createLogger } from "../../utils/logger/index.js";
+import { init_logger } from "../../utils/logger.js";
 import { connectionBinding, connectionBindings, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import "../../storage/sqlite/index.js";
@@ -10,7 +12,9 @@ import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { ExternalToolSearchError } from "./search-error.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 //#region src/agent/external-tools/composio-provider.ts
+init_logger();
 const CONNECTION_ARGUMENT = "xopcConnectionId";
+const log = createLogger("ComposioToolProvider");
 function textResult(value) {
 	return {
 		content: [{
@@ -108,47 +112,73 @@ function actionInputSchema(action) {
 var ComposioToolProvider = class {
 	source = "composio";
 	adapter;
+	unavailableToolkits = /* @__PURE__ */ new Set();
 	constructor(deps) {
 		this.deps = deps;
 		this.adapter = deps.adapter ?? new ComposioSessionsAdapter();
 	}
 	async search(query) {
 		const available = this.availableInstallations();
-		const toolkits = available.installations.map(toolkitFromInstallation);
-		if (toolkits.length === 0) return [];
-		let phase = "create_session";
-		let result;
-		try {
-			const session = await this.adapter.createSession({
-				principalId: available.principalId,
-				toolkits,
-				authConfigs: getConfiguredComposioAuthConfigs(this.deps.getConfig(), toolkits)
-			});
-			phase = "search";
-			result = await session.search({
-				query,
-				toolkits
-			});
-		} catch (cause) {
-			throw new ExternalToolSearchError(phase, toolkits, cause);
-		}
-		const schemas = result && typeof result === "object" && !Array.isArray(result) ? result.toolSchemas : void 0;
+		if (available.installations.length === 0) return [];
+		const settled = await Promise.allSettled(available.installations.map(async (installation) => {
+			const toolkit = toolkitFromInstallation(installation);
+			let phase = "create_session";
+			try {
+				const session = await this.adapter.createSession({
+					principalId: available.principalId,
+					toolkits: [toolkit],
+					authConfigs: getConfiguredComposioAuthConfigs(this.deps.getConfig(), [toolkit])
+				});
+				phase = "search";
+				return {
+					installation,
+					toolkit,
+					result: await session.search({
+						query,
+						toolkits: [toolkit]
+					})
+				};
+			} catch (cause) {
+				throw new ExternalToolSearchError(phase, [toolkit], cause);
+			}
+		}));
 		const hits = [];
-		if (!schemas || typeof schemas !== "object" || Array.isArray(schemas)) return hits;
-		for (const [actionId, schema] of Object.entries(schemas)) {
-			const toolkit = toolkitForAction(actionId, toolkits);
-			if (!toolkit || !isComposioActionAllowedByCatalog(actionId)) continue;
-			const installation = available.installations.find((candidate) => toolkitFromInstallation(candidate) === toolkit);
-			if (!installation) continue;
-			if (!isToolInputSchema(schema && typeof schema === "object" ? schema.inputSchema : void 0)) continue;
-			upsertConnectorActionMetadata(contractFromSearch(installation.connectorId, toolkit, actionId, schema));
-			hits.push({
-				toolRef: externalToolRef(this.source, installation.id, actionId),
-				source: this.source,
-				namespace: toolkit,
-				title: actionId,
-				summary: schemaSummary(schema, `Run ${actionId} in ${toolkit}.`)
-			});
+		const failures = [];
+		for (const attempt of settled) {
+			if (attempt.status === "rejected") {
+				failures.push(attempt.reason instanceof ExternalToolSearchError ? attempt.reason : new ExternalToolSearchError("search", [], attempt.reason));
+				continue;
+			}
+			const { installation, toolkit, result } = attempt.value;
+			this.unavailableToolkits.delete(toolkit);
+			const schemas = result && typeof result === "object" && !Array.isArray(result) ? result.toolSchemas : void 0;
+			if (!schemas || typeof schemas !== "object" || Array.isArray(schemas)) continue;
+			for (const [actionId, schema] of Object.entries(schemas)) {
+				if (toolkitForAction(actionId, [toolkit]) !== toolkit || !isComposioActionAllowedByCatalog(actionId)) continue;
+				if (!isToolInputSchema(schema && typeof schema === "object" ? schema.inputSchema : void 0)) continue;
+				upsertConnectorActionMetadata(contractFromSearch(installation.connectorId, toolkit, actionId, schema));
+				hits.push({
+					toolRef: externalToolRef(this.source, installation.id, actionId),
+					source: this.source,
+					namespace: toolkit,
+					title: actionId,
+					summary: schemaSummary(schema, `Run ${actionId} in ${toolkit}.`)
+				});
+			}
+		}
+		if (failures.length === settled.length) {
+			const first = failures[0];
+			throw new ExternalToolSearchError(first.phase, [...new Set(failures.flatMap((failure) => failure.toolkits))], first);
+		}
+		if (failures.length > 0) {
+			const failedToolkits = [...new Set(failures.flatMap((failure) => failure.toolkits))];
+			const newlyUnavailable = failedToolkits.filter((toolkit) => !this.unavailableToolkits.has(toolkit));
+			failedToolkits.forEach((toolkit) => this.unavailableToolkits.add(toolkit));
+			if (newlyUnavailable.length > 0) log.warn({
+				failedToolkits: newlyUnavailable,
+				failureCount: newlyUnavailable.length,
+				err: failures[0]
+			}, `Composio tool discovery skipped ${newlyUnavailable.length} unavailable toolkit${newlyUnavailable.length === 1 ? "" : "s"}`);
 		}
 		return hits;
 	}

package/dist/src/agent/external-tools/search-error.js CHANGED Viewed

@@ -13,15 +13,17 @@ function searchFailureDetails(error) {
 		phase: error.phase,
 		toolkits: error.toolkits
 	} : { phase: "search" };
+	const pending = [error];
 	const visited = /* @__PURE__ */ new Set();
-	let current = error;
-	while (current && typeof current === "object" && !visited.has(current)) {
+	while (pending.length > 0) {
+		const current = pending.shift();
+		if (!current || typeof current !== "object" || visited.has(current)) continue;
 		visited.add(current);
 		const row = current;
 		if (details.code === void 0 && (typeof row.code === "number" || typeof row.code === "string" && /^[a-zA-Z0-9_.-]{1,100}$/.test(row.code))) details.code = row.code;
 		const status = row.status ?? row.statusCode;
 		if (details.status === void 0 && typeof status === "number") details.status = status;
-		current = row.cause;
+		pending.push(row.cause, row.error);
 	}
 	return details;
 }

package/dist/src/agent/image/tool-model-config.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "../../config/schema.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
-import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
+import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
 import { resolveAgentModelFallbackValues, resolveAgentModelPrimaryValue } from "../../config/model-input.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
 import "../../capabilities/readiness/index.js";