@xopcai/xopc 0.0.252 → 0.0.254

package/dist/src/agent/tools/browser/tool/schemas.d.ts

@@ -1,5 +1,6 @@
+import type { BrowserActionInput } from '@xopcai/browser-control-contract';
 import { type Static } from '@sinclair/typebox';
-export declare const BrowserUseSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
+export declare const BrowserUseActionSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
     action: import("@sinclair/typebox").TLiteral<"observe">;
     sessionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     approvalId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -200,4 +201,87 @@ export declare const BrowserUseSchema: import("@sinclair/typebox").TUnion<[impor
     sessionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     approvalId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>]>;
+export declare const BrowserUseSchema: import("@sinclair/typebox").TObject<{
+    action: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"observe">, import("@sinclair/typebox").TLiteral<"navigate">, import("@sinclair/typebox").TLiteral<"click">, import("@sinclair/typebox").TLiteral<"fill">, import("@sinclair/typebox").TLiteral<"select">, import("@sinclair/typebox").TLiteral<"press">, import("@sinclair/typebox").TLiteral<"scroll">, import("@sinclair/typebox").TLiteral<"wait">, import("@sinclair/typebox").TLiteral<"upload">, import("@sinclair/typebox").TLiteral<"tabs">, import("@sinclair/typebox").TLiteral<"sequence">, import("@sinclair/typebox").TLiteral<"close">]>;
+    sessionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    approvalId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    revision: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+    ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+    }>>;
+    visual: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"never">, import("@sinclair/typebox").TLiteral<"auto">, import("@sinclair/typebox").TLiteral<"always">]>>;
+    url: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    value: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    submit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
+    key: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    deltaY: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+    condition: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"page_idle">, import("@sinclair/typebox").TLiteral<"text">, import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+    timeoutMs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+    paths: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+    operation: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"list">, import("@sinclair/typebox").TLiteral<"create">, import("@sinclair/typebox").TLiteral<"activate">, import("@sinclair/typebox").TLiteral<"close">]>>;
+    tabId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    steps: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
+        action: import("@sinclair/typebox").TLiteral<"click">;
+        ref: import("@sinclair/typebox").TString;
+        expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+        }>>;
+    }>, import("@sinclair/typebox").TObject<{
+        action: import("@sinclair/typebox").TLiteral<"fill">;
+        ref: import("@sinclair/typebox").TString;
+        value: import("@sinclair/typebox").TString;
+        submit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
+        expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+        }>>;
+    }>, import("@sinclair/typebox").TObject<{
+        action: import("@sinclair/typebox").TLiteral<"select">;
+        ref: import("@sinclair/typebox").TString;
+        value: import("@sinclair/typebox").TString;
+        expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+        }>>;
+    }>, import("@sinclair/typebox").TObject<{
+        action: import("@sinclair/typebox").TLiteral<"press">;
+        ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        key: import("@sinclair/typebox").TString;
+        expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+        }>>;
+    }>, import("@sinclair/typebox").TObject<{
+        action: import("@sinclair/typebox").TLiteral<"scroll">;
+        ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        deltaY: import("@sinclair/typebox").TNumber;
+        expect: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            urlIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            titleIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            textIncludes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            ref: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            state: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"visible">, import("@sinclair/typebox").TLiteral<"hidden">]>>;
+        }>>;
+    }>]>>>;
+}>;
 export type BrowserUseInput = Static<typeof BrowserUseSchema>;
+/** Decode the provider-facing superset into one exact Browser Control action. */
+export declare function decodeBrowserUseInput(value: unknown): BrowserActionInput | null;

package/dist/src/agent/tools/browser/tool/schemas.js

@@ -1,16 +1,21 @@
 import { Type } from "@sinclair/typebox";
+import { Value } from "@sinclair/typebox/value";
 //#region src/agent/tools/browser/tool/schemas.ts
 const ApprovalId = Type.Optional(Type.String({ description: "One-time local-owner approval id for this exact action." }));
 const SessionId = Type.Optional(Type.String({ description: "Browser session id returned by the previous observation." }));
 const Revision = Type.Number({ description: "Observation revision used to resolve element refs." });
-const Ref = Type.String({ description: "Ephemeral element ref from the latest observation." });
-const Expectation = Type.Optional(Type.Object({
+const Ref = Type.String({
+	minLength: 1,
+	description: "Ephemeral element ref from the latest observation."
+});
+const ExpectationSchema = Type.Object({
 	urlIncludes: Type.Optional(Type.String()),
 	titleIncludes: Type.Optional(Type.String()),
 	textIncludes: Type.Optional(Type.String()),
 	ref: Type.Optional(Type.String()),
 	state: Type.Optional(Type.Union([Type.Literal("visible"), Type.Literal("hidden")]))
-}, { additionalProperties: false }));
+}, { additionalProperties: false });
+const Expectation = Type.Optional(ExpectationSchema);
 function action(name, properties) {
 	return Type.Object({
 		action: Type.Literal(name),
@@ -133,7 +138,7 @@ const Sequence = action("sequence", {
 	expect: Expectation
 });
 const Close = action("close", {});
-const BrowserUseSchema = Type.Union([
+const BrowserUseActionSchema = Type.Union([
 	Observe,
 	Navigate,
 	Click,
@@ -147,5 +152,207 @@ const BrowserUseSchema = Type.Union([
 	Sequence,
 	Close
 ]);
+const BrowserUseSchema = Type.Object({
+	action: Type.Union([
+		Type.Literal("observe"),
+		Type.Literal("navigate"),
+		Type.Literal("click"),
+		Type.Literal("fill"),
+		Type.Literal("select"),
+		Type.Literal("press"),
+		Type.Literal("scroll"),
+		Type.Literal("wait"),
+		Type.Literal("upload"),
+		Type.Literal("tabs"),
+		Type.Literal("sequence"),
+		Type.Literal("close")
+	]),
+	sessionId: SessionId,
+	approvalId: ApprovalId,
+	revision: Type.Optional(Revision),
+	ref: Type.Optional(Ref),
+	expect: Type.Optional(ExpectationSchema),
+	visual: Type.Optional(Type.Union([
+		Type.Literal("never"),
+		Type.Literal("auto"),
+		Type.Literal("always")
+	])),
+	url: Type.Optional(Type.String({ minLength: 1 })),
+	value: Type.Optional(Type.String()),
+	submit: Type.Optional(Type.Boolean()),
+	key: Type.Optional(Type.String({ minLength: 1 })),
+	deltaY: Type.Optional(Type.Number()),
+	condition: Type.Optional(Type.Union([
+		Type.Literal("page_idle"),
+		Type.Literal("text"),
+		Type.Literal("visible"),
+		Type.Literal("hidden")
+	])),
+	timeoutMs: Type.Optional(Type.Number({
+		minimum: 100,
+		maximum: 12e4
+	})),
+	paths: Type.Optional(Type.Array(Type.String({ minLength: 1 }), {
+		minItems: 1,
+		maxItems: 20
+	})),
+	operation: Type.Optional(Type.Union([
+		Type.Literal("list"),
+		Type.Literal("create"),
+		Type.Literal("activate"),
+		Type.Literal("close")
+	])),
+	tabId: Type.Optional(Type.String()),
+	steps: Type.Optional(Type.Array(SequenceStep, {
+		minItems: 1,
+		maxItems: 10
+	}))
+}, { additionalProperties: false });
+const ACTION_FIELDS = {
+	observe: ["visual"],
+	navigate: ["url", "expect"],
+	click: [
+		"revision",
+		"ref",
+		"expect"
+	],
+	fill: [
+		"revision",
+		"ref",
+		"value",
+		"submit",
+		"expect"
+	],
+	select: [
+		"revision",
+		"ref",
+		"value",
+		"expect"
+	],
+	press: [
+		"revision",
+		"ref",
+		"key",
+		"expect"
+	],
+	scroll: [
+		"revision",
+		"ref",
+		"deltaY",
+		"expect"
+	],
+	wait: [
+		"revision",
+		"condition",
+		"value",
+		"ref",
+		"timeoutMs"
+	],
+	upload: [
+		"revision",
+		"ref",
+		"paths",
+		"expect"
+	],
+	tabs: [
+		"operation",
+		"tabId",
+		"url"
+	],
+	sequence: [
+		"revision",
+		"steps",
+		"expect"
+	],
+	close: []
+};
+const SEQUENCE_STEP_FIELDS = {
+	click: ["ref", "expect"],
+	fill: [
+		"ref",
+		"value",
+		"submit",
+		"expect"
+	],
+	select: [
+		"ref",
+		"value",
+		"expect"
+	],
+	press: [
+		"ref",
+		"key",
+		"expect"
+	],
+	scroll: [
+		"ref",
+		"deltaY",
+		"expect"
+	]
+};
+/** Decode the provider-facing superset into one exact Browser Control action. */
+function decodeBrowserUseInput(value) {
+	if (!isRecord(value) || !isBrowserActionName(value.action)) return null;
+	const candidate = { action: value.action };
+	copyNonEmptyString(value, candidate, "sessionId");
+	copyNonEmptyString(value, candidate, "approvalId");
+	for (const field of ACTION_FIELDS[value.action]) {
+		const fieldValue = value[field];
+		if (fieldValue === void 0 || fieldValue === null) continue;
+		if (field === "expect") {
+			const expectation = decodeExpectation(fieldValue);
+			if (expectation) candidate.expect = expectation;
+		} else if (field === "steps") {
+			if (!Array.isArray(fieldValue)) {
+				candidate.steps = fieldValue;
+				continue;
+			}
+			const steps = fieldValue.map(decodeSequenceStep);
+			if (steps.some((step) => step === null)) return null;
+			candidate.steps = steps;
+		} else if ((field === "ref" || field === "tabId" || field === "url") && fieldValue === "") continue;
+		else candidate[field] = fieldValue;
+	}
+	return Value.Check(BrowserUseActionSchema, candidate) ? candidate : null;
+}
+function decodeSequenceStep(value) {
+	if (!isRecord(value) || !isSequenceActionName(value.action)) return null;
+	const candidate = { action: value.action };
+	for (const field of SEQUENCE_STEP_FIELDS[value.action]) {
+		const fieldValue = value[field];
+		if (fieldValue === void 0 || fieldValue === null) continue;
+		if (field === "expect") {
+			const expectation = decodeExpectation(fieldValue);
+			if (expectation) candidate.expect = expectation;
+		} else if (field === "ref" && fieldValue === "") continue;
+		else candidate[field] = fieldValue;
+	}
+	return candidate;
+}
+function decodeExpectation(value) {
+	if (!isRecord(value)) return null;
+	const expectation = {};
+	for (const field of [
+		"urlIncludes",
+		"titleIncludes",
+		"textIncludes",
+		"ref"
+	]) copyNonEmptyString(value, expectation, field);
+	if (expectation.ref && (value.state === "visible" || value.state === "hidden")) expectation.state = value.state;
+	return Object.keys(expectation).length > 0 ? expectation : null;
+}
+function copyNonEmptyString(source, target, field) {
+	const value = source[field];
+	if (typeof value === "string" && value.length > 0) target[field] = value;
+}
+function isBrowserActionName(value) {
+	return typeof value === "string" && Object.hasOwn(ACTION_FIELDS, value);
+}
+function isSequenceActionName(value) {
+	return typeof value === "string" && Object.hasOwn(SEQUENCE_STEP_FIELDS, value);
+}
+function isRecord(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
 //#endregion
-export { BrowserUseSchema };
+export { BrowserUseActionSchema, BrowserUseSchema, decodeBrowserUseInput };

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

@@ -3,11 +3,25 @@ export type ClarifyRequestPayload = {
     kind?: 'approval';
     question: string;
     choices?: string[];
-    default?: string;
+    suggestedAnswer?: string;
+    /** Stable hash of the exact operation guarded by an approval. */
+    approvalKey?: string;
 };
-export type GatewayClarifyRequestFn = (sessionKey: string, request: ClarifyRequestPayload) => Promise<string>;
+export type ClarifyRequestResult = {
+    status: 'answered';
+    answer: string;
+} | {
+    status: 'waiting';
+    waitId: string;
+    expiresAt?: number;
+};
+export type GatewayClarifyRequestFn = (context: {
+    sessionKey: string;
+    runId: string;
+    toolCallId: string;
+}, request: ClarifyRequestPayload) => Promise<ClarifyRequestResult>;
 export interface ClarifyToolDeps {
     /** Resolve a per-turn callback; returns null when clarification is unavailable. */
-    resolveAskUser: () => ((request: ClarifyRequestPayload) => Promise<string>) | null;
+    resolveAskUser: (toolCallId: string) => ((request: ClarifyRequestPayload) => Promise<ClarifyRequestResult>) | null;
 }
 export declare function createClarifyTool(deps: ClarifyToolDeps): AgentTool;

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

@@ -7,7 +7,7 @@ const ClarifySchema = Type.Object({
 		minItems: 2,
 		maxItems: 10
 	})),
-	default: Type.Optional(Type.String({ description: "Default answer if the user does not respond within timeout." }))
+	suggestedAnswer: Type.Optional(Type.String({ description: "Optional recommendation shown to the user. It is never selected automatically." }))
 });
 function waitForAbort(signal) {
 	return new Promise((_, reject) => {
@@ -23,40 +23,42 @@ function createClarifyTool(deps) {
 	return {
 		name: "clarify",
 		label: "❓ Clarify",
-		description: "Ask the user a clarifying question and wait for their response.\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 default 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- Include a suggested answer when one option is clearly more likely",
 		parameters: ClarifySchema,
-		async execute(_toolCallId, params, signal) {
+		async execute(toolCallId, params, signal) {
 			const p = params;
-			const askUser = deps.resolveAskUser();
-			if (!askUser) {
-				if (p.default !== void 0 && p.default !== "") return {
-					content: [{
-						type: "text",
-						text: `Interactive clarification is not available in this environment. Using default: ${p.default}`
-					}],
-					details: { answer: p.default }
-				};
-				return {
-					content: [{
-						type: "text",
-						text: "Clarification is not available in this environment (no active webchat run). Provide a default or proceed with the best assumption."
-					}],
-					details: { answer: "" }
-				};
-			}
+			const askUser = deps.resolveAskUser(toolCallId);
+			if (!askUser) return {
+				content: [{
+					type: "text",
+					text: "Clarification is not available in this environment. Proceed with the best safe assumption or explain what is missing."
+				}],
+				details: { answer: "" }
+			};
 			const payload = {
 				question: p.question,
 				choices: p.choices,
-				default: p.default
+				suggestedAnswer: p.suggestedAnswer
 			};
 			try {
-				const answer = await Promise.race([askUser(payload), waitForAbort(signal)]);
+				const result = await Promise.race([askUser(payload), waitForAbort(signal)]);
+				if (result.status === "waiting") return {
+					content: [{
+						type: "text",
+						text: "Waiting for the user to answer this clarification. End the current run now."
+					}],
+					details: {
+						answer: "",
+						waitId: result.waitId,
+						status: result.status
+					}
+				};
 				return {
 					content: [{
 						type: "text",
-						text: `User answered: ${answer}`
+						text: `User answered: ${result.answer}`
 					}],
-					details: { answer }
+					details: { answer: result.answer }
 				};
 			} catch (error) {
 				const message = error instanceof Error ? error.message : String(error);
@@ -65,14 +67,7 @@ function createClarifyTool(deps) {
 						type: "text",
 						text: "Clarification cancelled (run aborted)."
 					}],
-					details: { answer: p.default ?? "" }
-				};
-				if (p.default !== void 0 && p.default !== "" && message.toLowerCase().includes("timeout")) return {
-					content: [{
-						type: "text",
-						text: `User did not respond in time. Using default: ${p.default}`
-					}],
-					details: { answer: p.default }
+					details: { answer: "" }
 				};
 				return {
 					content: [{

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

@@ -5,7 +5,7 @@ import * as readline from "node:readline/promises";
 * stdin/stdout prompts for `clarify` when running the CLI agent (no gateway).
 */
 function createCliReadlineClarifyRequestFn() {
-	return async (_sessionKey, req) => {
+	return async (_context, req) => {
 		const rl = readline.createInterface({
 			input: stdin,
 			output: stdout
@@ -15,19 +15,34 @@ function createCliReadlineClarifyRequestFn() {
 			if (choices && choices.length >= 2) {
 				stdout.write(`\n${req.question}\n`);
 				choices.forEach((c, i) => stdout.write(`  ${i + 1}) ${c}\n`));
-				if (req.default) stdout.write(`  (default: ${req.default})\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 choices[n - 1];
-				if (raw) return raw;
-				if (req.default) return req.default;
+				if (!Number.isNaN(n) && n >= 1 && n <= choices.length) return {
+					status: "answered",
+					answer: choices[n - 1]
+				};
+				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.default) stdout.write(`(Press Enter for default: ${req.default})\n`);
+			if (req.suggestedAnswer) stdout.write(`(Press Enter for recommendation: ${req.suggestedAnswer})\n`);
 			const raw = (await rl.question("> ")).trim();
-			if (raw) return raw;
-			if (req.default) return req.default;
+			if (raw) return {
+				status: "answered",
+				answer: raw
+			};
+			if (req.suggestedAnswer) return {
+				status: "answered",
+				answer: req.suggestedAnswer
+			};
 			throw new Error("No answer provided");
 		} finally {
 			rl.close();

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

@@ -7,7 +7,7 @@ import { getSessionTaskPlan, setSessionTaskPlan } from "../../storage/sqlite/ses
 import "../../storage/sqlite/index.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
-import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
+import { getEmbeddedExecutionRunId, getEmbeddedExecutionSession } from "../embedded/execution-context.js";
 import { wrapToolsWithProtection } from "./executor.js";
 import { EXTERNAL_TOOL_NAMES } from "../external-tools/gateway-tools.js";
 import { buildRuntimeEnvironment } from "../../runtime-tools/environment.js";
@@ -215,15 +215,25 @@ var AgentToolsFactory = class AgentToolsFactory {
 			createSessionStatusTool(),
 			createMemoryMaintenanceTool({ getConfig: () => this.deps.getConfig?.() }),
 			createToolManualTool(),
-			createClarifyTool({ resolveAskUser: () => {
+			createClarifyTool({ resolveAskUser: (toolCallId) => {
 				const req = this.deps.gatewayClarify?.requestClarification;
 				if (!req) return null;
 				const executionSession = getEmbeddedExecutionSession();
-				if (executionSession) return (r) => req(executionSession, r);
+				const runId = getEmbeddedExecutionRunId();
+				if (executionSession && runId) return (request) => req({
+					sessionKey: executionSession,
+					runId,
+					toolCallId
+				}, request);
 				const ctx = this.deps.getCurrentContext();
 				if (!ctx?.sessionKey) return null;
 				if (!CLARIFY_SUPPORTED_CHANNELS.has(ctx.channel)) return null;
-				return (r) => req(ctx.sessionKey, r);
+				if (!runId) return null;
+				return (request) => req({
+					sessionKey: ctx.sessionKey,
+					runId,
+					toolCallId
+				}, request);
 			} }),
 			createTodoTool({
 				getSessionKey: () => this.deps.getCurrentContext()?.sessionKey,

package/dist/src/ai-assist/text-assist.js

@@ -1,9 +1,9 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { getAssistantMessageErrorReason, stripCodeFences } from "../providers/model-response.js";
 import { getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
 import { isLocalModelBaseUrl, resolveModelCallApiKey, resolveModelCallOptions } from "../providers/model-call.js";
-import { getAssistantMessageErrorReason, stripCodeFences } from "../providers/model-response.js";
 //#region src/ai-assist/text-assist.ts
 init_providers();
 init_logger();

package/dist/src/auth/credentials.js

@@ -1,10 +1,10 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { init_paths, resolveAgentAuthProfilesPath, resolveAuthProfilesPath, resolveCredentialsDir, resolveOAuthPath } from "../config/paths.js";
 import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
-import { getOAuthProviderDefinition, init_registry } from "./oauth/registry.js";
+import { init_paths, resolveAgentAuthProfilesPath, resolveAuthProfilesPath, resolveCredentialsDir, resolveOAuthPath } from "../config/paths.js";
 import { getApiKeyFromEnv, init_env_keys } from "../providers/env-keys.js";
+import { getOAuthProviderDefinition, init_registry } from "./oauth/registry.js";
 import { init_oauth_provider_lock, withOAuthProviderLock } from "./oauth-provider-lock.js";
 import { dirname, join } from "path";
 import { mkdir, readFile, readdir, rm } from "fs/promises";

package/dist/src/auth/oauth/xopc-cloud.js

@@ -1,6 +1,6 @@
 import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
-import { init_resolution, resolveConnectedPlatformEndpoint } from "../../platform/resolution.js";
 import { generatePKCE, init_pkce } from "./pkce.js";
+import { init_resolution, resolveConnectedPlatformEndpoint } from "../../platform/resolution.js";
 import { hostname } from "node:os";
 import { randomBytes } from "node:crypto";
 import http from "node:http";

package/dist/src/auth/profiles/store.js

@@ -1,5 +1,5 @@
-import { init_paths, resolveCredentialsDir } from "../../config/paths.js";
 import { init_write_file_atomic, writeTextAtomicSync } from "../../infra/write-file-atomic.js";
+import { init_paths, resolveCredentialsDir } from "../../config/paths.js";
 import path from "node:path";
 import { chmodSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 //#region src/auth/profiles/store.ts

package/dist/src/auth/sync-provider-auth.js

@@ -1,8 +1,8 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { init_paths, resolveAgentAuthProfilesPath, resolveAuthProfilesPath, resolveOAuthPath } from "../config/paths.js";
-import { init_loader, loadConfig } from "../config/loader.js";
 import { init_registry, isOAuthOnlyProvider } from "./oauth/registry.js";
+import { init_loader, loadConfig } from "../config/loader.js";
+import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/auth/sync-provider-auth.ts
 /**

package/dist/src/automations/domain/validation.d.ts

@@ -117,9 +117,9 @@ export declare const AutomationActionSchema: z.ZodDiscriminatedUnion<[z.ZodObjec
         type: z.ZodLiteral<"add_wait">;
         wait: z.ZodObject<{
             kind: z.ZodEnum<{
+                approval: "approval";
                 dependency: "dependency";
                 user_input: "user_input";
-                approval: "approval";
                 external_event: "external_event";
                 scheduled_time: "scheduled_time";
                 retry_backoff: "retry_backoff";
@@ -294,9 +294,9 @@ export declare const AutomationSchema: z.ZodObject<{
             type: z.ZodLiteral<"add_wait">;
             wait: z.ZodObject<{
                 kind: z.ZodEnum<{
+                    approval: "approval";
                     dependency: "dependency";
                     user_input: "user_input";
-                    approval: "approval";
                     external_event: "external_event";
                     scheduled_time: "scheduled_time";
                     retry_backoff: "retry_backoff";
@@ -456,9 +456,9 @@ export declare const CreateAutomationSchema: z.ZodObject<{
             type: z.ZodLiteral<"add_wait">;
             wait: z.ZodObject<{
                 kind: z.ZodEnum<{
+                    approval: "approval";
                     dependency: "dependency";
                     user_input: "user_input";
-                    approval: "approval";
                     external_event: "external_event";
                     scheduled_time: "scheduled_time";
                     retry_backoff: "retry_backoff";
@@ -645,9 +645,9 @@ export declare const UpdateAutomationSchema: z.ZodObject<{
             type: z.ZodLiteral<"add_wait">;
             wait: z.ZodObject<{
                 kind: z.ZodEnum<{
+                    approval: "approval";
                     dependency: "dependency";
                     user_input: "user_input";
-                    approval: "approval";
                     external_event: "external_event";
                     scheduled_time: "scheduled_time";
                     retry_backoff: "retry_backoff";