@xopcai/xopc 0.0.361 → 0.0.363

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 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xopcai/xopc",
-  "version": "0.0.361",
+  "version": "0.0.363",
   "description": "Local-first personal AI for the one-person company, with durable context, tasks, workflows, automations, and local or cloud models.",
   "type": "module",
   "main": "dist/src/index.js",
@@ -75,6 +75,9 @@
     "@inquirer/prompts": "^8.5.0",
     "@modelcontextprotocol/sdk": "1.32.1",
     "@mozilla/readability": "^0.6.0",
+    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/context-async-hooks": "^2.12.0",
+    "@opentelemetry/sdk-trace-base": "^2.12.0",
     "@sinclair/typebox": "^0.34.49",
     "@trycua/cua-driver": "0.28.2",
     "@vscode/ripgrep": "^1.18.0",
@@ -158,10 +161,10 @@
     "vitepress": "^1.6.4",
     "vitest": "4.1.5",
     "vue": "^3.5.35",
-    "@xopcai/browser-control-contract": "0.1.0",
     "@xopcai/computer-control-contract": "0.1.0",
     "@xopcai/endpoint-tools-client": "0.0.0",
     "@xopcai/endpoint-tools-protocol": "0.0.0",
+    "@xopcai/browser-control-contract": "0.1.0",
     "@xopcai/gateway-contract": "0.0.0",
     "@xopcai/realtime-client": "0.0.0",
     "@xopcai/realtime-protocol": "0.0.0"

package/dist/gateway/static/root/assets/dependency-picker-DfYC22si.js

@@ -1 +0,0 @@
-import{i as e}from"./rolldown-runtime-aKtaBQYM.js";import{a as t,n,t as r}from"./vendor-react-BOUWij0V.js";import{t as i}from"./chunk-KS7C4IRE-BMYIfy9x.js";import{t as a}from"./check-DUBLcKHA.js";import{t as o}from"./link-2-D_ZKYUW7.js";import{t as s}from"./search-DA7gz22f.js";import{t as c}from"./x-B_N4OPjy.js";import{t as l}from"./cn-JdwAhgNB.js";import{t as u}from"./button-CS04eWY9.js";import{a as d,i as f,n as p,r as m,t as h}from"./dist-Che_jiQF.js";import{bc as g}from"./index-C0JT9Ja4.js";var _=n(),v=e(t(),1),y=r(),b=`!z-[10000] max-w-[min(28rem,90vw)] rounded-md border border-edge bg-surface-panel px-2.5 py-2 text-left text-xs leading-relaxed text-fg shadow-lg`;function x(e){let t=(0,_.c)(31),{candidates:n,selectedIds:r,labels:x,disabled:C,borderless:w,getTaskHref:T,onChange:E}=e,D=w===void 0?!1:w,[O,k]=(0,v.useState)(!1),[A,j]=(0,v.useState)(``),M;t[0]===A?M=t[1]:(M=A.trim().toLocaleLowerCase(),t[0]=A,t[1]=M);let N=M,P;if(t[2]!==n||t[3]!==N){let e;t[5]===N?e=t[6]:(e=e=>!N||e.title.toLocaleLowerCase().includes(N),t[5]=N,t[6]=e),P=n.filter(e).slice(0,20),t[2]=n,t[3]=N,t[4]=P}else P=t[4];let F=P,I;t[7]!==n||t[8]!==C||t[9]!==T||t[10]!==x.remove||t[11]!==E||t[12]!==r?(I=r.length>0?(0,y.jsx)(`div`,{className:`flex min-w-0 flex-wrap gap-2`,children:r.map(e=>{let t=n.find(t=>t.id===e);return t?(0,y.jsxs)(`span`,{className:`inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg bg-surface-hover px-2.5 py-1.5 text-xs text-fg-muted`,children:[(0,y.jsxs)(f,{children:[(0,y.jsx)(d,{asChild:!0,children:T?(0,y.jsx)(i,{to:T(t.id),className:`min-w-0 truncate rounded-sm outline-none transition-colors hover:text-fg hover:underline focus-visible:ring-2 focus-visible:ring-accent/50`,children:t.title}):(0,y.jsx)(`span`,{className:`min-w-0 truncate`,children:t.title})}),(0,y.jsx)(p,{children:(0,y.jsx)(h,{side:`top`,sideOffset:6,collisionPadding:12,className:b,children:(0,y.jsx)(`span`,{className:`break-words`,children:t.title})})})]}),(0,y.jsx)(`button`,{type:`button`,className:`shrink-0 rounded text-fg-subtle transition-colors hover:text-fg`,"aria-label":x.remove.replace(`{{task}}`,t.title),disabled:C,onClick:()=>E(r.filter(e=>e!==t.id)),children:(0,y.jsx)(c,{className:`size-3.5`,"aria-hidden":!0})})]},t.id):null})}):null,t[7]=n,t[8]=C,t[9]=T,t[10]=x.remove,t[11]=E,t[12]=r,t[13]=I):I=t[13];let L;t[14]!==D||t[15]!==n.length||t[16]!==C||t[17]!==x.link||t[18]!==x.linked||t[19]!==x.noCandidates||t[20]!==x.noMatches||t[21]!==x.searchPlaceholder||t[22]!==F||t[23]!==E||t[24]!==O||t[25]!==A||t[26]!==r?(L=n.length>0?(0,y.jsxs)(y.Fragment,{children:[(0,y.jsxs)(u,{type:`button`,variant:`secondary`,className:l(`w-fit rounded-lg`,D&&`border-0 bg-surface-hover shadow-none`),disabled:C,"aria-expanded":O,onClick:()=>k(S),children:[(0,y.jsx)(o,{className:`size-4`,"aria-hidden":!0}),r.length>0?x.linked.replace(`{{count}}`,String(r.length)):x.link,(0,y.jsx)(g,{className:l(`size-3.5 transition-transform`,O&&`rotate-180`),"aria-hidden":!0})]}),O?(0,y.jsxs)(`div`,{className:l(`grid gap-2 rounded-lg p-2`,D?`bg-surface-hover`:`border border-edge bg-surface-base`),children:[(0,y.jsxs)(`label`,{className:`relative block`,children:[(0,y.jsx)(s,{className:`pointer-events-none absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-fg-subtle`,"aria-hidden":!0}),(0,y.jsx)(`input`,{value:A,onChange:e=>j(e.target.value),placeholder:x.searchPlaceholder,className:l(`h-9 w-full rounded-md bg-surface-panel pl-8 pr-3 text-sm text-fg outline-none placeholder:text-fg-subtle`,D?`focus:ring-2 focus:ring-accent/30`:`border border-edge focus:border-accent`),autoFocus:!0})]}),F.length>0?(0,y.jsx)(`div`,{className:`grid max-h-52 gap-1 overflow-y-auto`,children:F.map(e=>{let t=r.includes(e.id);return(0,y.jsxs)(`button`,{type:`button`,"aria-pressed":t,disabled:C,onClick:()=>E(t?r.filter(t=>t!==e.id):[...r,e.id]),className:l(`flex items-center gap-2 rounded-md px-2.5 py-2 text-left text-sm transition-colors`,t?`bg-accent-soft text-accent-fg`:`text-fg hover:bg-surface-hover`),children:[(0,y.jsx)(`span`,{className:l(`flex size-4 shrink-0 items-center justify-center rounded`,D?t?`bg-accent text-on-accent`:`bg-surface-active`:t?`border border-accent bg-accent text-on-accent`:`border border-edge`),children:t?(0,y.jsx)(a,{className:`size-3`,"aria-hidden":!0}):null}),(0,y.jsx)(`span`,{className:`min-w-0 flex-1 truncate`,children:e.title})]},e.id)})}):(0,y.jsx)(`p`,{className:`px-2 py-3 text-center text-sm text-fg-subtle`,children:x.noMatches})]}):null]}):(0,y.jsx)(`p`,{className:`text-sm text-fg-subtle`,children:x.noCandidates}),t[14]=D,t[15]=n.length,t[16]=C,t[17]=x.link,t[18]=x.linked,t[19]=x.noCandidates,t[20]=x.noMatches,t[21]=x.searchPlaceholder,t[22]=F,t[23]=E,t[24]=O,t[25]=A,t[26]=r,t[27]=L):L=t[27];let R;return t[28]!==I||t[29]!==L?(R=(0,y.jsx)(m,{delayDuration:300,children:(0,y.jsxs)(`div`,{className:`min-w-0 grid gap-2`,children:[I,L]})}),t[28]=I,t[29]=L,t[30]=R):R=t[30],R}function S(e){return!e}export{x as t};

package/dist/gateway/static/root/assets/gateway-realtime-store-B6B1fw_K.js

@@ -1 +0,0 @@
-import{p as e}from"./locale-store-5sV3dDRG.js";var t=e(()=>({connectionState:`idle`,error:null}));function n(e){t.setState(e)}export{t as n,n as t};