dsh-live-compact 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-live-compact",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "In-place newest-turn compaction for DeepSeek Harness. Compress while the task runs and keep the prefix.",
   "license": "MIT",
   "author": "MerkyorLynn <268568828+MerkyorLynn@users.noreply.github.com>",
@@ -17,6 +17,7 @@
     "./shadow-search": "./shadow-search.js"
   },
   "files": [
+    "CHANGELOG.md",
     "shell.js",
     "adapter.js",
     "settings.js",
@@ -26,6 +27,7 @@
     "plan.js",
     "raw.js",
     "shadow.js",
+    "shadow-save-worker.mjs",
     "shadow-search.js",
     "cooldown.js",
     "thunder.js",
@@ -41,7 +43,8 @@
     "compaction"
   ],
   "scripts": {
-    "test:gate": "node test/p0-gate.mjs && node test/p0-blockers.mjs && node test/excerpt.mjs && node --test test/public-exports.test.mjs test/cooldown.test.mjs test/gate-config.test.mjs test/drain-stopline.mjs test/scan-once.mjs test/issue-19.mjs test/issue-20.mjs test/issue-34.mjs test/windows-acl.test.mjs test/issue-27.mjs test/issue-29.mjs test/issue-29-notice.mjs test/client-settings.test.mjs test/settings-integration.test.mjs test/runtime-lifecycle.mjs test/shadow-lifecycle.mjs test/finalize-over-32000.mjs",
+    "test:gate": "node test/p0-gate.mjs && node test/p0-blockers.mjs && node test/excerpt.mjs && node test/shadow-worker.mjs && node test/shadow-worker-pool.mjs && node test/shadow-worker-fuse.mjs && node --test test/failed-diagnostics.test.mjs test/public-exports.test.mjs test/cooldown.test.mjs test/gate-config.test.mjs test/stand-down.test.mjs test/drain-stopline.mjs test/scan-once.mjs test/issue-19.mjs test/issue-20.mjs test/issue-34.mjs test/windows-acl.test.mjs test/issue-27.mjs test/issue-29.mjs test/issue-29-notice.mjs test/client-settings.test.mjs test/settings-integration.test.mjs test/runtime-lifecycle.mjs test/shadow-lifecycle.mjs test/finalize-over-32000.mjs test/p1-fable-review.mjs",
+    "test:compat41": "node test/compat-cordis41.mjs",
     "test:live-gate": "python3 -B -m unittest discover -s test/live-fill -p test_*.py"
   },
   "engines": {

package/plan.js

@@ -241,6 +241,8 @@ function failureBody(text) {
   if (raw.startsWith("{")) {
     try {
       const parsed = JSON.parse(raw);
+      // A bounded failed result keeps every field, not only the two streams.
+      if (raw.length <= TOOL_BUDGET) return raw;
       const streams = [];
       for (const [label, value] of [["stderr", parsed?.stderr?.text], ["stdout", parsed?.stdout?.text]]) {
         if (typeof value === "string" && value.trim()) {
@@ -257,8 +259,9 @@ function failureBody(text) {
 
 export function failureKeptLines(text) {
   const useful = usefulLines(failureBody(text));
-  if (useful.join("\n").length <= TOOL_BUDGET) return useful.map(shorten);
-  const marked = useful.filter((line) => FAILURE_LINE.test(line)).slice(-8).map(shorten);
+  if (useful.join("\n").length <= TOOL_BUDGET) return useful;
+  const markedLines = useful.filter((line) => FAILURE_LINE.test(line));
+  const marked = (markedLines.length > 8 ? [markedLines[0], ...markedLines.slice(-7)] : markedLines).map(shorten);
   const causes = useful.filter((line) => /(?:root|stderr|stdout)[ _-]*cause\b|CAUSE\b/i.test(line)).slice(-4).map(shorten);
   const edges = [...useful.slice(0, 1), ...useful.slice(-2)].map(shorten);
   const picked = [];
@@ -538,9 +541,10 @@ export function roundHasLongRead(events, round) {
   return false;
 }
 
-export function keptToolRounds(events, limit = 3) {
+export function keptToolRounds(events, limit = 3, afterIndex = -1) {
   const count = Number.isInteger(limit) && limit > 0 ? limit : 3;
-  const rounds = finishedToolRounds(events).filter((round) => !roundHasLongRead(events, round));
+  const floor = Number.isInteger(afterIndex) ? afterIndex : -1;
+  const rounds = finishedToolRounds(events).filter((round) => round.start > floor && !roundHasLongRead(events, round));
   return rounds.slice(-count);
 }
 
@@ -730,11 +734,18 @@ export function providerURLFromPatch(text, provider) {
 
 // 内置目录只在这家没有自己的地址时使用。调用方传入 {id, baseURL}，这里不读包。
 // Use a built-in catalog URL only when this provider has no URL of its own.
-export function catalogProviderURL(provider, catalog) {
+export function catalogProviderURL(provider, catalog, model = "") {
   const name = String(provider || "");
   if (!name || !catalog) return "";
   const list = Array.isArray(catalog) ? catalog : [];
   const match = list.find((entry) => entry?.id === name || entry?.provider === name);
+  const modelName = String(model || "");
+  if (match && modelName) {
+    const models = Array.isArray(match.models) ? match.models : [];
+    const modelMatch = models.find((entry) => entry?.id === modelName || entry?.model === modelName);
+    const modelURL = modelMatch?.baseURL || modelMatch?.baseUrl || "";
+    if (modelURL) return String(modelURL);
+  }
   return String(match?.baseURL || match?.baseUrl || "");
 }
 
@@ -744,6 +755,7 @@ export function catalogProviderURL(provider, catalog) {
 // Official DeepSeek and the built-in catalog apply only when the profile has no URL. Empty stays unresolved.
 export function resolveProviderBaseURL({
   provider = "",
+  model = "",
   headerURL = "",
   listed = [],
   layers = [],
@@ -767,10 +779,11 @@ export function resolveProviderBaseURL({
   if (fromConfig) return fromConfig;
   const fromPatch = providerURLFromPatch(patchText, provider);
   if (fromPatch) return fromPatch;
-  if (provider === "deepseek-account" && launchURL) return String(launchURL);
+  const launch = String(launchURL || "").trim();
+  if (provider === "deepseek-account" && launch) return launch;
   const fallback = fallbackProviderURL(provider);
   if (fallback) return fallback;
-  return catalogProviderURL(provider, catalog);
+  return catalogProviderURL(provider, catalog, model);
 }
 
 export function resolveEngine({ provider = "", baseURL = "", env = process.env } = {}) {
@@ -947,7 +960,7 @@ export function pointerOnlyText(pieces) {
   const lines = tools.map((piece) => {
     const cmd = piece.command || piece.name || "tool";
     const call = Number.isInteger(piece.callSeq) ? piece.callSeq : "?";
-    const flag = piece.isError ? " error" : "";
+    const flag = isToolFailure(piece.text, piece.isError) ? " error" : "";
     return `* ${piece.name || "tool"} "${cmd}" (seq ${call} -> result ${piece.seq}${flag})`;
   });
   const userBlock = users.length
@@ -1033,9 +1046,15 @@ function toolBlock(span) {
   if (command) prefix.push(command);
   const exitCode = failed ? exitCodeOf(text) : null;
   if (exitCode !== null) prefix.push(`[exit code: ${exitCode}]`);
-  if (small) return { block: [...prefix, ...lines.map((line) => `│ ${line}`)].join("\n"), failed, needsBackup: false, hardLines, ordinaryLines };
-  if (failed) return { block: [...prefix, ...failureKeptLines(text).map((line) => `│ ${line}`)].join("\n"), failed, needsBackup: true, hardLines, ordinaryLines };
-  return { block: [...prefix, ...unknownKeptLines(text).map((line) => `│ ${line}`)].join("\n"), failed, needsBackup: true, hardLines, ordinaryLines };
+  if (small) return { block: [...prefix, ...lines.map((line) => `│ ${line}`)].join("\n"), failed, failureDiagnosticsComplete: true, needsBackup: false, hardLines, ordinaryLines };
+  if (failed) {
+    const original = text.trim();
+    const diagnostic = usefulLines(original.startsWith("{") ? original : failureBody(text));
+    const kept = failureKeptLines(text);
+    const failureDiagnosticsComplete = diagnostic.length === kept.length && diagnostic.every((line, index) => line === kept[index]);
+    return { block: [...prefix, ...kept.map((line) => `│ ${line}`)].join("\n"), failed, failureDiagnosticsComplete, needsBackup: true, hardLines, ordinaryLines };
+  }
+  return { block: [...prefix, ...unknownKeptLines(text).map((line) => `│ ${line}`)].join("\n"), failed, failureDiagnosticsComplete: true, needsBackup: true, hardLines, ordinaryLines };
 }
 
 export function fitFailure(block, budget) {
@@ -1051,7 +1070,7 @@ export function fitFailure(block, budget) {
 
 export function toolExcerpt(spans, backupId = "") {
   const tools = (spans || []).filter((span) => sourceRole(span.role) === "tool" && String(span.text || "").trim().length > 0);
-  if (tools.length === 0) return { text: "", omitted: 0, needsBackup: false, excerpts: [], stats: [] };
+  if (tools.length === 0) return { text: "", omitted: 0, needsBackup: false, failureDiagnosticsComplete: true, incompleteFailures: [], excerpts: [], stats: [] };
   let lastFailure = -1;
   tools.forEach((span, index) => {
     if (isToolFailure(span.text, span.isError)) lastFailure = index;
@@ -1067,15 +1086,22 @@ export function toolExcerpt(spans, backupId = "") {
   });
   const chosen = [];
   const stats = [];
+  const incompleteFailures = new Map();
   let used = 0;
   let needsBackup = false;
   for (const item of ranked) {
     const built = toolBlock(item.span);
+    const incomplete = (reason) => {
+      if (built.failed && !incompleteFailures.has(item.index)) incompleteFailures.set(item.index, { sourceId: item.span.id, reason });
+    };
+    if (!built.failureDiagnosticsComplete) incomplete("failed-tool-lines-truncated");
     let block = built.block;
     if (item.index === lastFailure && used + block.length > TOOL_BUDGET) {
+      incomplete("failed-tool-budget-truncated");
       block = fitFailure(block, Math.max(0, TOOL_BUDGET - used));
     }
     if (used + block.length > TOOL_BUDGET) {
+      incomplete("failed-tool-budget-omitted");
       needsBackup = true;
       stats.push({ sourceId: item.span.id, hardLines: built.hardLines, omittedOrdinaryToolLines: built.ordinaryLines.length });
       continue;
@@ -1107,6 +1133,8 @@ export function toolExcerpt(spans, backupId = "") {
     text: parts.join("\n"),
     omitted: skipped,
     needsBackup,
+    failureDiagnosticsComplete: incompleteFailures.size === 0,
+    incompleteFailures: [...incompleteFailures.values()],
     excerpts: chosen.map(({ sourceId, text }) => ({ sourceId, text })),
     stats,
   };
@@ -1151,7 +1179,7 @@ function pointerLines(spans) {
     if (Number.isInteger(span.seq)) {
       const cmd = span.command || span.name || "tool";
       const call = Number.isInteger(span.callSeq) ? span.callSeq : "?";
-      const flag = span.isError ? " error" : "";
+      const flag = isToolFailure(span.text, span.isError) ? " error" : "";
       lines.push(`* ${span.name || "tool"} "${cmd}" (seq ${call} -> result ${span.seq}${flag})`);
       continue;
     }
@@ -1165,6 +1193,17 @@ function hasProtectedToolFact(line) {
   return /必须|不要|禁止|口令|方案|[a-z]{2,}-[a-z0-9]+-\d+|\bpinned\s+to\b/i.test(line);
 }
 
+// A model/version/region token by itself is ordinary prose. Only retain an
+// assistant line as an unresolved decision when the line contains a decision
+// verb or the explicit Chinese plan form; this avoids treating `us-east-1`
+// and `claude-3-5` as commands that block the cut.
+function unresolvedAssistantDecision(line) {
+  const text = String(line || "");
+  if (/方案\s*[A-Za-z0-9]/.test(text)) return true;
+  if (/(?:决定|采用|选用|选择|固定为|改用|切换到|定为|使用|确定)/.test(text)) return true;
+  return /\b(?:pinned\s+to|decid(?:e|ed|es)|adopt(?:ed|s)?|selected|choose|chosen|will\s+use|must\s+use)\b/i.test(text);
+}
+
 function normalizeSourceLine(role, text) {
   return (role === "tool" ? text.replace(/^[ \t]*\d+:[ \t]*/, "") : text).trim();
 }
@@ -1281,13 +1320,22 @@ export function buildCard(
     requiredLines: hard,
     keptLines: kept.map((item) => ({ sourceId: item.sourceId, text: item.line })),
   });
+  const incompleteFailures = tools.incompleteFailures.filter((item) => sourceById.has(item.sourceId));
+  for (const item of incompleteFailures) {
+    coverage.ok = false;
+    coverage.missing.push({
+      sourceId: item.sourceId,
+      text: `failed-tool-diagnostics-not-retained (seq ${sourceById.get(item.sourceId).seq ?? "?"})`,
+      reason: "failed-tool-diagnostics-not-retained",
+    });
+  }
 
   // 保留既有助手决策否决；助手正文既不进 Kept，也不能为其他来源提供证据。
   for (const source of sources) {
     if (source.role !== "assistant") continue;
     source.text.split(/\r?\n/).forEach((line) => {
       if (liveLines.has(line.trim())) return;
-      if (/[a-z]{2,}-[a-z0-9]+-\d+/i.test(line) || /方案\s*[A-Za-z0-9]/.test(line)) {
+      if (unresolvedAssistantDecision(line)) {
         coverage.ok = false;
         coverage.missing.push({ sourceId: source.id, text: line, reason: "assistant-decision-not-retained" });
       }
@@ -1341,12 +1389,18 @@ export function buildCard(
 
   return {
     ok: coverage.ok,
+    failureDiagnosticsComplete: incompleteFailures.length === 0,
     scope: TRUNK_SCOPE,
     hardLines: hard.map((item) => item.line),
+    hardFacts: hard.map((item) => ({ role: item.role, line: item.line })),
     hardCount: hard.length,
     omittedHard,
     deferred,
     missing,
+    missingFacts: coverage.missing.map((item) => ({
+      role: sourceById.get(item.sourceId)?.role || "unknown",
+      line: item.text,
+    })),
     omittedOrdinaryToolLines: omittedOrdinaryToolLines,
     uncovered: split.uncovered,
     keptChars: used,

package/raw.js

@@ -20,6 +20,10 @@ import {
 
 export const PRUNE_MARKER = "[... tool result middle pruned ...]";
 
+function transientCaptureError(error) {
+  return ["ESHADOWBUSY", "EAGAIN", "EBUSY", "EINTR", "EIO"].includes(error?.code);
+}
+
 export function contentHash(text) {
   const hash = createHash("sha256");
   hash.update(typeof text === "string" ? Buffer.from(text, "utf8") : text);
@@ -62,12 +66,14 @@ function readExisting(file, toolCallId) {
 
 // Restart recovery is read-only: never manufacture an original from the surface.
 // Resolve only the requested ID, with the same permissions/meta checks as capture.
-export function readRawToolResult({ dir, toolCallId, access = {} }) {
+export function readRawToolResult({ dir, toolCallId, access = {}, tighten = true }) {
   const file = join(dir, rawName(toolCallId));
   if (!existsSync(file)) return { ok: false, reason: "missing-file", toolCallId };
-  ensureShadowDir(dir, access);
-  tightenShadow(file, "file", access);
-  if (existsSync(`${file}.meta.json`)) tightenShadow(`${file}.meta.json`, "file", access);
+  if (tighten) {
+    ensureShadowDir(dir, access);
+    tightenShadow(file, "file", access);
+    if (existsSync(`${file}.meta.json`)) tightenShadow(`${file}.meta.json`, "file", access);
+  }
   return readExisting(file, toolCallId);
 }
 
@@ -120,7 +126,7 @@ export function captureToolResult(options) {
     ensureShadowDir(dir, access);
   } catch (error) {
     if (error?.code === "ESHADOWACCESS" || error?.code === "ESHADOWCLEANUP") throw error;
-    return { ok: false, reason: "unwritable", toolCallId };
+    return { ok: false, reason: "unwritable", toolCallId, retryable: transientCaptureError(error) };
   }
   let entered = false;
   try {
@@ -129,7 +135,7 @@ export function captureToolResult(options) {
       return captureToolResultLocked({ ...options, root });
     });
   } catch (error) {
-    if (!entered || error?.code === "ESHADOWBUSY") return { ok: false, reason: "unwritable", toolCallId, retryable: error?.code === "ESHADOWBUSY" };
+    if (!entered || transientCaptureError(error)) return { ok: false, reason: "unwritable", toolCallId, retryable: transientCaptureError(error) };
     throw error; // In particular, preserve exceptions from failed raw cleanup.
   }
 }
@@ -151,6 +157,8 @@ function captureToolResultLocked({
   const body = String(text ?? "");
   const file = join(dir, rawName(toolCallId));
   const metaPath = `${file}.meta.json`;
+  const bytes = Buffer.from(body, "utf8");
+  const hash = contentHash(bytes);
 
   if (!existsSync(file) && body.includes(PRUNE_MARKER)) {
     return { ok: false, reason: "already-pruned", toolCallId };
@@ -161,10 +169,24 @@ function captureToolResultLocked({
   let createdRaw = false;
 
   try {
-    if (existsSync(file)) return readProtectedExisting();
-
-    const bytes = Buffer.from(body, "utf8");
-    const hash = contentHash(bytes);
+    if (existsSync(file)) {
+      const existing = readProtectedExisting();
+      if (!existing.ok) {
+        // A raw without its meta marker is an incomplete publication. When
+        // the current event still has the original body, discard the orphan
+        // and rebuild the pair; a malformed/valid meta file remains fail-closed.
+        if (existing.reason === "missing-meta" && !body.includes(PRUNE_MARKER)) {
+          discardShadowFiles([file, metaPath], new Error("incomplete raw/meta pair"));
+        } else {
+          return existing;
+        }
+      }
+      if (existing.ok && body.includes(PRUNE_MARKER)) return existing;
+      if (existing.ok && (existing.sha256 !== hash || existing.bytes !== bytes.length)) {
+        return { ok: false, reason: "duplicate-tool-call-id", toolCallId, retryable: false };
+      }
+      if (existing.ok) return existing;
+    }
 
     writeShadowFile(file, bytes, access, { exclusive: true, root });
     createdRaw = true;
@@ -206,7 +228,7 @@ function captureToolResultLocked({
       return readProtectedExisting();
     }
 
-    return { ok: false, reason: "unwritable", toolCallId, retryable: error?.code === "ESHADOWBUSY" };
+    return { ok: false, reason: "unwritable", toolCallId, retryable: transientCaptureError(error) };
   }
 }
 

package/shadow-save-worker.mjs

@@ -0,0 +1,24 @@
+import { parentPort, workerData } from "node:worker_threads";
+import { attachShadowAccessFuse, saveShadowTransaction } from "./shadow.js";
+
+const managed = workerData?.spineWorker === 1;
+if (managed) attachShadowAccessFuse(workerData.accessFuse);
+
+async function handle(id, payload) {
+  try {
+    const result = saveShadowTransaction(payload);
+    parentPort.postMessage({ id, ok: true, result });
+  } catch (error) {
+    parentPort.postMessage({ id, ok: false, error: {
+      name: error?.name || "Error",
+      message: error?.message || String(error),
+      code: error?.code,
+    } });
+  }
+}
+
+let queue = Promise.resolve();
+if (workerData && !managed) handle(0, workerData);
+parentPort.on("message", ({ id, payload }) => {
+  queue = queue.then(() => handle(id, payload));
+});