oasis_test 0.1.34 → 0.1.35

package/dist/index.js

@@ -24550,7 +24550,7 @@ async function startOasisServer(opts) {
           const chatStore = opts.chatSession;
           const ws = review.workspace ?? engine.kernel.model.artifacts.get(review.anchor)?.workspace ?? null;
           let target = review.origin ?? discussSessions.get(`draft:${review.draftId}`) ?? void 0;
-          let record4 = target && chatStore ? await chatStore.getSession(target).catch(() => null) : null;
+          let record5 = target && chatStore ? await chatStore.getSession(target).catch(() => null) : null;
           if (!target && chatStore && ws) {
             const brief = [...engine.kernel.model.artifacts.values()].find((x2) => x2.type === "brief" && x2.workspace === ws);
             if (brief) {
@@ -24559,7 +24559,7 @@ async function startOasisServer(opts) {
                 const wos = await chatStore.listWorkOrdersForSession(s2.id).catch(() => []);
                 if (wos.includes(ws)) {
                   target = s2.id;
-                  record4 = s2;
+                  record5 = s2;
                   break;
                 }
               }
@@ -24570,7 +24570,7 @@ async function startOasisServer(opts) {
           if (chatStore) {
             await chatStore.appendMessage({ id: randomUUID18(), sessionId: target, role: "user", content: message, createdAt: (/* @__PURE__ */ new Date()).toISOString() }).catch(() => void 0);
           }
-          const rt = record4?.runtimeSessionId ?? opts.retainedSession?.({ draftId: review.draftId });
+          const rt = record5?.runtimeSessionId ?? opts.retainedSession?.({ draftId: review.draftId });
           const session = await opts.dispatchChat({
             actorId: review.proposedBy,
             message,
@@ -25668,14 +25668,14 @@ var init_tokens = __esm({
     };
     isTokenClaims = (value) => {
       if (value === null || typeof value !== "object") return false;
-      const record4 = value;
-      if (typeof record4["actor"] !== "string" || !record4["actor"].startsWith("actor:")) return false;
-      if (typeof record4["issuedAt"] !== "number" || !Number.isFinite(record4["issuedAt"])) return false;
-      if (record4["expiresAt"] !== void 0 && (typeof record4["expiresAt"] !== "number" || !Number.isFinite(record4["expiresAt"]))) return false;
-      if (record4["dispatchSeq"] !== void 0 && (typeof record4["dispatchSeq"] !== "number" || !Number.isFinite(record4["dispatchSeq"]))) return false;
-      if (record4["scopes"] !== void 0 && (!Array.isArray(record4["scopes"]) || record4["scopes"].some((scope) => typeof scope !== "string"))) return false;
+      const record5 = value;
+      if (typeof record5["actor"] !== "string" || !record5["actor"].startsWith("actor:")) return false;
+      if (typeof record5["issuedAt"] !== "number" || !Number.isFinite(record5["issuedAt"])) return false;
+      if (record5["expiresAt"] !== void 0 && (typeof record5["expiresAt"] !== "number" || !Number.isFinite(record5["expiresAt"]))) return false;
+      if (record5["dispatchSeq"] !== void 0 && (typeof record5["dispatchSeq"] !== "number" || !Number.isFinite(record5["dispatchSeq"]))) return false;
+      if (record5["scopes"] !== void 0 && (!Array.isArray(record5["scopes"]) || record5["scopes"].some((scope) => typeof scope !== "string"))) return false;
       for (const key of ["sessionId", "artifactId", "action", "nodeId", "runtimeKind", "companyId", "chatSessionId"]) {
-        if (record4[key] !== void 0 && typeof record4[key] !== "string") return false;
+        if (record5[key] !== void 0 && typeof record5[key] !== "string") return false;
       }
       return true;
     };
@@ -27877,9 +27877,9 @@ var init_service = __esm({
           ...input.revision.continuation ? { continuation: input.revision.continuation } : {}
         });
         await this.syncProjection();
-        const record4 = await this.artifacts.getRevision(kernelRevision.id);
-        if (!record4) throw new Error(`revision projection missing after register: ${kernelRevision.id}`);
-        return record4;
+        const record5 = await this.artifacts.getRevision(kernelRevision.id);
+        if (!record5) throw new Error(`revision projection missing after register: ${kernelRevision.id}`);
+        return record5;
       }
       async approveArtifactRevision(input) {
         if (input.actorKind !== "human") throw namedError("AgentReviewForbidden", "agents cannot approve artifact revisions");
@@ -27982,9 +27982,9 @@ var init_service = __esm({
           ...input.revisionId ? { revisionId: input.revisionId } : {}
         });
         await this.syncProjection();
-        const record4 = await this.artifacts.getAnnotation(kernelAnnotation.id);
-        if (!record4) throw new Error(`annotation projection missing after create: ${kernelAnnotation.id}`);
-        return record4;
+        const record5 = await this.artifacts.getAnnotation(kernelAnnotation.id);
+        if (!record5) throw new Error(`annotation projection missing after create: ${kernelAnnotation.id}`);
+        return record5;
       }
       async resolveArtifactAnnotation(input) {
         const artifact = await this.artifacts.getArtifact(input.artifactId);
@@ -28000,9 +28000,9 @@ var init_service = __esm({
           ...input.comment?.trim() ? { note: input.comment.trim() } : {}
         });
         await this.syncProjection();
-        const record4 = await this.artifacts.getAnnotation(input.annotationId);
-        if (!record4) throw new Error(`annotation projection missing after resolve: ${input.annotationId}`);
-        return record4;
+        const record5 = await this.artifacts.getAnnotation(input.annotationId);
+        if (!record5) throw new Error(`annotation projection missing after resolve: ${input.annotationId}`);
+        return record5;
       }
       async registerNodeOutput(input) {
         await this.assertProjectExecutable(input.projectId);
@@ -28679,10 +28679,10 @@ var init_dev_store = __esm({
       async appendMessage(m2) {
         const list = this.messages.get(m2.sessionId) ?? [];
         const seq = (list.length ? Math.max(...list.map((x2) => x2.seq)) : 0) + 1;
-        const record4 = { ...m2, seq };
-        list.push(record4);
+        const record5 = { ...m2, seq };
+        list.push(record5);
         this.messages.set(m2.sessionId, list);
-        return record4;
+        return record5;
       }
       async listMessages(sessionId, limit) {
         const list = (this.messages.get(sessionId) ?? []).sort((a, b2) => a.seq - b2.seq);
@@ -28728,9 +28728,9 @@ var init_dev_store = __esm({
         this.save();
       }
       async appendMessage(m2) {
-        const record4 = await super.appendMessage(m2);
+        const record5 = await super.appendMessage(m2);
         this.save();
-        return record4;
+        return record5;
       }
       async linkWorkOrder(sessionId, workOrderId) {
         await super.linkWorkOrder(sessionId, workOrderId);
@@ -33409,19 +33409,19 @@ var init_service2 = __esm({
       async upsertActor(a, by) {
         const existing = await this.opts.store.getActor(a.id);
         const roles = a.roles ?? existing?.roles ?? [];
-        const record4 = { ...a, roles, createdAt: existing?.createdAt ?? a.createdAt ?? this.now() };
-        if (isActiveCoordinatorAgent(record4)) {
-          const existingCoordinator = (await this.opts.store.listActors({ kind: "agent", status: "active" })).find((actor) => actor.id !== record4.id && isActiveCoordinatorAgent(actor));
+        const record5 = { ...a, roles, createdAt: existing?.createdAt ?? a.createdAt ?? this.now() };
+        if (isActiveCoordinatorAgent(record5)) {
+          const existingCoordinator = (await this.opts.store.listActors({ kind: "agent", status: "active" })).find((actor) => actor.id !== record5.id && isActiveCoordinatorAgent(actor));
           if (existingCoordinator) {
             throw new Error(
-              `\u7CFB\u7EDF\u53EA\u80FD\u6709\u4E00\u4E2A\u534F\u8C03\u8005\u667A\u80FD\u4F53\uFF1A\u5DF2\u5B58\u5728 ${existingCoordinator.name}\uFF08${existingCoordinator.id}\uFF09\uFF0C\u4E0D\u80FD\u518D\u521B\u5EFA\u6216\u542F\u7528 ${record4.name}\uFF08${record4.id}\uFF09\u3002`
+              `\u7CFB\u7EDF\u53EA\u80FD\u6709\u4E00\u4E2A\u534F\u8C03\u8005\u667A\u80FD\u4F53\uFF1A\u5DF2\u5B58\u5728 ${existingCoordinator.name}\uFF08${existingCoordinator.id}\uFF09\uFF0C\u4E0D\u80FD\u518D\u521B\u5EFA\u6216\u542F\u7528 ${record5.name}\uFF08${record5.id}\uFF09\u3002`
             );
           }
         }
-        await this.opts.store.upsertActor(record4);
-        this.opts.onRolesChanged?.(record4.id, record4.status === "active" ? roles : []);
+        await this.opts.store.upsertActor(record5);
+        this.opts.onRolesChanged?.(record5.id, record5.status === "active" ? roles : []);
         await this.audit({ kind: "actor_upsert", actorId: a.id, by, at: this.now(), detail: { status: a.status, roles } });
-        return record4;
+        return record5;
       }
       /** 删除即停用（2.1 完成标准） */
       async disableActor(id, by) {
@@ -33437,10 +33437,10 @@ var init_service2 = __esm({
         const a = await this.opts.store.getActor(id);
         if (!a) throw new Error(`actor not found: ${id}`);
         const { avatar: _drop, ...rest } = a;
-        const record4 = ref === null ? rest : { ...rest, avatar: ref };
-        await this.opts.store.upsertActor(record4);
+        const record5 = ref === null ? rest : { ...rest, avatar: ref };
+        await this.opts.store.upsertActor(record5);
         await this.audit({ kind: "actor_upsert", actorId: id, by, at: this.now(), detail: { avatar: ref ?? "cleared" } });
-        return record4;
+        return record5;
       }
       /** 设置/清除团队图标引用（同头像约定；不接受 emoji，只接受 blob 引用） */
       async setTeamIcon(teamId, ref) {
@@ -33853,13 +33853,13 @@ ${input.description}
           this.opts.store.listConnectors()
         ]);
         const globalConnected = new Set(connectors.filter((c) => c.status === "connected").map((c) => c.id));
-        const record4 = new Map(connections.map((c) => [c.connectorId, c.enabled]));
+        const record5 = new Map(connections.map((c) => [c.connectorId, c.enabled]));
         const legacy = new Set(config2?.connectorIds ?? []);
-        const ids = /* @__PURE__ */ new Set([...record4.keys(), ...legacy, ...globalConnected]);
+        const ids = /* @__PURE__ */ new Set([...record5.keys(), ...legacy, ...globalConnected]);
         const effective = /* @__PURE__ */ new Set();
         for (const id of ids) {
-          if (record4.has(id)) {
-            if (record4.get(id)) effective.add(id);
+          if (record5.has(id)) {
+            if (record5.get(id)) effective.add(id);
           } else if (legacy.has(id)) effective.add(id);
           else if (globalConnected.has(id)) effective.add(id);
         }
@@ -38089,9 +38089,105 @@ var init_codex = __esm({
 function newUsageAcc() {
   return { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0 };
 }
+function addToken(acc, value, field) {
+  if (typeof value === "number" && Number.isFinite(value) && value > 0) {
+    acc[field] += value;
+  }
+}
+function record3(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function firstNumber(src, keys) {
+  for (const key of keys) {
+    const value = src[key];
+    if (typeof value === "number" && Number.isFinite(value) && value > 0) return value;
+  }
+  return void 0;
+}
+function addFirstToken(acc, src, keys, field) {
+  const before = acc[field];
+  addToken(acc, firstNumber(src, keys), field);
+  return acc[field] !== before;
+}
+function accumulateTokenFields(acc, src) {
+  let changed = false;
+  changed = addFirstToken(acc, src, [
+    "input_tokens",
+    "inputTokens",
+    "prompt_tokens",
+    "promptTokens",
+    "promptTokenCount",
+    "inputTokenCount",
+    "input"
+  ], "inputTokens") || changed;
+  changed = addFirstToken(acc, src, [
+    "output_tokens",
+    "outputTokens",
+    "completion_tokens",
+    "completionTokens",
+    "completionTokenCount",
+    "candidatesTokenCount",
+    "response_tokens",
+    "responseTokens",
+    "generated_tokens",
+    "generatedTokens",
+    "outputTokenCount",
+    "output"
+  ], "outputTokens") || changed;
+  changed = addFirstToken(acc, src, [
+    "cached_read_tokens",
+    "cachedReadTokens",
+    "cacheReadTokens",
+    "cache_read_input_tokens",
+    "cacheReadInputTokens",
+    "cached_input_tokens",
+    "cachedInputTokens",
+    "cached_tokens",
+    "cachedTokens",
+    "cachedContentTokenCount"
+  ], "cacheReadTokens") || changed;
+  changed = addFirstToken(acc, src, [
+    "cache_creation_input_tokens",
+    "cacheCreationTokens",
+    "cacheCreationInputTokens",
+    "cache_creation_tokens",
+    "cache_write_input_tokens",
+    "cacheWriteInputTokens",
+    "cache_write_tokens",
+    "cacheWriteTokens"
+  ], "cacheCreationTokens") || changed;
+  const promptDetails = record3(src["prompt_tokens_details"]) ?? record3(src["promptTokensDetails"]);
+  if (promptDetails) {
+    changed = addFirstToken(acc, promptDetails, ["cached_tokens", "cachedTokens"], "cacheReadTokens") || changed;
+  }
+  return changed;
+}
+function accumulateUsage(acc, value) {
+  const root = record3(value);
+  if (!root) return false;
+  const candidates = [
+    root,
+    record3(root["usage"]),
+    record3(root["token_usage"]),
+    record3(root["tokenUsage"]),
+    record3(root["tokens"]),
+    record3(root["usageMetadata"]),
+    record3(root["usage_metadata"])
+  ];
+  const seen = /* @__PURE__ */ new Set();
+  let changed = false;
+  for (const candidate of candidates) {
+    if (!candidate || seen.has(candidate)) continue;
+    seen.add(candidate);
+    changed = accumulateTokenFields(acc, candidate) || changed;
+  }
+  return changed;
+}
+function hasUsage(acc) {
+  return acc.inputTokens > 0 || acc.outputTokens > 0 || acc.cacheReadTokens > 0 || acc.cacheCreationTokens > 0;
+}
 function buildUsage(acc, costUsdMicros) {
-  const hasTokens = acc.inputTokens > 0 || acc.outputTokens > 0 || acc.cacheReadTokens > 0 || acc.cacheCreationTokens > 0;
-  if (!hasTokens && costUsdMicros == null) return void 0;
+  if (!hasUsage(acc) && costUsdMicros == null) return void 0;
   return {
     inputTokens: acc.inputTokens || null,
     outputTokens: acc.outputTokens || null,
@@ -38262,7 +38358,7 @@ var init_pricing = __esm({
 });
 
 // ../adapters/src/_core/acp.ts
-function record3(value) {
+function record4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function firstString(...values) {
@@ -38277,11 +38373,11 @@ function textFromUnknown(value) {
     const parts = value.map(textFromUnknown).filter((x2) => Boolean(x2));
     return parts.length ? parts.join("") : void 0;
   }
-  const obj = record3(value);
+  const obj = record4(value);
   if (!obj) return void 0;
-  const direct = firstString(obj["text"], obj["delta"], obj["message"], record3(obj["error"])?.["message"]);
+  const direct = firstString(obj["text"], obj["delta"], obj["message"], record4(obj["error"])?.["message"]);
   if (direct) return direct;
-  return textFromUnknown(obj["content"]) ?? textFromUnknown(record3(obj["result"])?.["content"]) ?? textFromUnknown(obj["result"]);
+  return textFromUnknown(obj["content"]) ?? textFromUnknown(record4(obj["result"])?.["content"]) ?? textFromUnknown(obj["result"]);
 }
 function jsonLike(value) {
   if (typeof value !== "string") return value;
@@ -38296,15 +38392,15 @@ function jsonLike(value) {
   return { text: value };
 }
 function toolPayload(data) {
-  const d = record3(data) ?? {};
-  const nested = record3(d["toolCall"]) ?? record3(d["tool_call"]) ?? record3(d["call"]) ?? record3(d["tool"]) ?? record3(d["data"]) ?? {};
+  const d = record4(data) ?? {};
+  const nested = record4(d["toolCall"]) ?? record4(d["tool_call"]) ?? record4(d["call"]) ?? record4(d["tool"]) ?? record4(d["data"]) ?? {};
   return { ...nested, ...d };
 }
 function toolCallIdOf(d) {
   return firstString(d["toolCallId"], d["tool_call_id"], d["callId"], d["call_id"], d["id"]);
 }
 function toolNameOf(d) {
-  return firstString(d["name"], d["toolName"], d["tool_name"], record3(d["tool"])?.["name"]) ?? toolNameFromTitle(firstString(d["title"]) ?? "", firstString(d["kind"]) ?? "");
+  return firstString(d["name"], d["toolName"], d["tool_name"], record4(d["tool"])?.["name"]) ?? toolNameFromTitle(firstString(d["title"]) ?? "", firstString(d["kind"]) ?? "");
 }
 function inputFromTitle(title, toolName) {
   const colon = title.indexOf(":");
@@ -38346,7 +38442,7 @@ function argsTextOf(d) {
   return typeof value === "string" ? value : void 0;
 }
 function toolOutputOf(d) {
-  const error2 = record3(d["error"]);
+  const error2 = record4(d["error"]);
   if (error2) return error2["message"] ?? error2;
   const raw = d["rawOutput"] ?? d["raw_output"] ?? d["output"] ?? d["result"] ?? d["results"] ?? d["response"] ?? d["data"] ?? d["content"];
   const stream = compactRecord({
@@ -38384,7 +38480,7 @@ function parseJsonString(value) {
 function locationsOf(d) {
   const locations = d["locations"];
   if (!Array.isArray(locations)) return void 0;
-  const out = locations.filter((item) => Boolean(record3(item)));
+  const out = locations.filter((item) => Boolean(record4(item)));
   return out.length ? out : void 0;
 }
 function statusOf(d) {
@@ -38435,6 +38531,8 @@ function normalizeUpdateType(t) {
     toolcallfinished: "tool_call_update",
     toolcallcompleted: "tool_call_update",
     usageupdate: "usage_update",
+    usage: "usage_update",
+    tokenusage: "usage_update",
     turnend: "turn_end",
     endturn: "turn_end"
   }[key] ?? "";
@@ -38733,7 +38831,10 @@ var init_acp = __esm({
           const msg = detail ? `${p2.method}: ${err.message} (code=${err.code}, data=${detail})` : `${p2.method}: ${err.message} (code=${err.code})`;
           p2.reject(Object.assign(new Error(msg), { code: err.code, data: detail }));
         } else {
-          if (p2.method === "session/prompt") this.extractStopReason(raw["result"]);
+          if (p2.method === "session/prompt") {
+            this.extractStopReason(raw["result"]);
+            this.handleUsageFallback(raw["result"]);
+          }
           p2.resolve(raw["result"]);
         }
       }
@@ -38772,18 +38873,15 @@ var init_acp = __esm({
           case "turn_end":
             this.flushTextBuffers();
             this.extractStopReason(updateData);
+            this.handleUsageFallback(updateData);
             break;
         }
       }
       handleUsageUpdate(data) {
-        const d = record3(data);
-        if (!d) return;
-        const usage = record3(d["usage"]) ?? d;
-        const n = (v2) => typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
-        this.usage.inputTokens += n(usage["inputTokens"] ?? usage["input_tokens"]);
-        this.usage.outputTokens += n(usage["outputTokens"] ?? usage["output_tokens"]);
-        this.usage.cacheReadTokens += n(usage["cachedReadTokens"] ?? usage["cached_read_tokens"] ?? usage["cacheReadTokens"]);
-        this.usage.cacheCreationTokens += n(usage["cacheCreationTokens"] ?? usage["cache_creation_input_tokens"]);
+        accumulateUsage(this.usage, data);
+      }
+      handleUsageFallback(data) {
+        if (!hasUsage(this.usage)) this.handleUsageUpdate(data);
       }
       extractStopReason(data) {
         this.flushTextBuffers();
@@ -38815,11 +38913,11 @@ var init_acp = __esm({
         this.flushTextBuffer("message");
       }
       handleAgentMessage(data) {
-        const text = textFromUnknown(record3(data)?.["content"] ?? data);
+        const text = textFromUnknown(record4(data)?.["content"] ?? data);
         if (text) this.appendText("message", text);
       }
       handleAgentThought(data) {
-        const text = textFromUnknown(record3(data)?.["content"] ?? data);
+        const text = textFromUnknown(record4(data)?.["content"] ?? data);
         if (text) this.appendText("thought", text);
       }
       handleToolCallStart(data) {
@@ -54396,10 +54494,10 @@ async function startServe(opts) {
   let nodeStore = await FileNodeStore.open(path16.join(opts.dir, "nodes.json"));
   const registryAuditFile = path16.join(opts.dir, "registry-audit.ndjson");
   const registryListeners = /* @__PURE__ */ new Set();
-  const registryAudit = (record4) => {
-    fs17.appendFile(registryAuditFile, JSON.stringify(record4) + "\n", () => {
+  const registryAudit = (record5) => {
+    fs17.appendFile(registryAuditFile, JSON.stringify(record5) + "\n", () => {
     });
-    for (const l of registryListeners) l({ kind: record4.kind, actor: record4.actor, target: record4.target, timestamp: record4.timestamp });
+    for (const l of registryListeners) l({ kind: record5.kind, actor: record5.actor, target: record5.target, timestamp: record5.timestamp });
   };
   await syncRegistryRolesToKernel(registryStore, kernel);
   let builtinSkills = [];
@@ -57632,13 +57730,14 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.34" : "dev";
+var PKG_VERSION = true ? "0.1.35" : "dev";
 var OASIS_DIR = path18.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");
 var BIN_FILE = path18.join(OASIS_DIR, "bin", "oasis.js");
 var LOCAL_BIN = path18.join(os10.homedir(), ".local", "bin", "oasis");
 var LOG_FILE = path18.join(OASIS_DIR, "node.log");
+var NPM_PREFIX = path18.join(OASIS_DIR, "npm-global");
 var PKG_NAME = "oasis_test";
 var parseFlags = (argv) => {
   const flags = /* @__PURE__ */ new Map();
@@ -57772,8 +57871,9 @@ function selfUpdate() {
   const cfg = readConfig();
   if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis start` first");
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
-  const startCmd = `"$(npm prefix -g)/bin/oasis" start --server-ws '${cfg.serverUrl}'${nameArg}`;
-  const inner = `{ echo "[oasis] self-update \u2192 npm install -g ${PKG_NAME}@latest (then restart)"; sleep 2; npm install -g --prefer-online '${PKG_NAME}@latest' && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
+  const oasisBin = path18.join(NPM_PREFIX, "bin", "oasis");
+  const startCmd = `"${oasisBin}" start --server-ws '${cfg.serverUrl}'${nameArg}`;
+  const inner = `{ echo "[oasis] self-update \u2192 npm install --prefix ${NPM_PREFIX} ${PKG_NAME}@latest"; sleep 2; npm install -g --prefer-online --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest' && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
   const hasSystemd = process.platform === "linux" && (() => {
     try {
       (0, import_node_child_process15.execSync)("command -v systemd-run", { stdio: "ignore" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"