@rubytech/create-maxy-code 0.1.91 → 0.1.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-code",
-  "version": "0.1.91",
+  "version": "0.1.92",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy-code": "./dist/index.js"

package/payload/platform/package-lock.json

@@ -113,10 +113,6 @@
       "resolved": "plugins/scheduling/mcp",
       "link": true
     },
-    "node_modules/@maxy/tasks": {
-      "resolved": "plugins/tasks/mcp",
-      "link": true
-    },
     "node_modules/@maxy/waitlist": {
       "resolved": "plugins/waitlist/mcp",
       "link": true
@@ -125,6 +121,10 @@
       "resolved": "plugins/whatsapp/mcp",
       "link": true
     },
+    "node_modules/@maxy/work": {
+      "resolved": "plugins/work/mcp",
+      "link": true
+    },
     "node_modules/@maxy/workflows": {
       "resolved": "plugins/workflows/mcp",
       "link": true
@@ -3454,6 +3454,7 @@
     "plugins/tasks/mcp": {
       "name": "@maxy/tasks",
       "version": "0.1.0",
+      "extraneous": true,
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.12.1",
         "neo4j-driver": "^5.28.1",
@@ -3503,6 +3504,19 @@
         "typescript": "^5.7.0"
       }
     },
+    "plugins/work/mcp": {
+      "name": "@maxy/work",
+      "version": "0.1.0",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.12.1",
+        "neo4j-driver": "^5.28.1",
+        "zod": "^3.24.0"
+      },
+      "devDependencies": {
+        "@types/node": "^22.0.0",
+        "typescript": "^5.7.0"
+      }
+    },
     "plugins/workflows/mcp": {
       "name": "@maxy/workflows",
       "version": "0.2.0",

package/payload/platform/services/claude-session-manager/dist/fs-watcher.d.ts

@@ -2,7 +2,9 @@ import type { Logger } from './types.js';
 export type RowState = 'live' | 'archived';
 export type RowStatus = 'idle' | 'busy' | 'gone';
 export interface SessionRow {
-    /** Intrinsic Claude session id (UUID). Canonical key. */
+    /** Intrinsic Claude session id (UUID). Canonical key. For a top-level
+     *  jsonl row, this is the file basename. For a pre-first-turn live row,
+     *  this is the sessionId from the PID file. */
     sessionId: string;
     /** Full bridge session id ("session_<suffix>") from PID file, or null. */
     bridgeSessionId: string | null;
@@ -11,7 +13,7 @@ export interface SessionRow {
     /** Specialist agent name from PID file (`--agent <name>`), or null.
      *  Always null on archived rows — PID file is gone by then. */
     agent: string | null;
-    /** Specialist agent name cached from the first JSONL `agent-setting`
+    /** Specialist agent name cached from the JSONL `agent-setting`
      *  record (read once at row-archive transition or boot-seed of an
      *  archived row). Null when the JSONL has no `agent-setting` record
      *  (operator-driven session). UI's resolveAgentLabel falls back to
@@ -19,7 +21,6 @@ export interface SessionRow {
     cachedAgentSetting: string | null;
     cwd: string | null;
     pid: number | null;
-    jsonlPath: string | null;
     pidFilePath: string | null;
     state: RowState;
     status: RowStatus;

package/payload/platform/services/claude-session-manager/dist/fs-watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs-watcher.d.ts","sourceRoot":"","sources":["../src/fs-watcher.ts"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAsCxC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAA;AAC1C,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAEhD,MAAM,WAAW,UAAU;IACzB,yDAAyD;IACzD,SAAS,EAAE,MAAM,CAAA;IACjB,0EAA0E;IAC1E,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B;mEAC+D;IAC/D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB;;;;qCAIiC;IACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,QAAQ,CAAA;IACf,MAAM,EAAE,SAAS,CAAA;IACjB,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACpC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAA;IACvB,GAAG,EAAE,UAAU,GAAG,IAAI,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;AAEtD,MAAM,WAAW,SAAS;IACxB,QAAQ,IAAI,IAAI,CAAA;IAChB,GAAG,IAAI,IAAI,CAAA;IACX,SAAS,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,IAAI,CAAA;IACtC,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IAClD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IACxD,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IACzD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IAC7C,GAAG,IAAI,UAAU,EAAE,CAAA;IACnB,6EAA6E;IAC7E,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC/D,KAAK,IAAI,IAAI,CAAA;IACb;;;;2EAIuE;IACvE,UAAU,EAAE;QACV,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;QACpC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KACvC,CAAA;CACF;AA0DD,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,SAAS,CAoaZ"}
+{"version":3,"file":"fs-watcher.d.ts","sourceRoot":"","sources":["../src/fs-watcher.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAsCxC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAA;AAC1C,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAEhD,MAAM,WAAW,UAAU;IACzB;;mDAE+C;IAC/C,SAAS,EAAE,MAAM,CAAA;IACjB,0EAA0E;IAC1E,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B;mEAC+D;IAC/D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB;;;;qCAIiC;IACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,QAAQ,CAAA;IACf,MAAM,EAAE,SAAS,CAAA;IACjB,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACpC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAA;IACvB,GAAG,EAAE,UAAU,GAAG,IAAI,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;AAEtD,MAAM,WAAW,SAAS;IACxB,QAAQ,IAAI,IAAI,CAAA;IAChB,GAAG,IAAI,IAAI,CAAA;IACX,SAAS,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,IAAI,CAAA;IACtC,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IAClD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IACxD,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IACzD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IAC7C,GAAG,IAAI,UAAU,EAAE,CAAA;IACnB,6EAA6E;IAC7E,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC/D,KAAK,IAAI,IAAI,CAAA;IACb;;;;2EAIuE;IACvE,UAAU,EAAE;QACV,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;QACpC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KACvC,CAAA;CACF;AAyDD,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,SAAS,CA2XZ"}

package/payload/platform/services/claude-session-manager/dist/fs-watcher.js

@@ -1,23 +1,28 @@
-// Filesystem watcher — single source of truth for the manager's row index.
+// Filesystem watcher — disk is the source of truth (Task 258).
 //
 // Two directories are watched continuously:
 //
 //   ${CLAUDE_CONFIG_DIR}/sessions/<pid>.json   — written by Claude Code at PTY
-//     launch for entrypoint=cli. Carries sessionId, bridgeSessionId, agent,
-//     status, cwd, updatedAt directly. Created at process init, refreshed on
-//     status/agent change, deleted when the process exits cleanly.
+//     launch. Carries sessionId, bridgeSessionId, agent, status, cwd,
+//     updatedAt directly. Created at process init, refreshed on status/agent
+//     change, deleted when the process exits cleanly.
 //
 //   ${CLAUDE_CONFIG_DIR}/projects/<slug>/<sessionId>.jsonl — written on the
 //     first operator turn; persists after process exit as the audit
 //     transcript.
 //
-// The watcher unifies the two surfaces into one row indexed by the intrinsic
-// `sessionId` (the UUID Claude Code mints, identical to the JSONL basename).
-// PID-file events drive the live half of the lifecycle; JSONL events drive
-// the archived half. A row exists whenever EITHER file exists.
+// Row identity rule:
+//   - A top-level JSONL file at `<projectsDir>/<sid>.jsonl` is a row whose
+//     `sessionId` IS the basename. Always.
+//   - A PID file at `<sessionsDir>/<pid>.json` decorates a row: the row
+//     becomes 'live' when the PID file's `sessionId` field matches a
+//     top-level JSONL basename, OR when the PID file's `sessionId` field
+//     has no matching JSONL yet (fresh /spawn pre-first-turn).
+//   - The fs-watcher carries no path-anchored maps and no merge state
+//     machine. After Task 258, paths are derived; the watcher reads disk.
 //
 // Boot sequence is sync-then-arm: bootSeed() reads both directories
-// synchronously and rebuilds the in-memory index before arm() turns on the
+// synchronously and rebuilds the in-memory cache before arm() turns on the
 // fs.watch handlers. Without this ordering, watch events fire before the
 // seed completes and either land before any subscriber attaches (silent
 // drop) or race with seed inserts (double-emit). The deterministic order
@@ -28,16 +33,6 @@
 // emits when the PID file is rewritten (write-temp-rename is two events
 // from fs.watch's perspective on macOS, more on Linux), and folds the
 // CREATE→MODIFY pair an editor-style writer can emit.
-//
-// Identifiers carried on every row:
-//   - sessionId           (canonical, never null)
-//   - bridgeSessionId     ("session_<suffix>" form, null for entrypoint=cli
-//                          rows that have not yet written URL-bound state)
-//   - bridgeSuffix        ("<suffix>" — derived; bridgeSessionId minus the
-//                          "session_" prefix)
-//   - pid                 (null on archived JSONL-only rows)
-// The store/HTTP layer resolves an inbound id against all four keys so a
-// caller holding any one of them resolves to the same row.
 import { existsSync, mkdirSync, openSync, closeSync, readSync, readFileSync, readdirSync, statSync, watch } from 'node:fs';
 import { join } from 'node:path';
 const DEBOUNCE_MS = 200;
@@ -119,39 +114,16 @@ function parsePidFile(path) {
         : typeof parsed.startedAt === 'number'
             ? parsed.startedAt
             : 0;
-    return {
-        sessionId,
-        bridgeSessionId,
-        bridgeSuffix,
-        agent,
-        cachedAgentSetting: null,
-        cwd,
-        pid,
-        jsonlPath: null,
-        pidFilePath: path,
-        state: 'live',
-        status,
-        updatedAt,
-    };
+    return { sessionId, pid, bridgeSessionId, bridgeSuffix, agent, cwd, status, updatedAt, pidFilePath: path };
 }
 export function createFsWatcher(opts) {
     const { sessionsDir, projectsDir, logger } = opts;
-    // Canonical store keyed on sessionId. Secondary maps re-derived from the
-    // canonical row so a removeRow drops every key in one shot.
+    // Transient row cache, keyed on sessionId. Built by bootSeed and kept
+    // in sync by fs event reconciliation. Not the source of truth — disk is.
     const rowsBySessionId = new Map();
+    // Reverse indexes derived from row content. Rebuilt on indexRow/unindexRow.
     const sessionIdByPid = new Map();
     const sessionIdByBridgeSuffix = new Map();
-    const sessionIdByPidFilePath = new Map();
-    // Task 190 — jsonl-path-anchored prior-row lookup. Closes the symmetric
-    // gap to Task 186's pid-file swap: when `claude --resume` rewrites the
-    // pid file, the fork sid stays canonical, but Claude continues writing
-    // turns to `<source>.jsonl`. The admin server archives the source jsonl
-    // during resume, so the first post-resume turn re-creates the file at
-    // the projects-dir path. Without this map, that create event lands as
-    // a stray archived row. The pid-file swap branch pre-seeds this map
-    // with `jsonlPathFor(parsed.sessionId) → priorSessionIdAtPath` so the
-    // jsonl event redirects onto the fork row.
-    const sessionIdByJsonlPath = new Map();
     const subscribers = new Set();
     const pidWaiters = new Map();
     const debounceTimers = new Map();
@@ -161,7 +133,7 @@ export function createFsWatcher(opts) {
     let seeded = false;
     function emit(event) {
         logger(`[fs-watcher] event=${event.kind} kind=${event.source} sessionId=${event.sessionId} agent=${event.row?.agent ?? 'none'} ` +
-            `status=${event.row?.status ?? 'gone'} path=${event.row?.[event.source === 'pid' ? 'pidFilePath' : 'jsonlPath'] ?? 'none'}`);
+            `status=${event.row?.status ?? 'gone'} path=${event.row?.pidFilePath ?? 'derived'}`);
         for (const sub of subscribers) {
             try {
                 sub(event);
@@ -186,10 +158,6 @@ export function createFsWatcher(opts) {
             sessionIdByPid.set(row.pid, row.sessionId);
         if (row.bridgeSuffix)
             sessionIdByBridgeSuffix.set(row.bridgeSuffix, row.sessionId);
-        if (row.pidFilePath)
-            sessionIdByPidFilePath.set(row.pidFilePath, row.sessionId);
-        if (row.jsonlPath)
-            sessionIdByJsonlPath.set(row.jsonlPath, row.sessionId);
     }
     function unindexRow(row) {
         rowsBySessionId.delete(row.sessionId);
@@ -197,36 +165,90 @@ export function createFsWatcher(opts) {
             sessionIdByPid.delete(row.pid);
         if (row.bridgeSuffix)
             sessionIdByBridgeSuffix.delete(row.bridgeSuffix);
-        if (row.pidFilePath)
-            sessionIdByPidFilePath.delete(row.pidFilePath);
-        if (row.jsonlPath)
-            sessionIdByJsonlPath.delete(row.jsonlPath);
     }
     function jsonlPathFor(sessionId) {
         return join(projectsDir, `${sessionId}.jsonl`);
     }
+    /** Find the pid file (if any) whose content names `sessionId`. Used at
+     *  bootSeed to correlate jsonls with their live pid files, and on jsonl
+     *  events to detect a freshly-created jsonl whose sessionId matches a
+     *  pre-first-turn live row. */
+    function findPidFileForSessionId(sessionId) {
+        try {
+            for (const entry of readdirSync(sessionsDir, { withFileTypes: true })) {
+                if (!entry.isFile() || !entry.name.endsWith('.json'))
+                    continue;
+                const parsed = parsePidFile(join(sessionsDir, entry.name));
+                if (parsed && parsed.sessionId === sessionId)
+                    return parsed;
+            }
+        }
+        catch {
+            // sessionsDir absent — fine.
+        }
+        return null;
+    }
+    function buildLiveRow(pidContent) {
+        return {
+            sessionId: pidContent.sessionId,
+            bridgeSessionId: pidContent.bridgeSessionId,
+            bridgeSuffix: pidContent.bridgeSuffix,
+            agent: pidContent.agent,
+            cachedAgentSetting: null,
+            cwd: pidContent.cwd,
+            pid: pidContent.pid,
+            pidFilePath: pidContent.pidFilePath,
+            state: 'live',
+            status: pidContent.status,
+            updatedAt: pidContent.updatedAt,
+        };
+    }
+    function buildArchivedRow(sessionId, jsonlPath) {
+        return {
+            sessionId,
+            bridgeSessionId: null,
+            bridgeSuffix: null,
+            agent: null,
+            cachedAgentSetting: readAgentSettingFromJsonl(jsonlPath),
+            cwd: null,
+            pid: null,
+            pidFilePath: null,
+            state: 'archived',
+            status: 'gone',
+            updatedAt: (() => {
+                try {
+                    return statSync(jsonlPath).mtimeMs;
+                }
+                catch {
+                    return 0;
+                }
+            })(),
+        };
+    }
     /** Apply the current on-disk state for one PID-file path to the index.
-     *  Reads the file if present, merges with any existing row (by sessionId),
-     *  or removes the row when the file is gone. Emits create/modify/delete. */
+     *  Reads the file if present; on delete, finds the row via pid (from the
+     *  filename) since we no longer carry a path-keyed index. */
     function reconcilePidFile(path) {
         const onDisk = existsSync(path);
-        const priorSessionId = sessionIdByPidFilePath.get(path);
         if (!onDisk) {
+            // pid is encoded in the filename. Look up by pid → sessionId.
+            const fileName = path.slice(path.lastIndexOf('/') + 1);
+            const pidStr = fileName.replace(/\.json$/, '');
+            const pid = /^\d+$/.test(pidStr) ? Number(pidStr) : null;
+            if (pid === null)
+                return;
+            const priorSessionId = sessionIdByPid.get(pid);
             if (!priorSessionId)
                 return;
             const prior = rowsBySessionId.get(priorSessionId);
-            if (!prior) {
-                sessionIdByPidFilePath.delete(path);
+            if (!prior)
                 return;
-            }
-            // PID file gone. If JSONL still exists, demote row to archived;
-            // else drop it entirely.
-            const jsonlPath = prior.jsonlPath ?? jsonlPathFor(prior.sessionId);
+            const jsonlPath = jsonlPathFor(prior.sessionId);
             if (existsSync(jsonlPath)) {
                 // Cache agent identity from JSONL head before the PID file is
-                // forgotten. `agent` on a live row comes from the PID file
-                // (`--agent <name>`); after demote it's null, so without this
-                // cache the UI would lose the specialist label.
+                // forgotten. `agent` on a live row comes from the PID file; after
+                // demote it's null, so without this cache the UI would lose the
+                // specialist label.
                 const cachedAgentSetting = prior.cachedAgentSetting
                     ?? readAgentSettingFromJsonl(jsonlPath);
                 const updated = {
@@ -236,7 +258,6 @@ export function createFsWatcher(opts) {
                     state: 'archived',
                     status: 'gone',
                     cachedAgentSetting,
-                    jsonlPath,
                 };
                 unindexRow(prior);
                 indexRow(updated);
@@ -251,58 +272,31 @@ export function createFsWatcher(opts) {
         const parsed = parsePidFile(path);
         if (!parsed)
             return;
-        const jsonlPath = jsonlPathFor(parsed.sessionId);
-        if (existsSync(jsonlPath))
-            parsed.jsonlPath = jsonlPath;
-        // Task 186 — `claude --resume` rewrites the pid file's sessionId field
-        // to the resumed source id at the same path. Hold the prior sessionId
-        // as canonical: it matches `SessionStore.add(...)` from `/spawn` (and
-        // the `/resume` response payload echoed to the client URL). Merge the
-        // rewritten content's mutable fields (agent, status, updatedAt) into
-        // the prior row; do NOT index a second row.
-        const priorSessionIdAtPath = sessionIdByPidFilePath.get(path);
-        if (priorSessionIdAtPath && priorSessionIdAtPath !== parsed.sessionId) {
-            const priorAtPath = rowsBySessionId.get(priorSessionIdAtPath);
-            if (priorAtPath) {
-                logger(`[fs-watcher] pid-file-sessionId-changed path=${path} prior=${priorSessionIdAtPath} next=${parsed.sessionId}`);
-                // Task 190 — pre-register the resumed source jsonl path against
-                // the prior canonical sid so the eventual jsonl create event
-                // (Claude writes turns to `<parsed.sessionId>.jsonl`) routes back
-                // to this row instead of indexing a stray archived row.
-                sessionIdByJsonlPath.set(jsonlPathFor(parsed.sessionId), priorSessionIdAtPath);
-                const merged = {
-                    ...priorAtPath,
-                    agent: parsed.agent,
-                    status: parsed.status,
-                    updatedAt: parsed.updatedAt,
-                };
-                rowsBySessionId.set(priorSessionIdAtPath, merged);
-                emit({ kind: 'modify', source: 'pid', row: merged, sessionId: priorSessionIdAtPath });
-                return;
+        // If this pid was already mapped to a different sessionId (claude
+        // rewrote the file's sessionId mid-life, e.g. Task 186 resume
+        // convergence), drop the stale row first. The new content is the
+        // authoritative state.
+        const stalePriorByPid = sessionIdByPid.get(parsed.pid);
+        if (stalePriorByPid && stalePriorByPid !== parsed.sessionId) {
+            const stale = rowsBySessionId.get(stalePriorByPid);
+            if (stale) {
+                unindexRow(stale);
+                emit({ kind: 'delete', source: 'pid', row: null, sessionId: stalePriorByPid });
             }
-            // Prior row was unindexed (e.g. by the reaper) between events. Drop
-            // the stale path mapping and fall through to the standard new-row
-            // path so the rewritten content lands as a fresh row rather than
-            // permanently leaking the swap log line.
-            logger(`[fs-watcher] pid-file-sessionId-changed path=${path} prior=${priorSessionIdAtPath} next=${parsed.sessionId} prior-row=gone`);
-            sessionIdByPidFilePath.delete(path);
         }
         const prior = rowsBySessionId.get(parsed.sessionId);
-        if (!prior) {
-            indexRow(parsed);
-            emit({ kind: 'create', source: 'pid', row: parsed, sessionId: parsed.sessionId });
+        const merged = buildLiveRow(parsed);
+        if (prior) {
+            // Preserve cachedAgentSetting from the prior row (read once at
+            // archive transition or boot-seed; pid file rewrites don't carry it).
+            merged.cachedAgentSetting = prior.cachedAgentSetting ?? merged.cachedAgentSetting;
+            unindexRow(prior);
+            indexRow(merged);
+            emit({ kind: 'modify', source: 'pid', row: merged, sessionId: merged.sessionId });
             return;
         }
-        // Merge: keep jsonlPath from prior if file existed; otherwise from
-        // parsed (which already checked disk above).
-        const merged = {
-            ...prior,
-            ...parsed,
-            jsonlPath: parsed.jsonlPath ?? prior.jsonlPath,
-        };
-        unindexRow(prior);
         indexRow(merged);
-        emit({ kind: 'modify', source: 'pid', row: merged, sessionId: merged.sessionId });
+        emit({ kind: 'create', source: 'pid', row: merged, sessionId: merged.sessionId });
     }
     function reconcileJsonlFile(path) {
         const onDisk = existsSync(path);
@@ -314,12 +308,11 @@ export function createFsWatcher(opts) {
         if (!onDisk) {
             if (!prior)
                 return;
-            // JSONL gone. If PID file still present, row stays live but loses
-            // transcript; else drop row entirely.
+            // JSONL gone. If PID file still present, row stays live (transient
+            // state — the live PTY may write a new jsonl on the next turn);
+            // else drop the row entirely.
             if (prior.pidFilePath && existsSync(prior.pidFilePath)) {
-                const updated = { ...prior, jsonlPath: null };
-                rowsBySessionId.set(updated.sessionId, updated);
-                emit({ kind: 'delete', source: 'jsonl', row: updated, sessionId });
+                emit({ kind: 'delete', source: 'jsonl', row: prior, sessionId });
                 return;
             }
             unindexRow(prior);
@@ -327,62 +320,26 @@ export function createFsWatcher(opts) {
             return;
         }
         if (prior) {
-            if (prior.jsonlPath === path) {
-                emit({ kind: 'modify', source: 'jsonl', row: prior, sessionId });
-                return;
-            }
-            const updated = { ...prior, jsonlPath: path };
-            unindexRow(prior);
-            indexRow(updated);
-            emit({ kind: 'modify', source: 'jsonl', row: updated, sessionId });
+            // Row already exists at this sessionId. If the row was live
+            // (pid-file-derived), the jsonl appearing is the first-turn flush;
+            // emit a modify so subscribers re-render. If the row was archived,
+            // the jsonl is the same file we already knew about; no-op except
+            // for the modify emission (subscribers may want to re-poll the tail).
+            emit({ kind: prior.state === 'archived' ? 'modify' : 'modify', source: 'jsonl', row: prior, sessionId });
             return;
         }
-        // Task 190 — before falling into the archived-row fallback, consult
-        // the jsonl-path map. A prior canonical sid may have pre-registered
-        // this path via the Task 186 pid-file swap branch (the resume case)
-        // or a row indexed earlier may name this path. Either way: redirect
-        // the event onto the prior canonical sid rather than indexing a
-        // second row at the basename-derived sid.
-        const priorCanonicalSid = sessionIdByJsonlPath.get(path);
-        if (priorCanonicalSid && priorCanonicalSid !== sessionId) {
-            const priorCanonical = rowsBySessionId.get(priorCanonicalSid);
-            if (priorCanonical) {
-                logger(`[fs-watcher] jsonl-path-sessionId-changed path=${path} prior=${priorCanonicalSid} next=${sessionId}`);
-                const updated = { ...priorCanonical, jsonlPath: path };
-                unindexRow(priorCanonical);
-                indexRow(updated);
-                emit({ kind: 'modify', source: 'jsonl', row: updated, sessionId: updated.sessionId });
-                return;
-            }
-            // Prior canonical row vanished between the swap pre-seed and the
-            // jsonl event (e.g. pid file deleted, reaper). Drop the stale map
-            // entry and fall through to the standard archived-row path so the
-            // file lands as an ordinary archived row at the basename sid.
-            logger(`[fs-watcher] jsonl-path-sessionId-changed path=${path} prior=${priorCanonicalSid} next=${sessionId} prior-row=gone`);
-            sessionIdByJsonlPath.delete(path);
+        // Fresh jsonl at this sessionId. If a pid file already exists with this
+        // sessionId, the row is live (claude wrote its first turn before the
+        // pid-file create event was observed — rare but possible). Otherwise
+        // the row is archived (jsonl with no live PTY behind it).
+        const matchingPid = findPidFileForSessionId(sessionId);
+        if (matchingPid) {
+            const row = buildLiveRow(matchingPid);
+            indexRow(row);
+            emit({ kind: 'create', source: 'jsonl', row, sessionId });
+            return;
         }
-        // JSONL appeared without a corresponding PID file → archived row.
-        const row = {
-            sessionId,
-            bridgeSessionId: null,
-            bridgeSuffix: null,
-            agent: null,
-            cachedAgentSetting: readAgentSettingFromJsonl(path),
-            cwd: null,
-            pid: null,
-            jsonlPath: path,
-            pidFilePath: null,
-            state: 'archived',
-            status: 'gone',
-            updatedAt: (() => {
-                try {
-                    return statSync(path).mtimeMs;
-                }
-                catch {
-                    return 0;
-                }
-            })(),
-        };
+        const row = buildArchivedRow(sessionId, path);
         indexRow(row);
         emit({ kind: 'create', source: 'jsonl', row, sessionId });
     }
@@ -404,68 +361,51 @@ export function createFsWatcher(opts) {
     function bootSeed() {
         if (seeded)
             return;
-        let pidCount = 0;
+        // Walk the projects dir first so jsonl rows exist as the canonical key
+        // surface. Then walk the sessions dir; each pid file's sessionId either
+        // matches an already-seeded jsonl row (promote to live) or has no jsonl
+        // yet (a pre-first-turn live row, no transcript).
         let jsonlCount = 0;
+        let pidCount = 0;
         try {
-            for (const entry of readdirSync(sessionsDir, { withFileTypes: true })) {
-                if (!entry.isFile() || !entry.name.endsWith('.json'))
+            for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
+                if (!entry.isFile() || !entry.name.endsWith('.jsonl'))
                     continue;
-                const path = join(sessionsDir, entry.name);
-                const row = parsePidFile(path);
-                if (!row)
+                const sessionId = entry.name.slice(0, -'.jsonl'.length);
+                if (!sessionId)
                     continue;
-                const jsonlPath = jsonlPathFor(row.sessionId);
-                if (existsSync(jsonlPath))
-                    row.jsonlPath = jsonlPath;
-                indexRow(row);
-                pidCount += 1;
+                const jsonlPath = join(projectsDir, entry.name);
+                if (!rowsBySessionId.has(sessionId)) {
+                    indexRow(buildArchivedRow(sessionId, jsonlPath));
+                }
+                jsonlCount += 1;
             }
         }
         catch {
-            // sessionsDir absent — fine. Watcher creates it via mkdir at arm time.
+            // projectsDir absent on first boot — Claude Code creates it on first
+            // transcript write. Watcher's mkdirSync at arm() avoids fs.watch ENOENT.
         }
         try {
-            for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
-                if (!entry.isFile() || !entry.name.endsWith('.jsonl'))
+            for (const entry of readdirSync(sessionsDir, { withFileTypes: true })) {
+                if (!entry.isFile() || !entry.name.endsWith('.json'))
                     continue;
-                const sessionId = entry.name.slice(0, -'.jsonl'.length);
-                const path = join(projectsDir, entry.name);
-                const prior = rowsBySessionId.get(sessionId);
+                const path = join(sessionsDir, entry.name);
+                const parsed = parsePidFile(path);
+                if (!parsed)
+                    continue;
+                const prior = rowsBySessionId.get(parsed.sessionId);
+                const row = buildLiveRow(parsed);
                 if (prior) {
-                    if (prior.jsonlPath !== path) {
-                        rowsBySessionId.set(sessionId, { ...prior, jsonlPath: path });
-                    }
-                }
-                else {
-                    const row = {
-                        sessionId,
-                        bridgeSessionId: null,
-                        bridgeSuffix: null,
-                        agent: null,
-                        cachedAgentSetting: readAgentSettingFromJsonl(path),
-                        cwd: null,
-                        pid: null,
-                        jsonlPath: path,
-                        pidFilePath: null,
-                        state: 'archived',
-                        status: 'gone',
-                        updatedAt: (() => {
-                            try {
-                                return statSync(path).mtimeMs;
-                            }
-                            catch {
-                                return 0;
-                            }
-                        })(),
-                    };
-                    indexRow(row);
+                    // Preserve cached agent setting we already read from the jsonl head.
+                    row.cachedAgentSetting = prior.cachedAgentSetting ?? row.cachedAgentSetting;
+                    unindexRow(prior);
                 }
-                jsonlCount += 1;
+                indexRow(row);
+                pidCount += 1;
             }
         }
         catch {
-            // projectsDir absent on first boot — Claude Code creates it on first
-            // transcript write. Watcher's mkdirSync at arm() avoids fs.watch ENOENT.
+            // sessionsDir absent — fine. Watcher creates it via mkdir at arm time.
         }
         seeded = true;
         logger(`[fs-watcher] boot-seed sessions-dir=${pidCount} projects-dir=${jsonlCount} rows=${rowsBySessionId.size}`);