@abelxiaoxing/cadence 2.0.17 → 2.0.19

package/src/service-host.mjs

@@ -21038,7 +21038,8 @@ import { createHash as createHash21 } from "node:crypto";
 import { lstatSync as lstatSync12, readdirSync as readdirSync3, readlinkSync } from "node:fs";
 import { join as join19, relative as relative7 } from "node:path";
 var admin = (path) => path === ".cadence/assistant/tasks" || path.startsWith(".cadence/assistant/tasks/");
-function captureChanges(root) {
+var GIT_OUTPUT_BYTES = 16 * 1024 * 1024;
+function captureChanges(root, outputBytes = GIT_OUTPUT_BYTES) {
   const deadline = Date.now() + 3000;
   const hash3 = createHash21("sha256");
   const parts = [];
@@ -21050,24 +21051,25 @@ function captureChanges(root) {
     hash3.update(label).update("\x00").update(data2).update("\x00");
   };
   const git = (args) => {
-    if (Date.now() >= deadline) {
-      complete = false;
-      limits.push("Git observation time budget exhausted");
-      return { stdout: Buffer.alloc(0) };
-    }
-    const result = spawnSync2("git", gitArguments(["-c", "core.quotepath=true", ...args]), {
-      cwd: root,
-      encoding: "buffer",
-      timeout: Math.max(1, deadline - Date.now()),
-      maxBuffer: 512 * 1024,
-      windowsHide: true,
-      env: gitEnvironment()
-    });
-    if (result.error || result.status !== 0) {
-      complete = false;
-      limits.push(`Unavailable/limited Git observation: ${args[0]}`);
+    let outcome;
+    if (Date.now() >= deadline)
+      outcome = "time budget exhausted";
+    else {
+      const result = spawnSync2("git", gitArguments(["-c", "core.quotepath=true", ...args]), {
+        cwd: root,
+        encoding: "buffer",
+        timeout: Math.max(1, deadline - Date.now()),
+        maxBuffer: outputBytes,
+        windowsHide: true,
+        env: gitEnvironment()
+      });
+      if (!result.error && result.status === 0)
+        return { stdout: result.stdout, limited: false };
+      outcome = result.error ? result.error.code ?? "error" : result.signal ? `signal ${result.signal}` : `exit ${result.status}`;
     }
-    return result;
+    complete = false;
+    limits.push(`Unavailable/limited Git observation: ${args[0]} (${outcome})`);
+    return { stdout: Buffer.from(`[limited: ${outcome}]`), limited: true };
   };
   const inventory = (name) => {
     if (admin(name))
@@ -21120,7 +21122,7 @@ function captureChanges(root) {
       ":(exclude).cadence/assistant/tasks/**"
     ];
     const head = git(["rev-parse", "--verify", "HEAD"]);
-    add("HEAD", head.stdout ?? "");
+    add("HEAD", head.stdout);
     for (const [label, args] of [
       [
         "Status (includes pre-existing dirt)",
@@ -21156,15 +21158,14 @@ function captureChanges(root) {
         ]
       ]
     ]) {
-      const result = git([...args]);
-      const data2 = result.stdout ?? Buffer.alloc(0);
+      const data2 = git([...args]).stdout;
       add(label, data2);
       parts.push(`## ${label}
 ${data2.toString("utf8")}`);
     }
     const index = git(["ls-files", "--stage", "-z", ...pathspec]);
-    add("Index entries", index.stdout ?? "");
-    for (const entry of (index.stdout ?? Buffer.alloc(0)).toString("utf8").split("\x00")) {
+    add("Index entries", index.stdout);
+    for (const entry of index.stdout.toString("utf8").split("\x00")) {
       if (!entry.startsWith("160000 "))
         continue;
       complete = false;
@@ -21178,19 +21179,25 @@ ${data2.toString("utf8")}`);
       ...pathspec
     ]);
     parts.push("## Untracked identities (content not automatically sent to model)");
-    for (const name of (untracked.stdout ?? Buffer.alloc(0)).toString("utf8").split("\x00").filter(Boolean))
-      inventory(name);
+    if (untracked.limited)
+      add("Untracked", untracked.stdout);
+    else
+      for (const name of untracked.stdout.toString("utf8").split("\x00").filter(Boolean))
+        inventory(name);
     const ignored = git([
       "ls-files",
       "--others",
       "--ignored",
       "--exclude-standard",
+      "--directory",
+      "--no-empty-directory",
       "-z",
       ...pathspec
     ]);
-    if (ignored.stdout?.length) {
+    if (ignored.stdout.length) {
       complete = false;
-      limits.push("Ignored files exist and are not inspected; review coverage is incomplete.");
+      if (!ignored.limited)
+        limits.push("Ignored files exist and are not inspected; review coverage is incomplete.");
       add("ignored paths", ignored.stdout);
     }
     parts.push("Administrative .cadence/assistant/tasks records are excluded from business freshness; configuration is not excluded.");
@@ -21937,6 +21944,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")
@@ -21966,27 +21989,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,
@@ -24845,7 +24861,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
     };
@@ -24875,7 +24891,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;
         }
@@ -24903,7 +24919,7 @@ class TaskActions {
         });
         if (publication.status !== "published" || !publication.observed)
           throw new ContractError("conflict");
-        own2 = publication.observed;
+        own3 = publication.observed;
       }
     });
     accepted2.activate(work);