@xopcai/xopc 0.0.388 → 0.0.390

package/dist/src/agent/service/process-direct-streaming.js

@@ -5,25 +5,27 @@ 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 { init_model_usage, modelUsageOriginFromTurn, withModelUsageOrigin } from "../../providers/model-usage.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";
 import { isSuccessfulWebchatTtsToolEvent } from "./webchat-tts.js";
 //#region src/agent/service/process-direct-streaming.ts
+init_model_usage();
 init_agent_session_key();
 init_agent_scope();
 init_src();
@@ -137,7 +139,7 @@ function pushAssistantReceipt(queue, text, runId, metadata) {
 		message
 	});
 }
-async function* runProcessDirectStreaming(deps, input) {
+async function* runProcessDirectStreamingInner(deps, input) {
 	const conversationId = input.conversationId ?? resolveAgentMainConversationId({ agentId: resolveDefaultAgentId() });
 	deps.sessionStore?.idleCompaction?.interrupt(conversationId);
 	const isConnectionResume = Boolean(input.runId && getConnectionResumeInput(conversationId, input.runId));
@@ -445,5 +447,19 @@ async function* runProcessDirectStreaming(deps, input) {
 		deps.endDirectRequestContext();
 	}
 }
+/** Bind each generator advancement so independent streams retain their own origin. */
+async function* runProcessDirectStreaming(deps, input) {
+	const iterator = runProcessDirectStreamingInner(deps, input);
+	const origin = modelUsageOriginFromTurn(input.origin);
+	try {
+		while (true) {
+			const result = await withModelUsageOrigin(origin, () => iterator.next());
+			if (result.done) return;
+			yield result.value;
+		}
+	} finally {
+		await withModelUsageOrigin(origin, () => iterator.return());
+	}
+}
 //#endregion
 export { runProcessDirectStreaming };

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;

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

@@ -1,49 +1,35 @@
+import { normalizeClarificationSubmission } from "../../../packages/gateway-contract/src/clarifications.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import * as readline from "node:readline/promises";
 import { stdin, stdout } from "node:process";
 //#region src/agent/tools/cli-clarify.ts
-/**
-* stdin/stdout prompts for `clarify` when running the CLI agent (no gateway).
-*/
+init_src();
 function createCliReadlineClarifyRequestFn() {
-	return async (_context, req) => {
+	return async (_context, request) => {
 		const rl = readline.createInterface({
 			input: stdin,
 			output: stdout
 		});
 		try {
-			const choices = req.choices;
-			if (choices && choices.length >= 2) {
-				stdout.write(`\n${req.question}\n`);
-				choices.forEach((c, i) => stdout.write(`  ${i + 1}) ${c}\n`));
-				if (req.suggestedAnswer) stdout.write(`  (recommended: ${req.suggestedAnswer})\n`);
-				const raw = (await rl.question("Choice (number or exact text): ")).trim();
-				const n = parseInt(raw, 10);
-				if (!Number.isNaN(n) && n >= 1 && n <= choices.length) return {
+			stdout.write(`\n${request.question}\n`);
+			if (request.kind === "approval") {
+				stdout.write(`${JSON.stringify(request.approval)}\n`);
+				return {
 					status: "answered",
-					answer: choices[n - 1]
+					answer: normalizeClarificationSubmission(request, { decision: (await rl.question("Type approve or deny: ")).trim() }).answer
 				};
-				if (raw) return {
-					status: "answered",
-					answer: raw
-				};
-				if (req.suggestedAnswer) return {
-					status: "answered",
-					answer: req.suggestedAnswer
-				};
-				throw new Error("No answer provided");
 			}
-			stdout.write(`\n${req.question}\n`);
-			if (req.suggestedAnswer) stdout.write(`(Press Enter for recommendation: ${req.suggestedAnswer})\n`);
-			const raw = (await rl.question("> ")).trim();
-			if (raw) return {
-				status: "answered",
-				answer: raw
-			};
-			if (req.suggestedAnswer) return {
+			request.choiceDetails?.forEach((choice, index) => stdout.write(`  ${index + 1}) ${choice.label}${choice.description ? ` — ${choice.description}` : ""}${choice.id === request.recommendedChoiceId ? " (recommended)" : ""}\n`));
+			const raw = (await rl.question("Choice number or your answer: ")).trim();
+			const choice = /^\d+$/.test(raw) ? request.choiceDetails?.[Number(raw) - 1] : void 0;
+			const text = choice && request.interactionMode === "compose" ? (await rl.question("Additional information (optional): ")).trim() : choice ? void 0 : raw;
+			return {
 				status: "answered",
-				answer: req.suggestedAnswer
+				answer: normalizeClarificationSubmission(request, { response: {
+					choiceId: choice?.id,
+					text
+				} }).answer
 			};
-			throw new Error("No answer provided");
 		} finally {
 			rl.close();
 		}

package/dist/src/agent/tools/create-share-tool.js

@@ -1,15 +1,15 @@
 import { turnOutcomeKindFromFileName } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
-import { resolveReverseProxyPublicUrl } from "../../gateway/public-url.js";
-import { resolvePathUnderWorkspace } from "./tool-paths.js";
 import { assertWorkspaceTreeReadable, checkedFilePath } from "../sandbox/fileAccess.js";
+import { resolvePathUnderWorkspace } from "./tool-paths.js";
+import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
 import { resolveShareConfig } from "../../share/share-config.js";
 import { mergeWithDefaults } from "../../share/site-share-config.js";
 import { getShareStore } from "../../share/share-store.js";
 import { getSiteShareStore } from "../../share/site-share-store.js";
 import { resolveShareUrl, resolveSiteShareUrl } from "../../share/share-url.js";
 import { publishHostedStaticSite } from "../../share/hosted-static-site-publish.js";
+import { resolveReverseProxyPublicUrl } from "../../gateway/public-url.js";
 import { audienceDefaults, decideShareKind, makeDescription, makeTitle, probeShareTarget, rememberStagedSite, stageSingleHtmlAsSite } from "../../share/share-auto.js";
 import { scheduleThumbnail } from "../../share/share-thumbnail.js";
 import { resolveToolLocale, shareToolErrorLine, shareToolSuccessLines } from "../../i18n/share-tool-bundle.js";

package/dist/src/agent/tools/dataBatch.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { renderDataBatch } from "../data-acquisition/render.js";
 import { DataBatchSchema } from "../data-acquisition/schema.js";
 import { acquireData } from "../data-acquisition/service.js";
+import { renderDataBatch } from "../data-acquisition/render.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/agent/tools/dataBatch.ts
 init_logger();

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

@@ -1,15 +1,15 @@
 import { init_research_checkpoint, researchResumeContext } from "../orchestration/research-checkpoint.js";
 import { claimResearchCheckpoint, createResearchCheckpoint, finishResearchCheckpoint, getResearchCheckpoint, init_research_checkpoint_repository, recordResearchEvidence, recordResearchSearch, saveResearchCheckpoint } from "../../storage/sqlite/research-checkpoint-repository.js";
 import { resolveAgentAbortReason } from "../orchestration/run-termination.js";
-import { runGit } from "../../execution-environments/git.js";
-import { LocalWorktreeManager } from "../../execution-environments/local-worktree-manager.js";
-import { SessionEnvironmentService } from "../../execution-environments/session-environment-service.js";
 import { readWorkspaceRevision } from "../coding/workspace-revision.js";
 import { EXTERNAL_TOOL_NAMES } from "../external-tools/gateway-tools.js";
 import "../external-tools/index.js";
 import { getDelegationScope } from "../orchestration/delegation-scope.js";
 import { DELEGATION_BUDGETS } from "../orchestration/delegation-budget.js";
 import { createDelegateChildHandle } from "../child-agent-factory.js";
+import { runGit } from "../../execution-environments/git.js";
+import { LocalWorktreeManager } from "../../execution-environments/local-worktree-manager.js";
+import { SessionEnvironmentService } from "../../execution-environments/session-environment-service.js";
 import { DELEGATION_CAPABILITIES, DELEGATION_TOOL_CAPABILITIES, protectDelegatedTool, resolveDelegationTools } from "./delegation-policy.js";
 import { resolve } from "node:path";
 import { Type } from "@sinclair/typebox";

package/dist/src/agent/tools/executor.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { withRetry } from "../../infra/retry.js";
 import { commandTimeout } from "../commands/command-registry.js";
 import { DEFAULT_TOOL_EXECUTION_TIMEOUT_MS, TimeoutError, executeWithTimeout } from "../lifecycle/timeout-wrapper.js";
+import { withRetry } from "../../infra/retry.js";
 import { ToolConcurrencyController, resolveToolLockMode } from "./concurrency.js";
 //#region src/agent/tools/executor.ts
 init_logger();

package/dist/src/agent/tools/factory.js

@@ -9,33 +9,23 @@ import { patchSessionMetadata } from "../../storage/sqlite/session-repository.js
 import { getSessionTaskPlan, setSessionTaskPlan } from "../../storage/sqlite/session-task-plan-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
-import { buildRuntimeEnvironment } from "../../runtime-tools/environment.js";
-import { skillEnvironmentId } from "../skills/installer.js";
+import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
 import { resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { createWorkflowCatalog } from "../workflow/catalog.js";
-import { BrowserRuntime } from "../../browser/runtime/browser-runtime.js";
+import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";
+import { createPersonalAttentionTool } from "./personal-attention-tool.js";
+import { markCodemodeCoreRead } from "./codemode-permissions.js";
+import { PERSONAL_TOOL_DESCRIPTIONS } from "../../personal-agent/policy.js";
+import { PERSONAL_REQUEST_TOOL_IDS, filterExecutionTools, resolveExecutionToolPolicy } from "../embedded/execution-tool-policy.js";
 import "../../../packages/browser-control-contract/src/index.js";
-import { createBrowserDriver } from "../../browser/drivers/create-driver.js";
-import { checkBrowserReadiness } from "../../browser/readiness.js";
-import "../../browser/index.js";
 import { getEmbeddedExecutionRunId, getEmbeddedExecutionSession } from "../embedded/execution-context.js";
-import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
-import { ComputerRuntime } from "../../computer/runtime.js";
 import { wrapToolsWithProtection } from "./executor.js";
 import { EXTERNAL_TOOL_NAMES } from "../external-tools/gateway-tools.js";
 import { createDefaultExternalToolGatewayTools } from "../external-tools/index.js";
-import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
-import { getPendingTranscriptUserText } from "../inbound/attachment-pipeline.js";
-import { createDataBatchTool } from "./dataBatch.js";
-import { markCodemodeCoreRead } from "./codemode-permissions.js";
-import { PERSONAL_TOOL_DESCRIPTIONS } from "../../personal-agent/policy.js";
-import { PERSONAL_REQUEST_TOOL_IDS, filterExecutionTools, resolveExecutionToolPolicy } from "../embedded/execution-tool-policy.js";
-import { createDelegateTool } from "./delegate-tool.js";
-import { createDelegationParentPolicy } from "./delegation-parent-policy.js";
-import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";
-import { createPersonalAttentionTool } from "./personal-attention-tool.js";
 import { createReadFileTool } from "./read.js";
+import { createDataBatchTool } from "./dataBatch.js";
+import { buildRuntimeEnvironment } from "../../runtime-tools/environment.js";
+import { skillEnvironmentId } from "../skills/installer.js";
 import { createWriteFileTool } from "./write.js";
 import { createListDirTool } from "./list-dir.js";
 import { createPublishArtifactsTool } from "./publish-artifacts.js";
@@ -59,7 +49,14 @@ import { createUpdatePlanTool } from "./update-plan-tool.js";
 import { createSessionStatusTool } from "./session-status-tool.js";
 import { createMemoryMaintenanceTool } from "./memory-maintenance-tool.js";
 import { createClarifyTool } from "./clarify-tool.js";
+import { BrowserRuntime } from "../../browser/runtime/browser-runtime.js";
+import { createBrowserDriver } from "../../browser/drivers/create-driver.js";
+import { checkBrowserReadiness } from "../../browser/readiness.js";
+import "../../browser/index.js";
+import { getPendingTranscriptUserText } from "../inbound/attachment-pipeline.js";
+import { createDelegateTool } from "./delegate-tool.js";
 import { createWorkflowTool } from "./workflow-tool.js";
+import { createWorkflowCatalog } from "../workflow/catalog.js";
 import { createWorkflowManageTool } from "./workflow-manage-tool.js";
 import { createAutomationTool } from "./automation-tool.js";
 import { createBrowserAutomationTool } from "./browser-automation-tool.js";
@@ -84,9 +81,12 @@ import { createPersonalRequestTools } from "./personal-request-tool.js";
 import { createPersonalRequestConnectionTool, createPersonalRequestResultTool } from "./personal-request-result-tool.js";
 import { createPersonalPreferenceTool } from "./personal-preference-tool.js";
 import { createBrowserUseTool } from "./browser/tool/browser-use-tool.js";
+import { ComputerRuntime } from "../../computer/runtime.js";
 import { createComputerUseTool } from "./computer-use-tool.js";
 import { createReviewWorkspaceTool } from "./review-workspace.js";
 import { createLanguageDiagnosticsTool } from "./language-diagnostics.js";
+import { createDelegationParentPolicy } from "./delegation-parent-policy.js";
+import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 import { createTextToSpeechTool } from "./tts-tool.js";
 import { getAgentCapabilityToolNames } from "../capabilities/registry.js";
 import "../capabilities/index.js";

package/dist/src/agent/tools/image-generate-tool.js

@@ -1,12 +1,12 @@
 import { getAgentDefaultImageGenerationModelConfig, init_schema } from "../../config/schema.js";
+import { readWorkspaceFile, writeWorkspaceFile } from "../sandbox/fileAccess.js";
 import { imageAssetFromDataUrl, imageFileExtensionForMimeType, mimeTypeFromFileName, parseImageDataUrl, sniffImageMimeType } from "../image/generation/image-assets.js";
-import { getImageGenerationProvider } from "../image/generation/provider-registry.js";
+import { persistToolMedia } from "./tool-media.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
 import "../../capabilities/readiness/index.js";
 import { applyImageGenerationModelConfigDefaults } from "../image/image-helpers.js";
-import { readWorkspaceFile, writeWorkspaceFile } from "../sandbox/fileAccess.js";
-import { persistToolMedia } from "./tool-media.js";
 import { isFailoverError } from "../failover-error.js";
+import { getImageGenerationProvider } from "../image/generation/provider-registry.js";
 import { generateImage, listImageGenerationProvidersSummary } from "../image/generation/runtime.js";
 import path from "node:path";
 import { randomBytes } from "node:crypto";
@@ -195,10 +195,14 @@ function createImageGenerateTool(options) {
 	});
 	if (!imageGenerationModelConfig) return null;
 	const effectiveCfg = applyImageGenerationModelConfigDefaults(options.config, imageGenerationModelConfig) ?? options.config;
+	const primaryRef = imageGenerationModelConfig.primary;
+	const primaryProvider = primaryRef ? getImageGenerationProvider(primaryRef.slice(0, primaryRef.indexOf("/"))) : void 0;
+	const primaryModel = primaryRef?.slice(primaryRef.indexOf("/") + 1);
+	const capabilities = primaryModel ? primaryProvider?.modelCapabilities?.[primaryModel] ?? primaryProvider?.capabilities : void 0;
 	return {
 		name: "image_generate",
 		label: "Image Generation",
-		description: "Generate and attach images with the configured image-generation model. Use action=\"list\" to see providers. Also saves files under workspace/media/generated/. Do not call send_media for generated images.",
+		description: `Generate and attach images with the configured image-generation model (${primaryRef}). ${capabilities ? `Configured model capabilities: ${JSON.stringify(capabilities)}. ` : ""}Omit optional image parameters unless needed. Keep the configured model unless the user asks for another provider/model. Use action="list" to see providers. Also saves files under workspace/media/generated/. Do not call send_media for generated images.`,
 		parameters: ImageGenerateToolSchema,
 		async execute(_toolCallId, args) {
 			const params = args;