@xopcai/xopc 0.0.388 → 0.0.389

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/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/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/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-streaming.js

@@ -5,20 +5,20 @@ import { getClarificationResumeInput, init_clarification_wait_repository } from
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
-import { isSessionSourceBinding, summarizeSourceContext } from "../source-context/types.js";
-import { stripEnvelopeTimestampPrefix } from "../../channels/envelope-timestamp.js";
-import { mergeSttConfigFromAppConfig } from "../../voice/stt/config.js";
-import "../../voice/stt/index.js";
-import { abortEmbeddedRun } from "../embedded/runs.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
+import { abortEmbeddedRun } from "../embedded/runs.js";
 import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
+import { mergeSttConfigFromAppConfig } from "../../voice/stt/config.js";
+import "../../voice/stt/index.js";
+import { isSessionSourceBinding, summarizeSourceContext } from "../source-context/types.js";
+import { formatAgentRunErrorForClient } from "../client-error-format.js";
 import { resolveConfiguredActivityDetailDefault, resolveEffectiveReasoningLevel } from "../../session/thinking-resolve.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
 import "../../session/index.js";
 import { getTaskContinuation } from "../../tasks/task-continuation.js";
+import { stripEnvelopeTimestampPrefix } from "../../channels/envelope-timestamp.js";
 import { isVoiceLikeAttachment, mergeVoiceTranscriptsIntoUserText, requestsOriginalVoiceInspection } from "../../channels/attachments/voice-stt-webchat.js";
 import { applyReasoningVisibility } from "../streaming/reasoning-visibility.js";
-import { formatAgentRunErrorForClient } from "../client-error-format.js";
 import { injectSourceContextsIntoUserMessage } from "../source-context/injector.js";
 import { AsyncQueue, AsyncQueueOverflowError } from "./async-queue.js";
 import { hydratePerTurnState, runDirectAgentTurn, tryRunSlashCommand } from "./direct-turn-helpers.js";

package/dist/src/agent/service/webchat-tts.js

@@ -1,12 +1,12 @@
 import { appendMediaToAssistantTranscriptEntry, findLatestAssistantTranscriptEntryId } from "../../storage/sqlite/transcript-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { isTTSAvailable } from "../../voice/tts/factory.js";
+import { speak } from "../../voice/tts/speak-core.js";
 import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 import { getChannelOutputFormat, shouldUseTTS } from "../../voice/tts/service.js";
-import { speak } from "../../voice/tts/speak-core.js";
 import { compressAudio } from "../../voice/tts/audio.js";
-import "../../voice/tts/index.js";
 import { persistOutboundTtsAudio } from "../../channels/attachments/outbound-tts-persist.js";
+import "../../voice/tts/index.js";
 import { deleteMediaUris } from "../../media/session-references.js";
 //#region src/agent/service/webchat-tts.ts
 init_sqlite();

package/dist/src/agent/service.js

@@ -3,37 +3,43 @@ import { init_logger } from "../utils/logger.js";
 import { init_attachment_ref, parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
 import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { extractTextContent } from "./context/workspace.js";
-import { onSessionTranscriptUpdate } from "../session/transcript-events.js";
-import { getUserTimezone } from "../user-model/repository.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
-import "../user-model/index.js";
-import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
-import { removeSkillsLockEntry } from "./skills/hub-lock.js";
-import { installSkillFromZip } from "./skills/managed-store.js";
-import { pullSkillFromSource } from "./skills/hub-pull.js";
 import { extractProfileAgentId, resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
-import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
-import { getProjectForSession } from "../projects/workspace.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { init_providers, resolveModel } from "../providers/index.js";
 import { configureTracing, flushTracing } from "../observability/runtime.js";
-import { runWithEmbeddedExecutionSession } from "./embedded/execution-context.js";
-import { initializeCommands } from "../chat-commands/index.js";
+import { getUserTimezone } from "../user-model/repository.js";
+import { resolveAgentTurnTimeoutMs } from "./orchestration/run-agent-turn-with-timeout.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
-import { ExtensionHookRunner } from "../extensions/hooks.js";
-import "../extensions/index.js";
-import { MAX_WEBCHAT_ATTACHMENT_FILE_BYTES } from "../gateway/chat-limits.js";
+import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
+import { getProjectForSession } from "../projects/workspace.js";
+import "../user-model/index.js";
+import { onSessionTranscriptUpdate } from "../session/transcript-events.js";
+import { runWithEmbeddedExecutionSession } from "./embedded/execution-context.js";
+import { removeSkillsLockEntry } from "./skills/hub-lock.js";
+import { installSkillFromZip } from "./skills/managed-store.js";
+import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
+import { pullSkillFromSource } from "./skills/hub-pull.js";
 import { persistInboundAttachments } from "../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, hydrateUserTurnForLlm } from "./inbound/attachment-pipeline.js";
 import { drainEmbeddedSessionRunnerShutdowns } from "./embedded/session-runner.js";
-import { maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle } from "../session/session-title.js";
 import { resolveCompactionPolicy } from "./memory/compaction-policy.js";
+import { getModelThinking } from "../providers/model-thinking.js";
+import { runXopcEmbeddedTurn } from "./embedded/run-turn.js";
+import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
+import { normalizeSkillInstallTarget } from "./skills/install-target.js";
+import { AgentManager } from "./agent-manager.js";
+import { MAX_WEBCHAT_ATTACHMENT_FILE_BYTES } from "../gateway/chat-limits.js";
+import { maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle } from "../session/session-title.js";
 import { SessionStore } from "../session/store.js";
 import { SessionConfigStore } from "../session/config-store.js";
 import "../session/index.js";
+import { ExtensionHookRunner } from "../extensions/hooks.js";
+import "../extensions/index.js";
 import { SessionTracker } from "./session/tracker.js";
 import { ModelManager } from "./models/manager.js";
 import "./models/index.js";
+import { initializeCommands } from "../chat-commands/index.js";
 import { HookHandler } from "./lifecycle/hook-handler.js";
 import { ToolErrorTracker } from "./tools/error-tracker.js";
 import { RequestLimiter } from "./models/request-limiter.js";
@@ -45,9 +51,6 @@ import { ContextMiddleware } from "./middleware/context.js";
 import "./middleware/index.js";
 import { LifecycleManager } from "./lifecycle/manager.js";
 import "./lifecycle/index.js";
-import { resolveAgentTurnTimeoutMs } from "./orchestration/run-agent-turn-with-timeout.js";
-import { getModelThinking } from "../providers/model-thinking.js";
-import { runXopcEmbeddedTurn } from "./embedded/run-turn.js";
 import { MessageRouter } from "./messaging/message-router.js";
 import { CommandHandler } from "./messaging/command-handler.js";
 import { StreamManager } from "./messaging/stream-manager.js";
@@ -66,10 +69,7 @@ import { AgentOrchestrator } from "./orchestration/agent-orchestrator.js";
 import { AgentEventHandler } from "./orchestration/agent-event-handler.js";
 import "./orchestration/index.js";
 import { getWorkflowProgressBroker } from "./workflow/progress-broker.js";
-import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
 import "./workflow/index.js";
-import { normalizeSkillInstallTarget } from "./skills/install-target.js";
-import { AgentManager } from "./agent-manager.js";
 import { TaskJudgeService } from "./tasks/task-judge-service.js";
 import { analyzeResponseLanguage } from "../i18n/language-consistency.js";
 import { readFile } from "node:fs/promises";

package/dist/src/agent/session/session-config-service.js

@@ -2,14 +2,14 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { chooseModelThinking } from "../../../packages/gateway-contract/src/model-selection.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { isPersonalConversation } from "../../personal-agent/repository.js";
+import { ResponseLanguageSchema, init_response_language } from "../../i18n/response-language.js";
 import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 import { normalizeWorkingDirectoryInput } from "../../session/session-workspace.js";
 import { getProjectWorkspacePathForSession } from "../../projects/workspace.js";
-import { ResponseLanguageSchema, init_response_language } from "../../i18n/response-language.js";
+import { isPersonalConversation } from "../../personal-agent/repository.js";
+import { getModelThinking } from "../../providers/model-thinking.js";
 import { normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel } from "../transcript/thinking-types.js";
 import "../../session/index.js";
-import { getModelThinking } from "../../providers/model-thinking.js";
 import { mkdir } from "node:fs/promises";
 //#region src/agent/session/session-config-service.ts
 init_src();

package/dist/src/agent/session/session-hydrator.js

@@ -3,9 +3,9 @@ import { init_logger } from "../../utils/logger.js";
 import { getExecutionEnvironmentForSession } from "../../execution-environments/subject.js";
 import { effectiveWorkspacePathForSession, normalizeWorkingDirectoryInput, projectWorkspacePath } from "../../session/session-workspace.js";
 import { getProjectForSession } from "../../projects/workspace.js";
+import { getModelThinking } from "../../providers/model-thinking.js";
 import { resolveEffectiveThinkingLevel } from "../../session/thinking-resolve.js";
 import "../../session/index.js";
-import { getModelThinking } from "../../providers/model-thinking.js";
 import { mkdir, stat } from "node:fs/promises";
 //#region src/agent/session/session-hydrator.ts
 /**

package/dist/src/agent/session/session-inspector.js

@@ -2,10 +2,10 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_workspace_defaults, resolveDefaultAgentWorkspaceDir } from "../../config/workspace-defaults.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
+import { init_providers, resolveModel } from "../../providers/index.js";
 import { getExecutionEnvironmentForSession } from "../../execution-environments/subject.js";
 import { effectiveWorkspacePathForSession, projectWorkspacePath } from "../../session/session-workspace.js";
 import { getProjectForSession } from "../../projects/workspace.js";
-import { init_providers, resolveModel } from "../../providers/index.js";
 import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
 import { resolveVerboseLevel } from "../../session/config-store.js";
 import { resolveConfiguredActivityDetailDefault, resolveEffectiveReasoningLevel, resolveEffectiveThinkingLevel } from "../../session/thinking-resolve.js";

package/dist/src/agent/skills/filesystem-watcher.js

@@ -2,10 +2,10 @@ import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveSkillsDir } from "../../config/paths.js";
+import { isManagedSkillTransientDirName } from "./managed-store.js";
 import { createSkillConfigManager } from "./config.js";
 import { resolveWorkspaceSkillsDir } from "./workspace-skills-dir.js";
 import { resolveAgentsSkillsDir, resolveWorkspaceAgentsSkillsDir } from "./skill-sources.js";
-import { isManagedSkillTransientDirName } from "./managed-store.js";
 import path from "node:path";
 import chokidar from "chokidar";
 //#region src/agent/skills/filesystem-watcher.ts

package/dist/src/agent/skills/hub-pull.js

@@ -1,8 +1,8 @@
 import { parseFrontmatter } from "../../markdown/frontmatter.js";
-import { formatScanSummary, scanSkillDirectory } from "./scanner.js";
-import { computeSkillTreeHashSync } from "./hub-hash.js";
 import { getSkillsLockEntry, recordSkillsHubInstall } from "./hub-lock.js";
 import { installSkillFromZip, isIgnorableZipEntry, isValidSkillId, prepareManagedSkillTempDir, promoteManagedSkillTempDir } from "./managed-store.js";
+import { formatScanSummary, scanSkillDirectory } from "./scanner.js";
+import { computeSkillTreeHashSync } from "./hub-hash.js";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, normalize, resolve, sep } from "node:path";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";

package/dist/src/agent/skills/marketplace/adapters/store/adapter.js

@@ -1,6 +1,6 @@
+import { downloadSkillZipBuffer, fetchMarketplacePackageDetail, listSkillCategories, listSkillPackages, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 } from "./store-api-client.js";
 import { registerMarketplaceAdapter } from "../../registry.js";
 import { buildSkillMarkdownPreviewFromRaw } from "../../../skill-markdown-preview-from-raw.js";
-import { downloadSkillZipBuffer, fetchMarketplacePackageDetail, listSkillCategories, listSkillPackages, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 } from "./store-api-client.js";
 //#region src/agent/skills/marketplace/adapters/store/adapter.ts
 const storeMarketplaceAdapter = {
 	id: "store",

package/dist/src/agent/skills/marketplace/adapters/store/store-api-client.js

@@ -1,6 +1,6 @@
-import { MAX_SKILL_ZIP_BYTES, isValidSkillId } from "../../../managed-store.js";
 import { init_resolution, resolveConnectedPlatformEndpoint } from "../../../../../platform/resolution.js";
 import { MAX_EXTENSION_STORE_ZIP_BYTES } from "../../../../../extensions/store-zip-limits.js";
+import { MAX_SKILL_ZIP_BYTES, isValidSkillId } from "../../../managed-store.js";
 import { createHash } from "node:crypto";
 //#region src/agent/skills/marketplace/adapters/store/store-api-client.ts
 /**

package/dist/src/agent/source-context/index.js

@@ -1,7 +1,7 @@
 import { isSessionSourceBinding, isTurnContextRef, parseTurnContextRefs, summarizeSourceContext } from "./types.js";
 import { buildUserAssertionAgentContext } from "./user-assertion-context.js";
+import { injectSourceContextsIntoUserMessage } from "./injector.js";
 import { buildFileAgentContext } from "./file-context.js";
 import { buildSessionAgentContext } from "./session-context.js";
 import { buildBrowserTabAgentContext } from "./browser-tab.js";
-import { injectSourceContextsIntoUserMessage } from "./injector.js";
 export { buildBrowserTabAgentContext, buildFileAgentContext, buildSessionAgentContext, buildUserAssertionAgentContext, injectSourceContextsIntoUserMessage, isSessionSourceBinding, isTurnContextRef, parseTurnContextRefs, summarizeSourceContext };

package/dist/src/agent/tasks/task-judge-service.js

@@ -2,20 +2,20 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
-import { resolveTaskLocale } from "../../tasks/task-language.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
-import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
-import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { extractAssistantText, getAssistantMessageErrorReason, isTransientProviderErrorMessage, stripCodeFences } from "../../providers/model-response.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { getApiKey, init_providers, resolveModel } from "../../providers/index.js";
 import { completeWithResolvedCredentials } from "../../providers/model-call.js";
-import { currentTaskResearchResult } from "../../tasks/task-research-result.js";
-import { TaskApplicationService } from "../../tasks/task-application-service.js";
-import { readWorkspaceRevision } from "../coding/workspace-revision.js";
+import { extractAssistantText, getAssistantMessageErrorReason, isTransientProviderErrorMessage, stripCodeFences } from "../../providers/model-response.js";
 import { canResumeAfterModelFailure } from "../orchestration/turn-recovery.js";
+import { resolveTaskLocale } from "../../tasks/task-language.js";
+import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
+import { readWorkspaceRevision } from "../coding/workspace-revision.js";
+import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
+import { currentTaskResearchResult } from "../../tasks/task-research-result.js";
 import { buildResponseLanguageSection } from "../prompt/sections/response-language.js";
 import { resolveResponseLanguageForSession } from "../prompt/response-language.js";
+import { TaskApplicationService } from "../../tasks/task-application-service.js";
 //#region src/agent/tasks/task-judge-service.ts
 init_schema();
 init_providers();

package/dist/src/agent/tools/clarify-tool.d.ts

@@ -1,9 +1,8 @@
+import type { ClarificationPresentation } from '@xopcai/gateway-contract';
 import type { AgentTool } from '@earendil-works/pi-agent-core';
-export type ClarifyRequestPayload = {
+export type ClarifyRequestPayload = ClarificationPresentation & {
     kind?: 'approval';
     question: string;
-    choices?: string[];
-    suggestedAnswer?: string;
     /** Stable hash of the exact operation guarded by an approval. */
     approvalKey?: string;
 };

package/dist/src/agent/tools/clarify-tool.js

@@ -2,13 +2,18 @@ import { Type } from "@sinclair/typebox";
 //#region src/agent/tools/clarify-tool.ts
 const ClarifySchema = Type.Object({
 	question: Type.String({ description: "The question to ask the user. Be specific and concise." }),
-	choices: Type.Optional(Type.Array(Type.String(), {
-		description: "Optional list of choices for multiple-choice questions. If provided, the user picks one. If omitted, the user types a free-form answer.",
+	interactionMode: Type.Optional(Type.Union([Type.Literal("quick"), Type.Literal("compose")], { description: "quick submits a choice immediately; compose lets the user select and add details before submitting." })),
+	choiceDetails: Type.Optional(Type.Array(Type.Object({
+		id: Type.String(),
+		label: Type.String(),
+		description: Type.Optional(Type.String())
+	}), {
 		minItems: 2,
-		maxItems: 10
+		maxItems: 10,
+		description: "Answer choices with stable unique IDs and optional descriptions."
 	})),
-	suggestedAnswer: Type.Optional(Type.String({ description: "Optional recommendation shown to the user. It is never selected automatically." }))
-});
+	recommendedChoiceId: Type.Optional(Type.String())
+}, { additionalProperties: false });
 function waitForAbort(signal) {
 	return new Promise((_, reject) => {
 		if (!signal) return;
@@ -23,7 +28,7 @@ function createClarifyTool(deps) {
 	return {
 		name: "clarify",
 		label: "❓ Clarify",
-		description: "Ask the user a clarifying question and pause the objective until they respond.\n\nUse this when you need more information to proceed correctly, rather than guessing.\n\nWHEN TO USE:\n- Ambiguous instructions with multiple valid interpretations\n- Missing critical information (which file, which approach, etc.)\n- Confirming destructive or irreversible actions\n\nWHEN NOT TO USE:\n- When you can reasonably infer the answer from context\n- For trivial decisions that do not affect the task\n- When the user explicitly said \"just do it\" or \"your choice\"\n\nTIPS:\n- Provide choices when there are clear options (faster for the user)\n- Keep questions short and specific\n- Include a suggested answer when one option is clearly more likely",
+		description: "Ask the user a clarifying question and pause the objective until they respond.\n\nUse this when you need more information to proceed correctly, rather than guessing.\n\nWHEN TO USE:\n- Ambiguous instructions with multiple valid interpretations\n- Missing critical information (which file, which approach, etc.)\n- Confirming destructive or irreversible actions\n\nWHEN NOT TO USE:\n- When you can reasonably infer the answer from context\n- For trivial decisions that do not affect the task\n- When the user explicitly said \"just do it\" or \"your choice\"\n\nTIPS:\n- Provide choices when there are clear options (faster for the user)\n- Keep questions short and specific\n- Set recommendedChoiceId when one option is clearly more likely",
 		parameters: ClarifySchema,
 		async execute(toolCallId, params, signal) {
 			const p = params;
@@ -36,9 +41,10 @@ function createClarifyTool(deps) {
 				details: { answer: "" }
 			};
 			const payload = {
-				question: p.question,
-				choices: p.choices,
-				suggestedAnswer: p.suggestedAnswer
+				interactionMode: p.interactionMode,
+				choiceDetails: p.choiceDetails,
+				recommendedChoiceId: p.recommendedChoiceId,
+				question: p.question
 			};
 			try {
 				const result = await Promise.race([askUser(payload), waitForAbort(signal)]);

package/dist/src/agent/tools/cli-clarify.d.ts

@@ -1,5 +1,2 @@
 import type { GatewayClarifyRequestFn } from './clarify-tool.js';
-/**
- * stdin/stdout prompts for `clarify` when running the CLI agent (no gateway).
- */
 export declare function createCliReadlineClarifyRequestFn(): GatewayClarifyRequestFn;