@wrongstack/core 0.3.1 → 0.3.2

package/dist/storage/index.js

@@ -1,7 +1,6 @@
 import { randomBytes, randomUUID } from 'crypto';
 import * as fsp from 'fs/promises';
 import * as path2 from 'path';
-import 'fs';
 import * as os from 'os';
 
 // src/storage/session-store.ts
@@ -70,6 +69,98 @@ async function renameWithRetry(from, to) {
   throw lastErr;
 }
 
+// src/utils/message-invariants.ts
+function repairToolUseAdjacency(messages) {
+  const removedToolUses = [];
+  const removedToolResults = [];
+  let removedMessages = 0;
+  let changed = false;
+  const out = [];
+  for (let i = 0; i < messages.length; i++) {
+    const original = messages[i];
+    let msg = original;
+    if (hasToolUse(msg)) {
+      const nextIds = toolResultIds(messages[i + 1]);
+      const filtered = mapContent(msg, (blocks) => {
+        const next = [];
+        for (const block of blocks) {
+          if (block.type === "tool_use" && !nextIds.has(block.id)) {
+            removedToolUses.push(block.id);
+            changed = true;
+            continue;
+          }
+          next.push(block);
+        }
+        return next;
+      });
+      msg = filtered ?? msg;
+    }
+    if (hasToolResult(msg)) {
+      const allowed = toolUseIds(out[out.length - 1]);
+      const filtered = mapContent(msg, (blocks) => {
+        const next = [];
+        for (const block of blocks) {
+          if (block.type === "tool_result" && !allowed.has(block.tool_use_id)) {
+            removedToolResults.push(block.tool_use_id);
+            changed = true;
+            continue;
+          }
+          next.push(block);
+        }
+        return next;
+      });
+      msg = filtered ?? msg;
+    }
+    if (isEmptyMessage(msg)) {
+      removedMessages++;
+      changed = true;
+      continue;
+    }
+    out.push(msg);
+  }
+  return {
+    messages: changed ? out : messages,
+    report: { changed, removedToolUses, removedToolResults, removedMessages }
+  };
+}
+function hasToolUse(msg) {
+  return contentBlocks(msg).some((b) => b.type === "tool_use");
+}
+function hasToolResult(msg) {
+  return contentBlocks(msg).some((b) => b.type === "tool_result");
+}
+function toolUseIds(msg) {
+  const ids = /* @__PURE__ */ new Set();
+  if (!msg || msg.role !== "assistant") return ids;
+  for (const block of contentBlocks(msg)) {
+    if (block.type === "tool_use") ids.add(block.id);
+  }
+  return ids;
+}
+function toolResultIds(msg) {
+  const ids = /* @__PURE__ */ new Set();
+  if (!msg || msg.role !== "user") return ids;
+  for (const block of contentBlocks(msg)) {
+    if (block.type === "tool_result") ids.add(block.tool_use_id);
+  }
+  return ids;
+}
+function contentBlocks(msg) {
+  return msg && Array.isArray(msg.content) ? msg.content : [];
+}
+function mapContent(msg, fn) {
+  if (!Array.isArray(msg.content)) return msg;
+  const next = fn(msg.content);
+  if (next.length === msg.content.length && next.every((b, idx) => b === msg.content[idx])) {
+    return msg;
+  }
+  return { ...msg, content: next };
+}
+function isEmptyMessage(msg) {
+  if (typeof msg.content === "string") return msg.content.trim().length === 0;
+  return msg.content.length === 0;
+}
+
 // src/storage/session-store.ts
 var DefaultSessionStore = class {
   dir;
@@ -272,11 +363,17 @@ var DefaultSessionStore = class {
     if (openToolUses.size > 0) {
       this.events?.emit("session.damaged", {
         sessionId,
-        detail: `${openToolUses.size} tool_use blocks without matching results \u2014 replay truncated`
+        detail: `${openToolUses.size} tool_use blocks without matching results - replay repaired`
+      });
+    }
+    const repaired = repairToolUseAdjacency(messages);
+    if (repaired.report.changed) {
+      this.events?.emit("session.damaged", {
+        sessionId,
+        detail: `Repaired replay adjacency: removed ${repaired.report.removedToolUses.length} tool_use, ${repaired.report.removedToolResults.length} tool_result, ${repaired.report.removedMessages} empty messages`
       });
-      return { messages, usage };
     }
-    return { messages, usage };
+    return { messages: repaired.messages, usage };
   }
 };
 var FileSessionWriter = class {
@@ -302,6 +399,7 @@ var FileSessionWriter = class {
   startedAt;
   meta;
   closed = false;
+  closing = false;
   manifestFile;
   summary;
   tokenIn = 0;
@@ -317,9 +415,7 @@ var FileSessionWriter = class {
   resumed;
   appendFailCount = 0;
   lastAppendWarnAt = 0;
-  async writeSessionStart() {
-    if (this.initDone || this.closed) return;
-    this.initDone = true;
+  async writeSessionStartLazy() {
     const record = `${JSON.stringify({
       type: this.resumed ? "session_resumed" : "session_start",
       ts: this.startedAt,
@@ -338,7 +434,8 @@ var FileSessionWriter = class {
   async append(event) {
     if (this.closed) return;
     if (!this.initDone) {
-      await this.writeSessionStart();
+      this.initDone = true;
+      await this.writeSessionStartLazy();
     }
     this.observeForSummary(event);
     try {
@@ -379,7 +476,8 @@ var FileSessionWriter = class {
     }
   }
   async close() {
-    if (this.closed) return;
+    if (this.closing) return;
+    this.closing = true;
     this.closed = true;
     if (this.manifestFile) {
       try {
@@ -781,6 +879,8 @@ function deepFreeze(obj) {
   }
   return Object.freeze(obj);
 }
+
+// src/security/config-secrets.ts
 function decryptConfigSecrets(cfg, vault) {
   return walk(cfg, vault, (v, key) => {
     try {
@@ -820,6 +920,57 @@ function isSecretField(name) {
   return SECRET_KEY_PATTERN.test(lc);
 }
 
+// src/types/context-window.ts
+var DEFAULT_CONTEXT_WINDOW_MODE_ID = "balanced";
+var CONTEXT_WINDOW_MODES = Object.freeze([
+  {
+    id: "balanced",
+    name: "Balanced",
+    description: "Default rolling compaction: recent work stays verbatim, old tool output is trimmed.",
+    thresholds: { warn: 0.6, soft: 0.75, hard: 0.9 },
+    aggressiveOn: "soft",
+    preserveK: 10,
+    eliseThreshold: 2e3,
+    targetLoad: 0.65
+  },
+  {
+    id: "frugal",
+    name: "Frugal",
+    description: "Token-saver mode: compacts early and keeps a tighter verbatim tail.",
+    thresholds: { warn: 0.45, soft: 0.6, hard: 0.75 },
+    aggressiveOn: "warn",
+    preserveK: 6,
+    eliseThreshold: 700,
+    targetLoad: 0.5
+  },
+  {
+    id: "deep",
+    name: "Deep",
+    description: "Long-reasoning mode: delays compaction and keeps more recent turns intact.",
+    thresholds: { warn: 0.72, soft: 0.86, hard: 0.96 },
+    aggressiveOn: "hard",
+    preserveK: 18,
+    eliseThreshold: 5e3,
+    targetLoad: 0.78
+  },
+  {
+    id: "archival",
+    name: "Archival",
+    description: "Decision-preserving mode: compacts steadily while keeping summaries prominent.",
+    thresholds: { warn: 0.55, soft: 0.7, hard: 0.84 },
+    aggressiveOn: "soft",
+    preserveK: 8,
+    eliseThreshold: 1200,
+    targetLoad: 0.58
+  }
+]);
+function listContextWindowModes() {
+  return CONTEXT_WINDOW_MODES.map((m) => ({ ...m, thresholds: { ...m.thresholds } }));
+}
+function isContextWindowModeId(id) {
+  return CONTEXT_WINDOW_MODES.some((m) => m.id === id);
+}
+
 // src/utils/safe-json.ts
 function safeParse(input, maxBytes = 5e6) {
   if (input.length > maxBytes) {
@@ -839,6 +990,7 @@ function safeParse(input, maxBytes = 5e6) {
 var BEHAVIOR_DEFAULTS = {
   version: 1,
   context: {
+    mode: DEFAULT_CONTEXT_WINDOW_MODE_ID,
     warnThreshold: 0.6,
     softThreshold: 0.75,
     hardThreshold: 0.9,
@@ -1013,6 +1165,10 @@ var DefaultConfigLoader = class {
     if (c.warnThreshold >= c.softThreshold || c.softThreshold >= c.hardThreshold) {
       throw new Error("Config: context thresholds must satisfy warn < soft < hard");
     }
+    if (c.mode !== void 0 && !isContextWindowModeId(c.mode)) {
+      const known = listContextWindowModes().map((m) => m.id).join(", ");
+      throw new Error(`Config: context.mode must be one of: ${known}`);
+    }
   }
   validateIdentity(cfg) {
     if (!cfg.provider) {
@@ -1589,24 +1745,35 @@ async function saveTodosCheckpoint(filePath, sessionId, todos) {
 function attachTodosCheckpoint(state, filePath, sessionId) {
   let timer = null;
   let pending = null;
+  let writeChain = Promise.resolve();
+  const enqueueWrite = (todos) => {
+    writeChain = writeChain.then(() => saveTodosCheckpoint(filePath, sessionId, todos));
+    return writeChain;
+  };
   const flush = () => {
     timer = null;
     if (pending) {
-      void saveTodosCheckpoint(filePath, sessionId, pending);
+      const todos = pending;
       pending = null;
+      return enqueueWrite(todos);
     }
+    return writeChain;
   };
   const unsubscribe = state.onChange((change) => {
     if (change.kind !== "todos_replaced") return;
     pending = change.todos;
     if (timer) clearTimeout(timer);
-    timer = setTimeout(flush, 150);
+    timer = setTimeout(() => {
+      void flush();
+    }, 150);
   });
-  return () => {
+  return async () => {
     unsubscribe();
     if (timer) {
       clearTimeout(timer);
-      flush();
+      await flush();
+    } else {
+      await writeChain;
     }
   };
 }