@xopcai/xopc 0.0.332 → 0.0.334

package/dist/src/home-intelligence/generator.js

@@ -1,7 +1,7 @@
 import { init_agent_scope, resolveDefaultAgentId } from "../agent/agent-scope.js";
+import { extractAssistantText, getAssistantMessageErrorReason } from "../providers/model-response.js";
 import { init_providers, resolveModel } from "../providers/index.js";
 import { completeWithResolvedCredentials, isLocalModelBaseUrl } from "../providers/model-call.js";
-import { extractAssistantText, getAssistantMessageErrorReason } from "../providers/model-response.js";
 import { resolveModelSelector } from "../config/agent-model-intents.js";
 import { z } from "zod";
 //#region src/home-intelligence/generator.ts
@@ -182,7 +182,7 @@ var HomeAdviceGenerator = class {
 			maxTokens: 3e3,
 			temperature: .1,
 			signal: requestSignal
-		});
+		}, void 0, { operation: "home.generate_advice" });
 		const raw = extractHomeResponseText(response);
 		let result;
 		try {
@@ -205,6 +205,9 @@ var HomeAdviceGenerator = class {
 				maxTokens: 3e3,
 				temperature: 0,
 				signal: requestSignal
+			}, void 0, {
+				operation: "home.generate_advice",
+				trigger: "retry"
 			});
 			try {
 				result = HomeModelResultSchema.parse(parseJson(extractHomeResponseText(corrected)));

package/dist/src/infra/domain-outbox-dispatcher.d.ts

@@ -1,6 +1,3 @@
-import type { AutomationEvent } from '../automations/domain/types.js';
 export declare class DomainOutboxDispatcher {
-    private readonly publish;
-    constructor(publish: (event: AutomationEvent) => void);
     drain(limit?: number, subjectKind?: string): number;
 }

package/dist/src/infra/domain-outbox-dispatcher.js

@@ -1,26 +1,34 @@
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { automationEventPublisher } from "../automations/events/event-repository.js";
 //#region src/infra/domain-outbox-dispatcher.ts
 init_transaction();
 var DomainOutboxDispatcher = class {
-	constructor(publish) {
-		this.publish = publish;
-	}
 	drain(limit = 100, subjectKind) {
-		const rows = getSqliteDatabase().prepare(`SELECT event_id, event_type, payload_json, created_at, subject_kind, operation_id
+		const rows = getSqliteDatabase().prepare(`SELECT event_id, event_type, payload_json, created_at, subject_kind, subject_id, operation_id
        FROM domain_outbox WHERE published_at IS NULL AND (? IS NULL OR subject_kind = ?)
-       ORDER BY created_at, event_id LIMIT ?`).all(subjectKind ?? null, subjectKind ?? null, Math.max(1, Math.min(500, Math.floor(limit))));
+       ORDER BY created_at, rowid LIMIT ?`).all(subjectKind ?? null, subjectKind ?? null, Math.max(1, Math.min(500, Math.floor(limit))));
 		let published = 0;
 		for (const row of rows) try {
 			const payload = JSON.parse(row.payload_json);
-			this.publish({
+			automationEventPublisher.publish({
+				id: row.event_id,
 				type: row.event_type,
 				source: row.subject_kind === "note" ? "notes" : row.subject_kind === "project" ? "projects" : row.subject_kind === "scene" ? "scenes" : row.subject_kind === "local_app" ? "local_apps" : "tasks",
+				schemaVersion: 1,
+				subject: {
+					kind: row.subject_kind,
+					id: row.subject_id
+				},
 				payload: {
 					...payload,
 					sourceEventId: row.event_id,
 					...row.operation_id ? { operationId: row.operation_id } : {}
 				},
-				occurredAtMs: row.created_at
+				occurredAtMs: row.created_at,
+				correlationId: typeof payload.correlationId === "string" ? payload.correlationId : row.event_id,
+				causationId: typeof payload.causationId === "string" ? payload.causationId : void 0,
+				dedupeKey: row.event_id,
+				trust: "system"
 			});
 			runSqliteWriteTransaction((db) => {
 				db.prepare(`UPDATE domain_outbox SET published_at = ?, attempts = attempts + 1

package/dist/src/local-apps/service.js

@@ -5,10 +5,10 @@ import { currentOperationId, init_operation_context } from "../infra/operation-c
 import { afterSqliteCommit, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { ExtensionCapabilityBindingsSchema, extensionCapabilityPermissions } from "../../packages/gateway-contract/src/extension-capabilities.js";
 import { init_src } from "../../packages/gateway-contract/src/index.js";
+import { CapabilityError } from "../capabilities/runtime/errors.js";
 import { init_paths, resolveExtensionsDir } from "../config/paths.js";
 import { LocalAppStore } from "./store.js";
 import { slugifyProjectName } from "../projects/project-store.js";
-import { CapabilityError } from "../capabilities/runtime/errors.js";
 import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { validateLocalAppCapabilityContracts } from "./capabilities/contracts.js";
 import { buildLocalAppFixGuidance } from "./fix-guidance.js";
@@ -511,7 +511,7 @@ var LocalAppService = class {
 		});
 	}
 	flushAcceptanceEvents() {
-		new DomainOutboxDispatcher((event) => this.options.emit(event.type, event.payload)).drain(100, "local_app");
+		new DomainOutboxDispatcher().drain(100, "local_app");
 	}
 	releaseRoot(appId) {
 		return join(resolveStateDir(), "local-apps", "releases", appId);

package/dist/src/mcp/channel-bridge.js

@@ -144,10 +144,20 @@ var XopcChannelBridge = class {
 		return null;
 	}
 	async sendMessage(params) {
-		return this.client.postJson(`/api/sessions/${encodeURIComponent(params.conversationId)}/inputs`, {
+		const client = this.client;
+		const path = `/api/sessions/${encodeURIComponent(params.conversationId)}`;
+		const [detail, config] = await Promise.all([client.getJson(path), client.getJson(`${path}/agent-config`)]);
+		return client.postJson(`/api/sessions/${encodeURIComponent(params.conversationId)}/inputs`, {
+			kind: "append",
 			clientMessageId: crypto.randomUUID(),
+			expectedTranscriptId: detail.session.transcriptId,
+			configVersion: config.configVersion,
 			delivery: "next",
-			content: params.text
+			input: { content: params.text },
+			origin: {
+				type: "system",
+				source: "cli"
+			}
 		});
 	}
 	listPendingApprovals() {

package/dist/src/notes/capabilities/read.js

@@ -20,8 +20,8 @@ function registerNoteReadCapabilities(dispatcher, getNotes) {
 		id: "xopc.notes.preview_edit",
 		description: "Build a local edit suggestion without modifying the note or calling a model.",
 		...ProductReadContracts["xopc.notes.preview_edit"],
-		async execute({ id, instruction, markdown }) {
-			const result = await getNotes().createAiEditPatch(id, instruction, markdown);
+		async execute({ id, instruction, markdown, context }) {
+			const result = await getNotes().createAiEditPatch(id, instruction, markdown, context?.range);
 			if (!result) throw new CapabilityError("NOT_FOUND", "Note not found");
 			return ProductReadContracts["xopc.notes.preview_edit"].output.parse(result);
 		}

package/dist/src/notes/service.d.ts

@@ -23,7 +23,10 @@ export declare class NotesService {
         note: Note | null;
         conflict: boolean;
     }>;
-    createAiEditPatch(id: string, instruction: string, markdownOverride?: string): Promise<{
+    createAiEditPatch(id: string, instruction: string, markdownOverride?: string, requestedRange?: {
+        start: number;
+        end: number;
+    }): Promise<{
         message: string;
         patch: NoteAiPatch;
     } | null>;

package/dist/src/notes/service.js

@@ -7,9 +7,8 @@ import { init_note_markdown, parseNoteMarkdown } from "./note-markdown.js";
 import { init_notes_repository, listNoteProjectSummaries } from "../storage/sqlite/notes-repository.js";
 import { changedFieldsFromPatch, emitActivity, previewText, systemActivityActor, systemActivitySource } from "../activity/emitter.js";
 import { getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
-import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
-import { publishAutomationProductEvent } from "../automations/product-events.js";
 import { completeWithResolvedCredentials } from "../providers/model-call.js";
+import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { partitionAttachmentsByReference } from "./note-attachment-sync.js";
 import { buildNoteAgentContextArtifact, getCachedNoteAgentContextArtifact } from "./agent-context.js";
 import { revokeNoteShareRecords } from "../share/note-share-revocation.js";
@@ -153,7 +152,7 @@ async function buildAiCatalysisReport(note, config) {
 		role: "user",
 		content: buildCatalysisPrompt(note),
 		timestamp: Date.now()
-	}] }, { temperature: .2 });
+	}] }, { temperature: .2 }, void 0, { operation: "note.generate" });
 	let responseText = "";
 	if (Array.isArray(response.content)) {
 		for (const part of response.content) if (part && typeof part === "object" && part.type === "text") responseText += String(part.text || "");
@@ -173,7 +172,7 @@ var NotesService = class {
 	flushCommittedEffects() {
 		this.store.drainAttachmentCleanup();
 		this.store.drainDeletionCleanup();
-		new DomainOutboxDispatcher(publishAutomationProductEvent).drain(100, "note");
+		new DomainOutboxDispatcher().drain(100, "note");
 	}
 	async quickCapture(markdown, source, idempotencyKey) {
 		const note = this.quickCaptureAtomically(markdown, source, idempotencyKey);
@@ -334,19 +333,22 @@ var NotesService = class {
 			throw error;
 		}
 	}
-	async createAiEditPatch(id, instruction, markdownOverride) {
+	async createAiEditPatch(id, instruction, markdownOverride, requestedRange) {
 		const note = await this.store.getNote(id);
 		if (!note) return null;
 		const source = markdownOverride ?? note.markdown;
-		const parsed = parseNoteMarkdown(source, id);
+		const start = Math.max(0, Math.min(source.length, requestedRange?.start ?? 0));
+		const end = Math.max(start, Math.min(source.length, requestedRange?.end ?? source.length));
+		const target = source.slice(start, end);
+		const parsed = parseNoteMarkdown(target, id);
 		const wantsTodos = /待办|todo|task|行动|提醒/i.test(instruction);
 		const wantsSummary = /摘要|总结|summary|压缩/i.test(instruction);
 		let generated = "";
 		if (wantsTodos) {
-			const lines = source.split(/\n|。|；|;/).map((line) => line.trim()).filter(Boolean);
+			const lines = target.split(/\n|。|；|;/).map((line) => line.trim()).filter(Boolean);
 			generated = (lines.length ? lines : [parsed.plainText]).slice(0, 12).map((line) => `- [ ] ${line.replace(/^[-*\d.\s\[\]x]+/i, "").trim()}`).join("\n");
 		} else if (wantsSummary) generated = `> [!SUMMARY]\n> ${parsed.plainText.slice(0, 220)}`;
-		else generated = `${source.trimEnd()}\n\n## AI 整理\n\n${instruction.trim()}`;
+		else generated = `${target.trimEnd()}\n\n## AI 整理\n\n${instruction.trim()}`;
 		return {
 			message: "AI edit patch generated",
 			patch: {
@@ -354,9 +356,9 @@ var NotesService = class {
 				summary: instruction,
 				operations: [{
 					type: "replaceRange",
-					from: 0,
-					to: source.length,
-					markdown: generated || source
+					from: start,
+					to: end,
+					markdown: generated || target
 				}]
 			}
 		};

package/dist/src/projects/project-service.js

@@ -8,7 +8,6 @@ import { enqueueProjectChanged } from "./project-change-events.js";
 import { ProjectWorkspaceConflictError, ProjectWorkspaceMissingError, canonicalWorkspacePath, inferProjectNameFromWorkspaceRoot, isPathSameOrInsideWorkspace, isSafeAutoCreateWorkspaceRoot, resolveWorkspaceProjectRoot, workspaceDirectoryExists } from "./workspace-project.js";
 import { drainProjectWorkspaceCreation, queueProjectWorkspaceCreation } from "./project-workspace-creation.js";
 import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
-import { publishAutomationProductEvent } from "../automations/product-events.js";
 import { listPendingProjectUnderstandingRuns } from "../work-discovery/repository.js";
 import { inferProjectExecutionMode } from "./project-kind.js";
 import { bindSessionToProject, listProjectConversationIds, unbindSessionFromProject } from "./session-bind.js";
@@ -280,7 +279,7 @@ var ProjectService = class {
 	}
 	flushCommittedEffects(projectId) {
 		drainProjectWorkspaceCreation(projectId);
-		new DomainOutboxDispatcher(publishAutomationProductEvent).drain(100, "project");
+		new DomainOutboxDispatcher().drain(100, "project");
 	}
 	listUpdates(projectId, limit) {
 		return this.store.listUpdates(projectId, limit);

package/dist/src/projects/project-skill-service.js

@@ -1,8 +1,8 @@
 import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
-import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "../agent/skills/workspace-skills-dir.js";
-import { loadSkills, loadWorkspaceSkillInventory } from "../agent/skills/index.js";
 import { removeSkillsLockEntry } from "../agent/skills/hub-lock.js";
 import { deleteManagedSkill, installSkillFromZip, isValidSkillId } from "../agent/skills/managed-store.js";
+import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "../agent/skills/workspace-skills-dir.js";
+import { loadSkills, loadWorkspaceSkillInventory } from "../agent/skills/index.js";
 import { pullSkillFromSource } from "../agent/skills/hub-pull.js";
 import { downloadFromMarketplace } from "../agent/skills/skills-marketplace.js";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";

package/dist/src/providers/auth-runtime/resolve-auth.js

@@ -1,5 +1,5 @@
-import { init_sync_provider_auth, resolveProviderApiKeyForAgentSync } from "../../auth/sync-provider-auth.js";
 import { getApiKeyFromEnv, init_env_keys } from "../env-keys.js";
+import { init_sync_provider_auth, resolveProviderApiKeyForAgentSync } from "../../auth/sync-provider-auth.js";
 import { getDefaultAuthProfileStore } from "./auth-profile-store.js";
 //#region src/providers/auth-runtime/resolve-auth.ts
 init_env_keys();

package/dist/src/providers/index.js

@@ -1,11 +1,11 @@
 import { __esmMin, __exportAll } from "../../_virtual/_rolldown/runtime.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { getModelOAuthProviderIds, init_registry } from "../auth/oauth/registry.js";
-import { hasProviderAuthOnDiskSync, init_sync_provider_auth } from "../auth/sync-provider-auth.js";
 import { PROVIDER_ENV_MAP, getApiKeyFromEnv, init_env_keys } from "./env-keys.js";
 import { init_model_ref, splitProviderModelRef } from "./model-ref.js";
 import { ModelRegistry, getModelRegistry, init_model_registry, prewarmModelRegistry, resetModelRegistry } from "./model-registry.js";
+import { getModelOAuthProviderIds, init_registry } from "../auth/oauth/registry.js";
 import { CredentialResolver, hasCredentials, init_credentials } from "../auth/credentials.js";
+import { hasProviderAuthOnDiskSync, init_sync_provider_auth } from "../auth/sync-provider-auth.js";
 import { EXTENSION_PROVIDER_BASE_URL, init_constants } from "./constants.js";
 import { applyOfficialModelMetadataCorrections, getSupplementalModels, init_model_supplements } from "./model-supplements.js";
 import { getProviderRegistry, init_plugin_registry } from "./plugin-registry.js";

package/dist/src/providers/model-call.d.ts

@@ -1,5 +1,6 @@
 import { type Api, type AssistantMessage, type Context, type Model, type SimpleStreamOptions } from '@earendil-works/pi-ai/compat';
 import type { CredentialResolverOptions } from '../auth/credentials.js';
+import type { AiUsageContext } from '../usage/types.js';
 export declare function isLocalModelBaseUrl(baseUrl: string | undefined): boolean;
 /** Codex Responses rejects the temperature request parameter. */
 export declare function supportsModelTemperature(model: Model<Api>): boolean;
@@ -8,10 +9,10 @@ export declare function resolveModelCallOptions(model: Model<Api>, options?: Sim
 /**
  * Complete a one-shot request with xopc credential resolution and extension-provider routing.
  */
-export declare function completeWithResolvedCredentials(model: Model<Api>, context: Context, options?: SimpleStreamOptions, credentialOptions?: CredentialResolverOptions): Promise<AssistantMessage>;
+export declare function completeWithResolvedCredentials(model: Model<Api>, context: Context, options: SimpleStreamOptions, credentialOptions: CredentialResolverOptions | undefined, usageContext: AiUsageContext): Promise<AssistantMessage>;
 /**
  * Start a model stream with xopc credential resolution and extension-provider routing.
  * Callers that need live visible output should consume the returned stream before calling
  * its `result()` method.
  */
-export declare function createResolvedModelStream(model: Model<Api>, context: Context, options?: SimpleStreamOptions, credentialOptions?: CredentialResolverOptions): Promise<import("@earendil-works/pi-ai/compat").AssistantMessageEventStream>;
+export declare function createResolvedModelStream(model: Model<Api>, context: Context, options: SimpleStreamOptions, credentialOptions: CredentialResolverOptions | undefined, usageContext: AiUsageContext): Promise<import("@earendil-works/pi-ai/compat").AssistantMessageEventStream>;

package/dist/src/providers/model-call.js

@@ -1,6 +1,7 @@
 import { init_constants } from "./constants.js";
 import { getApiKey, init_providers } from "./index.js";
 import { createExtensionAwareStreamFn } from "./extension-stream-bridge.js";
+import { finishAiUsageFromMessage, observeAiUsageStream, startAiUsageCall } from "../usage/recorder.js";
 import { completeSimple, normalizeContext } from "@earendil-works/pi-ai/compat";
 //#region src/providers/model-call.ts
 init_constants();
@@ -40,19 +41,43 @@ async function resolveModelCallOptions(model, options = {}, credentialOptions) {
 /**
 * Complete a one-shot request with xopc credential resolution and extension-provider routing.
 */
-async function completeWithResolvedCredentials(model, context, options = {}, credentialOptions) {
+async function completeWithResolvedCredentials(model, context, options, credentialOptions, usageContext) {
 	const resolvedOptions = await resolveModelCallOptions(model, options, credentialOptions);
-	if (model.baseUrl === "extension://provider-plugin") return await (await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions)).result();
-	return await completeSimple(model, context, resolvedOptions);
+	const usageCall = startAiUsageCall(model, usageContext);
+	try {
+		if (model.baseUrl === "extension://provider-plugin") {
+			const result = await (await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions)).result();
+			finishAiUsageFromMessage(usageCall, result);
+			return result;
+		}
+		const result = await completeSimple(model, context, resolvedOptions);
+		finishAiUsageFromMessage(usageCall, result);
+		return result;
+	} catch (error) {
+		usageCall?.finish({
+			status: "failed",
+			errorSummary: error instanceof Error ? error.message : String(error)
+		});
+		throw error;
+	}
 }
 /**
 * Start a model stream with xopc credential resolution and extension-provider routing.
 * Callers that need live visible output should consume the returned stream before calling
 * its `result()` method.
 */
-async function createResolvedModelStream(model, context, options = {}, credentialOptions) {
+async function createResolvedModelStream(model, context, options, credentialOptions, usageContext) {
 	const resolvedOptions = await resolveModelCallOptions(model, options, credentialOptions);
-	return await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions);
+	const usageCall = startAiUsageCall(model, usageContext);
+	try {
+		return observeAiUsageStream(await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions), usageCall);
+	} catch (error) {
+		usageCall?.finish({
+			status: "failed",
+			errorSummary: error instanceof Error ? error.message : String(error)
+		});
+		throw error;
+	}
 }
 //#endregion
 export { completeWithResolvedCredentials, createResolvedModelStream, isLocalModelBaseUrl, resolveModelCallApiKey, resolveModelCallOptions, supportsModelTemperature };

package/dist/src/providers/model-catalog-persistence.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { init_paths_state, resolveXopcCloudCatalogCachePath } from "../config/paths-state.js";
-import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
+import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { voiceManifestSchema } from "../../packages/realtime-protocol/src/voice-catalog.js";
 import { init_voice } from "../../packages/realtime-protocol/src/voice.js";
 import { readFileSync, rmSync } from "node:fs";

package/dist/src/providers/register-runtime-providers.js

@@ -1,6 +1,6 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { getOAuthProviderDefinition, init_registry } from "../auth/oauth/registry.js";
 import { getModelCatalogStore, init_model_catalog_store } from "./model-catalog-store.js";
+import { getOAuthProviderDefinition, init_registry } from "../auth/oauth/registry.js";
 import { XOPC_CLOUD_PROVIDER_ID, init_xopc_cloud_config, resolveXopcModelRouterUrl } from "./xopc-cloud-config.js";
 //#region src/providers/register-runtime-providers.ts
 function registerRuntimeProvider(modelRuntime, source) {

package/dist/src/scenes/activationAdapter.d.ts

@@ -0,0 +1,19 @@
+import type { ScenePrincipal, SceneTemplate } from './contracts.js';
+/** Extension point for activation shapes that need more than the core read-only setup. */
+export interface SceneActivationAdapter {
+    id: string;
+    preflight(principal: ScenePrincipal, template: SceneTemplate, configuration: unknown): Promise<{
+        ready: boolean;
+        missing: string[];
+    }>;
+    create(principal: ScenePrincipal, template: SceneTemplate, configuration: unknown): Promise<unknown>;
+    get(principal: ScenePrincipal, activationId: string): unknown;
+    configure(principal: ScenePrincipal, activationId: string, expectedRevision: number, configuration: unknown): Promise<unknown>;
+    transition(principal: ScenePrincipal, activationId: string, expectedRevision: number, status: 'active' | 'paused' | 'archived'): Promise<unknown>;
+    tick(): Promise<void>;
+    stop(): Promise<void>;
+    executeTask?(runId: string, conversationId: string): Promise<boolean>;
+    allowsTaskNotification?(taskId: string): boolean;
+    listProjectBranches?(principal: ScenePrincipal, projectId: string): Promise<unknown>;
+    associateBranch?(principal: ScenePrincipal, input: unknown): Promise<unknown>;
+}

package/dist/src/scenes/activationAdapter.js

@@ -0,0 +1 @@
+export {};

package/dist/src/scenes/agentExecutor.js

@@ -1,6 +1,7 @@
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
+import { trackAiUsageStream } from "../usage/recorder.js";
 import { readOnlyResultSchema } from "./execution.js";
 import { Agent } from "@earendil-works/pi-agent-core";
 //#region src/scenes/agentExecutor.ts
@@ -25,10 +26,10 @@ var SceneAgentExecutor = class {
 			},
 			streamFn: (model, context, options) => {
 				if (++calls > 1) throw new Error("Scene executor permits one model call");
-				return stream(model, context, {
+				return trackAiUsageStream(model, input.usage, () => stream(model, context, {
 					...options,
 					maxTokens: input.template.execution.limits.maxOutputTokens
-				});
+				}));
 			},
 			getApiKey: (provider) => resolveProviderApiKeySync(provider) ?? getApiKeySync(provider) ?? ""
 		});
@@ -42,14 +43,6 @@ var SceneAgentExecutor = class {
 			}));
 			input.signal.throwIfAborted();
 			const response = agent.state.messages.findLast((message) => message.role === "assistant");
-			if (response?.role === "assistant") input.onUsage?.({
-				provider: response.provider,
-				model: response.model,
-				inputTokens: response.usage.input,
-				outputTokens: response.usage.output,
-				totalTokens: response.usage.totalTokens,
-				estimatedCost: response.usage.cost.total
-			});
 			if (!response || response.role !== "assistant" || response.stopReason !== "stop") throw new Error("Scene model did not complete a read-only result");
 			if (response.content.some((block) => block.type === "toolCall")) throw new Error("Scene model attempted an unavailable tool");
 			const text = response.content.filter((block) => block.type === "text").map((block) => block.text).join("");

package/dist/src/scenes/contracts.d.ts

@@ -2,14 +2,8 @@ export { sceneOutcomeKinds, activationStatuses, sceneScopeSchema, sceneTemplateS
 import { type SceneTemplate, type ScenePermission, type ActivationStatus } from '@xopcai/gateway-contract';
 /** Stable JSON hashing binds approvals and immutable versions to exact content. */
 export declare function sceneContentHash(value: unknown): string;
-export declare function validateTemplate(value: unknown, registered: Pick<ScenePermission, 'contextProviders' | 'effectHandlers'>): SceneTemplate;
+export declare function validateTemplate(value: unknown, registered: Pick<ScenePermission, 'contextProviders' | 'effectHandlers'> & {
+    executionAdapters?: string[];
+}): SceneTemplate;
 export declare function intersectPermissions(...permissions: ScenePermission[]): ScenePermission;
 export declare function canTransitionActivation(from: ActivationStatus, to: ActivationStatus): boolean;
-export type SceneModelUsage = {
-    provider: string;
-    model: string;
-    inputTokens: number;
-    outputTokens: number;
-    totalTokens: number;
-    estimatedCost: number;
-};

package/dist/src/scenes/contracts.js

@@ -18,6 +18,7 @@ function validateTemplate(value, registered) {
 	const template = sceneTemplateSchema.parse(value);
 	for (const provider of template.contextProviders) if (!registered.contextProviders.includes(provider)) throw new Error(`Unknown scene context provider: ${provider}`);
 	for (const handler of template.allowedEffectHandlers) if (!registered.effectHandlers.includes(handler)) throw new Error(`Unknown scene effect handler: ${handler}`);
+	if (registered.executionAdapters && !registered.executionAdapters.includes(template.execution.kind)) throw new Error(`Unknown scene execution adapter: ${template.execution.kind}`);
 	return template;
 }
 function intersectPermissions(...permissions) {

package/dist/src/scenes/execution.d.ts

@@ -1,6 +1,8 @@
 import { z } from 'zod';
-import { type SceneModelUsage, type SceneActivation, type ScenePermission, type SceneTemplate } from './contracts.js';
+import type { AiUsageContext } from '../usage/types.js';
+import { type SceneActivation, type ScenePermission, type SceneTemplate } from './contracts.js';
 import { SceneRepository } from './repository.js';
+import { SceneCapabilityRegistry } from './registry.js';
 export declare const readOnlyResultSchema: z.ZodObject<{
     kind: z.ZodEnum<{
         artifact: "artifact";
@@ -27,6 +29,10 @@ export interface SceneEvidence {
 }
 export interface SceneContextProvider {
     id: string;
+    setupIssues?(activation: SceneActivation): string[];
+    authorization?(activation: SceneActivation): string[] | null;
+    tracksHealth?: boolean;
+    requiresAccountIdentity?: boolean;
     read(input: {
         activation: SceneActivation;
         subjectId: string;
@@ -41,7 +47,7 @@ export interface SceneReadOnlyExecutor {
         goal: string;
         evidence: SceneEvidence[];
         signal: AbortSignal;
-        onUsage?: (usage: SceneModelUsage) => void;
+        usage: AiUsageContext;
     }): Promise<unknown>;
 }
 /** Runs one durable claim without exposing messaging, filesystem or write tools. */
@@ -51,6 +57,6 @@ export declare class SceneExecutionService {
     private readonly executor;
     private readonly authorize;
     private readonly clock;
-    constructor(repository: SceneRepository, providers: readonly SceneContextProvider[], executor: SceneReadOnlyExecutor, authorize: (activation: SceneActivation) => Promise<ScenePermission>, clock?: () => number);
+    constructor(repository: SceneRepository, providers: SceneCapabilityRegistry<SceneContextProvider>, executor: SceneReadOnlyExecutor, authorize: (activation: SceneActivation) => Promise<ScenePermission>, clock?: () => number);
     runNext(worker: string, outerSignal?: AbortSignal): Promise<'idle' | 'completed' | 'discarded' | 'failed' | 'deferred'>;
 }

package/dist/src/scenes/execution.js

@@ -36,7 +36,6 @@ var SceneExecutionService = class {
 		this.executor = executor;
 		this.authorize = authorize;
 		this.clock = clock;
-		if (new Set(providers.map((provider) => provider.id)).size !== providers.length) throw new Error("Duplicate scene context providers");
 	}
 	async runNext(worker, outerSignal) {
 		outerSignal?.throwIfAborted();
@@ -46,6 +45,7 @@ var SceneExecutionService = class {
 		if (!runInput) return "discarded";
 		const { activation, subjectId, accountId, notBefore } = runInput;
 		const template = this.repository.getTemplate(activation.templateKey, activation.templateVersion);
+		if (template.execution.kind !== "agent") throw new SceneExecutionRejected("executor_unavailable");
 		if (!this.repository.renewLease(claim, this.clock(), template.execution.limits.timeoutSeconds * 1e3 + 5e3)) return "discarded";
 		const controller = new AbortController();
 		const abort = () => controller.abort(outerSignal?.reason);
@@ -69,7 +69,7 @@ var SceneExecutionService = class {
 			try {
 				granted = await this.authorize(activation);
 			} catch (error) {
-				if (template.contextProviders.includes("mail")) this.repository.recordSourceHealth(activation, sceneSourceFailureReason(error), this.clock(), this.clock() + 6e4);
+				if (template.contextProviders.some((id) => this.providers.get(id).tracksHealth)) this.repository.recordSourceHealth(activation, sceneSourceFailureReason(error), this.clock(), this.clock() + 6e4);
 				throw error;
 			}
 			assertCurrent();
@@ -80,12 +80,11 @@ var SceneExecutionService = class {
 			});
 			const evidence = [];
 			for (const providerId of template.contextProviders) {
+				const provider = this.providers.get(providerId);
 				if (!permissions.contextProviders.includes(providerId)) {
-					if (providerId === "mail") this.repository.recordSourceHealth(activation, "needs_permission", this.clock(), this.clock() + 6e4);
+					if (provider.tracksHealth) this.repository.recordSourceHealth(activation, "needs_permission", this.clock(), this.clock() + 6e4);
 					throw new SceneExecutionRejected("needs_permission");
 				}
-				const provider = this.providers.find((item) => item.id === providerId);
-				if (!provider) throw new SceneExecutionRejected("provider_unavailable");
 				let items;
 				try {
 					items = await provider.read({
@@ -96,11 +95,11 @@ var SceneExecutionService = class {
 						signal: controller.signal
 					});
 				} catch (error) {
-					if (providerId === "mail" && !outerSignal?.aborted) this.repository.recordSourceHealth(activation, sceneSourceFailureReason(error), this.clock(), this.clock() + 6e4);
+					if (provider.tracksHealth && !outerSignal?.aborted) this.repository.recordSourceHealth(activation, sceneSourceFailureReason(error), this.clock(), this.clock() + 6e4);
 					throw error;
 				}
 				assertCurrent();
-				if (providerId === "mail" && items.some((item) => item.accountId === void 0)) throw new SceneExecutionRejected("missing_account_identity");
+				if (provider.requiresAccountIdentity && items.some((item) => item.accountId === void 0)) throw new SceneExecutionRejected("missing_account_identity");
 				if (items.some((item) => !evidenceAllowed(item, activation, permissions, this.clock()))) throw new SceneExecutionRejected("unauthorized_or_stale_evidence");
 				evidence.push(...items);
 			}
@@ -108,7 +107,7 @@ var SceneExecutionService = class {
 			if (new Set(evidence.map((item) => item.id)).size !== evidence.length) throw new SceneExecutionRejected("duplicate_evidence");
 			evidence.sort((left, right) => left.id.localeCompare(right.id));
 			const fingerprint = sceneContentHash(evidence.map(({ freshUntil: _freshUntil, ...item }) => item));
-			if (template.contextProviders.includes("mail")) this.repository.recordSourceHealth(activation, null, this.clock());
+			if (template.contextProviders.some((id) => this.providers.get(id).tracksHealth)) this.repository.recordSourceHealth(activation, null, this.clock());
 			return {
 				evidence,
 				fingerprint,
@@ -137,9 +136,11 @@ var SceneExecutionService = class {
 				goal: activation.goal,
 				evidence: snapshot.evidence,
 				signal: controller.signal,
-				onUsage: (usage) => {
-					assertCurrent();
-					this.repository.recordModelUsage(claim, usage, this.clock());
+				usage: {
+					operation: "scene.execute",
+					traceId: claim.id,
+					runId: claim.id,
+					...activation.scope.kind === "conversation" ? { conversationId: activation.scope.id } : {}
 				}
 			});
 			assertCurrent();

package/dist/src/scenes/httpServices.d.ts

@@ -6,10 +6,13 @@ import type { SceneApplicationService } from './service.js';
 import type { SceneMailContextProvider } from './mailContext.js';
 import type { ScenePreferenceService } from './preferences.js';
 import type { SceneMetrics } from './metrics.js';
-import type { TaskFollowUpService } from './taskFollowUp/service.js';
+import type { SceneActivationAdapter } from './activationAdapter.js';
+import type { SceneCapabilityRegistry } from './registry.js';
+import type { SceneSourceRegistry } from './taskFollowUp/contracts.js';
 /** An explicitly installed scene domain; never resolves to the old runtime. */
 export interface SceneHttpServices {
-    followUps?: TaskFollowUpService;
+    activationAdapters: SceneCapabilityRegistry<SceneActivationAdapter>;
+    sourceProviders: SceneSourceRegistry;
     repository: SceneRepository;
     application: SceneApplicationService;
     inbox: SceneInboxService;

package/dist/src/scenes/mailContext.d.ts

@@ -6,7 +6,11 @@ export declare class SceneMailContextProvider implements SceneContextProvider {
     private readonly db;
     private readonly clock;
     readonly id = "mail";
+    readonly tracksHealth = true;
+    readonly requiresAccountIdentity = true;
     constructor(db: DatabaseSync, clock?: () => number);
+    setupIssues(activation: SceneActivation): string[];
+    authorization(activation: SceneActivation): string[] | null;
     /** Resolve current account grants for the exact delegated source, including reconnects and revocation. */
     authorizedAccounts(activation: SceneActivation): string[];
     /** Picker metadata only; choosing an item still requires explicit activation consent. */

package/dist/src/scenes/mailContext.js

@@ -11,10 +11,19 @@ const accountPolicy = `a.enabled = 1 AND installation.enabled = 1 AND c.status =
 /** Reads a bounded, account-scoped thread from synchronized connector knowledge. */
 var SceneMailContextProvider = class {
 	id = "mail";
+	tracksHealth = true;
+	requiresAccountIdentity = true;
 	constructor(db, clock = Date.now) {
 		this.db = db;
 		this.clock = clock;
 	}
+	setupIssues(activation) {
+		return activation.scope.kind === "objects" && activation.scope.ids.length === 1 && activation.permissions.accountIds.length === 1 ? [] : ["one_mail_thread_and_account"];
+	}
+	authorization(activation) {
+		const accounts = this.authorizedAccounts(activation);
+		return accounts.length ? accounts : null;
+	}
 	/** Resolve current account grants for the exact delegated source, including reconnects and revocation. */
 	authorizedAccounts(activation) {
 		if (activation.scope.kind !== "objects" || activation.scope.ids.length !== 1) return [];