ahp-inspector 1.1.2 → 1.3.0

package/dist/index.js

@@ -19,10 +19,10 @@ var MAX_DEPTH_BELOW_LAUNCH = 3;
 function defaultRoots() {
   const home = homedir();
   const platform = process.platform;
-  const ossDev = {
-    origin: "vscode-oss-dev",
-    dir: join(home, ".vscode-oss-agents-dev", "logs")
-  };
+  const ossDevRoots = [
+    { origin: "vscode-oss-dev", dir: join(home, ".vscode-oss-dev", "logs") },
+    { origin: "vscode-oss-dev", dir: join(home, ".vscode-oss-agents-dev", "logs") }
+  ];
   if (platform === "darwin") {
     return [
       { origin: "vscode", dir: join(home, "Library", "Application Support", "Code", "logs") },
@@ -30,7 +30,7 @@ function defaultRoots() {
         origin: "vscode-insiders",
         dir: join(home, "Library", "Application Support", "Code - Insiders", "logs")
       },
-      ossDev
+      ...ossDevRoots
     ];
   }
   if (platform === "win32") {
@@ -38,13 +38,13 @@ function defaultRoots() {
     return [
       { origin: "vscode", dir: join(appData, "Code", "logs") },
       { origin: "vscode-insiders", dir: join(appData, "Code - Insiders", "logs") },
-      ossDev
+      ...ossDevRoots
     ];
   }
   return [
     { origin: "vscode", dir: join(home, ".config", "Code", "logs") },
     { origin: "vscode-insiders", dir: join(home, ".config", "Code - Insiders", "logs") },
-    ossDev
+    ...ossDevRoots
   ];
 }
 var FILENAME_RE_AHP_JSONL = /^(agenthost|agent-host|ahp).*\.jsonl$/i;
@@ -2351,12 +2351,19 @@ var TailReader = class {
       this.#lastOffset = 0;
       return;
     }
+    sink.onInitialReadStart?.({ totalBytes: sizeAtStart });
     if (sizeAtStart === 0) {
       this.#lastOffset = 0;
+      sink.onInitialReadComplete?.({ loadedBytes: 0, totalBytes: 0 });
       return;
     }
-    await this.#readRange(0, sizeAtStart, sink);
-    this.#lastOffset = sizeAtStart;
+    const result = await this.#readRange(0, sizeAtStart, sink, (loadedBytes) => {
+      sink.onInitialReadProgress?.({ loadedBytes, totalBytes: sizeAtStart });
+    });
+    this.#lastOffset = result.nextOffset;
+    if (result.completed && result.nextOffset >= sizeAtStart) {
+      sink.onInitialReadComplete?.({ loadedBytes: sizeAtStart, totalBytes: sizeAtStart });
+    }
   }
   /**
    * Subscribe to file growth, rotation, and errors. Returns a disposer that
@@ -2410,8 +2417,8 @@ var TailReader = class {
       }
       if (nextSize === this.#lastOffset) return;
       const start = this.#lastOffset;
-      await this.#readRange(start, nextSize, sink);
-      this.#lastOffset = nextSize;
+      const result = await this.#readRange(start, nextSize, sink);
+      this.#lastOffset = result.nextOffset;
     } finally {
       this.#readInFlight = false;
       if (this.#readAgainAfterCurrent && !this.#disposed) {
@@ -2433,11 +2440,11 @@ var TailReader = class {
     this.#lastOffset = 0;
     sink.onReset({ newSize, reason });
     if (newSize > 0) {
-      await this.#readRange(0, newSize, sink);
-      this.#lastOffset = newSize;
+      const result = await this.#readRange(0, newSize, sink);
+      this.#lastOffset = result.nextOffset;
     }
   }
-  #readRange(start, end, sink) {
+  #readRange(start, end, sink, onProgress) {
     return new Promise((resolve3) => {
       const stream2 = createReadStream(this.#path, {
         start,
@@ -2453,11 +2460,12 @@ var TailReader = class {
         })();
         sink.onChunk(bytes, cursor);
         cursor += bytes.byteLength;
+        onProgress?.(cursor);
       });
-      stream2.on("end", () => resolve3());
+      stream2.on("end", () => resolve3({ completed: true, nextOffset: cursor }));
       stream2.on("error", (err) => {
         sink.onError(err, false);
-        resolve3();
+        resolve3({ completed: false, nextOffset: cursor });
       });
     });
   }
@@ -2529,6 +2537,7 @@ var Correlator = class {
   #store;
   #pendingRequests = /* @__PURE__ */ new Map();
   #pendingResponses = /* @__PURE__ */ new Map();
+  #changedIndexes = /* @__PURE__ */ new Set();
   #unsubscribe;
   pairIdx = [];
   latencyMs = [];
@@ -2548,6 +2557,11 @@ var Correlator = class {
   statusOf(idx) {
     return this.status[idx] ?? "n/a";
   }
+  drainChangedIndexes() {
+    const indexes = [...this.#changedIndexes];
+    this.#changedIndexes.clear();
+    return indexes;
+  }
   /**
    * Advance time. Any request still pending older than `timeoutMs` becomes
    * 'unmatched'. Cheap O(pendingRequests).
@@ -2557,6 +2571,7 @@ var Correlator = class {
       const ts = this.#store.ts[idx];
       if (ts !== void 0 && nowMs - ts >= timeoutMs) {
         this.status[idx] = "unmatched";
+        this.#changedIndexes.add(idx);
         this.#pendingRequests.delete(key);
       }
     }
@@ -2569,6 +2584,7 @@ var Correlator = class {
   reset() {
     this.#pendingRequests.clear();
     this.#pendingResponses.clear();
+    this.#changedIndexes.clear();
     this.pairIdx.length = 0;
     this.latencyMs.length = 0;
     this.status.length = 0;
@@ -2600,9 +2616,11 @@ var Correlator = class {
     const displaced = this.#pendingRequests.get(key);
     if (displaced !== void 0) {
       this.status[displaced] = "orphan";
+      this.#changedIndexes.add(displaced);
     }
     this.#pendingRequests.set(key, idx);
     this.status[idx] = "pending";
+    this.#changedIndexes.add(idx);
   }
   #onResponse(idx, ev) {
     const key = correlationKeyForResponse(ev);
@@ -2615,6 +2633,7 @@ var Correlator = class {
     const displaced = this.#pendingResponses.get(key);
     if (displaced !== void 0) {
       this.status[displaced] = "orphan";
+      this.#changedIndexes.add(displaced);
     }
     this.#pendingResponses.set(key, idx);
   }
@@ -2629,6 +2648,8 @@ var Correlator = class {
     const s = isError ? "error" : "ok";
     this.status[reqIdx] = s;
     this.status[respIdx] = s;
+    this.#changedIndexes.add(reqIdx);
+    this.#changedIndexes.add(respIdx);
   }
 };
 function isErrorResponse(ev) {
@@ -4680,6 +4701,9 @@ async function createAppState(opts) {
   const searchIdx = new SearchIndex();
   let seq = 0;
   let byteOffset = 0;
+  let initialReadLoadedBytes = 0;
+  let initialReadTotalBytes;
+  let initialReadPhase = "idle";
   function emit(payload) {
     for (const l of listeners) {
       try {
@@ -4688,6 +4712,22 @@ async function createAppState(opts) {
       }
     }
   }
+  function currentLoadProgress(phase = initialReadPhase) {
+    const totalBytes = initialReadTotalBytes;
+    const percent = totalBytes !== void 0 && totalBytes > 0 ? Math.min(100, Math.round(initialReadLoadedBytes / totalBytes * 100)) : void 0;
+    return {
+      kind: "load-progress",
+      phase,
+      loadedRows: rows.length,
+      loadedBytes: initialReadLoadedBytes,
+      ...totalBytes !== void 0 ? { totalBytes } : {},
+      ...percent !== void 0 ? { percent } : {}
+    };
+  }
+  function emitLoadProgress(phase) {
+    initialReadPhase = phase;
+    emit(currentLoadProgress());
+  }
   let lastSeenServerSeq = null;
   function buildRow(idx) {
     const ev = store.at(idx);
@@ -4717,6 +4757,30 @@ async function createAppState(opts) {
     };
     return projectRow(ev, idx, status, latency, extras, pairMethod);
   }
+  function buildPatchUpdates(indexes) {
+    const updates = [];
+    for (const idx of indexes) {
+      const prev = rows[idx];
+      if (!prev) continue;
+      const status = correlator.statusOf(idx);
+      const latencyMs = correlator.latencyOf(idx);
+      const pairIdx = correlator.pairOf(idx);
+      if (prev.status === status && prev.latencyMs === latencyMs && prev.pairIdx === pairIdx) {
+        continue;
+      }
+      const latencyBand = bandFor(latencyMs);
+      rows[idx] = { ...prev, status, latencyMs, latencyBand, pairIdx };
+      updates.push({
+        idx,
+        status,
+        latencyMs,
+        latencyBand,
+        ...prev.summary !== void 0 ? { summary: prev.summary } : {},
+        pairIdx
+      });
+    }
+    return updates;
+  }
   const offStore = store.subscribe((range) => {
     const newRows = [];
     for (let i = range.from; i < range.to; i++) {
@@ -4728,30 +4792,27 @@ async function createAppState(opts) {
         if (ev) searchIdx.append(ev);
       }
     }
-    const updates = [];
-    for (let i = 0; i < range.from; i++) {
-      const prev = rows[i];
-      if (!prev) continue;
-      const status = correlator.statusOf(i);
-      const latencyMs = correlator.latencyOf(i);
-      const pairIdx = correlator.pairOf(i);
-      if (prev.status !== status || prev.latencyMs !== latencyMs || prev.pairIdx !== pairIdx) {
-        const latencyBand = bandFor(latencyMs);
-        rows[i] = { ...prev, status, latencyMs, latencyBand, pairIdx };
-        updates.push({
-          idx: i,
-          status,
-          latencyMs,
-          latencyBand,
-          ...prev.summary !== void 0 ? { summary: prev.summary } : {},
-          pairIdx
-        });
-      }
-    }
+    const changedIndexes = correlator.drainChangedIndexes().filter((idx) => idx < range.from);
+    const updates = buildPatchUpdates(changedIndexes);
     if (newRows.length > 0) emit({ kind: "append", rows: newRows, from: range.from });
     if (updates.length > 0) emit({ kind: "patch", updates });
   });
   const watcher = opts.host.watchLog(handle, {
+    onInitialReadStart(info) {
+      initialReadLoadedBytes = 0;
+      initialReadTotalBytes = info.totalBytes;
+      emitLoadProgress("loading");
+    },
+    onInitialReadProgress(info) {
+      initialReadLoadedBytes = info.loadedBytes;
+      initialReadTotalBytes = info.totalBytes;
+      emitLoadProgress("loading");
+    },
+    onInitialReadComplete(info) {
+      initialReadLoadedBytes = info.loadedBytes;
+      initialReadTotalBytes = info.totalBytes;
+      emitLoadProgress("complete");
+    },
     onChunk(chunk, _byteOffset) {
       const text = decoder.decode(chunk, { stream: true });
       const newlineSize = text.includes("\r\n") ? 2 : 1;
@@ -4793,6 +4854,9 @@ async function createAppState(opts) {
       rows.length = 0;
       searchIdx.reset();
       lastSeenServerSeq = null;
+      initialReadLoadedBytes = 0;
+      initialReadTotalBytes = void 0;
+      emitLoadProgress("idle");
       emit({ kind: "rotation", newSize: info.newSize, reason: info.reason });
     },
     onError(err, fatal) {
@@ -4806,26 +4870,7 @@ async function createAppState(opts) {
   function runFlush(nowMs) {
     const now = nowMs ?? Date.now();
     correlator.flush(now, unmatchedTimeoutMs);
-    const updates = [];
-    for (let i = 0; i < store.size(); i++) {
-      const prev = rows[i];
-      if (!prev) continue;
-      const status = correlator.statusOf(i);
-      const latencyMs = correlator.latencyOf(i);
-      const pairIdx = correlator.pairOf(i);
-      if (prev.status !== status || prev.latencyMs !== latencyMs || prev.pairIdx !== pairIdx) {
-        const latencyBand = bandFor(latencyMs);
-        rows[i] = { ...prev, status, latencyMs, latencyBand, pairIdx };
-        updates.push({
-          idx: i,
-          status,
-          latencyMs,
-          latencyBand,
-          ...prev.summary !== void 0 ? { summary: prev.summary } : {},
-          pairIdx
-        });
-      }
-    }
+    const updates = buildPatchUpdates(correlator.drainChangedIndexes());
     if (updates.length > 0) emit({ kind: "patch", updates });
   }
   const flushIntervalMs = opts.flushIntervalMs ?? 1e3;
@@ -4835,7 +4880,7 @@ async function createAppState(opts) {
     meta,
     searchIndex: searchIdx,
     snapshot() {
-      return { meta, rows: rows.slice() };
+      return { meta, rows: rows.slice(), loadProgress: currentLoadProgress() };
     },
     subscribe(l) {
       listeners.add(l);
@@ -7881,30 +7926,17 @@ function registerLogRoutes(app, sessions) {
     }
     return streamSSE(c, async (stream2) => {
       const a = initial;
-      const snap = a.appState.snapshot();
-      await stream2.writeSSE({
-        event: "snapshot-begin",
-        data: JSON.stringify({ meta: snap.meta, total: snap.rows.length })
-      });
-      for (let i = 0; i < snap.rows.length; i += SNAPSHOT_CHUNK) {
-        if (stream2.aborted || stream2.closed) return;
-        const chunk = snap.rows.slice(i, i + SNAPSHOT_CHUNK);
-        await stream2.writeSSE({
-          event: "snapshot-chunk",
-          data: JSON.stringify({ rows: chunk, from: i })
-        });
-        await stream2.sleep(0);
-      }
-      if (stream2.aborted || stream2.closed) return;
-      await stream2.writeSSE({ event: "snapshot-end", data: "{}" });
       const queue = [];
+      let queueStart = 0;
       let pumping = false;
+      let snapshotStreaming = true;
+      const queuedFrameCount = () => queue.length - queueStart;
       const pump = async () => {
-        if (pumping) return;
+        if (pumping || snapshotStreaming) return;
         pumping = true;
         try {
-          while (queue.length > 0 && !stream2.aborted && !stream2.closed) {
-            const msg = queue.shift();
+          while (queuedFrameCount() > 0 && !stream2.aborted && !stream2.closed) {
+            const msg = queue[queueStart++];
             if (!msg) break;
             try {
               await stream2.writeSSE({ event: msg.kind, data: JSON.stringify(msg) });
@@ -7913,6 +7945,10 @@ function registerLogRoutes(app, sessions) {
             }
           }
         } finally {
+          if (queueStart === queue.length) {
+            queue.length = 0;
+            queueStart = 0;
+          }
           pumping = false;
         }
       };
@@ -7920,6 +7956,56 @@ function registerLogRoutes(app, sessions) {
         queue.push(msg);
         void pump();
       });
+      const snap = a.appState.snapshot();
+      await stream2.writeSSE({
+        event: "snapshot-begin",
+        data: JSON.stringify({ meta: snap.meta, total: snap.rows.length })
+      });
+      for (let i = 0; i < snap.rows.length; i += SNAPSHOT_CHUNK) {
+        if (stream2.aborted || stream2.closed) {
+          off();
+          return;
+        }
+        const chunk = snap.rows.slice(i, i + SNAPSHOT_CHUNK);
+        await stream2.writeSSE({
+          event: "snapshot-chunk",
+          data: JSON.stringify({ rows: chunk, from: i })
+        });
+        await stream2.sleep(0);
+      }
+      if (stream2.aborted || stream2.closed) {
+        off();
+        return;
+      }
+      await stream2.writeSSE({ event: "snapshot-end", data: "{}" });
+      if (snap.loadProgress.phase !== "idle") {
+        await stream2.writeSSE({
+          event: snap.loadProgress.kind,
+          data: JSON.stringify(snap.loadProgress)
+        });
+      }
+      snapshotStreaming = false;
+      if (queuedFrameCount() > 0) {
+        const queuedRows = queue.slice(queueStart).reduce((total, msg) => total + (msg.kind === "append" ? msg.rows.length : 0), 0);
+        const backlog = {
+          kind: "stream-backlog",
+          queuedFrames: queuedFrameCount(),
+          queuedRows
+        };
+        await stream2.writeSSE({ event: backlog.kind, data: JSON.stringify(backlog) });
+        await pump();
+        const clearedBacklog = {
+          kind: "stream-backlog",
+          queuedFrames: 0,
+          queuedRows: 0
+        };
+        await stream2.writeSSE({
+          event: clearedBacklog.kind,
+          data: JSON.stringify(clearedBacklog)
+        });
+      } else {
+        await pump();
+      }
       let endRequested = false;
       const offChange = sessions.onChange(async () => {
         if (endRequested) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ahp-inspector",
-  "version": "1.1.2",
+  "version": "1.3.0",
   "type": "module",
   "description": "Local-first viewer for VS Code Agent Host Protocol (AHP) JSONL logs.",
   "keywords": [