@xopcai/xopc 0.0.362 → 0.0.364

package/dist/src/personal-agent/service.js

@@ -4,13 +4,14 @@ import { init_config_repository, setSessionConfig } from "../storage/sqlite/conf
 import { ResponsePreferencesSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { createConversation, init_conversation_repository } from "../storage/sqlite/conversation-repository.js";
 import { getAvailableModels, init_providers } from "../providers/index.js";
 import { DEFAULT_PERSONAL_PREFERENCES, getPersonalAgent, personalAgentId } from "./repository.js";
 import { getModelThinking } from "../providers/model-thinking.js";
-import { AgentCatalogService } from "../agent-catalog/service.js";
 import { PERSONAL_COMMUNICATION_RULES, PERSONAL_RELIABILITY_RULES } from "./communication.js";
 import { PERSONAL_MAIN_TOOL_IDS } from "./policy.js";
+import { PERSONAL_REPLY_EXAMPLES, PERSONAL_REPLY_STYLE_RULES } from "./reply-style.js";
 import { completePersonalOnboarding } from "./onboarding.js";
 import { z } from "zod";
 //#region src/personal-agent/service.ts
@@ -67,6 +68,8 @@ function personalInstructions(preferences) {
 		RESULT_DELIVERY_RULE,
 		...PERSONAL_COMMUNICATION_RULES,
 		...PERSONAL_RELIABILITY_RULES,
+		...PERSONAL_REPLY_STYLE_RULES,
+		PERSONAL_REPLY_EXAMPLES,
 		"When creating a Task, provide a short title that names the work, a one-sentence objective, and a Markdown description with all detailed instructions. Keep the title free of checklists and long background. Preserve user requirements in the description.",
 		"Adapt to the user’s current words first, then their saved preferences. If the user explicitly changes how they want you to respond in future, save it with personal_preference. Do not infer a lasting emotional trait from one conversation or claim human feelings or experiences.",
 		"Give the accurate answer or next step in the order this user prefers. Acknowledge feelings only when relevant, without guessing how the user feels. Avoid formulaic reassurance, praise, pet names, emojis, or jokes unless the user welcomes them and the moment fits. Be accurate about task state, evidence, and uncertainty."
@@ -117,7 +120,12 @@ async function refreshPersonalDelegationGuidance(service, ownerId) {
 	if (!nextInstructions.includes(LOCAL_READ_RULE)) nextInstructions += `\n${LOCAL_READ_RULE}`;
 	if (!nextInstructions.includes(RESULT_DELIVERY_RULE)) nextInstructions += `\n${RESULT_DELIVERY_RULE}`;
 	if (!nextInstructions.includes(CONNECTED_APP_RULE)) nextInstructions += `\n${CONNECTED_APP_RULE}`;
-	for (const rule of [...PERSONAL_COMMUNICATION_RULES, ...PERSONAL_RELIABILITY_RULES]) if (!nextInstructions.includes(rule)) nextInstructions += `\n${rule}`;
+	for (const rule of [
+		...PERSONAL_COMMUNICATION_RULES,
+		...PERSONAL_RELIABILITY_RULES,
+		...PERSONAL_REPLY_STYLE_RULES,
+		PERSONAL_REPLY_EXAMPLES
+	]) if (!nextInstructions.includes(rule)) nextInstructions += `\n${rule}`;
 	const toolAllowlist = agent.toolAllowlist?.includes("personal_task") ? [...new Set([...agent.toolAllowlist, ...PERSONAL_MAIN_TOOL_IDS])] : agent.toolAllowlist;
 	if (nextInstructions === instructions && JSON.stringify(toolAllowlist) === JSON.stringify(agent.toolAllowlist)) return;
 	try {

package/dist/src/platform/index.js

@@ -1,5 +1,5 @@
-import { AgentManifestSchema, PlatformCapabilitySchema, PlatformConfigSchema, PlatformDiscoverySchema, PlatformEventSchema, init_contracts } from "./contracts.js";
 import { init_resolution, resolveConnectedPlatformDiscovery, resolveConnectedPlatformEndpoint, setActivePlatformDiscovery } from "./resolution.js";
+import { AgentManifestSchema, PlatformCapabilitySchema, PlatformConfigSchema, PlatformDiscoverySchema, PlatformEventSchema, init_contracts } from "./contracts.js";
 import { PLATFORM_RUNTIME_PROFILE, PLATFORM_RUNTIME_PROVIDER, PlatformRuntimeClient, RuntimeCommandSchema, discoverPlatform } from "./client.js";
 import { processRuntimeCommand } from "./worker.js";
 //#region src/platform/index.ts

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 { PROVIDER_ENV_MAP, getApiKeyFromEnv, init_env_keys } from "./env-keys.js";
 import { getModelOAuthProviderIds, init_registry } from "../auth/oauth/registry.js";
+import { CredentialResolver, hasCredentials, init_credentials } from "../auth/credentials.js";
+import { getAgentDefaultModelRef, init_schema } from "../config/schema.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 { CredentialResolver, hasCredentials, init_credentials } from "../auth/credentials.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.js

@@ -43,14 +43,21 @@ async function resolveModelCallOptions(model, options = {}, credentialOptions) {
 */
 async function completeWithResolvedCredentials(model, context, options, credentialOptions, usageContext) {
 	const resolvedOptions = await resolveModelCallOptions(model, options, credentialOptions);
-	const usageCall = startAiUsageCall(model, usageContext);
+	const usageCall = startAiUsageCall(model, usageContext, {
+		context,
+		options: {
+			reasoning: options.reasoning,
+			temperature: options.temperature,
+			maxTokens: options.maxTokens
+		}
+	});
 	try {
 		if (model.baseUrl === "extension://provider-plugin") {
-			const result = await (await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions)).result();
+			const result = await (await usageCall.run(() => createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions))).result();
 			finishAiUsageFromMessage(usageCall, result);
 			return result;
 		}
-		const result = await completeSimple(model, context, resolvedOptions);
+		const result = await usageCall.run(() => completeSimple(model, context, resolvedOptions));
 		finishAiUsageFromMessage(usageCall, result);
 		return result;
 	} catch (error) {
@@ -68,9 +75,16 @@ async function completeWithResolvedCredentials(model, context, options, credenti
 */
 async function createResolvedModelStream(model, context, options, credentialOptions, usageContext) {
 	const resolvedOptions = await resolveModelCallOptions(model, options, credentialOptions);
-	const usageCall = startAiUsageCall(model, usageContext);
+	const usageCall = startAiUsageCall(model, usageContext, {
+		context,
+		options: {
+			reasoning: options.reasoning,
+			temperature: options.temperature,
+			maxTokens: options.maxTokens
+		}
+	});
 	try {
-		return observeAiUsageStream(await createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions), usageCall);
+		return observeAiUsageStream(await usageCall.run(() => createExtensionAwareStreamFn()(model, normalizeContext(context), resolvedOptions)), usageCall);
 	} catch (error) {
 		usageCall?.finish({
 			status: "failed",

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/model-registry.js

@@ -1,10 +1,10 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { getApiKeyFromEnv, init_env_keys } from "./env-keys.js";
 import { resolveModelsJsonPath } from "../config/paths.js";
 import { init_resolve_config_value, resolveConfigValue, resolveHeaders } from "../config/resolve-config-value.js";
 import { getDefaultModelValues, init_models_json, validateModelsConfig } from "../config/models-json.js";
-import { getApiKeyFromEnv, init_env_keys } from "./env-keys.js";
 import { getModelCatalogStore, init_model_catalog_store } from "./model-catalog-store.js";
 import { init_model_ref, splitProviderModelRef } from "./model-ref.js";
 import { existsSync, readFileSync } from "fs";

package/dist/src/providers/provider-disconnect-core.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { getModelRegistry, init_model_registry } from "./model-registry.js";
 import { init_oauth_provider_lock, withOAuthProviderLock } from "../auth/oauth-provider-lock.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { getModelRegistry, init_model_registry } from "./model-registry.js";
 import { getProviderAuthService, init_provider_auth_service } from "./provider-auth-service.js";
 import { evictAllEmbeddedSessionRunners } from "../agent/embedded/session-runner.js";
 //#region src/providers/provider-disconnect-core.ts

package/dist/src/providers/xopc-cloud-catalog-coordinator.js

@@ -1,9 +1,9 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { init_oauth_provider_lock, withOAuthProviderLock } from "../auth/oauth-provider-lock.js";
 import { ModelCatalogPersistence, init_model_catalog_persistence } from "./model-catalog-persistence.js";
 import { getModelCatalogStore, init_model_catalog_store } from "./model-catalog-store.js";
 import { getModelRegistry, init_model_registry } from "./model-registry.js";
-import { init_oauth_provider_lock, withOAuthProviderLock } from "../auth/oauth-provider-lock.js";
 import { reloadImageGenerationProviders } from "../agent/image/generation/provider-registry.js";
 import { disconnectProviderCore } from "./provider-disconnect-core.js";
 import { XopcCloudModelSource } from "./xopc-cloud-model-source.js";

package/dist/src/storage/sqlite/ai-usage-repository.d.ts

@@ -55,6 +55,8 @@ export declare function listAiUsageEvents(query: AiUsageQuery & {
     items: {
         id: string;
         traceId: string;
+        otelTraceId: string;
+        otelSpanId: string;
         parentEventId: string;
         conversationId: string;
         runId: string;
@@ -85,6 +87,8 @@ export declare function listAiUsageEvents(query: AiUsageQuery & {
 export declare function getAiUsageEventView(id: string): {
     id: string;
     traceId: string;
+    otelTraceId: string;
+    otelSpanId: string;
     parentEventId: string;
     conversationId: string;
     runId: string;
@@ -113,6 +117,8 @@ export declare function getAiUsageEventView(id: string): {
 export declare function listAiUsageTrace(traceId: string): {
     id: string;
     traceId: string;
+    otelTraceId: string;
+    otelSpanId: string;
     parentEventId: string;
     conversationId: string;
     runId: string;

package/dist/src/storage/sqlite/ai-usage-repository.js

@@ -15,8 +15,8 @@ function insertAiUsageEvent(event) {
       started_at, finished_at, duration_ms, input_tokens, output_tokens,
       cache_read_tokens, cache_write_tokens, reasoning_tokens, total_tokens,
       estimated_cost_microusd, cost_source, pricing_snapshot_json, error_summary,
-      created_at, updated_at
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(event.id, event.traceId, event.parentEventId ?? null, event.conversationId ?? null, event.runId ?? null, event.agentId ?? null, event.category, event.operation, event.trigger, event.reasonKey, event.provider, event.model, event.status, event.startedAt, event.finishedAt ?? null, event.durationMs ?? null, event.inputTokens ?? null, event.outputTokens ?? null, event.cacheReadTokens ?? null, event.cacheWriteTokens ?? null, event.reasoningTokens ?? null, event.totalTokens ?? null, event.estimatedCostMicrousd ?? null, event.costSource, event.pricingSnapshot ? JSON.stringify(event.pricingSnapshot) : null, boundedError(event.errorSummary) ?? null, event.startedAt, event.startedAt);
+      created_at, updated_at, otel_trace_id, otel_span_id
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(event.id, event.traceId, event.parentEventId ?? null, event.conversationId ?? null, event.runId ?? null, event.agentId ?? null, event.category, event.operation, event.trigger, event.reasonKey, event.provider, event.model, event.status, event.startedAt, event.finishedAt ?? null, event.durationMs ?? null, event.inputTokens ?? null, event.outputTokens ?? null, event.cacheReadTokens ?? null, event.cacheWriteTokens ?? null, event.reasoningTokens ?? null, event.totalTokens ?? null, event.estimatedCostMicrousd ?? null, event.costSource, event.pricingSnapshot ? JSON.stringify(event.pricingSnapshot) : null, boundedError(event.errorSummary) ?? null, event.startedAt, event.startedAt, event.otelTraceId ?? null, event.otelSpanId ?? null);
 	});
 }
 function finishAiUsageEvent(id, finish) {
@@ -143,6 +143,8 @@ function eventFromRow(row) {
 	return {
 		id: String(row.id),
 		traceId: String(row.trace_id),
+		otelTraceId: row.otel_trace_id ? String(row.otel_trace_id) : void 0,
+		otelSpanId: row.otel_span_id ? String(row.otel_span_id) : void 0,
 		parentEventId: row.parent_event_id ? String(row.parent_event_id) : void 0,
 		conversationId: row.conversation_id ? String(row.conversation_id) : void 0,
 		runId: row.run_id ? String(row.run_id) : void 0,

package/dist/src/storage/sqlite/migrations/233_observability_usage_links.sql

@@ -0,0 +1,3 @@
+ALTER TABLE ai_usage_events ADD COLUMN otel_trace_id TEXT;
+ALTER TABLE ai_usage_events ADD COLUMN otel_span_id TEXT;
+CREATE INDEX idx_ai_usage_events_otel_trace ON ai_usage_events(otel_trace_id) WHERE otel_trace_id IS NOT NULL;

package/dist/src/storage/sqlite/migrations/234_task_result_reply.sql

@@ -0,0 +1,14 @@
+-- Keep artifact delivery and final prose in one durable outbox with independent progress.
+ALTER TABLE task_result_deliveries ADD COLUMN reply_payload_json TEXT;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_status TEXT CHECK(reply_status IN ('pending','generating','ready','delivered','stale'));
+ALTER TABLE task_result_deliveries ADD COLUMN reply_lease_token TEXT;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_lease_until INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_text TEXT;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_draft_transcript_id TEXT;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_message_entry_id TEXT;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_notified_at INTEGER;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_attempts INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_next_attempt_at INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE task_result_deliveries ADD COLUMN reply_last_error TEXT;
+
+CREATE INDEX idx_task_result_reply_pending ON task_result_deliveries(reply_status, reply_next_attempt_at, reply_lease_until);

package/dist/src/storage/sqlite/migrations/runner.d.ts

@@ -3,7 +3,7 @@ import type { ApplyMigrationsOptions } from './types.js';
 /** Baseline schema version applied from schema.sql on first open. */
 export declare const XOPC_DB_BASELINE_SCHEMA_VERSION = 165;
 /** Latest schema version this release supports (increment when adding migrations). */
-export declare const XOPC_DB_SCHEMA_VERSION = 232;
+export declare const XOPC_DB_SCHEMA_VERSION = 234;
 export declare function resolveMigrationsDir(override?: string): string;
 /**
  * Apply sequential SQL migrations from (currentVersion + 1) through targetVersion.

package/dist/src/storage/sqlite/migrations/runner.js

@@ -57,7 +57,7 @@ function applySingleMigration(db, migration, discardOldScenes = false) {
 */
 function applyPendingMigrations(db, options = {}) {
 	db.function("xopc_operation_id", () => currentOperationId() ?? null);
-	const targetVersion = options.targetVersion ?? 232;
+	const targetVersion = options.targetVersion ?? 234;
 	let currentVersion = readSchemaVersion(db);
 	if (currentVersion > targetVersion) throw new DatabaseSchemaTooNewError(currentVersion, targetVersion);
 	if (!options.migrationsDir && currentVersion < 165) throw new DatabaseSchemaTooOldError(currentVersion, 165);
@@ -95,7 +95,7 @@ function applyPendingMigrations(db, options = {}) {
 }
 /** Inspect schema version without mutating the database. */
 function inspectSchemaMigrationStatus(db, options = {}) {
-	const appVersion = options.targetVersion ?? 232;
+	const appVersion = options.targetVersion ?? 234;
 	const dbVersion = readSchemaVersion(db);
 	if (dbVersion > appVersion) return {
 		dbVersion,
@@ -137,7 +137,7 @@ var init_runner = __esmMin((() => {
 	init_errors();
 	log = createLogger("Sqlite:Migrations");
 	XOPC_DB_BASELINE_SCHEMA_VERSION = 165;
-	XOPC_DB_SCHEMA_VERSION = 232;
+	XOPC_DB_SCHEMA_VERSION = 234;
 }));
 //#endregion
 init_runner();

package/dist/src/storage/sqlite/schema.js

@@ -28,7 +28,7 @@ function ensureXopcDatabaseSchema(db, options = {}) {
 		currentVersion = 165;
 	}
 	applyPendingMigrations(db, {
-		targetVersion: 232,
+		targetVersion: 234,
 		databasePath: fresh ? void 0 : options.databasePath
 	});
 }

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

@@ -2,10 +2,10 @@ import { ProductReadContracts } from "../../../packages/gateway-contract/src/cap
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { TaskRepository, init_task_repository } from "../task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../task-run-repository.js";
-import { TaskConversationRepository } from "../task-conversation-repository.js";
-import { TaskReadModelProjector } from "../task-read-model-projector.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { defineReadCapability } from "../../capabilities/runtime/dispatcher.js";
+import { TaskConversationRepository } from "../task-conversation-repository.js";
+import { TaskReadModelProjector } from "../task-read-model-projector.js";
 import { TaskContextRepository } from "../task-context-repository.js";
 import { TaskDependencyService } from "../task-dependency-service.js";
 import { TaskCriterionReviewRepository } from "../task-criterion-review-repository.js";

package/dist/src/tasks/task-result-delivery-service.js

@@ -3,19 +3,25 @@ import { init_logger } from "../utils/logger.js";
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { TaskResultDeliverySchema } from "../../packages/gateway-contract/src/task-result-delivery.js";
 import { init_src } from "../../packages/gateway-contract/src/index.js";
+import { TaskRepository, init_task_repository } from "./task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "./task-run-repository.js";
+import { init_request_repository, personalRequestForTask } from "../personal-agent/request-repository.js";
 import { appendTranscriptEntry, init_transcript_repository } from "../storage/sqlite/transcript-repository.js";
 import { TaskConversationRepository } from "./task-conversation-repository.js";
 import { tryParseMediaUri } from "../media/uri.js";
 import { resolveMediaBufferPath } from "../media/store.js";
 import { emitSessionTranscriptUpdate } from "../session/transcript-events.js";
+import { getPersonalAgentByConversation } from "../personal-agent/repository.js";
 import { TaskResultDeliveryRepository } from "./task-result-delivery-repository.js";
+import { enqueuePersonalReply } from "../personal-agent/reply-composer.js";
 import { lstat } from "node:fs/promises";
 //#region src/tasks/task-result-delivery-service.ts
 init_src();
 init_transcript_repository();
 init_transaction();
 init_logger();
+init_request_repository();
+init_task_repository();
 init_task_run_repository();
 const log = createLogger("TaskResultDelivery");
 async function materializedArtifact(item) {
@@ -86,21 +92,31 @@ var TaskResultDeliveryService = class {
 						status: deliverables.length > 0 && available === 0 ? "failed" : available < deliverables.length ? "partial" : delivery.outcome.status
 					};
 					const statusText = db.prepare("SELECT locale FROM tasks WHERE task_id = ?").get(delivery.taskId).locale?.startsWith("zh") === true ? `${delivery.taskTitle}：${available === deliverables.length ? "成果已生成" : available > 0 ? "部分成果已生成" : "成果暂不可用"}。` : `${delivery.taskTitle}: ${available === deliverables.length ? "Results ready" : available > 0 ? "Partial results ready" : "Results unavailable"}.`;
-					const content = delivery.text ? `${statusText}\n\n${delivery.text}` : statusText;
+					const personal = getPersonalAgentByConversation(delivery.conversationId);
+					if (personal && !personalRequestForTask(delivery.taskId)) enqueuePersonalReply({
+						delivery: {
+							...delivery,
+							outcome
+						},
+						report: delivery.text?.trim() || delivery.outcome.summary?.trim() || statusText,
+						objective: new TaskRepository().get(delivery.taskId)?.contract?.objective ?? delivery.taskTitle
+					});
+					const content = personal ? statusText : delivery.text ? `${statusText}\n\n${delivery.text}` : statusText;
 					const details = {
 						...delivery,
 						outcome
 					};
-					const entry = appendTranscriptEntry(delivery.conversationId, {
+					if (personal) delete details.text;
+					const entry = !personal || deliverables.length ? appendTranscriptEntry(delivery.conversationId, {
 						role: "custom",
 						customType: "task_result_delivery",
 						content,
 						display: true,
 						details,
 						timestamp: Date.now()
-					});
+					}) : void 0;
 					db.prepare(`UPDATE task_result_deliveries SET status = 'delivered', payload_json = ?,
-              message_entry_id = ?, delivered_at = ? WHERE delivery_id = ?`).run(JSON.stringify(details), entry.entry_id, Date.now(), row.delivery_id);
+              message_entry_id = ?, delivered_at = ? WHERE delivery_id = ?`).run(JSON.stringify(details), entry?.entry_id ?? null, Date.now(), row.delivery_id);
 					return true;
 				})) continue;
 			}

package/dist/src/tui/backends/embedded-backend.js

@@ -9,11 +9,12 @@ import { appendComposerInputHistory, listComposerInputHistory } from "../../stor
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { normalizeAgentId } from "../../agent-catalog/id.js";
-import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { init_agent_scope, listAgentEntries } from "../../agent/agent-scope.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
+import { init_paths } from "../../config/paths.js";
+import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../../routing/agent-session-key.js";
 import { resolveEffectiveAgentProfile } from "../../config/agent-profile.js";
-import { init_paths } from "../../config/paths.js";
 import { effectiveWorkspacePathForSession } from "../../session/session-workspace.js";
 import { ProjectService } from "../../projects/project-service.js";
 import { inferSuggestedProjectDefaultAgentId } from "../../projects/project-agent-suggestion.js";
@@ -22,7 +23,6 @@ import { buildSessionTimeline } from "../../session/transcript-outline.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
 import { createCreateShareTool, isShareToolAvailable } from "../../agent/tools/create-share-tool.js";
 import { evictEmbeddedSessionRunner } from "../../agent/embedded/session-runner.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { SessionIndex } from "../../session/manager.js";
 import "../../session/index.js";
 import { parseModelRef } from "../../agent/models/selection.js";

package/dist/src/tui/tui-commands.js

@@ -2,8 +2,8 @@ import { closeXopcDatabase, isXopcDatabaseOpen, openXopcDatabase } from "../stor
 import { TaskRepository } from "../tasks/task-repository.js";
 import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { resolveConfigPath } from "../config/paths.js";
+import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { init_providers, providerSupportsOAuth } from "../providers/index.js";
 import { ProjectService } from "../projects/project-service.js";
 import { isValidProjectAgentId, normalizeProjectAgentId } from "../projects/project-agent.js";

package/dist/src/tui/tui-startup-resources.js

@@ -1,6 +1,6 @@
 import { resolveStateDir } from "../config/paths-state.js";
-import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir } from "../config/paths.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { resolveBootstrapFilesSync } from "../agent/bootstrap/bootstrap-files.js";
 import { listConnectorInstances } from "../connectors/instances.js";
 import { createSkillConfigManager, isSkillEnabled } from "../agent/skills/config.js";

package/dist/src/tui/tui.js

@@ -1,8 +1,8 @@
 import { version } from "../../package.js";
 import { resolveStateDir, resolveXopcDatabasePath } from "../config/paths-state.js";
+import { init_paths } from "../config/paths.js";
 import { init_agent_session_key, normalizeAgentId } from "../routing/agent-session-key.js";
 import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
-import { init_paths } from "../config/paths.js";
 import { getAllModels, getAllProviders, getApiKey, init_providers, isProviderConfiguredSync } from "../providers/index.js";
 import { isTerminalWorkflowRunStatus } from "../workflows/domain/run.js";
 import "../workflows/domain/index.js";

package/dist/src/usage/recorder.d.ts

@@ -1,13 +1,15 @@
 import type { AssistantMessage, AssistantMessageEventStream } from '@earendil-works/pi-ai/compat';
+import { type Observation } from '../observability/runtime.js';
 import type { AiUsageContext, AiUsageFinish, AiUsageModel } from './types.js';
 export type AiUsageCall = {
     id: string;
     finish: (result: AiUsageFinish) => void;
+    run: Observation['run'];
 };
 export declare function continuesAfterTool(messages: readonly {
     role?: string;
 }[]): boolean;
-export declare function startAiUsageCall(model: AiUsageModel, context: AiUsageContext): AiUsageCall | undefined;
+export declare function startAiUsageCall(model: AiUsageModel, context: AiUsageContext, input?: unknown): AiUsageCall;
 export declare function observeAiUsageStream(stream: AssistantMessageEventStream, call: AiUsageCall | undefined): AssistantMessageEventStream;
-export declare function trackAiUsageStream(model: AiUsageModel, context: AiUsageContext, create: () => AssistantMessageEventStream | Promise<AssistantMessageEventStream>): AssistantMessageEventStream | Promise<AssistantMessageEventStream>;
+export declare function trackAiUsageStream(model: AiUsageModel, context: AiUsageContext, create: () => AssistantMessageEventStream | Promise<AssistantMessageEventStream>, input?: unknown): AssistantMessageEventStream | Promise<AssistantMessageEventStream>;
 export declare function finishAiUsageFromMessage(call: AiUsageCall | undefined, message: AssistantMessage): void;

package/dist/src/usage/recorder.js

@@ -1,6 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_connection, isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
+import { startObservation } from "../observability/runtime.js";
 import { finishAiUsageEvent, insertAiUsageEvent } from "../storage/sqlite/ai-usage-repository.js";
 import { classifyCostSource, dollarsToMicrousd, pricingSnapshot } from "./cost.js";
 import { resolveAiUsageScenario } from "./scenario-registry.js";
@@ -17,32 +18,43 @@ function continuesAfterTool(messages) {
 	}
 	return false;
 }
-function startAiUsageCall(model, context) {
-	if (!isXopcDatabaseOpen()) return void 0;
+function startAiUsageCall(model, context, input) {
+	const observation = startObservation(context.operation, "generation", context);
+	observation.update({
+		"gen_ai.request.model": model.id,
+		"gen_ai.system": model.provider
+	});
+	observation.input(input);
 	const operation = context.operation;
 	const scenario = resolveAiUsageScenario(operation);
 	const id = randomUUID();
 	const startedAt = Date.now();
 	const costSource = classifyCostSource(model);
+	let persisted = false;
 	try {
-		insertAiUsageEvent({
-			id,
-			traceId: context.traceId ?? context.runId ?? id,
-			parentEventId: context.parentEventId,
-			conversationId: context.conversationId,
-			runId: context.runId,
-			agentId: context.agentId,
-			category: scenario.category,
-			operation,
-			trigger: context.trigger ?? scenario.trigger,
-			reasonKey: scenario.reasonKey,
-			provider: model.provider,
-			model: model.id,
-			status: "running",
-			startedAt,
-			costSource,
-			pricingSnapshot: costSource === "unknown" ? void 0 : pricingSnapshot(model)
-		});
+		if (isXopcDatabaseOpen()) {
+			insertAiUsageEvent({
+				otelTraceId: observation.span?.spanContext().traceId,
+				otelSpanId: observation.span?.spanContext().spanId,
+				id,
+				traceId: context.traceId ?? context.runId ?? id,
+				parentEventId: context.parentEventId,
+				conversationId: context.conversationId,
+				runId: context.runId,
+				agentId: context.agentId,
+				category: scenario.category,
+				operation,
+				trigger: context.trigger ?? scenario.trigger,
+				reasonKey: scenario.reasonKey,
+				provider: model.provider,
+				model: model.id,
+				status: "running",
+				startedAt,
+				costSource,
+				pricingSnapshot: costSource === "unknown" ? void 0 : pricingSnapshot(model)
+			});
+			persisted = true;
+		}
 	} catch (err) {
 		log.error({
 			err,
@@ -50,18 +62,33 @@ function startAiUsageCall(model, context) {
 			provider: model.provider,
 			modelId: model.id
 		}, "Failed to start AI usage record");
-		return;
 	}
+	observation.update({ "xopc.usageEventId": id });
 	let completed = false;
 	return {
 		id,
+		run: observation.run,
 		finish(result) {
 			if (completed) return;
 			completed = true;
+			observation.update({
+				"gen_ai.usage.input_tokens": result.usage?.input,
+				"gen_ai.usage.output_tokens": result.usage?.output,
+				"langfuse.observation.usage_details": JSON.stringify({
+					input: result.usage?.input,
+					output: result.usage?.output,
+					cache_read: result.usage?.cacheRead,
+					cache_write: result.usage?.cacheWrite
+				}),
+				"langfuse.observation.cost_details": costSource === "unknown" ? void 0 : JSON.stringify({ total: result.usage?.cost?.total }),
+				"xopc.costSource": costSource
+			});
+			observation.finish(result.status === "failed" ? "error" : result.status === "aborted" ? "cancelled" : "success", result.output ?? result.errorSummary);
+			if (!persisted) return;
 			try {
 				finishAiUsageEvent(id, {
 					...result,
-					estimatedCostMicrousd: costSource === "local" ? 0 : costSource === "unknown" ? void 0 : dollarsToMicrousd(result.usage?.cost.total)
+					estimatedCostMicrousd: costSource === "local" ? 0 : costSource === "unknown" ? void 0 : dollarsToMicrousd(result.usage?.cost?.total)
 				});
 			} catch (err) {
 				log.error({
@@ -79,7 +106,8 @@ function finishFromMessage(call, message) {
 	call.finish({
 		status,
 		usage: message.usage,
-		errorSummary: message.errorMessage
+		errorSummary: message.errorMessage,
+		output: message.content
 	});
 }
 function observeAiUsageStream(stream, call) {
@@ -90,10 +118,10 @@ function observeAiUsageStream(stream, call) {
 	}));
 	return stream;
 }
-function trackAiUsageStream(model, context, create) {
-	const call = startAiUsageCall(model, context);
+function trackAiUsageStream(model, context, create, input) {
+	const call = startAiUsageCall(model, context, input);
 	try {
-		const created = create();
+		const created = call.run(create);
 		if (created instanceof Promise) return created.then((stream) => observeAiUsageStream(stream, call), (error) => {
 			call?.finish({
 				status: "failed",

package/dist/src/usage/types.d.ts

@@ -19,6 +19,8 @@ export type AiPricingSnapshot = {
     cacheWrite: number;
 };
 export type AiUsageEvent = {
+    otelTraceId?: string;
+    otelSpanId?: string;
     id: string;
     traceId: string;
     parentEventId?: string;
@@ -50,6 +52,7 @@ export type AiUsageFinish = {
     status: Exclude<AiUsageStatus, 'running'>;
     usage?: Usage;
     errorSummary?: string;
+    output?: unknown;
     finishedAt?: number;
 };
 export type AiUsageModel = Pick<Model<Api>, 'provider' | 'id' | 'baseUrl' | 'cost'>;

package/dist/src/utils/logger/context.d.ts

@@ -4,7 +4,7 @@
  */
 import type { LogContext } from './types.js';
 /** Correlation fields merged into every log line while the store is active (via pino mixin). */
-declare const ASYNC_LOG_CORRELATION_KEYS: readonly ["requestId", "conversationId", "transcriptId", "userId", "correlationId"];
+declare const ASYNC_LOG_CORRELATION_KEYS: readonly ["requestId", "conversationId", "transcriptId", "userId", "correlationId", "traceId", "spanId", "runId"];
 type AsyncLogCorrelationKey = (typeof ASYNC_LOG_CORRELATION_KEYS)[number];
 /**
  * Run *fn* with merged async log context. Propagates through async/await (Node AsyncLocalStorage).

package/dist/src/utils/logger/context.js

@@ -54,7 +54,10 @@ var init_context = __esmMin((() => {
 		"conversationId",
 		"transcriptId",
 		"userId",
-		"correlationId"
+		"correlationId",
+		"traceId",
+		"spanId",
+		"runId"
 	];
 	logContextStorage = new AsyncLocalStorage();
 	INBOUND_METADATA_FROM_ASYNC = [

package/dist/src/utils/logger/types.d.ts

@@ -41,6 +41,9 @@ export declare const LogLevelValue: Record<LogLevel, number>;
  * Common log context fields
  */
 export interface LogContext {
+    traceId?: string;
+    spanId?: string;
+    runId?: string;
     /** Request/operation ID for tracing */
     requestId?: string;
     /** Session ID for user tracking */