@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/node-runtime/{chunk-2KIPT4HJ.js → chunk-PWHTSQC4.js}

@@ -9,18 +9,18 @@ import {
   SessionOwnershipError,
   canonicalSessionPath,
   writeSessionJson
-} from "./chunk-UAEOTO52.js";
+} from "./chunk-MNQXDFPV.js";
 import {
   getAgentDir,
   getSessionsDir,
   normalizePath,
   resolvePath
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 
 // packages/coding-agent/dist/core/session-manager.js
 import { uuidv7 } from "@ashx-j/lunr-agent";
 import { createHash, randomUUID } from "crypto";
-import { appendFileSync, closeSync, createReadStream, existsSync, mkdirSync, openSync, readdirSync, readFileSync, readSync, statSync, writeFileSync } from "fs";
+import { appendFileSync, closeSync, createReadStream, existsSync, fchmodSync, fsyncSync, mkdirSync, openSync, readdirSync, readFileSync, readSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { readdir, stat } from "fs/promises";
 import { join, resolve } from "path";
 import { createInterface } from "readline";
@@ -326,6 +326,23 @@ async function listSessionsFromDir(dir, onProgress, progressOffset = 0, progress
   }
   return sessions;
 }
+function writeSessionEntries(file, entries) {
+  let mode = existsSync(file) ? statSync(file).mode & 511 : 384, temp = `${file}.${randomUUID()}.tmp`, fd = openSync(temp, "wx", mode);
+  try {
+    try {
+      fchmodSync(fd, mode);
+      for (let entry of entries)
+        writeFileSync(fd, `${JSON.stringify(entry)}
+`);
+      fsyncSync(fd);
+    } finally {
+      closeSync(fd);
+    }
+    renameSync(temp, file);
+  } finally {
+    existsSync(temp) && unlinkSync(temp);
+  }
+}
 var SessionManager = class _SessionManager {
   sessionId = "";
   sessionFile;
@@ -333,6 +350,7 @@ var SessionManager = class _SessionManager {
   cwd;
   persist;
   flushed = !1;
+  needsAppendSeparator = !1;
   fileEntries = [];
   byId = /* @__PURE__ */ new Map();
   labelsById = /* @__PURE__ */ new Map();
@@ -419,7 +437,15 @@ var SessionManager = class _SessionManager {
   }
   loadSessionFile(sessionFile) {
     if (this.claim(sessionFile), this.sessionFile = resolvePath(sessionFile), existsSync(this.sessionFile)) {
-      if (this.fileEntries = loadEntriesFromFile(this.sessionFile), this.fileEntries.length === 0) {
+      this.fileEntries = loadEntriesFromFile(this.sessionFile);
+      let fd = openSync(this.sessionFile, "r");
+      try {
+        let size = statSync(this.sessionFile).size, lastByte = Buffer.alloc(1);
+        this.needsAppendSeparator = size > 0 && readSync(fd, lastByte, 0, 1, size - 1) === 1 && lastByte[0] !== 10;
+      } finally {
+        closeSync(fd);
+      }
+      if (this.fileEntries.length === 0) {
         let explicitPath = this.sessionFile;
         if (statSync(explicitPath).size > 0)
           throw new Error(`Session file is not a valid pi session: ${explicitPath}`);
@@ -450,7 +476,7 @@ var SessionManager = class _SessionManager {
       cwd: this.cwd,
       parentSession: options?.parentSession
     };
-    if (this.fileEntries = [header], this.byId.clear(), this.labelsById.clear(), this.labelTimestampsById.clear(), this.leafId = null, this.flushed = !1, this.permissionMode = void 0, this.persist) {
+    if (this.fileEntries = [header], this.byId.clear(), this.labelsById.clear(), this.labelTimestampsById.clear(), this.leafId = null, this.flushed = !1, this.needsAppendSeparator = !1, this.permissionMode = void 0, this.persist) {
       let fileTimestamp = timestamp.replace(/[:.]/g, "-");
       this.sessionFile = join(this.getSessionDir(), `${fileTimestamp}_${this.sessionId}.jsonl`);
     }
@@ -461,17 +487,19 @@ var SessionManager = class _SessionManager {
     for (let entry of this.fileEntries)
       entry.type !== "session" && (this.byId.set(entry.id, entry), this.leafId = entry.id, entry.type === "label" && (entry.label ? (this.labelsById.set(entry.targetId, entry.label), this.labelTimestampsById.set(entry.targetId, entry.timestamp)) : (this.labelsById.delete(entry.targetId), this.labelTimestampsById.delete(entry.targetId))));
   }
+  /** Replace only after the sibling log is written, synced and closed.
+   * Rename protects the previous log on write failure, not against every power-loss scenario.
+   */
   _rewriteFile() {
     if (this.assertWritable(), !this.persist || !this.sessionFile)
       return;
-    let fd = openSync(this.sessionFile, "w");
-    try {
-      for (let entry of this.fileEntries)
-        writeFileSync(fd, `${JSON.stringify(entry)}
-`);
-    } finally {
-      closeSync(fd);
-    }
+    let file = this.ownership?.owner.file ?? this.sessionFile;
+    writeSessionEntries(file, this.fileEntries), this.needsAppendSeparator = !1;
+  }
+  _appendToFile(entry) {
+    this.sessionFile && (appendFileSync(this.sessionFile, `${this.needsAppendSeparator ? `
+` : ""}${JSON.stringify(entry)}
+`), this.needsAppendSeparator = !1);
   }
   isPersisted() {
     return this.persist;
@@ -495,13 +523,11 @@ var SessionManager = class _SessionManager {
     if (this.assertWritable(), !this.persist || !this.sessionFile)
       return;
     if (!this.fileEntries.some((e) => e.type === "message" && e.message.role === "assistant")) {
-      this.flushed ? appendFileSync(this.sessionFile, `${JSON.stringify(entry)}
-`) : this.flushed = !1;
+      this.flushed ? this._appendToFile(entry) : this.flushed = !1;
       return;
     }
     if (this.flushed)
-      appendFileSync(this.sessionFile, `${JSON.stringify(entry)}
-`);
+      this._appendToFile(entry);
     else {
       let fd = openSync(this.sessionFile, "wx");
       try {
@@ -524,6 +550,7 @@ var SessionManager = class _SessionManager {
    * These need to be appended via appendCompaction() and appendBranchSummary() methods.
    */
   appendMessage(message) {
+    message.role === "assistant" && (message.usage.requestId ??= randomUUID());
     let entry = {
       type: "message",
       id: generateId(this.byId),
@@ -533,6 +560,19 @@ var SessionManager = class _SessionManager {
     };
     return this._appendEntry(entry), entry.id;
   }
+  /** Persist an auxiliary request without adding it to model context. */
+  appendRequestUsage(purpose, message) {
+    let usage = { ...message.usage, requestId: message.usage.requestId ?? randomUUID() };
+    return this.appendCustomEntry("request-usage", {
+      id: usage.requestId,
+      purpose,
+      provider: message.provider,
+      model: message.responseModel ?? message.model,
+      timestamp: Date.now(),
+      usage,
+      stopReason: message.stopReason
+    });
+  }
   /** Append a thinking level change as child of current leaf, then advance leaf. Returns entry id. */
   appendThinkingLevelChange(thinkingLevel) {
     let entry = {
@@ -748,7 +788,7 @@ var SessionManager = class _SessionManager {
   branch(branchFromId) {
     if (this.assertWritable(), !this.byId.has(branchFromId))
       throw new Error(`Entry ${branchFromId} not found`);
-    this.leafId = branchFromId, this.flush();
+    this.moveLeaf(branchFromId);
   }
   /**
    * Reset the leaf pointer to null (before any entries).
@@ -756,7 +796,16 @@ var SessionManager = class _SessionManager {
    * Use this when navigating to re-edit the first user message.
    */
   resetLeaf() {
-    this.assertWritable(), this.leafId = null, this.flush();
+    this.assertWritable(), this.moveLeaf(null);
+  }
+  moveLeaf(leafId) {
+    let previous = this.leafId;
+    this.leafId = leafId;
+    try {
+      this.flush();
+    } catch (error) {
+      throw this.leafId = previous, error;
+    }
   }
   /**
    * Start a new branch with a summary of the abandoned path.
@@ -791,7 +840,7 @@ var SessionManager = class _SessionManager {
       throw new Error(`Entry ${leafId} not found`);
     let pathWithoutLabels = [], pathParentId = null;
     for (let entry of path)
-      entry.type !== "label" && (pathWithoutLabels.push({ ...entry, parentId: pathParentId }), pathParentId = entry.id);
+      entry.type !== "label" && (pathWithoutLabels.push({ ...entry, inherited: !0, parentId: pathParentId }), pathParentId = entry.id);
     let newSessionId = createSessionId(), timestamp = (/* @__PURE__ */ new Date()).toISOString(), fileTimestamp = timestamp.replace(/[:.]/g, "-"), newSessionFile = join(this.getSessionDir(), `${fileTimestamp}_${newSessionId}.jsonl`), header = {
       type: "session",
       version: CURRENT_SESSION_VERSION,
@@ -815,7 +864,20 @@ var SessionManager = class _SessionManager {
         };
         pathEntryIds.add(labelEntry.id), labelEntries2.push(labelEntry), parentId2 = labelEntry.id;
       }
-      return this.claim(newSessionFile), this.fileEntries = [header, ...pathWithoutLabels, ...labelEntries2], this.sessionId = newSessionId, this.ownership?.bindSession(this.sessionId), this.sessionFile = newSessionFile, this._buildIndex(), this.fileEntries.some((e) => e.type === "message" && e.message.role === "assistant") ? (this._rewriteFile(), this.flushed = !0) : this.flushed = !1, newSessionFile;
+      let entries = [header, ...pathWithoutLabels, ...labelEntries2], hasAssistant = entries.some((e) => e.type === "message" && e.message.role === "assistant");
+      this.saveLeaf();
+      let nextOwnership = new SessionOwnership(canonicalSessionPath(newSessionFile)), wroteFork = !1;
+      try {
+        nextOwnership.bindSession(newSessionId), hasAssistant && (writeSessionEntries(nextOwnership.owner.file, entries), wroteFork = !0), this.ownership?.release();
+      } catch (error) {
+        if (wroteFork)
+          try {
+            unlinkSync(nextOwnership.owner.file);
+          } catch {
+          }
+        throw nextOwnership.release(), error;
+      }
+      return this.ownership = nextOwnership, this.fileEntries = entries, this.sessionId = newSessionId, this.sessionFile = newSessionFile, this._buildIndex(), this.flushed = hasAssistant, this.needsAppendSeparator = !1, newSessionFile;
     }
     let labelEntries = [], parentId = pathWithoutLabels[pathWithoutLabels.length - 1]?.id || null;
     for (let { targetId, label, timestamp: labelTimestamp } of labelsToWrite) {

package/dist/node-runtime/{chunk-RWTKOC3B.js → chunk-QBTJG3UM.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   theme
-} from "./chunk-RDDAZOMU.js";
+} from "./chunk-JL4HYQXK.js";
 
 // packages/coding-agent/dist/core/permission-mode.js
 var PERMISSION_MODE_BRIDGE_SYMBOL = /* @__PURE__ */ Symbol.for("@lunr/permission-mode"), getModeFn, bridge = {