shadok-ai 0.17.21 → 0.17.23

package/dist/forktrace.d.ts

@@ -40,4 +40,14 @@ seen?: ReadonlySet<string>,
  *  transcript a second time. Treating it like any other visited fork pinned
  *  the tail to a dead one for good — nothing streamed, the chat was silent
  *  live and perfect on every reload, and no restart could recover it. */
-ownId?: string): string | null;
+ownId?: string, 
+/** Directories to search for the fork. Defaults to the frozen file's OWN
+ *  directory — but a fork does NOT always land there. Claude Code derives the
+ *  project dir from the cwd it is LAUNCHED with, so a session created in a
+ *  worktree and later resumed at the repo root (the worktree pruned) writes
+ *  its context-overflow continuation under a DIFFERENT project dir. Scanning
+ *  one directory is then blind to it — the exact freeze this followed. The
+ *  caller passes every project dir so the lineage is found wherever it landed;
+ *  the root-match still keeps a sibling's transcript from being adopted, so
+ *  widening the search cannot mis-attribute across the boundary. */
+searchDirs?: readonly string[]): string | null;

package/dist/forktrace.js

@@ -109,7 +109,17 @@ seen = new Set(),
  *  transcript a second time. Treating it like any other visited fork pinned
  *  the tail to a dead one for good — nothing streamed, the chat was silent
  *  live and perfect on every reload, and no restart could recover it. */
-ownId) {
+ownId, 
+/** Directories to search for the fork. Defaults to the frozen file's OWN
+ *  directory — but a fork does NOT always land there. Claude Code derives the
+ *  project dir from the cwd it is LAUNCHED with, so a session created in a
+ *  worktree and later resumed at the repo root (the worktree pruned) writes
+ *  its context-overflow continuation under a DIFFERENT project dir. Scanning
+ *  one directory is then blind to it — the exact freeze this followed. The
+ *  caller passes every project dir so the lineage is found wherever it landed;
+ *  the root-match still keeps a sibling's transcript from being adopted, so
+ *  widening the search cannot mis-attribute across the boundary. */
+searchDirs) {
     let myMtime;
     try {
         myMtime = fs.statSync(myFile).mtimeMs;
@@ -117,30 +127,32 @@ ownId) {
     catch {
         return null; // our own file vanished — nothing to reason about
     }
-    const dir = path.dirname(myFile);
-    let names;
-    try {
-        names = fs.readdirSync(dir);
-    }
-    catch {
-        return null;
-    }
+    const dirs = searchDirs ?? [path.dirname(myFile)];
     const candidates = [];
-    for (const name of names) {
-        const id = idFromTranscriptName(name);
-        if (!id || id === tailId || (seen.has(id) && id !== ownId))
-            continue;
-        const f = path.join(dir, name);
-        let mtime;
+    for (const dir of dirs) {
+        let names;
         try {
-            mtime = fs.statSync(f).mtimeMs;
+            names = fs.readdirSync(dir);
         }
         catch {
-            continue; // vanished mid-scan
+            continue; // a listed dir that vanished/denied — skip, don't abort the scan
+        }
+        for (const name of names) {
+            const id = idFromTranscriptName(name);
+            if (!id || id === tailId || (seen.has(id) && id !== ownId))
+                continue;
+            const f = path.join(dir, name);
+            let mtime;
+            try {
+                mtime = fs.statSync(f).mtimeMs;
+            }
+            catch {
+                continue; // vanished mid-scan
+            }
+            if (mtime <= myMtime)
+                continue; // the fork is newer than the frozen file
+            candidates.push({ id, mtime, root: rootIdOfFile(f) });
         }
-        if (mtime <= myMtime)
-            continue; // the fork is newer than the frozen file
-        candidates.push({ id, mtime, root: rootIdOfFile(f) });
     }
     return forkTarget(candidates, tailId, myRoot);
 }

package/dist/forktrace.js.map

@@ -1 +1 @@
-{"version":3,"file":"forktrace.js","sourceRoot":"","sources":["../src/forktrace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"forktrace.js","sourceRoot":"","sources":["../src/forktrace.ts"],"names":[],"mappings":"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"}

package/dist/server.js

@@ -5983,11 +5983,25 @@ function maybeFollowFork(s) {
     // when the file has no root record yet (a session that never took a turn).
     const myRoot = (s.rootId ??= rootIdOfFile(myFile) ?? s.id);
     const seen = (s.tailSeen ??= new Set([tailId]));
+    // Search EVERY project dir, not just the frozen file's own: a session whose
+    // cwd drifted (created in a worktree, resumed at the repo root once the
+    // worktree was pruned) writes its context-overflow continuation under a
+    // DIFFERENT project dir, and scanning one directory is blind to it — the chat
+    // freezes while the TUI is fine. The root-match inside detectFork still bars a
+    // sibling's transcript, so widening the search cannot mis-attribute.
+    const projectsRoot = path.join(s.transcriptHome, ".claude", "projects");
+    let searchDirs;
+    try {
+        searchDirs = fs.readdirSync(projectsRoot).map((d) => path.join(projectsRoot, d));
+    }
+    catch {
+        searchDirs = [path.dirname(myFile)];
+    }
     // `s.id` is passed so the hunt can come HOME: every restart respawns with
     // `--resume <s.id>`, so the session's own transcript becomes the live file
     // again, and excluding it as a visited fork left the tail on a dead one for
     // good (see `detectFork`).
-    const target = detectFork(myFile, tailId, myRoot, seen, s.id);
+    const target = detectFork(myFile, tailId, myRoot, seen, s.id, searchDirs);
     if (!target)
         return;
     const home = target === s.id;