@xopcai/xopc 0.0.332 → 0.0.334

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

@@ -3,13 +3,13 @@ import { TaskPhaseSchema, TaskWaitSchema, init_task_lifecycle } from "./task-lif
 import { TaskRunEventSchema, TaskRunSchema, init_task_runs } from "./task-runs.js";
 import { TaskDetailResponseSchema, TaskListResponseSchema, TaskPrioritySchema, TaskRunReceiptSchema, init_tasks } from "./tasks.js";
 import { LocalAppDetailSchema, LocalAppRecordSchema, LocalAppValidationSchema, init_local_apps } from "./local-apps.js";
+import { AppContextEnvelopeSchema, ResolvedAppContextSchema, init_app_context } from "./app-context.js";
 import { TaskValueMetricsSchema, init_home } from "./home.js";
 import { AutomationMetricsSchema, AutomationRunEventSchema, AutomationRunSchema, AutomationSchema, init_automations } from "./automations.js";
-import { AppContextEnvelopeSchema, ResolvedAppContextSchema, init_app_context } from "./app-context.js";
 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),
@@ -564,7 +574,19 @@ var init_capabilities = __esmMin((() => {
 		"xopc.notes.preview_edit": {
 			input: CapabilityResourceInputSchema.extend({
 				instruction: z.string().trim().min(1).max(16e3),
-				markdown: z.string().max(2e6).optional()
+				markdown: z.string().max(2e6).optional(),
+				context: z.looseObject({
+					type: z.enum([
+						"selection",
+						"section",
+						"block",
+						"note"
+					]),
+					range: z.strictObject({
+						start: z.number().int().nonnegative(),
+						end: z.number().int().nonnegative()
+					})
+				}).optional()
 			}),
 			output: z.object({
 				message: z.string(),
@@ -601,6 +623,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 +833,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 +1079,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

@@ -13,6 +13,9 @@ import { init_conversation_identity } from "./conversation-identity.js";
 import { init_sessions } from "./sessions.js";
 import { init_session_identity } from "./session-identity.js";
 import { init_session_input_reliability } from "./session-input-reliability.js";
+import { init_app_context } from "./app-context.js";
+import { init_browser_page_context } from "./browser-page-context.js";
+import { init_session_input_command } from "./session-input-command.js";
 import { init_welcome_suggestions } from "./welcome-suggestions.js";
 import { init_home } from "./home.js";
 import { init_tool_activity } from "./tool-activity.js";
@@ -25,16 +28,16 @@ import { init_files } from "./files.js";
 import { init_mobile_privacy } from "./mobile-privacy.js";
 import { init_device_pairing } from "./device-pairing.js";
 import { init_gateway_scopes } from "./gateway-scopes.js";
-import { init_browser_page_context } from "./browser-page-context.js";
 import { init_browser_tab_binding } from "./browser-tab-binding.js";
 import { init_model_selection } from "./model-selection.js";
 import { init_connection_waits } from "./connection-waits.js";
 import { init_clarifications } from "./clarifications.js";
 import { init_discussions } from "./discussions.js";
-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";
+import { init_session_command_rejection } from "./session-command-rejection.js";
 //#region packages/gateway-contract/src/index.ts
 var init_src = __esmMin((() => {
 	init_agent_stream();
@@ -49,6 +52,7 @@ var init_src = __esmMin((() => {
 	init_session_identity();
 	init_conversation_identity();
 	init_session_input_reliability();
+	init_session_input_command();
 	init_welcome_suggestions();
 	init_home();
 	init_tool_activity();
@@ -73,6 +77,8 @@ var init_src = __esmMin((() => {
 	init_extension_capabilities();
 	init_local_apps();
 	init_chat_previews();
+	init_usage();
+	init_session_command_rejection();
 }));
 //#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/session-command-rejection.js

@@ -0,0 +1,19 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
+//#region packages/gateway-contract/src/session-command-rejection.ts
+/** Only explicit pre-acceptance failures allow a client to replace its frozen command. */
+function isSessionCommandRejected(status, body) {
+	if (status !== 400 && status !== 409 && status !== 410) return false;
+	const code = body?.error?.code;
+	return typeof code === "string" && [
+		"BAD_REQUEST",
+		"CONFIG_CHANGED",
+		"SESSION_CHANGED",
+		"SESSION_DELETED",
+		"SESSION_BUSY",
+		"QUEUE_FULL"
+	].includes(code);
+}
+var init_session_command_rejection = __esmMin((() => {}));
+//#endregion
+init_session_command_rejection();
+export { init_session_command_rejection, isSessionCommandRejected };

package/dist/packages/gateway-contract/src/session-input-command.js

@@ -0,0 +1,109 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
+import { AppContextEnvelopeSchema, init_app_context } from "./app-context.js";
+import { browserPageContextsInputSchema, init_browser_page_context } from "./browser-page-context.js";
+import { z } from "zod";
+//#region packages/gateway-contract/src/session-input-command.ts
+/** Stable JSON representation; object insertion order and transport credentials are not identities. */
+function canonicalSessionCommand(value) {
+	if (value === null || typeof value !== "object") return JSON.stringify(value) ?? "null";
+	if (Array.isArray(value)) return `[${value.map(canonicalSessionCommand).join(",")}]`;
+	const object = value;
+	return `{${Object.keys(object).filter((key) => object[key] !== void 0).sort().map((key) => `${JSON.stringify(key)}:${canonicalSessionCommand(object[key])}`).join(",")}}`;
+}
+function sessionCommandIdentity(command) {
+	if ("origin" in command) {
+		const { origin: _origin, ...identity } = command;
+		return canonicalSessionCommand(identity);
+	}
+	return canonicalSessionCommand(command);
+}
+var sessionCreationSchema, attachmentSchema, sessionInputContentSchema, originSchema, sessionInputCommandSchema, sessionMaterializeCommandSchema;
+var init_session_input_command = __esmMin((() => {
+	init_app_context();
+	init_browser_page_context();
+	sessionCreationSchema = z.strictObject({
+		agentId: z.string().trim().min(1),
+		projectId: z.string().trim().min(1).nullable(),
+		execution: z.strictObject({
+			mode: z.enum(["local_checkout", "managed_worktree"]),
+			baseRef: z.string().trim().min(1).optional()
+		}).nullable(),
+		temporary: z.boolean(),
+		model: z.string().trim().min(1),
+		thinkingLevel: z.string().min(1)
+	}).refine((value) => value.projectId !== null || value.execution === null, {
+		message: "An execution environment requires a project",
+		path: ["execution"]
+	});
+	attachmentSchema = z.strictObject({
+		id: z.string().optional(),
+		type: z.string().min(1),
+		mimeType: z.string().optional(),
+		data: z.string().optional(),
+		uri: z.string().optional(),
+		name: z.string().optional(),
+		size: z.number().nonnegative().optional(),
+		workspaceRelativePath: z.string().optional(),
+		durationSeconds: z.number().nonnegative().optional()
+	});
+	sessionInputContentSchema = z.strictObject({
+		content: z.string(),
+		attachments: z.array(attachmentSchema).optional(),
+		contextRefs: z.array(z.strictObject({
+			kind: z.enum([
+				"note",
+				"task",
+				"file",
+				"session",
+				"browser_tab",
+				"mcp_resource"
+			]),
+			sourceId: z.string().trim().min(1),
+			refId: z.string().regex(/^[A-Za-z0-9_-]{1,64}$/).optional(),
+			expectedVersion: z.string().optional()
+		})).max(5).optional(),
+		browserContexts: browserPageContextsInputSchema.optional(),
+		appContext: AppContextEnvelopeSchema.optional()
+	});
+	originSchema = z.discriminatedUnion("type", [z.strictObject({
+		type: z.literal("endpoint"),
+		endpointId: z.string().min(1),
+		token: z.string().min(1)
+	}), z.strictObject({
+		type: z.literal("system"),
+		source: z.literal("cli")
+	})]);
+	sessionInputCommandSchema = z.discriminatedUnion("kind", [z.strictObject({
+		kind: z.literal("start"),
+		clientMessageId: z.string().min(1).max(128),
+		creation: sessionCreationSchema,
+		input: sessionInputContentSchema,
+		origin: originSchema
+	}), z.strictObject({
+		kind: z.literal("append"),
+		clientMessageId: z.string().min(1).max(128),
+		expectedTranscriptId: z.string().min(1).max(128),
+		configVersion: z.number().int().nonnegative(),
+		delivery: z.enum(["next", "steer"]),
+		input: sessionInputContentSchema,
+		origin: originSchema
+	})]);
+	sessionMaterializeCommandSchema = z.strictObject({
+		commandId: z.string().min(1).max(128),
+		creation: sessionCreationSchema,
+		purpose: z.enum(["voice", "session_resources"])
+	});
+	z.object({
+		operationId: z.string(),
+		revision: z.number().int(),
+		state: z.enum([
+			"preparing",
+			"ready",
+			"preparation_failed"
+		]),
+		lastError: z.string().nullable()
+	});
+}));
+//#endregion
+init_session_input_command();
+export { canonicalSessionCommand, init_session_input_command, sessionCommandIdentity, sessionCreationSchema, sessionInputCommandSchema, sessionInputContentSchema, sessionMaterializeCommandSchema };

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

@@ -70,15 +70,10 @@ 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({
-		key: z.string(),
-		transcriptId: transcriptIdSchema.optional(),
-		projectId: z.string().optional(),
-		routing: sessionRoutingMetaSchema.optional()
-	}).passthrough() }).passthrough();
 	z.object({
 		ok: z.literal(true),
 		conversationId: z.uuid(),

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 { 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 { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
+import { extractTextContent } from "./context/workspace.js";
+import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
+import { CredentialResolver, init_credentials } from "../auth/credentials.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 { extractTextContent } from "./context/workspace.js";
+import { continuesAfterTool, trackAiUsageStream } from "../usage/recorder.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.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 { extractProfileAgentId } from "../../config/agent-profile.js";
+import { extractTextContent } from "../context/workspace.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 { extractTextContent } from "../context/workspace.js";
+import { trackAiUsageStream } from "../../usage/recorder.js";
+import { extractProfileAgentId } from "../../config/agent-profile.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/model-runtime.js

@@ -1,6 +1,6 @@
 import { init_paths, resolveModelsJsonPath } 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 { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../../auth/model-credential-store.js";
 import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "../../providers/register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "../../providers/register-runtime-providers.js";

package/dist/src/agent/embedded/run-for-session.js

@@ -2,9 +2,9 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { appendDynamicPromptSection } from "../prompt/cache-boundary.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";

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 { 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 { 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 { 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[];