@xopcai/xopc 0.0.331 → 0.0.333

package/dist/packages/gateway-contract/src/capabilities.js

@@ -9,7 +9,7 @@ import { AppContextEnvelopeSchema, ResolvedAppContextSchema, init_app_context }
 import { SceneActivationSchema, SceneConfigureSchema, SceneFeedbackSchema, ScenePreferencePatchSchema, SceneTransitionSchema, SceneWorkItemCreateSchema, SceneWorkItemSchema, SceneWorkItemUpdateSchema, activationInputSchema, init_scenes, sceneNotesSchema, scenePreferencesSchema, sceneScheduleSchema, sceneTemplateSchema } from "./scenes.js";
 import { z } from "zod";
 //#region packages/gateway-contract/src/capabilities.ts
-var CapabilityErrorCodeSchema, CapabilityCallSchema, AutomationSimulationSchema, AutomationDraftRequestSchema, AutomationDraftOutputSchema, AutomationRepairDraftOutputSchema, CapabilityResourceInputSchema, ScenePageInputSchema, SceneWriteContracts, SceneOutcomeReadSchema, TaskRunCancelInputSchema, TaskRunFeedbackInputSchema, TaskRunFeedbackOutputSchema, TaskRunCancelOutputSchema, AutomationSetEnabledInputSchema, AutomationMutationOutputSchema, AutomationRunMutationOutputSchema, AutomationCancelOutputSchema, AutomationReadOutputSchema, AutomationReadAllInputSchema, AutomationReadAllOutputSchema, AutomationDeleteInputSchema, AutomationDeleteOutputSchema, NoteListInputSchema, NoteRecordSchema, NoteGetOutputSchema, NoteDeleteInputSchema, NoteDeleteOutputSchema, NoteCreateInputSchema, NoteUpdateInputSchema, NoteCaptureInputSchema, NoteAppendInputSchema, NoteRestoreInputSchema, NoteListOutputSchema, TaskListInputSchema, ProjectRecordSchema, ProjectSetPinnedInputSchema, ProjectMutationOutputSchema, ProjectResolveWorkspaceInputSchema, ProjectResolveWorkspaceOutputSchema, ProjectDeleteInputSchema, ProjectDeleteOutputSchema, ProjectFields, ProjectCreateInputSchema, ProjectEditInputSchema, ProjectListInputSchema, ProjectMilestoneSchema, ProjectUpdateSchema, MilestoneFields, ProjectMilestoneCreateInputSchema, ProjectMilestoneUpdateInputSchema, ProjectMilestoneDeleteInputSchema, ProjectMilestoneOutputSchema, ProjectMilestoneDeleteOutputSchema, ProjectUpdateCreateInputSchema, ProjectUpdateOutputSchema, ProductReadContracts;
+var CapabilityErrorCodeSchema, CapabilityCallSchema, AutomationSimulationSchema, AutomationDraftRequestSchema, AutomationDraftOutputSchema, AutomationRepairDraftOutputSchema, CapabilityResourceInputSchema, ScenePageInputSchema, SceneWriteContracts, SceneOutcomeReadSchema, TaskRunCancelInputSchema, TaskRunFeedbackInputSchema, TaskRunFeedbackOutputSchema, TaskRunCancelOutputSchema, AutomationSetEnabledInputSchema, AutomationMutationOutputSchema, AutomationRunMutationOutputSchema, AutomationCancelOutputSchema, AutomationReadOutputSchema, AutomationReadAllInputSchema, AutomationReadAllOutputSchema, AutomationReplayEventInputSchema, AutomationRetryDeliveryInputSchema, AutomationRecoveryOutputSchema, AutomationDeleteInputSchema, AutomationDeleteOutputSchema, NoteListInputSchema, NoteRecordSchema, NoteGetOutputSchema, NoteDeleteInputSchema, NoteDeleteOutputSchema, NoteCreateInputSchema, NoteUpdateInputSchema, NoteCaptureInputSchema, NoteAppendInputSchema, NoteRestoreInputSchema, NoteListOutputSchema, TaskListInputSchema, ProjectRecordSchema, ProjectSetPinnedInputSchema, ProjectMutationOutputSchema, ProjectResolveWorkspaceInputSchema, ProjectResolveWorkspaceOutputSchema, ProjectDeleteInputSchema, ProjectDeleteOutputSchema, ProjectFields, ProjectCreateInputSchema, ProjectEditInputSchema, ProjectListInputSchema, ProjectMilestoneSchema, ProjectUpdateSchema, MilestoneFields, ProjectMilestoneCreateInputSchema, ProjectMilestoneUpdateInputSchema, ProjectMilestoneDeleteInputSchema, ProjectMilestoneOutputSchema, ProjectMilestoneDeleteOutputSchema, ProjectUpdateCreateInputSchema, ProjectUpdateOutputSchema, ProductReadContracts;
 var init_capabilities = __esmMin((() => {
 	init_app_context();
 	init_task_lifecycle();
@@ -227,6 +227,16 @@ var init_capabilities = __esmMin((() => {
 		ok: z.literal(true),
 		count: z.number().int().nonnegative()
 	});
+	AutomationReplayEventInputSchema = CapabilityResourceInputSchema.extend({ reason: z.string().trim().min(1).max(2e3) });
+	AutomationRetryDeliveryInputSchema = z.strictObject({
+		runId: z.string().trim().min(1).max(200),
+		destinationKey: z.string().trim().min(1).max(100),
+		reason: z.string().trim().min(1).max(2e3)
+	});
+	AutomationRecoveryOutputSchema = z.object({
+		ok: z.literal(true),
+		accepted: z.literal(true)
+	});
 	AutomationDeleteInputSchema = CapabilityResourceInputSchema.extend({ expectedRevision: z.number().int().nonnegative().nullable() });
 	AutomationDeleteOutputSchema = z.object({
 		ok: z.literal(true),
@@ -601,6 +611,100 @@ var init_capabilities = __esmMin((() => {
 				metrics: AutomationMetricsSchema
 			})
 		},
+		"xopc.automations.events": {
+			input: z.strictObject({
+				type: z.string().trim().min(1).max(512).optional(),
+				source: z.string().trim().min(1).max(512).optional(),
+				limit: z.number().int().min(1).max(200).default(50)
+			}),
+			output: z.object({
+				ok: z.literal(true),
+				items: z.array(z.object({
+					event: z.object({
+						id: z.string(),
+						type: z.string(),
+						schemaVersion: z.number().int(),
+						source: z.string(),
+						subject: z.object({
+							kind: z.string(),
+							id: z.string()
+						}).optional(),
+						payload: z.record(z.string(), z.unknown()),
+						occurredAtMs: z.number(),
+						ingestedAtMs: z.number(),
+						correlationId: z.string(),
+						causationId: z.string().optional(),
+						rootEventId: z.string(),
+						chainDepth: z.number().int(),
+						dedupeKey: z.string().optional(),
+						trust: z.enum([
+							"system",
+							"user",
+							"connector",
+							"untrusted_webhook"
+						])
+					}),
+					projectionStatus: z.enum([
+						"pending",
+						"projecting",
+						"retrying",
+						"projected",
+						"dead_letter"
+					]),
+					projectionAttempts: z.number().int(),
+					projectionError: z.string().optional(),
+					deliveries: z.array(z.object({
+						automationId: z.string(),
+						status: z.enum([
+							"pending",
+							"retrying",
+							"queued",
+							"completed",
+							"failed",
+							"cancelled",
+							"skipped",
+							"dead_letter"
+						]),
+						runId: z.string().optional(),
+						attempts: z.number().int(),
+						lastError: z.string().optional()
+					}))
+				}))
+			})
+		},
+		"xopc.automations.deliveries": {
+			input: z.strictObject({
+				runId: z.string().trim().min(1).max(200).optional(),
+				status: z.enum([
+					"pending",
+					"delivering",
+					"retrying",
+					"delivered",
+					"dead_letter"
+				]).optional(),
+				limit: z.number().int().min(1).max(200).default(50)
+			}),
+			output: z.object({
+				ok: z.literal(true),
+				items: z.array(z.object({
+					runId: z.string(),
+					destinationKey: z.string(),
+					kind: z.string(),
+					status: z.enum([
+						"pending",
+						"delivering",
+						"retrying",
+						"delivered",
+						"dead_letter"
+					]),
+					attempts: z.number().int(),
+					nextAttemptAtMs: z.number(),
+					lastError: z.string().optional(),
+					createdAtMs: z.number(),
+					updatedAtMs: z.number()
+				}))
+			})
+		},
 		"xopc.automations.product_events": {
 			input: z.strictObject({
 				eventType: z.string().trim().min(1).max(512),
@@ -717,12 +821,6 @@ var init_capabilities = __esmMin((() => {
 				currentModel: z.string().nullable(),
 				pendingChecks: z.number().int().nonnegative(),
 				oldestDueWaitMs: z.number().nonnegative(),
-				lastSevenDays: z.object({
-					modelCalls: z.number().int().nonnegative(),
-					connectorReads: z.number().int().nonnegative(),
-					tokens: z.number().nonnegative(),
-					estimatedCost: z.number().nonnegative()
-				}),
 				notifications: z.array(z.object({
 					status: z.string(),
 					count: z.number().int().nonnegative()
@@ -969,4 +1067,4 @@ var init_capabilities = __esmMin((() => {
 }));
 //#endregion
 init_capabilities();
-export { AutomationCancelOutputSchema, AutomationDeleteInputSchema, AutomationDeleteOutputSchema, AutomationDraftOutputSchema, AutomationDraftRequestSchema, AutomationMutationOutputSchema, AutomationReadAllInputSchema, AutomationReadAllOutputSchema, AutomationReadOutputSchema, AutomationRepairDraftOutputSchema, AutomationRunMutationOutputSchema, AutomationSetEnabledInputSchema, AutomationSimulationSchema, CapabilityCallSchema, CapabilityErrorCodeSchema, CapabilityResourceInputSchema, NoteAppendInputSchema, NoteCaptureInputSchema, NoteCreateInputSchema, NoteDeleteInputSchema, NoteDeleteOutputSchema, NoteGetOutputSchema, NoteListInputSchema, NoteListOutputSchema, NoteRecordSchema, NoteRestoreInputSchema, NoteUpdateInputSchema, ProductReadContracts, ProjectCreateInputSchema, ProjectDeleteInputSchema, ProjectDeleteOutputSchema, ProjectEditInputSchema, ProjectListInputSchema, ProjectMilestoneCreateInputSchema, ProjectMilestoneDeleteInputSchema, ProjectMilestoneDeleteOutputSchema, ProjectMilestoneOutputSchema, ProjectMilestoneSchema, ProjectMilestoneUpdateInputSchema, ProjectMutationOutputSchema, ProjectRecordSchema, ProjectResolveWorkspaceInputSchema, ProjectResolveWorkspaceOutputSchema, ProjectSetPinnedInputSchema, ProjectUpdateCreateInputSchema, ProjectUpdateOutputSchema, ProjectUpdateSchema, ScenePageInputSchema, SceneWriteContracts, TaskListInputSchema, TaskRunCancelInputSchema, TaskRunCancelOutputSchema, TaskRunFeedbackInputSchema, TaskRunFeedbackOutputSchema, init_capabilities };
+export { AutomationCancelOutputSchema, AutomationDeleteInputSchema, AutomationDeleteOutputSchema, AutomationDraftOutputSchema, AutomationDraftRequestSchema, AutomationMutationOutputSchema, AutomationReadAllInputSchema, AutomationReadAllOutputSchema, AutomationReadOutputSchema, AutomationRecoveryOutputSchema, AutomationRepairDraftOutputSchema, AutomationReplayEventInputSchema, AutomationRetryDeliveryInputSchema, AutomationRunMutationOutputSchema, AutomationSetEnabledInputSchema, AutomationSimulationSchema, CapabilityCallSchema, CapabilityErrorCodeSchema, CapabilityResourceInputSchema, NoteAppendInputSchema, NoteCaptureInputSchema, NoteCreateInputSchema, NoteDeleteInputSchema, NoteDeleteOutputSchema, NoteGetOutputSchema, NoteListInputSchema, NoteListOutputSchema, NoteRecordSchema, NoteRestoreInputSchema, NoteUpdateInputSchema, ProductReadContracts, ProjectCreateInputSchema, ProjectDeleteInputSchema, ProjectDeleteOutputSchema, ProjectEditInputSchema, ProjectListInputSchema, ProjectMilestoneCreateInputSchema, ProjectMilestoneDeleteInputSchema, ProjectMilestoneDeleteOutputSchema, ProjectMilestoneOutputSchema, ProjectMilestoneSchema, ProjectMilestoneUpdateInputSchema, ProjectMutationOutputSchema, ProjectRecordSchema, ProjectResolveWorkspaceInputSchema, ProjectResolveWorkspaceOutputSchema, ProjectSetPinnedInputSchema, ProjectUpdateCreateInputSchema, ProjectUpdateOutputSchema, ProjectUpdateSchema, ScenePageInputSchema, SceneWriteContracts, TaskListInputSchema, TaskRunCancelInputSchema, TaskRunCancelOutputSchema, TaskRunFeedbackInputSchema, TaskRunFeedbackOutputSchema, init_capabilities };

package/dist/packages/gateway-contract/src/index.js

@@ -35,6 +35,7 @@ import { init_app_context } from "./app-context.js";
 import { init_scenes } from "./scenes.js";
 import { init_capabilities } from "./capabilities.js";
 import { init_extension_capabilities } from "./extension-capabilities.js";
+import { init_usage } from "./usage.js";
 //#region packages/gateway-contract/src/index.ts
 var init_src = __esmMin((() => {
 	init_agent_stream();
@@ -73,6 +74,7 @@ var init_src = __esmMin((() => {
 	init_extension_capabilities();
 	init_local_apps();
 	init_chat_previews();
+	init_usage();
 }));
 //#endregion
 init_src();

package/dist/packages/gateway-contract/src/scenes.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
 import { z } from "zod";
 //#region packages/gateway-contract/src/scenes.ts
-var identifier, uniqueIds, sceneOutcomeKinds, activationStatuses, sceneScopeSchema, limitsSchema, sceneTemplateSchema, scenePermissionSchema, sceneNotesSchema, activationInputSchema, SceneActivationSchema, SceneConfigureSchema, SceneTransitionSchema, SceneWorkItemCreateSchema, SceneWorkItemUpdateSchema, SceneWorkItemSchema, hour, scenePreferencesSchema, preferenceFields, ScenePreferencePatchSchema, SceneFeedbackSchema, sceneScheduleSchema;
+var identifier, uniqueIds, sceneOutcomeKinds, activationStatuses, sceneScopeSchema, limitsSchema, executionSchema, sceneTemplateSchema, scenePermissionSchema, sceneNotesSchema, activationInputSchema, SceneActivationSchema, SceneConfigureSchema, SceneTransitionSchema, SceneWorkItemCreateSchema, SceneWorkItemUpdateSchema, SceneWorkItemSchema, hour, scenePreferencesSchema, preferenceFields, ScenePreferencePatchSchema, SceneFeedbackSchema, sceneScheduleSchema;
 var init_scenes = __esmMin((() => {
 	identifier = z.string().trim().min(1).max(200);
 	uniqueIds = z.array(identifier).max(100).refine((items) => new Set(items).size === items.length, "Duplicate identifiers");
@@ -42,6 +42,11 @@ var init_scenes = __esmMin((() => {
 		maxToolCalls: z.number().int().min(0).max(100),
 		maxOutputTokens: z.number().int().min(1).max(32768)
 	});
+	executionSchema = z.strictObject({
+		kind: z.string().regex(/^[a-z][a-z0-9_-]{0,63}$/),
+		instruction: z.string().trim().min(1).max(32e3),
+		limits: limitsSchema
+	});
 	sceneTemplateSchema = z.strictObject({
 		schemaVersion: z.literal(1),
 		key: z.string().regex(/^[a-z][a-z0-9-]{0,79}$/),
@@ -65,11 +70,7 @@ var init_scenes = __esmMin((() => {
 				type: z.literal("schedule")
 			})
 		])).min(1).max(20).refine((items) => new Set(items.map((item) => item.id)).size === items.length, "Duplicate trigger IDs"),
-		execution: z.strictObject({
-			kind: z.literal("agent"),
-			instruction: z.string().trim().min(1).max(32e3),
-			limits: limitsSchema
-		}),
+		execution: executionSchema,
 		allowedOutcomeKinds: z.array(z.enum(sceneOutcomeKinds)).min(1),
 		allowedEffectHandlers: uniqueIds
 	});

package/dist/packages/gateway-contract/src/sessions.js

@@ -70,7 +70,8 @@ var init_sessions = __esmMin((() => {
 			offset: z.number(),
 			hasMore: z.boolean(),
 			before: z.string().optional(),
-			nextBeforeCursor: z.string().optional()
+			nextBeforeCursor: z.string().optional(),
+			revision: z.number().int().nonnegative().optional()
 		}).passthrough()
 	}).passthrough();
 	z.object({ session: z.object({

package/dist/packages/gateway-contract/src/usage.js

@@ -0,0 +1,6 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
+//#region packages/gateway-contract/src/usage.ts
+var init_usage = __esmMin((() => {}));
+//#endregion
+init_usage();
+export { init_usage };

package/dist/src/agent/agent-manager.js

@@ -6,32 +6,33 @@ import { consumeClarificationApproval, init_clarification_wait_repository } from
 import { getInteractionState } from "../storage/sqlite/interaction-state-repository.js";
 import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
-import { init_agent_scope, listAgentEntries, resolveAgentProfileDir } from "./agent-scope.js";
-import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
-import { extractTextContent } from "./context/workspace.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
+import { init_agent_scope, listAgentEntries, resolveAgentProfileDir } from "./agent-scope.js";
 import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
 import { init_session_key } from "../routing/session-key.js";
 import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
+import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
+import { continuesAfterTool, trackAiUsageStream } from "../usage/recorder.js";
+import { extractTextContent } from "./context/workspace.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
 import { resolveBootstrapContextSync } from "./bootstrap/bootstrap-files.js";
 import { loadProjectAgentsContextFile } from "./bootstrap/project-agents-context.js";
 import { getEmbeddedExecutionRunId } from "./embedded/execution-context.js";
 import { parseExternalToolRef } from "./external-tools/refs.js";
+import { loadSkillsLock } from "./skills/hub-lock.js";
+import { isUnderManagedSkillsDir } from "./skills/managed-store.js";
 import { mcpToolPolicyId } from "./mcp/bundle-mcp-policy.js";
 import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForConversationId } from "./mcp/bundle-mcp-runtime.js";
 import { createSkillConfigManager, isSkillEnabled, resolveSkillConfig } from "./skills/config.js";
 import { isValidSkillEnvVarName } from "./skills/required-env-vars.js";
 import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
-import { loadSkillsLock } from "./skills/hub-lock.js";
-import { isUnderManagedSkillsDir } from "./skills/managed-store.js";
 import { replaceAgentSystemPrompt } from "./prompt/agent-system-prompt.js";
 import { evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
@@ -1027,6 +1028,7 @@ var AgentManager = class {
 		const registeredToolNames = tools.map((t) => t.name);
 		const thinkingLevel = this.config.thinkingLevel ?? "medium";
 		const turnPolicy = this.buildAgentTurnPolicy(conversationId, profile);
+		const providerStreamFn = createExtensionAwareStreamFn();
 		agent = new Agent({
 			initialState: {
 				systemPrompt: rt.systemPromptBuilder.build(contextFiles, {
@@ -1048,7 +1050,11 @@ var AgentManager = class {
 				messages: []
 			},
 			toolExecution: "parallel",
-			streamFn: createExtensionAwareStreamFn(),
+			streamFn: (streamModel, context, options) => trackAiUsageStream(streamModel, {
+				operation: continuesAfterTool(context.messages) ? "agent.continue_after_tool" : "agent.answer",
+				conversationId,
+				agentId: profile.agentId
+			}, () => providerStreamFn(streamModel, context, options)),
 			getApiKey: (provider) => this.resolveApiKeyWithCache(provider),
 			finishTurn: (context) => turnPolicy.shouldStopAfterTurn(context) ? { action: "end" } : void 0,
 			beforeToolCall: turnPolicy.beforeToolCall,

package/dist/src/agent/background-review/run-background-review.js

@@ -4,11 +4,12 @@ import { finishContextExtractionRun } from "../../storage/sqlite/context-extract
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { extractTextContent } from "../context/workspace.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
+import { trackAiUsageStream } from "../../usage/recorder.js";
+import { extractTextContent } from "../context/workspace.js";
 import { getAssertionSlot, listUserAssertions } from "../../user-model/repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
@@ -125,6 +126,7 @@ function resolveInterpreterRuntime(params) {
 	};
 }
 async function interpret(params) {
+	const providerStreamFn = createExtensionAwareStreamFn();
 	const reviewAgent = new Agent({
 		initialState: {
 			systemPrompt: USER_MODEL_MAINTAINER_SYSTEM_PROMPT,
@@ -133,7 +135,10 @@ async function interpret(params) {
 			tools: [],
 			messages: []
 		},
-		streamFn: createExtensionAwareStreamFn(),
+		streamFn: (model, context, options) => trackAiUsageStream(model, {
+			operation: "user_model.interpret",
+			conversationId: params.conversationId
+		}, () => providerStreamFn(model, context, options)),
 		getApiKey: (provider) => resolveProviderApiKeySync(provider) ?? getApiKeySync(provider) ?? ""
 	});
 	reviewAgent.state.messages = params.evidence.map(tagMessage);

package/dist/src/agent/bootstrap/filter-bootstrap-files.js

@@ -1,6 +1,6 @@
-import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 import { isCronConversationId, isSubagentConversationId } from "../../routing/agent-session-key.js";
 import { init_session_key } from "../../routing/session-key.js";
+import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 //#region src/agent/bootstrap/filter-bootstrap-files.ts
 init_session_key();
 const MINIMAL_BOOTSTRAP_ALLOWLIST = new Set([

package/dist/src/agent/embedded/run-turn.js

@@ -2,6 +2,7 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { getClarification, getClarificationResumeInput, init_clarification_wait_repository, isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
+import { continuesAfterTool, trackAiUsageStream } from "../../usage/recorder.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
 import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.js";
@@ -450,7 +451,12 @@ async function runXopcEmbeddedTurn(params) {
 					tools: effectiveTools
 				} } : {}
 			}, "Sending messages to AI");
-			return streamFnWithXopcExtensions(streamModel, effectiveContext, { ...options });
+			return trackAiUsageStream(streamModel, {
+				operation: continuesAfterTool(effectiveContext.messages) ? "agent.continue_after_tool" : "agent.answer",
+				conversationId,
+				runId,
+				traceId: runId
+			}, () => streamFnWithXopcExtensions(streamModel, effectiveContext, { ...options }));
 		};
 		session.agent.streamFunction = loggingStreamFn;
 		const verification = await RunVerification.open(workspaceDir);

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -1,7 +1,7 @@
-import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
-import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { COMPUTER_CONTROL_TOOL, init_src } from "../../../packages/computer-control-contract/src/index.js";
 import { BROWSER_CONTROL_ENDPOINT_TOOL_NAME } from "../../../packages/browser-control-contract/src/index.js";
+import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { createHash } from "node:crypto";
 //#region src/agent/external-tools/endpoint-provider.ts

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

@@ -1,4 +1,5 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
+import type { Config } from '../../config/schema.js';
 import type { ExternalToolTurnContext } from './types.js';
 import { type ExternalToolProvider } from './types.js';
 export declare const EXTERNAL_TOOL_NAMES: {
@@ -8,4 +9,4 @@ export declare const EXTERNAL_TOOL_NAMES: {
     readonly requireConnection: "xopc_require_connection";
     readonly updateConnectionObjective: "xopc_update_connection_objective";
 };
-export declare function createExternalToolGatewayTools(providers: ExternalToolProvider[], getContext?: () => ExternalToolTurnContext | null): AgentTool[];
+export declare function createExternalToolGatewayTools(providers: ExternalToolProvider[], getContext?: () => ExternalToolTurnContext | null, getConfig?: () => Config | undefined): AgentTool[];

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

@@ -1,6 +1,7 @@
 import { init_connector_repository, listConnectorConnections } from "../../storage/sqlite/connector-repository.js";
 import { connectionBindings, getActiveConnectionWait, init_connection_wait_repository, publishConnectionWait, requireSessionConnection, reviseCurrentConnectionObjective } from "../../storage/sqlite/connection-wait-repository.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
+import { getStoreConnectorInstallPlan, parseStoreConnectorCandidateRef, searchStoreConnectorInstallCandidates } from "../../capabilities/store-connector.js";
 import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
 import { parsePluginMcpCandidateRef, resolvePluginMcpConnectionCandidate } from "../../extensions/agent-plugins/connection.js";
 import { ExternalToolService } from "./service.js";
@@ -48,21 +49,31 @@ function textResult(value, details = {}) {
 		details
 	};
 }
-function createExternalToolGatewayTools(providers, getContext) {
+function createExternalToolGatewayTools(providers, getContext, getConfig) {
 	const service = new ExternalToolService(providers);
 	const searchTool = {
 		name: EXTERNAL_TOOL_NAMES.search,
 		label: "🔎 External Tool Search",
-		description: `Search external tools from these sources: ${EXTERNAL_TOOL_SOURCES.join(", ")}. CLI connectors include Feishu/Lark, WeCom and WPS 365. Omit sources unless intentionally restricting the search; do not guess a source list. Use concise English capability keywords, e.g. "wecom doc.search". Returns compact references only; call xopc_tool_describe before execution. If a source-filtered search finds no relevant tools, retry without sources before concluding a capability is unavailable or requesting a connection.`,
+		description: `Search external tools from these sources: ${EXTERNAL_TOOL_SOURCES.join(", ")}. CLI connectors include Feishu/Lark, WeCom and WPS 365. Omit sources unless intentionally restricting the search; do not guess a source list. Use concise English capability keywords, e.g. "wecom doc.search". Returns executable tools, connection candidates, or reviewed Store install candidates. Call xopc_tool_describe before executing a tool. If a source-filtered search finds no relevant tools, retry without sources before concluding a capability is unavailable.`,
 		parameters: ToolSearchSchema,
 		async execute(_toolCallId, params) {
 			const selectedSources = new Set(params.sources ?? []);
 			const excludedSources = selectedSources.size ? EXTERNAL_TOOL_SOURCES.filter((source) => !selectedSources.has(source)) : [];
 			const result = await service.search(params);
 			const candidates = [...result.connectionCandidates, ...connectionCandidates(params.query)].filter((candidate, index, all) => all.findIndex((item) => item.candidateRef === candidate.candidateRef) === index);
+			let installCandidates = [];
+			let installCatalogError;
+			const config = getConfig?.();
+			if (!params.sources?.length && result.tools.length === 0 && candidates.length === 0 && config) try {
+				installCandidates = await searchStoreConnectorInstallCandidates(config, params.query, params.limit ?? 5);
+			} catch (error) {
+				installCatalogError = error instanceof Error ? error.message : String(error);
+			}
 			return textResult({
 				...result,
 				connectionCandidates: candidates,
+				installCandidates,
+				...installCatalogError ? { installCatalogError } : {},
 				...excludedSources.length ? { searchScope: {
 					excludedSources,
 					instruction: "This search excluded these sources. Results from other apps do not establish that the requested app is unavailable. Retry without sources before declaring a capability unavailable or requesting authorization. Feishu/Lark, WeCom and WPS 365 connectors use cli."
@@ -140,7 +151,7 @@ function createExternalToolGatewayTools(providers, getContext) {
 		name: EXTERNAL_TOOL_NAMES.requireConnection,
 		label: "Connect app",
 		parameters: requireSchema,
-		description: "Request the connections returned as connectionCandidates by xopc_tool_search. Explain the need once before calling. This pauses the current objective and displays one action area above the input. Never return OAuth URLs or repeat a skipped request. If another objective is waiting, ask the user to continue or cancel it first.",
+		description: "Request a connectionCandidates or installCandidates entry returned by xopc_tool_search. Explain the need once before calling. This pauses the current objective and displays one action area above the input. Never invent a candidate reference, return OAuth URLs, or repeat a skipped request. If another objective is waiting, ask the user to continue or cancel it first.",
 		async execute(_id, params) {
 			const context = getContext?.();
 			if (!context) throw new Error("No active conversation.");
@@ -152,10 +163,15 @@ function createExternalToolGatewayTools(providers, getContext) {
 			const selected = connectionBindings(context.conversationId);
 			if (params.requirements.every((item) => {
 				const pluginTarget = parsePluginMcpCandidateRef(item.candidateRef);
-				return selected.some((need) => need.target.type === "connector" ? need.target.connectorId === item.candidateRef && Boolean(need.connectionId) && (!item.accountId || item.accountId === need.accountId) && (!item.accountSelector || item.accountSelector === need.accountSelector) && listConnectorConnections({
-					principalId: principal.principalId,
-					connectorId: need.target.connectorId
-				}).some((connection) => connection.id === need.connectionId && connection.status === "active") : Boolean(pluginTarget && need.target.pluginId === pluginTarget.pluginId && need.target.serverName === pluginTarget.serverName && need.connectionId === need.target.serverId));
+				return selected.some((need) => {
+					if (need.target.type === "connector") return need.target.connectorId === item.candidateRef && Boolean(need.connectionId) && (!item.accountId || item.accountId === need.accountId) && (!item.accountSelector || item.accountSelector === need.accountSelector) && listConnectorConnections({
+						principalId: principal.principalId,
+						connectorId: need.target.connectorId
+					}).some((connection) => connection.id === need.connectionId && connection.status === "active");
+					if (need.target.type === "plugin-mcp") return Boolean(pluginTarget && need.target.pluginId === pluginTarget.pluginId && need.target.serverName === pluginTarget.serverName && need.connectionId === need.target.serverId);
+					const storeTarget = parseStoreConnectorCandidateRef(item.candidateRef);
+					return Boolean(storeTarget && need.target.packageName === storeTarget.packageName && need.target.version === storeTarget.version && need.connectionId);
+				});
 			})) return textResult({
 				status: "already_connected",
 				selectedConnections: selected,
@@ -167,9 +183,26 @@ function createExternalToolGatewayTools(providers, getContext) {
 				agentId: principal.agentId ?? "main",
 				summary: params.purpose,
 				checkpoint: params.checkpoint,
-				needs: params.requirements.map((item) => {
-					const need = resolvePluginMcpConnectionCandidate(item.candidateRef) ?? resolveConnectionCandidate(item.candidateRef);
-					if (item.accountId && need.target.type !== "connector") throw new Error("Plugin MCP connections do not support account selection.");
+				needs: await Promise.all(params.requirements.map(async (item) => {
+					const storeRef = parseStoreConnectorCandidateRef(item.candidateRef);
+					const config = getConfig?.();
+					const plan = storeRef && config ? await getStoreConnectorInstallPlan(config, storeRef.packageName, storeRef.version) : void 0;
+					if (plan && !plan.definition.provenance) throw new Error("Store Connector provenance is unavailable.");
+					const need = plan ? {
+						key: item.candidateRef,
+						target: {
+							type: "store-connector",
+							packageName: plan.packageName,
+							connectorId: plan.definition.id,
+							version: plan.version,
+							sha256: plan.definition.provenance.sha256,
+							reviewHash: plan.reviewHash,
+							description: plan.definition.description
+						},
+						label: plan.definition.displayName,
+						capabilities: plan.definition.capabilities
+					} : resolvePluginMcpConnectionCandidate(item.candidateRef) ?? resolveConnectionCandidate(item.candidateRef);
+					if (item.accountId && need.target.type !== "connector") throw new Error("This install candidate does not support account selection.");
 					if (item.accountId && need.target.type === "connector" && !listConnectorConnections({
 						principalId: principal.principalId,
 						connectorId: need.target.connectorId
@@ -180,7 +213,7 @@ function createExternalToolGatewayTools(providers, getContext) {
 						accountSelector: item.accountSelector,
 						key: need.target.type === "connector" ? `${need.target.connectorId}:${item.accountId ?? item.accountSelector ?? "default"}` : need.key
 					};
-				})
+				}))
 			});
 			publishConnectionWait(context.conversationId);
 			return textResult(result);

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

@@ -53,7 +53,7 @@ function createDefaultExternalToolGatewayTools(deps) {
 		if (!deps.getConfig()) return void 0;
 		const conversationId = deps.getCurrentContext()?.conversationId;
 		return (conversationId ? resolveEffectiveAgentConfigForSession(conversationId) : deps.agentId ? resolveEffectiveAgentConfigForAgent(deps.agentId) : resolveEffectiveAgentConfigForSession(void 0)).config.tools[toolRef];
-	})), deps.getCurrentContext);
+	})), deps.getCurrentContext, deps.getConfig);
 }
 //#endregion
 export { EXTERNAL_TOOL_NAMES, ExternalToolService, createDefaultExternalToolGatewayTools };

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

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

package/dist/src/agent/image/understanding/pi-ai-provider.js

@@ -50,7 +50,7 @@ function buildPiAiImageUnderstandingProvider(providerId) {
 							setTimeout(() => controller.abort(), timeoutMs);
 							return controller.signal;
 						})()
-					}),
+					}, void 0, { operation: "media.understand_image" }),
 					provider: providerId,
 					model: modelId
 				}),

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

@@ -518,6 +518,10 @@ Return a JSON delta containing only missing facts, using {"upserts":[]}. Include
 						onPayload: compactionPayloadGuard(requestedMaxTokens, (actual) => {
 							actualMaxTokens = actual;
 						})
+					}, void 0, {
+						operation: "session.compact",
+						conversationId: callContext.conversationId,
+						trigger: attempt === 0 && modelIndex === 0 ? "system" : "retry"
 					});
 					parentSignal?.throwIfAborted();
 					if (linked.timedOut()) throw new CompactionRequestError("timeout", "Compaction handover timed out");

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

@@ -1,8 +1,5 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { parseMaintenanceInstruction } from "../../memory-maintenance/schedule.js";
-import { runMemoryMaintenance } from "../../memory-maintenance/service.js";
-import "../../memory-maintenance/index.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";
@@ -49,24 +46,6 @@ var AgentOrchestrator = class {
 		const { conversationId } = context;
 		log.debug({ conversationId }, "Processing message through agent orchestrator");
 		await this.sessionHydrator.workspace(conversationId);
-		if (typeof msg.content === "string" && (context.channel === "cron" || context.channel === "automation")) {
-			const maintenanceJob = parseMaintenanceInstruction(msg.content);
-			if (maintenanceJob) {
-				const cfg = this.getConfig?.();
-				if (!cfg) {
-					log.warn({ conversationId }, "Memory maintenance skipped: config unavailable");
-					return;
-				}
-				const maintenance = cfg.userContext.userModel.maintenance;
-				runMemoryMaintenance({
-					jobType: maintenanceJob,
-					limit: maintenance.limit,
-					staleRetentionDays: maintenance.staleRetentionDays,
-					evidenceThreshold: maintenance.evidenceThreshold
-				});
-				return;
-			}
-		}
 		try {
 			await this.sessionHydrator.model(conversationId);
 			const channelSystemPrompt = typeof context.metadata?.channelSystemPrompt === "string" ? context.metadata.channelSystemPrompt.trim() : "";

package/dist/src/agent/service/btw-query.js

@@ -108,7 +108,10 @@ async function runBtwQuery(opts) {
 		};
 		let streamedText = "";
 		const response = opts.onTextDelta ? await (async () => {
-			const stream = await createResolvedModelStream(model, { messages: [userMessage] }, modelCallOptions, opts.credentialOptions);
+			const stream = await createResolvedModelStream(model, { messages: [userMessage] }, modelCallOptions, opts.credentialOptions, {
+				operation: "agent.answer",
+				conversationId: opts.conversationId
+			});
 			for await (const event of stream) {
 				const streamEvent = event;
 				if (streamEvent.type === "text_delta" && typeof streamEvent.delta === "string") {
@@ -123,7 +126,10 @@ async function runBtwQuery(opts) {
 				}
 			}
 			return await stream.result();
-		})() : await completeWithResolvedCredentials(model, { messages: [userMessage] }, modelCallOptions, opts.credentialOptions);
+		})() : await completeWithResolvedCredentials(model, { messages: [userMessage] }, modelCallOptions, opts.credentialOptions, {
+			operation: "agent.answer",
+			conversationId: opts.conversationId
+		});
 		const text = (streamedText || textFromCompleteContent(response.content)).trim();
 		if (text) return { text };
 		const stopReason = typeof response.stopReason === "string" ? response.stopReason : void 0;

package/dist/src/agent/service.js

@@ -1,19 +1,19 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_attachment_ref, parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
-import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
-import { extractTextContent } from "./context/workspace.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { extractProfileAgentId } from "../config/agent-profile.js";
 import { init_providers, resolveModel } from "../providers/index.js";
+import { extractTextContent } from "./context/workspace.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
 import { runWithEmbeddedExecutionSession } from "./embedded/execution-context.js";
-import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
 import { removeSkillsLockEntry } from "./skills/hub-lock.js";
 import { installSkillFromZip } from "./skills/managed-store.js";
+import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
 import { pullSkillFromSource } from "./skills/hub-pull.js";
 import { getUserTimezone } from "../user-model/repository.js";
 import "../user-model/index.js";

package/dist/src/agent/skills/filesystem-watcher.js

@@ -2,10 +2,10 @@ import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveSkillsDir } from "../../config/paths.js";
+import { isManagedSkillTransientDirName } from "./managed-store.js";
 import { createSkillConfigManager } from "./config.js";
 import { resolveWorkspaceSkillsDir } from "./workspace-skills-dir.js";
 import { resolveAgentsSkillsDir, resolveWorkspaceAgentsSkillsDir } from "./skill-sources.js";
-import { isManagedSkillTransientDirName } from "./managed-store.js";
 import path from "node:path";
 import chokidar from "chokidar";
 //#region src/agent/skills/filesystem-watcher.ts