@xopcai/xopc 0.0.383 → 0.0.385

package/dist/src/agent/external-tools/gateway-tools.js

@@ -6,11 +6,12 @@ import { connectionBindings, getActiveConnectionWait, init_connection_wait_repos
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../storage/sqlite/session-repository.js";
 import { listConnectorInstances } from "../../connectors/instances.js";
-import { getStoreConnectorInstallPlan, parseStoreConnectorCandidateRef, searchStoreConnectorInstallCandidates } from "../../capabilities/store-connector.js";
-import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { parseExternalToolRef } from "./refs.js";
 import { setXopcToolMetadata } from "../embedded/tool-metadata.js";
+import { getStoreConnectorInstallPlan, parseStoreConnectorCandidateRef, searchStoreConnectorInstallCandidates } from "../../capabilities/store-connector.js";
+import { assertPersonalRequestAccountAccess } from "../../personal-agent/request-access.js";
+import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
 import { ExternalToolService } from "./service.js";
 import { EXTERNAL_TOOL_SOURCES } from "./types.js";
 import { bindExternalToolRegistry } from "./tool-registry.js";
@@ -143,6 +144,7 @@ function createExternalToolGatewayTools(providers, getContext, getConfig, getExe
 				const connectorId = composio ? getConnectorInstallation(composio.namespace)?.connectorId : cli && config ? listConnectorInstances(config).find((instance) => instance.instanceId === cli.namespace)?.connectorId : void 0;
 				if (connectorId !== request.connectorId) throw new Error("Use only the selected Personal request connector");
 				if (composio && !listConnectorActionMetadata(connectorId).some((action) => action.actionId === composio.toolName && action.scope === "read" && action.curated)) throw new Error("Personal requests permit only curated read operations");
+				assertPersonalRequestAccountAccess(request);
 				const account = getConnectorAccount(request.accountId);
 				const connection = account?.currentConnectionId ? getConnectorConnection(account.currentConnectionId) : void 0;
 				if (!connection || connection.status !== "active" || connection.expiresAt && Date.parse(connection.expiresAt) <= Date.now()) {
@@ -157,11 +159,15 @@ function createExternalToolGatewayTools(providers, getContext, getConfig, getExe
 			}
 			const result = await service.execute({
 				...params,
-				...request ? { readOnly: true } : {},
+				...request ? {
+					readOnly: void 0,
+					personalReadOnly: true
+				} : {},
 				context: {
 					toolCallId,
 					signal,
-					onUpdate
+					onUpdate,
+					...request ? { authorize: () => assertPersonalRequestAccountAccess(request) } : {}
 				}
 			});
 			return {

package/dist/src/agent/external-tools/index.js

@@ -1,5 +1,5 @@
-import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
 import { resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
+import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
 import { parseExternalToolRef } from "./refs.js";
 import { CliToolProvider } from "./cliProvider.js";
 import { ComposioToolProvider } from "./composio-provider.js";

package/dist/src/agent/external-tools/service.d.ts

@@ -28,6 +28,7 @@ export declare class ExternalToolService {
         arguments?: Record<string, unknown>;
         approvalId?: string;
         readOnly?: boolean;
+        personalReadOnly?: boolean;
         context: ExternalToolExecutionContext;
     }): Promise<import("@earendil-works/pi-agent-core").AgentToolResult<Record<string, unknown>>>;
     private providerForRef;

package/dist/src/agent/external-tools/service.js

@@ -137,10 +137,11 @@ var ExternalToolService = class {
 		const descriptor = await provider.describe(params.toolRef);
 		if (!descriptor) throw new Error(`External tool is unavailable: ${params.toolRef}`);
 		const current = versionDescriptor(descriptor);
+		if (params.personalReadOnly && current.readOnly !== true && current.batchRead !== true) throw new Error("This external operation has no host-curated read-only contract");
 		if (params.readOnly && current.batchRead !== true) throw new Error("This external operation is not approved for batch reads");
 		if (current.revision !== params.revision) throw new Error(`Tool contract changed. Describe ${params.toolRef} again before executing it.`);
 		const args = params.arguments ?? {};
-		if (params.readOnly && (provider.source === "composio" || provider.source === "cli") && (typeof args.xopcAccountId !== "string" || !args.xopcAccountId)) throw new Error("Batch connector reads require an explicit xopcAccountId");
+		if ((params.readOnly || params.personalReadOnly) && (provider.source === "composio" || provider.source === "cli") && (typeof args.xopcAccountId !== "string" || !args.xopcAccountId)) throw new Error("Batch connector reads require an explicit xopcAccountId");
 		let validate;
 		try {
 			validate = this.ajv.compile(current.inputSchema);
@@ -151,6 +152,7 @@ var ExternalToolService = class {
 			if (!validate(input)) throw new Error(`Arguments do not match ${params.toolRef}: ${this.ajv.errorsText(validate.errors)}`);
 		};
 		validateArguments(args);
+		params.context.authorize?.();
 		return provider.execute(params.toolRef, args, params.approvalId, {
 			...params.context,
 			contractRevision: current.contractRevision,

package/dist/src/agent/external-tools/types.d.ts

@@ -27,6 +27,8 @@ export interface ExternalToolDescriptor extends ExternalToolSearchHit {
     exposure?: import('@earendil-works/pi-coding-agent').ToolExposure;
     /** Host-curated contract; never copied from remote readOnlyHint annotations. */
     batchRead?: boolean;
+    /** Host-curated read scope; separate from eligibility for batch execution. */
+    readOnly?: boolean;
 }
 export interface VersionedExternalToolDescriptor extends ExternalToolDescriptor {
     revision: string;
@@ -36,6 +38,8 @@ export interface ExternalToolExecutionContext {
     signal?: AbortSignal;
     onUpdate?: AgentToolUpdateCallback<Record<string, unknown>>;
     contractRevision?: string;
+    /** Host authorization recheck immediately before remote dispatch. */
+    authorize?: () => void;
     validateArguments?: (args: Record<string, unknown>) => void;
 }
 export interface ExternalToolTurnContext {

package/dist/src/agent/image/generation/openai-images-provider.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
+import { imageFileExtensionForMimeType } from "./image-assets.js";
 import { pickTimeoutMsOrFallback } from "../../../media-shared/http/deadline.js";
 import { privateNetworkPolicyToSsrfGuardOptions } from "../../../media-shared/http/private-network.js";
 import { resolveProviderHttpRequestConfig } from "../../../media-shared/http/resolve-provider-http-request-config.js";
@@ -8,7 +9,6 @@ import "../../../media-shared/http/index.js";
 import { ImageProviderError, validateImageRequest } from "../../../../packages/image-providers/src/validation.js";
 import { decodeBase64, imageFromBytes } from "../../../../packages/image-providers/src/http.js";
 import "../../../../packages/image-providers/src/index.js";
-import { imageFileExtensionForMimeType } from "./image-assets.js";
 //#region src/agent/image/generation/openai-images-provider.ts
 /** Strict implementation of the OpenAI Images REST protocol. */
 init_logger();

package/dist/src/agent/image/generation/runtime.js

@@ -3,12 +3,12 @@ import { init_logger } from "../../../utils/logger.js";
 import { PROVIDER_ENV_MAP, init_env_keys } from "../../../providers/env-keys.js";
 import { ImageProviderError } from "../../../../packages/image-providers/src/validation.js";
 import "../../../../packages/image-providers/src/index.js";
-import { getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary as listImageGenerationProvidersSummary$1 } from "./provider-registry.js";
 import { describeFailoverError, isFailoverError } from "../../failover-error.js";
 import { buildNoCapabilityModelConfiguredMessage, recordCapabilityCandidateFailure, resolveCapabilityModelCandidates, throwCapabilityGenerationFailure } from "../../media-generation/runtime-shared.js";
 import "../../media-generation/index.js";
 import { parseImageGenerationModelRef } from "./model-ref.js";
 import { validateImageGenerationRequest } from "./validation.js";
+import { getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary as listImageGenerationProvidersSummary$1 } from "./provider-registry.js";
 //#region src/agent/image/generation/runtime.ts
 init_env_keys();
 init_logger();

package/dist/src/agent/image/index.js

@@ -1,9 +1,9 @@
-import { getImageGenerationProvider, listImageGenerationProviders } from "./generation/provider-registry.js";
 import { getImageUnderstandingProvider, listImageUnderstandingProviders, registerImageUnderstandingProvider } from "./understanding/provider-registry.js";
 import { resolveImageModelConfigForTool } from "./tool-model-config.js";
 import { describeImages, describeImagesWithFallback } from "./understanding/runtime.js";
 import { modelSupportsVision, resolveImageHandlingStrategy } from "./vision-detection.js";
 import { runWithImageModelFallback } from "./image-model-fallback.js";
 import { loadImageForToolInput } from "./load-image-media.js";
+import { getImageGenerationProvider, listImageGenerationProviders } from "./generation/provider-registry.js";
 import { generateImage, listImageGenerationProvidersSummary } from "./generation/runtime.js";
 export { describeImages, describeImagesWithFallback, generateImage, getImageGenerationProvider, getImageUnderstandingProvider, listImageGenerationProviders, listImageGenerationProvidersSummary, listImageUnderstandingProviders, loadImageForToolInput, modelSupportsVision, registerImageUnderstandingProvider, resolveImageHandlingStrategy, resolveImageModelConfigForTool, runWithImageModelFallback };

package/dist/src/agent/image/load-image-media.js

@@ -1,5 +1,5 @@
-import { decodeDataUrl } from "./image-helpers.js";
 import { checkFileSafety } from "../prompt/safety.js";
+import { decodeDataUrl } from "./image-helpers.js";
 import { homedir } from "node:os";
 import path from "node:path";
 import { promises } from "node:fs";

package/dist/src/agent/image/tool-model-config.js

@@ -1,7 +1,7 @@
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "../../config/schema.js";
 import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
-import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { resolveAgentModelFallbackValues, resolveAgentModelPrimaryValue } from "../../config/model-input.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
 import "../../capabilities/readiness/index.js";

package/dist/src/agent/inbound/attachment-pipeline.js

@@ -1,14 +1,14 @@
 import { stripRuntimeUserMessageEnvelope } from "../../../packages/gateway-contract/src/user-message-display.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
+import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { MODEL_IMAGE_MAX_BYTES, MODEL_IMAGE_SOURCE_MAX_BYTES, prepareImageForModel } from "../image/prepare-image-for-model.js";
 import { mimeTypeFromMediaPath } from "../../media/store.js";
 import { readMediaReference } from "../../media/media-reference.js";
 import { isImageInboundAttachment } from "../../channels/attachments/attachment-classifiers.js";
 import "../../channels/attachments/inbound-persist.js";
 import { expandAtFileMentionsInPlainText } from "../context/expand-at-file-mentions.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
 import { resolveInboundImageContentParts } from "../image/inbound-image-handling.js";
 //#region src/agent/inbound/attachment-pipeline.ts

package/dist/src/agent/inbound/inbound-loop.js

@@ -1,9 +1,9 @@
 import { runWithLogContext, updateAsyncLogContext } from "../../utils/logger/context.js";
 import { init_logger } from "../../utils/logger.js";
-import { MessageBusShutdownError } from "../../infra/bus/queue.js";
-import "../../infra/bus/index.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
+import { MessageBusShutdownError } from "../../infra/bus/queue.js";
+import "../../infra/bus/index.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
 import { inboundMessageLogRequestId } from "../service-inbound-utils.js";
 //#region src/agent/inbound/inbound-loop.ts

package/dist/src/agent/index.js

@@ -1,14 +1,14 @@
-import { extractToolCallsFromAssistant, extractToolResultId, sanitizeToolCallId, sanitizeToolCallIdsForCloudCodeAssist } from "./transcript/tool-call-id.js";
-import { makeMissingToolResult, repairToolUseResultPairing, sanitizeToolCallInputs, sanitizeToolUseResultPairing, stripToolResultDetails } from "./transcript/session-transcript-repair.js";
 import { resolveTranscriptPolicy } from "./transcript/transcript-policy.js";
 import { dropThinkingBlocks } from "./transcript/thinking.js";
+import { extractToolCallsFromAssistant, extractToolResultId, sanitizeToolCallId, sanitizeToolCallIdsForCloudCodeAssist } from "./transcript/tool-call-id.js";
+import { makeMissingToolResult, repairToolUseResultPairing, sanitizeToolCallInputs, sanitizeToolUseResultPairing, stripToolResultDetails } from "./transcript/session-transcript-repair.js";
 import { applySessionTranscriptHygiene, applySessionTranscriptHygieneForPersistence, applySessionTranscriptHygieneWithPolicy, resolvePolicyForModel, tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence } from "./transcript/transcript-hygiene.js";
-import { AgentService } from "./service.js";
 import { createResponseMessage, createSignalMessage, createTaskMessage, isValidIPCMessage } from "./ipc/types.js";
 import { AgentInbox } from "./ipc/inbox.js";
 import { AgentBus } from "./ipc/bus.js";
 import { AgentSocketClient, AgentSocketServer, isSocketAvailable } from "./ipc/socket.js";
 import "./ipc/index.js";
+import { AgentService } from "./service.js";
 import { stripToolMessages } from "./transcript/strip-tool-messages.js";
 import "./transcript/index.js";
 export { AgentBus, AgentInbox, AgentService, AgentSocketClient, AgentSocketServer, applySessionTranscriptHygiene, applySessionTranscriptHygieneForPersistence, applySessionTranscriptHygieneWithPolicy, createResponseMessage, createSignalMessage, createTaskMessage, dropThinkingBlocks, extractToolCallsFromAssistant, extractToolResultId, isSocketAvailable, isValidIPCMessage, makeMissingToolResult, repairToolUseResultPairing, resolvePolicyForModel, resolveTranscriptPolicy, sanitizeToolCallId, sanitizeToolCallIdsForCloudCodeAssist, sanitizeToolCallInputs, sanitizeToolUseResultPairing, stripToolMessages, stripToolResultDetails, tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence };

package/dist/src/agent/mcp/config.js

@@ -1,6 +1,6 @@
+import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { normalizeConfiguredMcpServers } from "../../config/mcp-config-normalize.js";
 import { inspectExtensionConnectorDependencies } from "../../extensions/connector-dependencies.js";
-import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { materializePluginServers } from "../../extensions/agent-plugins/mcp-adapter.js";
 //#region src/agent/mcp/config.ts
 function loadMergedMcpConfig(params) {

package/dist/src/agent/memory/context-budget.js

@@ -1,5 +1,5 @@
-import { getToolResultTextLength, truncateToolResultMessage } from "../embedded/tool-result-truncation.js";
 import { readAgentMessageContent } from "./agent-message-access.js";
+import { getToolResultTextLength, truncateToolResultMessage } from "../embedded/tool-result-truncation.js";
 //#region src/agent/memory/context-budget.ts
 const MESSAGE_OVERHEAD_TOKENS = 12;
 const REQUEST_OVERHEAD_TOKENS = 256;

package/dist/src/agent/memory/context-recovery.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { evaluateContextBudget, projectContextForModel, stringifyMessagesForBudget } from "./context-budget.js";
 import { stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
+import { evaluateContextBudget, projectContextForModel, stringifyMessagesForBudget } from "./context-budget.js";
 //#region src/agent/memory/context-recovery.ts
 init_logger();
 const log = createLogger("ContextRecovery");

package/dist/src/agent/memory/index.js

@@ -1,6 +1,6 @@
-import { buildUserContextBlock, sanitizeUserContextFenceEscapes } from "./context-fence.js";
 import { isMemorySubsystemEnabled } from "./memory-config.js";
 import { extractAgentUserPlainText } from "./user-message-text.js";
+import { buildUserContextBlock, sanitizeUserContextFenceEscapes } from "./context-fence.js";
 import { MemoryManager } from "./manager.js";
 import { discoverMemoryPlugins } from "./plugin-discovery.js";
 import { createMemoryManagerFromConfig } from "./create-memory-manager.js";

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { abortEmbeddedRun } from "../embedded/runs.js";
 import { persistInboundAttachments } from "../../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, clearPendingTranscriptUserMessage, hydrateUserTurnForLlm, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
-import { abortEmbeddedRun } from "../embedded/runs.js";
 import { resolveEffectiveThinkingLevel } from "../../session/thinking-resolve.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
 import { randomUUID } from "node:crypto";

package/dist/src/agent/orchestration/agent-turn-policy.d.ts

@@ -8,6 +8,7 @@ export interface AgentTurnPolicy {
     takeContinuationMessage?(): string | undefined;
     /** Recheck limits at dispatch, including requests made by recovery paths. */
     beforeModelRequest?(signal?: AbortSignal): string | undefined;
+    stopReason?(): 'completed' | 'limit';
 }
 export interface AgentTurnPolicyOptions {
     maxTurns?: number;

package/dist/src/agent/orchestration/delegation-budget.js

@@ -126,7 +126,8 @@ function createDelegationBudgetPolicy(budget, options, now = Date.now) {
 				const message = continuation;
 				continuation = void 0;
 				return message;
-			}
+			},
+			stopReason: () => !stopReason && options.isComplete?.() ? "completed" : "limit"
 		},
 		addTokens(tokens) {
 			usage.totalTokens += Math.max(0, tokens);

package/dist/src/agent/orchestration/llm-turn-retry.d.ts

@@ -26,6 +26,11 @@ export interface RetryTransientTurnOptions {
     baseDelayMs?: number;
     signal?: AbortSignal;
     conversationId: string;
+    onRetry?: () => void;
+    shouldRetry?: () => boolean;
+    budget?: {
+        continues: number;
+    };
     log: {
         warn: (obj: Record<string, unknown>, msg: string) => void;
     };

package/dist/src/agent/orchestration/llm-turn-retry.js

@@ -1,5 +1,6 @@
 import { isTransientProviderErrorMessage } from "../../providers/model-response.js";
 import { isContextOverflowError } from "./context-overflow.js";
+import { canResumeAfterModelFailure } from "./turn-recovery.js";
 //#region src/agent/orchestration/llm-turn-retry.ts
 function isTransientLlmErrorMessage(message) {
 	return isTransientProviderErrorMessage(message);
@@ -72,9 +73,9 @@ async function waitForRetryDelay(delayMs, signal) {
 */
 async function maybeRetryTurnAfterTransientLlmFailure(agent, options) {
 	const maxContinues = options.maxContinues ?? 2;
-	const baseDelayMs = Math.max(0, options.baseDelayMs ?? 300);
-	let continues = 0;
-	while (continues < maxContinues) {
+	const baseDelayMs = Math.max(0, options.baseDelayMs ?? 1e3);
+	const budget = options.budget ?? { continues: 0 };
+	while (budget.continues < maxContinues && options.shouldRetry?.() !== false) {
 		const last = getLastAssistantMessage(agent.state.messages);
 		if (!last) return;
 		if (last.stopReason !== "error") return;
@@ -88,8 +89,15 @@ async function maybeRetryTurnAfterTransientLlmFailure(agent, options) {
 			}, "Assistant turn ended with error (not retrying as transient)");
 			return;
 		}
-		continues += 1;
-		const retryDelayMs = baseDelayMs * 2 ** (continues - 1);
+		if (!canResumeAfterModelFailure(agent.state.messages)) {
+			options.log.warn({ conversationId: options.conversationId }, "Model recovery stopped because a tool outcome is unconfirmed");
+			return;
+		}
+		const continues = ++budget.continues;
+		const rateLimited = /429|rate.limit|too many requests/i.test(errMsg);
+		const serverDelay = /retry[- ]after\s*[:=]?\s*(\d+(?:\.\d+)?)\s*(ms|s|seconds)?/i.exec(errMsg);
+		const requestedDelay = serverDelay ? Number(serverDelay[1]) * (serverDelay[2] === "ms" ? 1 : 1e3) : 0;
+		const retryDelayMs = Math.min(6e4, Math.max(requestedDelay, (rateLimited && options.baseDelayMs === void 0 ? 5e3 : baseDelayMs) * 2 ** (continues - 1)));
 		options.log.warn({
 			conversationId: options.conversationId,
 			errorMessage: errMsg,
@@ -99,6 +107,8 @@ async function maybeRetryTurnAfterTransientLlmFailure(agent, options) {
 			retryDelayMs
 		}, "LLM request failed with a transient network error; retrying the same turn. If this persists, check outbound HTTPS to the provider API and HTTP(S)_PROXY.");
 		await waitForRetryDelay(retryDelayMs, options.signal);
+		options.signal?.throwIfAborted();
+		options.onRetry?.();
 		const trimmed = stripTrailingErrorAssistantMessages(agent.state.messages);
 		agent.state.messages = trimmed;
 		await agent.continue();

package/dist/src/agent/orchestration/turn-recovery.d.ts

@@ -0,0 +1,6 @@
+import type { AgentMessage } from '@earendil-works/pi-agent-core';
+/** A model request can be resumed only after every issued tool has a confirmed result. */
+export declare function canResumeAfterModelFailure(rows: readonly unknown[]): boolean;
+export declare function recoveryToolKey(name: string, args: unknown): string;
+/** Prevent a recovering model from replaying an already confirmed operation with a new call ID. */
+export declare function completedRecoveryToolResult(messages: readonly AgentMessage[], name: string, args: unknown): string | undefined;

package/dist/src/agent/orchestration/turn-recovery.js

@@ -0,0 +1,29 @@
+//#region src/agent/orchestration/turn-recovery.ts
+/** A model request can be resumed only after every issued tool has a confirmed result. */
+function canResumeAfterModelFailure(rows) {
+	const messages = rows.filter((row) => !!row && typeof row === "object");
+	const pending = /* @__PURE__ */ new Set();
+	for (const message of messages.slice(Math.max(0, messages.findLastIndex((item) => item.role === "user")))) if (message.role === "assistant") {
+		if (message.stopReason === "aborted") return false;
+		if (message.stopReason === "error") continue;
+		for (const block of Array.isArray(message.content) ? message.content : []) if (block?.type === "toolCall" && typeof block.id === "string") pending.add(block.id);
+	} else if (message.role === "toolResult") {
+		const recordedReplay = Array.isArray(message.content) && message.content.some((block) => block?.type === "text" && typeof block.text === "string" && block.text.startsWith("This operation already completed before recovery."));
+		if (message.isError && !recordedReplay) return false;
+		if (typeof message.toolCallId === "string") pending.delete(message.toolCallId);
+	}
+	return pending.size === 0;
+}
+function recoveryToolKey(name, args) {
+	return JSON.stringify([name, args], (_key, value) => value && typeof value === "object" && !Array.isArray(value) ? Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b))) : value);
+}
+/** Prevent a recovering model from replaying an already confirmed operation with a new call ID. */
+function completedRecoveryToolResult(messages, name, args) {
+	const calls = /* @__PURE__ */ new Map();
+	const key = recoveryToolKey(name, args);
+	for (const message of messages.slice(Math.max(0, messages.findLastIndex((item) => item.role === "user")))) if (message.role === "assistant" && message.stopReason !== "error" && message.stopReason !== "aborted") {
+		for (const block of message.content) if (block.type === "toolCall") calls.set(block.id, recoveryToolKey(block.name, block.arguments));
+	} else if (message.role === "toolResult" && !message.isError && calls.get(message.toolCallId) === key) return `This operation already completed before recovery. Do not execute it again. Use its recorded result and continue the remaining work:\n${JSON.stringify(message.content).slice(0, 8e3)}`;
+}
+//#endregion
+export { canResumeAfterModelFailure, completedRecoveryToolResult, recoveryToolKey };

package/dist/src/agent/prompt/response-language.js

@@ -2,9 +2,9 @@ import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { getSessionConfig } from "../../storage/sqlite/config-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
 import { resolveTaskLocale } from "../../tasks/task-language.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
 //#region src/agent/prompt/response-language.ts
 init_response_language();
 init_sqlite();

package/dist/src/agent/prompt/sections/tooling.js

@@ -152,7 +152,7 @@ function buildToolingSection(params) {
 		hasToolManual ? "Some complex tools have built-in manuals. Use `tool_manual(tool)` before non-trivial use." : "",
 		hasDelegate ? "If a task is complex or long-running, delegate it. Completion is push-based: the sub-agent result returns when done." : "",
 		...orchestrationLines,
-		"Do not poll delegate/workflow status in a tight loop; check on-demand or wait for completion."
+		hasDelegate || hasWorkflow ? "Do not poll delegate/workflow status in a tight loop; check on-demand or wait for completion." : ""
 	].filter(Boolean).join("\n");
 }
 function hasSkillsTools(toolNames) {

package/dist/src/agent/prompt/service-prompt-builder.js

@@ -6,14 +6,14 @@ import { getInteractionState } from "../../storage/sqlite/interaction-state-repo
 import { DEFAULT_USER_TRUST_LEVEL, init_trust_policy } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { getUserTimezone } from "../../user-model/repository.js";
 import { appendStablePromptSection } from "./cache-boundary.js";
-import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
-import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
+import { getUserTimezone } from "../../user-model/repository.js";
 import "../../user-model/index.js";
 import { resolveSystemPromptBuildParams } from "./system-prompt-params.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { resolveResponseLanguageForSession } from "./response-language.js";
+import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
+import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 //#region src/agent/prompt/service-prompt-builder.ts
 init_sqlite();
 init_interaction_state();

package/dist/src/agent/sandbox/exec-policy.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { prepareSafeToolEnv } from "./sanitize-env-vars.js";
 import { validatePath, validateWritePath } from "./path-policy.js";
+import { prepareSafeToolEnv } from "./sanitize-env-vars.js";
 import { auditCommand, validateCommand } from "./command-validator.js";
 import { DEFAULT_SANDBOX_CONFIG } from "./types.js";
 import { resolve } from "node:path";

package/dist/src/agent/service/direct-turn-helpers.js

@@ -1,17 +1,17 @@
 import { getClarificationResumeInput, init_clarification_wait_repository } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
-import { parseSlashCommand } from "../../chat-commands/command-parse.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { personalCommandRejection } from "../../chat-commands/personal-command-policy.js";
-import { commandRegistry } from "../../chat-commands/registry.js";
-import "../../chat-commands/index.js";
 import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
 import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
+import { buildDelegatedTaskDirective, buildTaskExecutionDirective } from "../../tasks/task-context-assembler.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
+import { parseSlashCommand } from "../../chat-commands/command-parse.js";
+import { personalCommandRejection } from "../../chat-commands/personal-command-policy.js";
+import { commandRegistry } from "../../chat-commands/registry.js";
+import "../../chat-commands/index.js";
+import { getTaskContinuation } from "../../tasks/task-continuation.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
 import { injectSourceContextsIntoUserMessage } from "../source-context/injector.js";
-import { buildDelegatedTaskDirective, buildTaskExecutionDirective } from "../../tasks/task-context-assembler.js";
-import { prependAgentContext } from "../context/prepend.js";
 import crypto from "node:crypto";
 //#region src/agent/service/direct-turn-helpers.ts
 /**
@@ -113,10 +113,11 @@ async function runDirectAgentTurn(deps, input) {
 	const turnId = input.runId ?? crypto.randomUUID();
 	const isConnectionResume = Boolean(getConnectionResumeInput(input.conversationId, turnId));
 	const isClarificationResume = Boolean(getClarificationResumeInput(input.conversationId, turnId));
-	const isResume = isConnectionResume || isClarificationResume;
+	const isResume = isConnectionResume || isClarificationResume || Boolean(getTaskContinuation(input.conversationId, turnId));
 	const userContext = await deps.agentManager.prepareUserTurnContext(input.userMessage, input.conversationId, turnId);
 	const sourceContexts = input.sourceContexts ?? [];
-	const userMessageForModel = prependAgentContext(injectSourceContextsIntoUserMessage(input.userMessage, sourceContexts), [buildTaskExecutionDirective(input.conversationId), buildDelegatedTaskDirective(input.conversationId)].filter(Boolean).join("\n"));
+	const sourceEnrichedMessage = injectSourceContextsIntoUserMessage(input.userMessage, sourceContexts);
+	const taskContext = [buildTaskExecutionDirective(input.conversationId), buildDelegatedTaskDirective(input.conversationId)].filter(Boolean).join("\n");
 	const modelRef = deps.modelManager.getModelForSession(input.conversationId);
 	const llmTurn = await hydrateUserTurnForLlm({
 		message: input.userMessage,
@@ -128,8 +129,8 @@ async function runDirectAgentTurn(deps, input) {
 	const result = await runEmbeddedTurnForSession({
 		conversationId: input.conversationId,
 		runId: turnId,
-		userMessage: userMessageForModel,
-		dynamicSystemContext: userContext.dynamicSystemContext,
+		userMessage: sourceEnrichedMessage,
+		dynamicSystemContext: [userContext.dynamicSystemContext, taskContext].filter(Boolean).join("\n\n"),
 		llmImages,
 		presentation: input.presentation,
 		requireVisibleReply: input.requireVisibleReply,

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

@@ -5,18 +5,19 @@ 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 { stripEnvelopeTimestampPrefix } from "../../channels/envelope-timestamp.js";
-import { mergeSttConfigFromAppConfig } from "../../voice/stt/config.js";
-import "../../voice/stt/index.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
-import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.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 { 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 { isSessionSourceBinding, summarizeSourceContext } from "../source-context/types.js";
 import { injectSourceContextsIntoUserMessage } from "../source-context/injector.js";
 import { AsyncQueue, AsyncQueueOverflowError } from "./async-queue.js";
@@ -141,7 +142,7 @@ async function* runProcessDirectStreaming(deps, input) {
 	deps.sessionStore?.idleCompaction?.interrupt(conversationId);
 	const isConnectionResume = Boolean(input.runId && getConnectionResumeInput(conversationId, input.runId));
 	const isClarificationResume = Boolean(input.runId && getClarificationResumeInput(conversationId, input.runId));
-	const isInternalResume = isConnectionResume || isClarificationResume;
+	const isInternalResume = isConnectionResume || isClarificationResume || Boolean(input.runId && getTaskContinuation(conversationId, input.runId));
 	const isTaskUpdate = input.origin.type === "system" && input.origin.source === "task_update";
 	const { channel, chatId } = await deps.resolveSessionEndpoint(conversationId);
 	const context = deps.initDirectStreamingSession(conversationId, channel, chatId, input.origin);
@@ -402,6 +403,11 @@ async function* runProcessDirectStreaming(deps, input) {
 	try {
 		for await (const event of queue) yield event;
 		await taskPromise;
+		if (streamOverflowed) yield {
+			type: "error",
+			runId: input.runId,
+			content: formatStreamError("Agent stream stopped because its critical event buffer overflowed")
+		};
 		if (channel === "webchat" && ranSlashCommand) try {
 			const userMsg = {
 				role: "user",

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.d.ts

@@ -103,6 +103,12 @@ export declare class AgentService {
     applyRuntimeConfiguration(config: Config): void;
     getSkillCatalog(): SkillCatalogEntry[];
     getSkillCatalogSnapshot(): SkillCatalogSnapshot;
+    getAgentToolAvailability(agentId: string, name: string): {
+        condition: string;
+        state: "blocked" | "verified";
+        reasonCode: string;
+        detail: string;
+    };
     getAgentSkillAvailability(agentId: string): AgentSkillAvailabilityPayload;
     getSessionSkillAvailability(conversationId: string): Promise<AgentSkillAvailabilityPayload>;
     getSessionWorkspaceTrust(conversationId: string): Promise<WorkspaceTrustState>;