@xopcai/xopc 0.0.384 → 0.0.385

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

@@ -10,6 +10,7 @@ import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { TaskAllocationRepository } from "../../tasks/task-allocation-repository.js";
 import { TaskOriginRepository } from "../../tasks/task-origin-repository.js";
 import { boundedPersonalResult } from "./personal-result-budget.js";
+import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";
 import { createXopcUseTool } from "./xopc-use-tool.js";
 import { getAvailablePersonalAgentTools, personalAgentModelAvailability } from "../../personal-agent/specialist-capabilities.js";
@@ -36,6 +37,8 @@ const PersonalTaskSchema = Type.Object({
 		Type.Literal("create"),
 		Type.Literal("list"),
 		Type.Literal("get"),
+		Type.Literal("collaboration"),
+		Type.Literal("entry"),
 		Type.Literal("instruct"),
 		Type.Literal("answer"),
 		Type.Literal("cancel")
@@ -81,6 +84,25 @@ const PersonalTaskSchema = Type.Object({
 	agentId: Type.Optional(Type.String({ description: "Specialist Agent ID. Never use your own ID." })),
 	taskId: Type.Optional(Type.String()),
 	instruction: Type.Optional(Type.String({ description: "The user’s new direction for this delegated Task." })),
+	entryId: Type.Optional(Type.String({ description: "Read one complete collaboration entry, including its question or instruction body." })),
+	afterSequence: Type.Optional(Type.Integer({ minimum: 0 })),
+	bodyOffset: Type.Optional(Type.Integer({
+		minimum: 0,
+		description: "Character offset for an entry body; follow nextBodyOffset until absent."
+	})),
+	section: Type.Optional(Type.Union([
+		"task",
+		"waits",
+		"runs",
+		"receipts",
+		"context",
+		"conversation",
+		"sessions",
+		"authorityGrants",
+		"dependencies",
+		"dependents",
+		"criterionReviews"
+	].map((value) => Type.Literal(value)))),
 	questionId: Type.Optional(Type.String({ description: "Collaboration question ID to answer." })),
 	expectedOutputs: Type.Optional(Type.Array(Type.String())),
 	acceptanceCriteria: Type.Optional(Type.Array(Type.String())),
@@ -107,6 +129,8 @@ const PersonalTaskModelSchema = Type.Object({
 		"submit",
 		"list",
 		"get",
+		"collaboration",
+		"entry",
 		"instruct",
 		"answer",
 		"retry_allocation",
@@ -124,11 +148,16 @@ const PersonalTaskModelSchema = Type.Object({
 		{
 			properties: { command: { enum: [
 				"get",
+				"collaboration",
 				"retry_allocation",
 				"cancel"
 			] } },
 			required: ["taskId"]
 		},
+		{
+			properties: { command: { const: "entry" } },
+			required: ["taskId", "entryId"]
+		},
 		{
 			properties: { command: { const: "instruct" } },
 			required: ["taskId", "instruction"]
@@ -164,7 +193,7 @@ function createPersonalTaskTool(deps) {
 	return {
 		name: "personal_task",
 		label: "Personal Task",
-		description: "Submit objective and a concise complete description, then return after local persistence. Preserve the user request and source references without inventing an execution plan or extra requirements. Omit optional structured fields when they merely repeat the description. Describe required capabilities in the brief; the background Task Router selects one executor and checks its tools. Do not read input files, select Agents or invent tool names before submit. Set requirements.requestedAgentId only for an executor explicitly named by the user, using their ID or display name; preserve explicitly requested requiredSkills. get/list inspect existing Tasks with limit/offset; cancel stops a Task on explicit user instruction and reports execution stop confirmation; instruct/answer send context; retry_allocation retries selection before execution; selection explains assignment. Status and results return automatically. Preserve idempotencyKey on uncertain retries. Report only confirmed states.",
+		description: "Submit objective and a concise complete description, then return after local persistence. Preserve the user request and source references without inventing an execution plan or extra requirements. Omit optional structured fields when they merely repeat the description. Describe required capabilities in the brief; the background Task Router selects one executor and checks its tools. Do not read input files, select Agents or invent tool names before submit. Set requirements.requestedAgentId only for an executor explicitly named by the user, using their ID or display name; preserve explicitly requested requiredSkills. get reads Task state, waits, runs, receipts and context; use section and limit/offset for complete paginated details. collaboration reads ordered message previews with afterSequence; entry reads exact message bodies using entryId and nextBodyOffset. Read full questions before answering. Delivery pending means saved, delivered means sent, confirmed means the executor acknowledged it; confirmation alone is not verified completion. get/list inspect existing Tasks with limit/offset; cancel stops a Task on explicit user instruction and reports execution stop confirmation; instruct/answer send context; retry_allocation retries selection before execution; selection explains assignment. Status and results return automatically. Preserve idempotencyKey on uncertain retries. Report only confirmed states.",
 		parameters: PersonalTaskModelSchema,
 		mutatesWorkspace: true,
 		mutationScope: "external",
@@ -383,6 +412,54 @@ function createPersonalTaskTool(deps) {
 				const taskId = input.taskId?.trim();
 				if (!taskId) throw new Error("taskId is required");
 				if (!new TaskOriginRepository().owns(taskId, conversationId)) throw new Error("Task does not belong to this personal conversation");
+				if (command === "collaboration" || command === "entry") {
+					const board = new TaskCollaborationRepository();
+					if (command === "entry") {
+						const entry = input.entryId ? board.get(input.entryId) : void 0;
+						if (!entry || entry.taskId !== taskId) throw new Error("Entry does not belong to this Task");
+						const offset = input.bodyOffset ?? 0;
+						const body = entry.body.slice(offset, offset + 4e3);
+						const payload = {
+							ok: true,
+							entry: {
+								...entry,
+								body
+							},
+							bodyOffset: offset,
+							bodyLength: entry.body.length,
+							...offset + body.length < entry.body.length ? { nextBodyOffset: offset + body.length } : {}
+						};
+						return {
+							content: [{
+								type: "text",
+								text: JSON.stringify(payload)
+							}],
+							details: {}
+						};
+					}
+					const limit = input.limit ?? 10;
+					const entries = board.list(taskId, input.afterSequence ?? 0, limit + 1);
+					const items = entries.slice(0, limit).map((entry) => ({
+						...entry,
+						body: entry.body.slice(0, 600),
+						bodyLength: entry.body.length,
+						...entry.body.length > 600 ? {
+							excerpt: true,
+							readEntryId: entry.id
+						} : {}
+					}));
+					return {
+						content: [{
+							type: "text",
+							text: JSON.stringify({
+								ok: true,
+								items,
+								...entries.length > limit ? { nextAfterSequence: items.at(-1)?.sequence } : {}
+							})
+						}],
+						details: {}
+					};
+				}
 				if (command === "cancel") {
 					const result = await cancelPersonalTask(taskId, conversationId, input.idempotencyKey ?? toolCallId);
 					deps.dispatchTaskRuns?.();
@@ -410,6 +487,13 @@ function createPersonalTaskTool(deps) {
 						taskId,
 						kind: input.command === "answer" ? "answer" : "instruction",
 						body,
+						idempotencyKey: input.idempotencyKey?.trim() || `personal-collaboration:${selectionRequestHash({
+							inputId: getSessionInputState(conversationId).activeInputId ?? toolCallId,
+							taskId,
+							kind: input.command,
+							body,
+							questionId: input.questionId
+						})}`,
 						...input.command === "answer" ? { causationId: input.questionId.trim() } : {}
 					};
 				} else args = { taskId };
@@ -459,20 +543,58 @@ function createPersonalTaskTool(deps) {
 						details: {}
 					};
 				}
-				if (payload && input.command === "get") return {
-					content: [{
-						type: "text",
-						text: JSON.stringify(boundedPersonalResult({
-							ok: payload.ok,
-							task: payload.task,
-							allocation: new TaskAllocationRepository().summary(input.taskId),
-							operationalState: payload.operationalState,
-							attention: payload.attention,
-							allowedCommands: payload.allowedCommands
-						}))
-					}],
-					details: {}
-				};
+				if (payload && input.command === "get") {
+					const offset = input.offset ?? 0;
+					const limit = input.limit ?? 10;
+					const read = input.section ? {
+						ok: payload.ok,
+						[input.section]: payload[input.section]
+					} : { ...payload };
+					const pagination = {};
+					for (const key of [
+						"waits",
+						"runs",
+						"receipts",
+						"context",
+						"sessions",
+						"authorityGrants",
+						"dependencies",
+						"dependents",
+						"criterionReviews"
+					]) {
+						const value = read[key];
+						if (!Array.isArray(value)) continue;
+						read[key] = value.slice(offset, offset + limit);
+						pagination[key] = {
+							total: value.length,
+							offset,
+							...offset + limit < value.length ? { nextOffset: offset + limit } : {}
+						};
+					}
+					if (!input.section) {
+						read.collaboration = new TaskCollaborationRepository().recent(input.taskId, void 0, 10).map((entry) => ({
+							...entry,
+							body: entry.body.slice(0, 600),
+							bodyLength: entry.body.length,
+							...entry.body.length > 600 ? {
+								excerpt: true,
+								readEntryId: entry.id
+							} : {}
+						}));
+						read.allocation = new TaskAllocationRepository().summary(input.taskId);
+						read.guidance = "Read entry for complete question/instruction bodies; collaboration with afterSequence pages the whole board. get(section, offset) pages state details. pending is saved, delivered is sent, confirmed is acknowledged; verification and Task acceptance are separate.";
+					}
+					return {
+						content: [{
+							type: "text",
+							text: JSON.stringify({
+								...read,
+								pagination
+							})
+						}],
+						details: {}
+					};
+				}
 				if (payload && input.command === "list") return {
 					content: [{
 						type: "text",

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

@@ -0,0 +1,16 @@
+import type { AgentTool } from '@earendil-works/pi-agent-core';
+import { type XopcUseToolDeps } from './xopc-use-tool.js';
+declare const Schema: import("@sinclair/typebox").TObject<{
+    command: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"get">, import("@sinclair/typebox").TLiteral<"post">]>;
+    section: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"collaboration">, import("@sinclair/typebox").TLiteral<"task">]>>;
+    kind: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"progress">, import("@sinclair/typebox").TLiteral<"question">, import("@sinclair/typebox").TLiteral<"ack">]>>;
+    body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    causationId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    entryId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    afterSequence: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
+    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
+    idempotencyKey: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+}>;
+/** Collaboration only: no product mutations, connection selection or external operations. */
+export declare function createTaskCollaborationTool(deps: XopcUseToolDeps): AgentTool<typeof Schema>;
+export {};

package/dist/src/agent/tools/task-collaboration-tool.js

@@ -0,0 +1,153 @@
+import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
+import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { init_request_repository, personalRequestForExecution } from "../../personal-agent/request-repository.js";
+import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
+import { init_session_repository } from "../../storage/sqlite/session-repository.js";
+import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
+import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
+import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
+import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
+import { createXopcUseTool } from "./xopc-use-tool.js";
+import { Type } from "@sinclair/typebox";
+//#region src/agent/tools/task-collaboration-tool.ts
+init_request_repository();
+init_session_repository();
+init_task_repository();
+init_task_run_repository();
+const Schema = Type.Object({
+	command: Type.Union([Type.Literal("get"), Type.Literal("post")]),
+	section: Type.Optional(Type.Union([Type.Literal("collaboration"), Type.Literal("task")])),
+	kind: Type.Optional(Type.Union([
+		Type.Literal("progress"),
+		Type.Literal("question"),
+		Type.Literal("ack")
+	])),
+	body: Type.Optional(Type.String({
+		minLength: 1,
+		maxLength: 8e3
+	})),
+	causationId: Type.Optional(Type.String({ minLength: 1 })),
+	entryId: Type.Optional(Type.String({ minLength: 1 })),
+	afterSequence: Type.Optional(Type.Integer({ minimum: 0 })),
+	limit: Type.Optional(Type.Integer({
+		minimum: 1,
+		maximum: 20
+	})),
+	idempotencyKey: Type.Optional(Type.String({
+		minLength: 1,
+		maxLength: 200
+	}))
+}, {
+	additionalProperties: false,
+	anyOf: [
+		{ properties: { command: { const: "get" } } },
+		{
+			properties: {
+				command: { const: "post" },
+				kind: { enum: ["progress", "question"] }
+			},
+			required: ["kind", "body"]
+		},
+		{
+			properties: {
+				command: { const: "post" },
+				kind: { const: "ack" }
+			},
+			required: [
+				"kind",
+				"body",
+				"causationId"
+			]
+		}
+	]
+});
+/** Collaboration only: no product mutations, connection selection or external operations. */
+function createTaskCollaborationTool(deps) {
+	return {
+		name: "task_collaboration",
+		label: "Task collaboration",
+		parameters: Schema,
+		description: "Coordinate the current Task with its Personal owner. get with section task reads the complete brief, constraints and waits; default get reads complete ordered messages (afterSequence/limit) or one entryId. post progress for meaningful changes; post question then stop this turn until answered. Before continuing, post ack with causationId equal to each delivered answer/instruction ID and explain how the result will incorporate it. Confirmation is receipt and intent, not completed verification. Reuse the same Task and executor. Account authorization stays in the main connection UI; answers and instructions cannot change the selected connector/account or permit writes. Preserve idempotencyKey on retries.",
+		mutatesWorkspace: true,
+		mutationScope: "external",
+		requiresExclusiveWorkspaceLock: false,
+		async execute(toolCallId, input, signal) {
+			const conversationId = getEmbeddedExecutionSession() ?? deps.getCurrentConversationId?.();
+			const active = conversationId ? new TaskConversationRepository().resolveActiveExecutionSession(conversationId) : void 0;
+			if (!active || deps.getCurrentAgentId?.() && active.agentId !== deps.getCurrentAgentId()) throw new Error("No active Task execution");
+			const request = personalRequestForExecution(conversationId);
+			if (!request && getSessionMetadata(conversationId)?.customData?.personalReadRequestId || request && [
+				"cancelled",
+				"completed",
+				"failed"
+			].includes(request.state)) throw new Error("Personal request is no longer active");
+			if (input.command === "get") {
+				if (input.section === "task") {
+					const model = new TaskReadModelProjector().project(new TaskRepository().require(active.taskId));
+					return {
+						content: [{
+							type: "text",
+							text: JSON.stringify({
+								ok: true,
+								...model,
+								waits: new TaskRunRepository().listActiveWaits(active.taskId)
+							})
+						}],
+						details: {}
+					};
+				}
+				const board = new TaskCollaborationRepository();
+				if (input.entryId) {
+					const entry = board.get(input.entryId);
+					if (entry?.taskId !== active.taskId) throw new Error("Entry does not belong to this Task");
+					return {
+						content: [{
+							type: "text",
+							text: JSON.stringify({
+								ok: true,
+								entry
+							})
+						}],
+						details: {}
+					};
+				}
+				const limit = input.limit ?? 10;
+				const rows = board.list(active.taskId, input.afterSequence ?? 0, limit + 1);
+				const entries = rows.slice(0, limit);
+				return {
+					content: [{
+						type: "text",
+						text: JSON.stringify({
+							ok: true,
+							entries,
+							...rows.length > limit ? { nextAfterSequence: entries.at(-1)?.sequence } : {}
+						})
+					}],
+					details: {}
+				};
+			}
+			const result = await createXopcUseTool({
+				...deps,
+				getCurrentConversationId: () => conversationId,
+				getCurrentAgentId: () => active.agentId
+			}).execute(toolCallId, {
+				mode: "task",
+				command: "collaboration_post",
+				args: {
+					taskId: active.taskId,
+					kind: input.kind,
+					body: input.body,
+					causationId: input.causationId,
+					idempotencyKey: input.idempotencyKey ?? (input.kind === "ack" ? `ack:${active.agentId}:${input.causationId}` : toolCallId)
+				}
+			}, signal, void 0);
+			if (result.details.result?.ok === false) throw new Error(result.details.result.error ?? "Task collaboration failed");
+			return {
+				content: result.content,
+				details: {}
+			};
+		}
+	};
+}
+//#endregion
+export { createTaskCollaborationTool };

package/dist/src/agent/tools/xopc-use-tool.js

@@ -1270,7 +1270,7 @@ async function handleTask(command, args, deps, dryRun, capabilities) {
 		};
 		if (causationId && (kind === "ack" || kind === "answer")) {
 			const cited = collaboration.get(causationId);
-			if (cited?.taskId !== taskId || kind === "answer" && cited?.kind !== "question" || kind === "ack" && cited?.deliveryStatus !== "delivered") return {
+			if (cited?.taskId !== taskId || kind === "answer" && cited?.kind !== "question" || kind === "ack" && (!active || !collaboration.canConfirm(causationId, conversationId, active.assignmentEpoch))) return {
 				ok: false,
 				error: "causationId must reference a relevant Task message"
 			};

package/dist/src/cli/commands/channels.js

@@ -1,8 +1,8 @@
 import { buildChannelCatalogForConfig } from "../../channels/catalog/channel-catalog-service.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
-import { formatExamples, register } from "../registry.js";
 import { listChannelPairingState } from "../../channels/pairing/pairing-service.js";
 import { approveChannelPairingFromCli } from "../../channels/pairing/approve-cli.js";
+import { formatExamples, register } from "../registry.js";
 import { colors } from "../utils/colors.js";
 import { Command } from "commander";
 //#region src/cli/commands/channels.ts

package/dist/src/cli/commands/connectors.js

@@ -1,8 +1,8 @@
 import { getStoreConnectorInstallPlan, installStoreConnector, listStoreConnectors } from "../../capabilities/store-connector.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { register } from "../registry.js";
-import { Command } from "commander";
 import { confirm } from "@inquirer/prompts";
+import { Command } from "commander";
 //#region src/cli/commands/connectors.ts
 function parsePairs(values, option) {
 	const output = {};

package/dist/src/cli/commands/extension-marketplace.js

@@ -16,8 +16,8 @@ import { existsSync, readFileSync, statSync } from "node:fs";
 import { execSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import semver from "semver";
-import { Command } from "commander";
 import { confirm } from "@inquirer/prompts";
+import { Command } from "commander";
 //#region src/cli/commands/extension-marketplace.ts
 init_paths();
 const MANIFEST = "xopc.extension.json";

package/dist/src/cli/commands/models.js

@@ -16,8 +16,8 @@ import { prepareUpdateGlobalDefaults } from "../../gateway/global-defaults-admin
 import { disconnectProvider } from "../../providers/provider-disconnect.js";
 import { colors } from "../utils/colors.js";
 import { runCliOAuthLogin } from "../utils/oauth-login.js";
-import { Command } from "commander";
 import { input } from "@inquirer/prompts";
+import { Command } from "commander";
 //#region src/cli/commands/models.ts
 init_credentials();
 init_schema();

package/dist/src/cli/commands/onboard.js

@@ -11,8 +11,8 @@ import { initWorkspace } from "../utils/init-workspace.js";
 import { setupModel } from "./onboard/model.js";
 import { getChannelConfigurators } from "./onboard/channels/registry.js";
 import { setupChannels } from "./onboard/channels/index.js";
-import { Command } from "commander";
 import { select } from "@inquirer/prompts";
+import { Command } from "commander";
 //#region src/cli/commands/onboard.ts
 init_repository();
 init_schema();

package/dist/src/connectors/connection-recovery-service.d.ts

@@ -7,6 +7,7 @@ export type ConnectionAction = {
     expectedTranscriptId: string;
     expectedVersion: number;
     idempotencyKey: string;
+    expectedObjectiveRevision?: number;
     action: 'install_complete' | 'connect' | 'check' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source';
     needKey?: string;
     accountId?: string;
@@ -17,6 +18,7 @@ export type ConnectionAction = {
 export declare class ConnectionRecoveryService {
     private readonly deps;
     private readonly busy;
+    private readonly checks;
     private timer?;
     private deliveryTimer?;
     private polling;
@@ -32,8 +34,12 @@ export declare class ConnectionRecoveryService {
         drain: (conversationId: string) => void;
         onPersonalRequestDelivered?: (conversationId: string, requestId: string) => void;
         adapter?: ComposioSessionsAdapter;
+        checkTimeoutMs?: number;
     });
     private get adapter();
+    private markChecking;
+    /** Readiness checks never execute the objective; late results cannot advance a newer wait. */
+    private boundedCheck;
     snapshot(conversationId: string): ConnectionWaitSnapshot;
     private view;
     private ensureInstallation;