@xopcai/xopc 0.0.382 → 0.0.384

package/dist/src/agent/tools/personal-request-tool.js

@@ -1,10 +1,15 @@
+import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
 import { getPersonalRequest, init_request_repository, listPersonalRequests } from "../../personal-agent/request-repository.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
+import { TaskAllocationRepository } from "../../tasks/task-allocation-repository.js";
+import { boundedPersonalResult } from "./personal-result-budget.js";
+import { cancelPersonalTask } from "../../personal-agent/task-cancel.js";
 import { personalCapabilities } from "../../personal-agent/capability-service.js";
 import { cancelPersonalRequest, personalRequestSnapshot, publishPersonalRequest, submitPersonalRequest } from "../../personal-agent/request-service.js";
 import { Type } from "@sinclair/typebox";
 //#region src/agent/tools/personal-request-tool.ts
 init_request_repository();
+init_transaction();
 const CapabilitySchema = Type.Object({
 	query: Type.String({
 		minLength: 1,
@@ -20,8 +25,12 @@ const RequestSchema = Type.Object({
 		"cancel"
 	].map((command) => Type.Literal(command))),
 	requestId: Type.Optional(Type.String()),
+	offset: Type.Optional(Type.Integer({ minimum: 0 })),
+	limit: Type.Optional(Type.Integer({
+		minimum: 1,
+		maximum: 20
+	})),
 	connectorId: Type.Optional(Type.String()),
-	agentId: Type.Optional(Type.String()),
 	accountId: Type.Optional(Type.String()),
 	objective: Type.Optional(Type.String({
 		minLength: 1,
@@ -37,6 +46,19 @@ const RequestSchema = Type.Object({
 		timezone: Type.String(),
 		expression: Type.String()
 	}))
+}, {
+	additionalProperties: false,
+	anyOf: [
+		{
+			properties: { command: { const: "submit" } },
+			required: ["objective", "connectorId"]
+		},
+		{ properties: { command: { const: "list" } } },
+		{
+			properties: { command: { enum: ["get", "cancel"] } },
+			required: ["requestId"]
+		}
+	]
 });
 function createPersonalRequestTools(deps) {
 	const conversation = () => {
@@ -44,6 +66,14 @@ function createPersonalRequestTools(deps) {
 		if (!id || !isPersonalConversation(id)) throw new Error("Personal conversation is required");
 		return id;
 	};
+	const snapshot = (request) => {
+		const value = personalRequestSnapshot(request);
+		return {
+			...value,
+			executorAgentId: value.parameters.allocate && value.executorAgentId === "task-router" ? void 0 : value.executorAgentId,
+			...value.taskId ? { allocation: new TaskAllocationRepository().summary(value.taskId) } : {}
+		};
+	};
 	const result = (value) => ({
 		content: [{
 			type: "text",
@@ -55,24 +85,39 @@ function createPersonalRequestTools(deps) {
 		name: "personal_capability",
 		label: "Connected app availability",
 		parameters: CapabilitySchema,
-		description: "Check connected-app capabilities, account connection state and specialist Agents locally. For Gmail or other supported apps, check here before delegating. ready is a local preflight; the worker still validates live tools. No remote search or authorization is performed.",
+		description: "Check connected-app capabilities, account connection state and specialist Agents locally. The background Task Router selects an executor within account permissions; do not compare executor profiles in the main conversation. For Gmail or other supported apps, check here before delegating. ready is a local preflight; the worker still validates live tools. No remote search or authorization is performed.",
 		async execute(_id, input) {
-			return result(personalCapabilities(conversation(), input.query, input.accountId));
+			return result(personalCapabilities(conversation(), input.query, input.accountId).map(({ executorProfiles: _profiles, executorAgentIds, accounts, ...capability }) => ({
+				...capability,
+				eligibleExecutorCount: executorAgentIds.length,
+				accounts: accounts.map(({ executorAgentIds: _ids, ...account }) => account)
+			})));
 		}
 	}, {
 		name: "personal_request",
 		label: "Connected app request",
 		parameters: RequestSchema,
-		description: "Submit a read-only connected-app request using exact connectorId and agentId from personal_capability. Preserves the objective, displays connection or account selection in this main chat, and starts a specialist Task automatically once connected. Return quickly after submission. Never claim data was read until the Task result arrives. Resolve absolute query dates and include timeRange. If mail has no user-specified range, the host returns an explicit last-7-days default; mention that range in your confirmation. Use get/list for status, cancel only when the user requests it.",
+		description: "Submit a read-only connected-app request using the exact connectorId from personal_capability. The background Task Router chooses an executor after account authorization. Preserves the objective, displays connection or account selection in this main chat, and starts a specialist Task automatically once connected. Return quickly after submission. Never claim data was read until the Task result arrives. Resolve absolute query dates and include timeRange. If mail has no user-specified range, the host returns an explicit last-7-days default; mention that range in your confirmation. Use paginated get/list for status without polling; preserve idempotencyKey on uncertain retries; cancel only when the user requests it.",
 		async execute(toolCallId, input) {
 			const conversationId = conversation();
-			if (input.command === "list") return result(listPersonalRequests(conversationId).map(personalRequestSnapshot));
+			if (input.command === "list") {
+				const offset = input.offset ?? 0;
+				const items = listPersonalRequests(conversationId, input.limit ?? 10, offset).map((request) => {
+					const { result: _result, ...summary } = snapshot(request);
+					return summary;
+				});
+				const total = getSqliteDatabase().prepare("SELECT count(*) AS count FROM personal_requests WHERE conversation_id = ?").get(conversationId).count;
+				return result(boundedPersonalResult({
+					items,
+					total,
+					offset
+				}));
+			}
 			if (input.command === "submit") {
-				if (!input.objective?.trim() || !input.connectorId || !input.agentId) throw new Error("objective, connectorId and agentId are required");
+				if (!input.objective?.trim() || !input.connectorId) throw new Error("objective and connectorId are required");
 				const request = submitPersonalRequest({
 					conversationId,
 					connectorId: input.connectorId,
-					agentId: input.agentId,
 					accountId: input.accountId,
 					objective: input.objective.trim(),
 					timeRange: input.timeRange,
@@ -80,19 +125,28 @@ function createPersonalRequestTools(deps) {
 				});
 				publishPersonalRequest(request);
 				deps.dispatchTaskRuns?.();
-				return result(personalRequestSnapshot(request));
+				return result(boundedPersonalResult(snapshot(request)));
 			}
 			const request = input.requestId ? getPersonalRequest(input.requestId) : void 0;
 			if (!request || request.conversationId !== conversationId) throw new Error("Request does not belong to this conversation");
 			if (input.command === "cancel") {
+				if (["completed", "failed"].includes(personalRequestSnapshot(request).state)) return result(boundedPersonalResult(snapshot(request)));
+				if (request.state === "cancelled") {
+					const stop = request.taskId ? await cancelPersonalTask(request.taskId, conversationId, input.idempotencyKey ?? toolCallId) : { executionStopConfirmed: true };
+					return result({
+						...snapshot(request),
+						executionStopConfirmed: stop.executionStopConfirmed
+					});
+				}
+				const stop = request.taskId ? await cancelPersonalTask(request.taskId, conversationId, input.idempotencyKey ?? toolCallId) : { executionStopConfirmed: true };
 				const cancelled = cancelPersonalRequest(request);
 				publishPersonalRequest(cancelled);
 				return result({
 					...cancelled,
-					executionStopConfirmed: false
+					executionStopConfirmed: stop.executionStopConfirmed
 				});
 			}
-			return result(personalRequestSnapshot(request));
+			return result(boundedPersonalResult(snapshot(request)));
 		}
 	}];
 }

package/dist/src/agent/tools/personal-result-budget.d.ts

@@ -0,0 +1,2 @@
+/** Bound model-visible reads and disclose every omitted field or list item. */
+export declare function boundedPersonalResult(value: unknown): unknown;

package/dist/src/agent/tools/personal-result-budget.js

@@ -0,0 +1,57 @@
+import "./local-read-budget.js";
+//#region src/agent/tools/personal-result-budget.ts
+/** Bound model-visible reads and disclose every omitted field or list item. */
+function boundedPersonalResult(value) {
+	let truncated = false;
+	const project = (entry, depth = 0) => {
+		if (typeof entry === "string") {
+			if (entry.length > 600) truncated = true;
+			return entry.slice(0, 600);
+		}
+		if (!entry || typeof entry !== "object") return entry;
+		if (depth > 6) {
+			truncated = true;
+			return "[omitted]";
+		}
+		if (Array.isArray(entry)) {
+			if (entry.length > 20) truncated = true;
+			return entry.slice(0, 20).map((item) => project(item, depth + 1));
+		}
+		return Object.fromEntries(Object.entries(entry).map(([key, item]) => [key, project(item, depth + 1)]));
+	};
+	const result = project(value);
+	if (!result || typeof result !== "object" || Array.isArray(result)) return result;
+	const payload = result;
+	let removedItems = false;
+	const items = payload.items;
+	if (Array.isArray(items)) {
+		while (items.length && JSON.stringify(payload).length > 7900) {
+			items.pop();
+			truncated = true;
+			removedItems = true;
+		}
+		if (!items.length && removedItems) return {
+			...payload,
+			nextOffset: void 0,
+			truncated: true,
+			requiresSpecialist: true,
+			guidance: "A single item exceeds the local read budget."
+		};
+		if (typeof payload.offset === "number" && (removedItems || typeof payload.total === "number" && payload.offset + items.length < payload.total)) payload.nextOffset = payload.offset + items.length;
+	}
+	if (JSON.stringify(payload).length > 7900) return {
+		truncated: true,
+		requiresSpecialist: true,
+		guidance: "Complete details exceed the local read budget."
+	};
+	return {
+		...payload,
+		...truncated ? {
+			truncated: true,
+			excerpts: true,
+			...!Array.isArray(items) ? { requiresSpecialist: true } : {}
+		} : {}
+	};
+}
+//#endregion
+export { boundedPersonalResult };

package/dist/src/agent/tools/personal-task-tool.d.ts

@@ -1,23 +1,35 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
+import { type MatchingContext } from '../../agent-matching/service.js';
 export { getAvailablePersonalAgentTools, personalAgentModelAvailability } from '../../personal-agent/specialist-capabilities.js';
 import { type XopcUseToolDeps } from './xopc-use-tool.js';
-declare const PersonalTaskSchema: import("@sinclair/typebox").TObject<{
-    command: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"agents">, import("@sinclair/typebox").TLiteral<"create">, import("@sinclair/typebox").TLiteral<"list">, import("@sinclair/typebox").TLiteral<"get">, import("@sinclair/typebox").TLiteral<"instruct">, import("@sinclair/typebox").TLiteral<"answer">]>;
+declare const PersonalTaskModelSchema: import("@sinclair/typebox").TObject<{
+    requirements: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        version: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TLiteral<1>>;
+        summary: import("@sinclair/typebox").TString;
+        inputKinds: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+        outputKinds: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+        domain: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        taskType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        requestedAgentId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    }>>;
+    command: import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"get" | "answer" | "retry_allocation" | "selection" | "list" | "cancel" | "submit" | "instruct">[]>;
+    requestId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    objective: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    agentId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     taskId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    instruction: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    questionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    requiredSkills: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+    idempotencyKey: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    objective: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     expectedOutputs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
     acceptanceCriteria: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
     constraints: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    requiredSkills: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    requiredTools: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    idempotencyKey: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
+    offset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
+    instruction: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    questionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>;
 export interface PersonalTaskToolDeps extends XopcUseToolDeps {
+    getAgentToolAvailability?: MatchingContext['getAgentToolAvailability'];
     getAgentSkillAvailability?: (agentId: string) => {
         skills: Array<{
             name: string;
@@ -36,4 +48,4 @@ export declare function buildPersonalTaskBrief(input: {
     body?: string;
 };
 /** A narrow Task surface for the fast personal conversation. */
-export declare function createPersonalTaskTool(deps: PersonalTaskToolDeps): AgentTool<typeof PersonalTaskSchema, Record<string, never>>;
+export declare function createPersonalTaskTool(deps: PersonalTaskToolDeps): AgentTool<typeof PersonalTaskModelSchema, Record<string, never>>;