@xopcai/xopc 0.0.388 → 0.0.390

package/dist/src/gateway/service/agent-runner.js

@@ -1,17 +1,19 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_transaction, runSqliteWriteTransaction } from "../../storage/sqlite/transaction.js";
+import { readClarificationPresentation } from "../../../packages/gateway-contract/src/clarifications.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { listActiveSessionInputExecutions, listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { createClarificationWait, getClarification, getClarificationSnapshot, init_clarification_wait_repository, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { init_connection_wait_repository, onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { TaskApplicationService } from "../../tasks/task-application-service.js";
-import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
+import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
 import { reserveEmbeddedRunCancellation } from "../../agent/embedded/runs.js";
+import { TaskApplicationService } from "../../tasks/task-application-service.js";
 import { EphemeralClarificationWaiter } from "../ephemeral-clarification-waiter.js";
 import { describeActiveExecution } from "./active-execution.js";
 import { runGatewayAgent } from "./run-gateway-agent.js";
@@ -20,6 +22,7 @@ import { fitSourceContextsToBudget } from "../../agent/source-context/budget.js"
 import { SessionInputCoordinator } from "./session-input-coordinator.js";
 import crypto from "node:crypto";
 //#region src/gateway/service/agent-runner.ts
+init_src();
 init_connection_wait_repository();
 init_clarification_wait_repository();
 init_logger();
@@ -299,25 +302,36 @@ var GatewayAgentRunner = class {
 	}
 	answerClarificationChoice(requestId, choiceIndex, idempotencyKey) {
 		const wait = getClarification(requestId);
-		const answer = wait?.status === "open" ? wait.choices?.[choiceIndex] : void 0;
-		if (!answer) return false;
+		const choice = wait?.status === "open" ? wait.choiceDetails?.[choiceIndex] : void 0;
+		if (!choice) return false;
 		return this.resolveClarificationResponse({
 			id: wait.id,
 			expectedVersion: wait.version,
 			idempotencyKey,
 			action: "answer",
-			answer
+			response: { choiceId: choice.id }
+		}).ok;
+	}
+	answerClarificationDecision(requestId, decision, idempotencyKey) {
+		const wait = getClarification(requestId);
+		if (!wait || wait.kind !== "approval" || wait.status !== "open") return false;
+		return this.resolveClarificationResponse({
+			id: wait.id,
+			expectedVersion: wait.version,
+			idempotencyKey,
+			action: "answer",
+			decision
 		}).ok;
 	}
-	answerClarificationText(conversationId, answer, idempotencyKey) {
+	answerClarificationText(conversationId, text, idempotencyKey) {
 		const wait = getClarificationSnapshot(conversationId)?.clarification;
-		if (!wait || wait.status !== "open" || !answer.trim()) return false;
+		if (!wait || wait.kind === "approval" || wait.status !== "open" || !text.trim()) return false;
 		return this.resolveClarificationResponse({
 			id: wait.id,
 			expectedVersion: wait.version,
 			idempotencyKey,
 			action: "answer",
-			answer
+			response: { text }
 		}).ok;
 	}
 	/** Same execution path as scheduled continuation, but lets callers observe failures. */
@@ -417,9 +431,8 @@ var GatewayAgentRunner = class {
 			runId: opts.runId,
 			toolCallId: opts.toolCallId,
 			kind: request.kind === "approval" ? "approval" : "input",
+			...readClarificationPresentation(request),
 			question: request.question,
-			choices: request.choices,
-			suggestedAnswer: request.suggestedAnswer,
 			approvalKey: request.approvalKey
 		});
 		this.opts.emit("clarification.created", wait);
@@ -427,9 +440,8 @@ var GatewayAgentRunner = class {
 			type: "clarify_request",
 			requestId: wait.id,
 			kind: wait.kind,
+			...readClarificationPresentation(wait),
 			question: wait.question,
-			choices: wait.choices,
-			suggestedAnswer: wait.suggestedAnswer,
 			expiresAt: wait.expiresAt,
 			createdAt: wait.createdAt,
 			version: wait.version
@@ -450,13 +462,17 @@ var GatewayAgentRunner = class {
 		const routing = (await this.opts.sessionIndex.getSessionMetadata(ctx.conversationId).catch(() => null))?.routing;
 		if (!routing || routing.source !== "telegram") return;
 		let body = ctx.request.question;
-		if (ctx.request.suggestedAnswer) body += `\n\nSuggested answer (never selected automatically): ${ctx.request.suggestedAnswer}`;
 		body += ctx.request.kind === "approval" ? "\n\nFor safety, this approval expires after 10 minutes." : "\n\nThis question remains available until you answer or cancel the task.";
-		const choices = ctx.request.choices;
-		const buttonRows = choices && choices.length >= 2 ? choices.map((c, i) => [{
-			text: c.length > 64 ? `${c.slice(0, 61)}…` : c,
-			callback_data: `clarify:${ctx.requestId}:${i}`
-		}]) : void 0;
+		const buttonRows = ctx.request.kind === "approval" ? [[{
+			text: "Approve once",
+			callback_data: `clarify:${ctx.requestId}:approve`
+		}, {
+			text: "Deny",
+			callback_data: `clarify:${ctx.requestId}:deny`
+		}]] : ctx.request.choiceDetails?.map((choice, index) => [{
+			text: choice.label.slice(0, 64),
+			callback_data: `clarify:${ctx.requestId}:${index}`
+		}]);
 		body += buttonRows ? "\n\nReply with your answer, or tap an option below." : "\n\nReply with your answer.";
 		await this.opts.getChannelManager().send({
 			channel: "telegram",