@abelxiaoxing/cadence 2.0.18 → 2.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abelxiaoxing/cadence",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "description": "Shared Pi task workspace: native terminal and WebUI, persistent service, checks and human review.",
   "license": "MIT",
   "type": "module",

package/src/conversation-context.mjs

@@ -21,6 +21,26 @@ function argumentsData(value, secrets) {
   if (sanitizer.limited) throw new Error("Unsupported context arguments");
   return parseWireJson(source, 64 * 1024);
 }
+function own(value, key) {
+  const d =
+    value && typeof value === "object"
+      ? Object.getOwnPropertyDescriptor(value, key)
+      : undefined;
+  if (!d || !("value" in d)) throw new Error("Invalid usage");
+  return d.value;
+}
+// Pi adds optional usage breakdowns per provider and release (reasoning, cacheWrite1h);
+// retain only the counts every assistant message carries, read as own data properties.
+function counts(value, keys) {
+  const out = Object.create(null);
+  for (const key of keys) {
+    const n = own(value, key);
+    if (typeof n !== "number" || !Number.isFinite(n) || n < 0)
+      throw new Error("Invalid usage");
+    out[key] = n;
+  }
+  return out;
+}
 /** Deliberately retain text and tool exchanges, not just last assistant prose. */
 export function conversationMessages(messages, secrets = []) {
   return list(messages, 4096, (message) => {
@@ -54,27 +74,20 @@ export function conversationMessages(messages, secrets = []) {
         toolName: clean(message.toolName, secrets, 128),
         isError: message.isError === true,
       };
-    const usage = closed(message.usage, [
+    const usage = counts(message.usage, [
       "input",
       "output",
       "cacheRead",
       "cacheWrite",
       "totalTokens",
-      "cost",
     ]);
-    const cost = closed(usage.cost, [
+    usage.cost = counts(own(message.usage, "cost"), [
       "input",
       "output",
       "cacheRead",
       "cacheWrite",
       "total",
     ]);
-    for (const value of [
-      ...Object.values(usage).filter((v) => typeof v !== "object"),
-      ...Object.values(cost),
-    ])
-      if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
-        throw new Error("Invalid usage");
     return {
       role,
       timestamp,

package/src/native-build.ts

@@ -2,5 +2,5 @@
 export const nativeBuild = {
   kind: "native",
   contractHash:
-    "944f3b53bd5b7f1d3f30868e0947d900e356ae9a2bcfb9f591edd988b3d5eb3a",
+    "83a2720c0a5a61f9e18e4f67e9738f184dee61cf07e75d9b98b5728577daaa6d",
 } as const;

package/src/service/contracts/workbench.ts

@@ -66,6 +66,9 @@ export interface ChatTurn {
   status: ChatStatus;
   items: ChatItem[];
   notice: string;
+  /** Content kinds observed and not retained; never written into `notice`.
+   * `other` is a block of a type Cadence does not recognize. */
+  omitted: { thinking: boolean; media: boolean; other: boolean };
 }
 export interface ChatSummary {
   id: string;
@@ -199,12 +202,24 @@ export function decodeWorkbenchCommand(v: unknown): WorkbenchCommand {
   };
 }
 export function decodeChatTurn(v: unknown): ChatTurn {
-  const o = closed(v, ["id", "epoch", "status", "items", "notice"]);
+  // Turns saved before `omitted` existed lack it; their flags read as unobserved.
+  const keys = ["id", "epoch", "status", "items", "notice"];
+  const current =
+    v !== null && typeof v === "object" && Object.hasOwn(v, "omitted");
+  const o = closed(v, current ? [...keys, "omitted"] : keys);
+  const omitted = current
+    ? closed(o.omitted, ["thinking", "media", "other"])
+    : null;
   return {
     id: decodeId(o.id),
     epoch: decodeId(o.epoch),
     status: oneOf(o.status, statuses),
     notice: text(o.notice, 1024),
+    omitted: {
+      thinking: omitted ? bool(omitted.thinking) : false,
+      media: omitted ? bool(omitted.media) : false,
+      other: omitted ? bool(omitted.other) : false,
+    },
     items: list(o.items, 256, (v) => {
       const i = closed(v, ["id", "role", "text", "name", "args", "error"]);
       return {

package/src/service-host.mjs

@@ -4006,12 +4006,20 @@ function decodeWorkbenchCommand(v) {
   };
 }
 function decodeChatTurn(v) {
-  const o = closed(v, ["id", "epoch", "status", "items", "notice"]);
+  const keys2 = ["id", "epoch", "status", "items", "notice"];
+  const current = v !== null && typeof v === "object" && Object.hasOwn(v, "omitted");
+  const o = closed(v, current ? [...keys2, "omitted"] : keys2);
+  const omitted = current ? closed(o.omitted, ["thinking", "media", "other"]) : null;
   return {
     id: decodeId(o.id),
     epoch: decodeId(o.epoch),
     status: oneOf(o.status, statuses),
     notice: text(o.notice, 1024),
+    omitted: {
+      thinking: omitted ? bool(omitted.thinking) : false,
+      media: omitted ? bool(omitted.media) : false,
+      other: omitted ? bool(omitted.other) : false
+    },
     items: list(o.items, 256, (v2) => {
       const i = closed(v2, ["id", "role", "text", "name", "args", "error"]);
       return {
@@ -10285,7 +10293,7 @@ async function createGateway(value, hostUrl, source) {
   const input = decodeGatewayInput(value), store = new GatewayStore(input.serverConfig, input.stateHome);
   const web = loadWebAssets(source?.webDirectory);
   const build2 = {
-    contractHash: "944f3b53bd5b7f1d3f30868e0947d900e356ae9a2bcfb9f591edd988b3d5eb3a",
+    contractHash: "83a2720c0a5a61f9e18e4f67e9738f184dee61cf07e75d9b98b5728577daaa6d",
     assets: {
       sourceHash: web.manifest.sourceHash,
       contractHash: web.manifest.contractHash,
@@ -21944,6 +21952,22 @@ function argumentsData(value, secrets) {
     throw new Error("Unsupported context arguments");
   return parseWireJson(source, 64 * 1024);
 }
+function own(value, key2) {
+  const d = value && typeof value === "object" ? Object.getOwnPropertyDescriptor(value, key2) : undefined;
+  if (!d || !("value" in d))
+    throw new Error("Invalid usage");
+  return d.value;
+}
+function counts(value, keys3) {
+  const out = Object.create(null);
+  for (const key2 of keys3) {
+    const n = own(value, key2);
+    if (typeof n !== "number" || !Number.isFinite(n) || n < 0)
+      throw new Error("Invalid usage");
+    out[key2] = n;
+  }
+  return out;
+}
 function conversationMessages(messages, secrets = []) {
   return list(messages, 4096, (message) => {
     if (!message || typeof message !== "object")
@@ -21973,27 +21997,20 @@ function conversationMessages(messages, secrets = []) {
         toolName: clean(message.toolName, secrets, 128),
         isError: message.isError === true
       };
-    const usage = closed(message.usage, [
+    const usage = counts(message.usage, [
       "input",
       "output",
       "cacheRead",
       "cacheWrite",
-      "totalTokens",
-      "cost"
+      "totalTokens"
     ]);
-    const cost = closed(usage.cost, [
+    usage.cost = counts(own(message.usage, "cost"), [
       "input",
       "output",
       "cacheRead",
       "cacheWrite",
       "total"
     ]);
-    for (const value of [
-      ...Object.values(usage).filter((v) => typeof v !== "object"),
-      ...Object.values(cost)
-    ])
-      if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
-        throw new Error("Invalid usage");
     return {
       role: role2,
       timestamp,
@@ -24852,7 +24869,7 @@ class TaskActions {
     const graph = action.kind === "start" ? plan?.graph ?? this.defaultGraph(selected2.record, selected2.identity, expected.model) : null;
     if (graph && hash2(canonicalJson(graph)) !== expected.task.graphIdentity)
       throw new ContractError("stale");
-    let own2 = {
+    let own3 = {
       revision: selected2.record.revision,
       identity: selected2.identity
     };
@@ -24882,7 +24899,7 @@ class TaskActions {
         try {
           this.assertChoice(expected);
           const latest = h.coordination.store.loadSnapshot(action.taskId);
-          return latest?.identity === own2.identity && latest.record.revision === own2.revision && this.sources.current();
+          return latest?.identity === own3.identity && latest.record.revision === own3.revision && this.sources.current();
         } catch {
           return false;
         }
@@ -24910,7 +24927,7 @@ class TaskActions {
         });
         if (publication.status !== "published" || !publication.observed)
           throw new ContractError("conflict");
-        own2 = publication.observed;
+        own3 = publication.observed;
       }
     });
     accepted2.activate(work);
@@ -25149,6 +25166,11 @@ import { dirname as dirname14, join as join22 } from "node:path";
 var TURN_BYTES = 384 * 1024;
 var META_BYTES = 64 * 1024;
 var SESSION_LIMIT = 200;
+var OMITTED_FLAG = {
+  "hidden-thinking": "thinking",
+  binary: "media",
+  unsupported: "other"
+};
 
 class ConversationCapture {
   turn;
@@ -25242,8 +25264,8 @@ class ConversationCapture {
         item.error = e.isError;
     } else if (e.kind === "worker-failure")
       this.turn.notice = `worker-failure: ${e.code}`;
-    else if (e.kind === "omitted-block")
-      this.turn.notice = "Hidden thinking, signatures and media are not retained.";
+    else if (e.kind === "omitted-block" && e.block.owner.kind !== "context" && e.block.owner.kind !== "handoff")
+      this.turn.omitted[OMITTED_FLAG[e.block.reason]] = true;
     if ([...this.details.values()].reduce((size, detail) => size + Buffer.byteLength(detail.text) + detail.sanitizer.retainedBytes, 0) > TURN_BYTES)
       throw new ContractError("capacity");
     canonicalJson(this.turn, TURN_BYTES);
@@ -25500,6 +25522,7 @@ class Conversations {
       epoch: input.model.epoch,
       status: "queued",
       notice: "",
+      omitted: { thinking: false, media: false, other: false },
       items: [
         {
           id: "user",
@@ -25925,7 +25948,7 @@ function refuseAt(stage, step) {
   }
 }
 async function createServiceHost(value, sourceBuild) {
-  const embedded = "944f3b53bd5b7f1d3f30868e0947d900e356ae9a2bcfb9f591edd988b3d5eb3a";
+  const embedded = "83a2720c0a5a61f9e18e4f67e9738f184dee61cf07e75d9b98b5728577daaa6d";
   if (embedded && sourceBuild)
     throw new ContractError("unsupported-context");
   const contractHash = decodeHash(embedded ?? sourceBuild?.contractHash);