@schoolai/shipyard 3.30.0 → 3.31.0-rc.20260915.0

package/dist/{serve-3TQOIJID.js → serve-JEU6SMZX.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-WO5EM3BP.js";
+} from "./chunk-5ZR72FWA.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -40,13 +40,13 @@ import {
   startPlanBackfillForDaemon,
   sync,
   validatePeerId
-} from "./chunk-JM2E5QZ5.js";
+} from "./chunk-KWDGZXQH.js";
 import {
   loadAuthToken
 } from "./chunk-XPYW5WQS.js";
 import {
   getDaemonVersion
-} from "./chunk-RGVTFZDF.js";
+} from "./chunk-WWO24OO4.js";
 import {
   collectPriorCrashDetail,
   getRecentWasmPanicMessages
@@ -188,7 +188,7 @@ import {
   unresolveReviewThread,
   withLabelAsync,
   writeCursorApiKeyToVault
-} from "./chunk-ZSMWOXEN.js";
+} from "./chunk-GRJGV64D.js";
 import {
   classifySkill,
   detectSkills,
@@ -256,7 +256,7 @@ import {
   createAssetResolver,
   toSdkContent,
   toSdkPermissionMode
-} from "./chunk-CW2PKTA6.js";
+} from "./chunk-3RWQ7G4S.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -465,7 +465,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-22TVFTWD.js";
+} from "./chunk-JTOJZZT2.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -554,7 +554,7 @@ import "./chunk-2H7UOFLK.js";
 // src/services/serve.ts
 import { mkdir as mkdir48, realpath as realpath7 } from "fs/promises";
 import { homedir as homedir17 } from "os";
-import { join as join93 } from "path";
+import { join as join94 } from "path";
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
 // ../../node_modules/.pnpm/@levischuck+tiny-cbor@0.3.2/node_modules/@levischuck/tiny-cbor/esm/cbor/cbor_internal.js
@@ -6067,7 +6067,7 @@ function nanoid(size = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.30.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.31.0" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -34704,7 +34704,7 @@ function buildCollabRoomManager(deps) {
 // src/services/serve-factory.ts
 import { randomUUID as randomUUID27 } from "crypto";
 import { mkdir as mkdir40 } from "fs/promises";
-import { join as join85 } from "path";
+import { join as join86 } from "path";
 import { getHeapStatistics } from "v8";
 
 // src/shared/capabilities/cursor-boot-auth.ts
@@ -34758,8 +34758,8 @@ function getCursorHookShimPath() {
 function verifyCursorHookShimPresent(path8) {
   const resolved = path8 ?? getCursorHookShimPath();
   try {
-    const stat22 = statSync4(resolved);
-    if (!stat22.isFile()) return null;
+    const stat23 = statSync4(resolved);
+    if (!stat23.isFile()) return null;
     return { path: resolved };
   } catch {
     return null;
@@ -86622,9 +86622,135 @@ function buildDeliverableStore(dataDir) {
 
 // src/services/storage/jsonl-conversation-store.ts
 import { createReadStream as createReadStream5 } from "fs";
-import { appendFile as appendFile3, mkdir as mkdir31, open as open4, readFile as readFile40, stat as stat19 } from "fs/promises";
-import { join as join73 } from "path";
+import { appendFile as appendFile4, mkdir as mkdir31, open as open4, readFile as readFile41, stat as stat20 } from "fs/promises";
+import { join as join74 } from "path";
 import { createInterface as createInterface5 } from "readline";
+
+// src/services/storage/jsonl-sdk-uuid-stamps.ts
+import { appendFile as appendFile3, readFile as readFile40, rm as rm12, stat as stat19 } from "fs/promises";
+import { join as join73 } from "path";
+var SdkUuidStampSchema = external_exports.object({
+  messageId: external_exports.string(),
+  sdkUuid: external_exports.string(),
+  batchCorrelationIds: external_exports.array(external_exports.string()).optional()
+});
+function recoverAfterTear(line) {
+  for (let i = line.indexOf("{", 1); i !== -1; i = line.indexOf("{", i + 1)) {
+    try {
+      return JSON.parse(line.slice(i));
+    } catch {
+    }
+  }
+  return void 0;
+}
+function parseStampLines(raw) {
+  const stamps = [];
+  for (const line of raw.split("\n")) {
+    if (line.length === 0) continue;
+    let json;
+    try {
+      json = JSON.parse(line);
+    } catch {
+      json = recoverAfterTear(line);
+      if (json === void 0) continue;
+    }
+    const parsed = SdkUuidStampSchema.safeParse(json);
+    if (parsed.success) stamps.push(parsed.data);
+  }
+  return stamps;
+}
+function serializeStamp(stamp) {
+  return `${JSON.stringify(stamp)}
+`;
+}
+function applySdkUuidStamps(messages, stamps) {
+  if (stamps.length === 0) return messages;
+  const byMessageId = /* @__PURE__ */ new Map();
+  for (const stamp of stamps) byMessageId.set(stamp.messageId, stamp);
+  const overlay = (message) => {
+    const stamp = byMessageId.get(message.messageId);
+    if (!stamp) return null;
+    const patch = {};
+    if (!message.sdkUuid) patch.sdkUuid = stamp.sdkUuid;
+    const batch = stamp.batchCorrelationIds;
+    if (batch && batch.length > 0 && !message.batchCorrelationIds)
+      patch.batchCorrelationIds = [...batch];
+    return Object.keys(patch).length > 0 ? patch : null;
+  };
+  if (!messages.some((message) => overlay(message) !== null)) return messages;
+  return messages.map((message) => {
+    const patch = overlay(message);
+    return patch === null ? message : { ...message, ...patch };
+  });
+}
+var EMPTY_STAMPS = Object.freeze([]);
+var MAX_STAMPS_CACHE_ENTRIES = 512;
+function createSdkUuidStampSidecar(channelsDir) {
+  const cache2 = /* @__PURE__ */ new Map();
+  function path8(channelId) {
+    return join73(channelsDir, `${channelId}.stamps.jsonl`);
+  }
+  function remember(channelId, entry) {
+    cache2.delete(channelId);
+    cache2.set(channelId, entry);
+    while (cache2.size > MAX_STAMPS_CACHE_ENTRIES) {
+      const oldest = cache2.keys().next();
+      if (oldest.done === true) break;
+      cache2.delete(oldest.value);
+    }
+  }
+  return {
+    path: path8,
+    async read(channelId) {
+      const target = path8(channelId);
+      let fileStat;
+      try {
+        const s2 = await stat19(target);
+        fileStat = { size: s2.size, mtimeMs: s2.mtimeMs };
+      } catch (err3) {
+        if (!isEnoent(err3)) throw err3;
+        cache2.delete(channelId);
+        return { stamps: EMPTY_STAMPS, size: 0, mtimeMs: 0 };
+      }
+      if (fileStat.size === 0) {
+        cache2.delete(channelId);
+        return { stamps: EMPTY_STAMPS, size: 0, mtimeMs: 0 };
+      }
+      const hit = cache2.get(channelId);
+      if (hit && hit.size === fileStat.size && hit.mtimeMs === fileStat.mtimeMs) {
+        return { stamps: hit.stamps, size: hit.size, mtimeMs: hit.mtimeMs };
+      }
+      let raw;
+      try {
+        raw = await readFile40(target, "utf-8");
+      } catch (err3) {
+        if (isEnoent(err3)) return { stamps: EMPTY_STAMPS, size: 0, mtimeMs: 0 };
+        throw err3;
+      }
+      const stamps = parseStampLines(raw);
+      remember(channelId, { size: fileStat.size, mtimeMs: fileStat.mtimeMs, stamps });
+      return { stamps, size: fileStat.size, mtimeMs: fileStat.mtimeMs };
+    },
+    async append(channelId, stamp) {
+      await appendFile3(path8(channelId), serializeStamp(stamp), "utf-8");
+    },
+    async discard(channelId) {
+      cache2.delete(channelId);
+      try {
+        await rm12(path8(channelId));
+        return true;
+      } catch (err3) {
+        if (isEnoent(err3)) return false;
+        throw err3;
+      }
+    },
+    cachedChannelCount() {
+      return cache2.size;
+    }
+  };
+}
+
+// src/services/storage/jsonl-conversation-store.ts
 var StoredMessageSchema = MessageSchema.omit({ seqNo: true, channelId: true });
 function logPerf(entry) {
   try {
@@ -86641,7 +86767,7 @@ function computeReadCacheBudgetBytes(heapSizeLimitBytes) {
   return Math.min(READ_CACHE_BUDGET_CAP_BYTES, Math.max(DEFAULT_READ_CACHE_BUDGET_BYTES, scaled));
 }
 function buildJsonlConversationStore(dataDir, opts = {}) {
-  const channelsDir = join73(dataDir, "channels");
+  const channelsDir = join74(dataDir, "channels");
   const seqCounters = /* @__PURE__ */ new Map();
   const channelQueues = /* @__PURE__ */ new Map();
   const readCache = /* @__PURE__ */ new Map();
@@ -86686,8 +86812,9 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
   }
   const turnCountCache = /* @__PURE__ */ new Map();
   function channelPath(channelId) {
-    return join73(channelsDir, `${channelId}.jsonl`);
+    return join74(channelsDir, `${channelId}.jsonl`);
   }
+  const stampSidecar = createSdkUuidStampSidecar(channelsDir);
   function countRuns(messages) {
     let turns = 0;
     let prev = null;
@@ -86747,9 +86874,10 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
   async function readLines(channelId) {
     const startedAt = Date.now();
     logPerf({ event: "perf_jsonl_read_start", channelId });
+    const stamps = await stampSidecar.read(channelId);
     let raw;
     try {
-      raw = await readFile40(channelPath(channelId), "utf-8");
+      raw = await readFile41(channelPath(channelId), "utf-8");
     } catch (err3) {
       if (!isEnoent(err3)) throw err3;
       logPerf({
@@ -86759,9 +86887,9 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
         linesParsed: 0,
         durationMs: Date.now() - startedAt
       });
-      return [];
+      return { messages: [], stampsSize: stamps.size, stampsMtimeMs: stamps.mtimeMs };
     }
-    const messages = parseJsonlBlob(raw, channelId);
+    const messages = applySdkUuidStamps(parseJsonlBlob(raw, channelId), stamps.stamps);
     logPerf({
       event: "perf_jsonl_read_done",
       channelId,
@@ -86769,7 +86897,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
       linesParsed: messages.length,
       durationMs: Date.now() - startedAt
     });
-    return messages;
+    return { messages, stampsSize: stamps.size, stampsMtimeMs: stamps.mtimeMs };
   }
   async function countLinesInFile(path8) {
     let fh;
@@ -86858,23 +86986,31 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
       const startSeqNo = totalLines - tailLines2.length;
       const messages = parseTailLines(tailLines2, startSeqNo, channelId);
       if (messages === null) return null;
-      return { messages, totalLines };
+      const stamps = await stampSidecar.read(channelId);
+      return { messages: applySdkUuidStamps(messages, stamps.stamps), totalLines };
     } finally {
       await fh.close();
     }
   }
   async function statFreshness(path8) {
     try {
-      const s2 = await stat19(path8);
+      const s2 = await stat20(path8);
       return { size: s2.size, mtimeMs: s2.mtimeMs };
     } catch (err3) {
       if (isEnoent(err3)) return null;
       throw err3;
     }
   }
-  function readTailFromCache(channelId, limit, fileStat) {
+  function isCacheEntryFresh(entry, fileStat, stampsStat) {
+    return entry.size === fileStat.size && entry.mtimeMs === fileStat.mtimeMs && entry.stampsSize === stampsStat.size && entry.stampsMtimeMs === stampsStat.mtimeMs;
+  }
+  function readTailFromCache(channelId, limit, fileStat, stampsStat) {
     const hit = readCache.get(channelId);
-    if (!hit || hit.size !== fileStat.size || hit.mtimeMs !== fileStat.mtimeMs) return null;
+    if (!hit) return null;
+    if (!isCacheEntryFresh(hit, fileStat, stampsStat)) {
+      dropCacheEntry(channelId);
+      return null;
+    }
     touchCacheEntry(channelId, hit);
     const tail = hit.messages.length <= limit ? [...hit.messages] : hit.messages.slice(-limit);
     return { messages: tail, totalLines: hit.messages.length };
@@ -86883,7 +87019,8 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
     if (limit <= 0) return { messages: [], totalLines: 0 };
     const fileStat = await statFreshness(channelPath(channelId));
     if (fileStat === null || fileStat.size === 0) return { messages: [], totalLines: 0 };
-    const cached = readTailFromCache(channelId, limit, fileStat);
+    const stampsStat = await stampSidecar.read(channelId);
+    const cached = readTailFromCache(channelId, limit, fileStat, stampsStat);
     if (cached !== null) return cached;
     if (fileStat.size <= 256 * 1024) {
       const all = await readLinesCached(channelId);
@@ -86896,24 +87033,29 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
     const path8 = channelPath(channelId);
     let fileStat = null;
     try {
-      const s2 = await stat19(path8);
+      const s2 = await stat20(path8);
       fileStat = { size: s2.size, mtimeMs: s2.mtimeMs };
     } catch (err3) {
       if (isEnoent(err3)) return [];
       throw err3;
     }
+    const stampsStat = await stampSidecar.read(channelId);
     const hit = readCache.get(channelId);
-    if (hit && hit.size === fileStat.size && hit.mtimeMs === fileStat.mtimeMs) {
+    if (hit && isCacheEntryFresh(hit, fileStat, stampsStat)) {
       touchCacheEntry(channelId, hit);
       return [...hit.messages];
     }
+    if (hit) dropCacheEntry(channelId);
     const fresh = await readLines(channelId);
+    await opts._testHooks?.onAfterReadBeforeCachePopulate?.();
     setCacheEntry(channelId, {
-      messages: fresh,
+      messages: fresh.messages,
       size: fileStat.size,
-      mtimeMs: fileStat.mtimeMs
+      mtimeMs: fileStat.mtimeMs,
+      stampsSize: fresh.stampsSize,
+      stampsMtimeMs: fresh.stampsMtimeMs
     });
-    return [...fresh];
+    return [...fresh.messages];
   }
   function pushIntoLiveCache(channelId, appended, fileStat) {
     const liveHit = readCache.get(channelId);
@@ -86932,7 +87074,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
   async function refreshCacheAfterAppend(channelId, appended) {
     if (!readCache.get(channelId)) return;
     try {
-      const s2 = await stat19(channelPath(channelId));
+      const s2 = await stat20(channelPath(channelId));
       await opts._testHooks?.onAfterStatBeforePush?.();
       pushIntoLiveCache(channelId, appended, { size: s2.size, mtimeMs: s2.mtimeMs });
     } catch (err3) {
@@ -87026,7 +87168,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
         seqCounters.set(message.channelId, seqNo);
         const { channelId: _channelId, ...rest } = message;
         const line = JSON.stringify(rest);
-        await appendFile3(channelPath(message.channelId), `${line}
+        await appendFile4(channelPath(message.channelId), `${line}
 `, "utf-8");
         await refreshCacheAfterAppend(message.channelId, {
           ...rest,
@@ -87080,7 +87222,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
           lines.push(JSON.stringify(rest));
           cacheUpdates.push({ ...rest, channelId, seqNo });
         }
-        await appendFile3(channelPath(channelId), `${lines.join("\n")}
+        await appendFile4(channelPath(channelId), `${lines.join("\n")}
 `, "utf-8");
         seqCounters.set(channelId, startSeqNo + messages.length - 1);
         await refreshCacheAfterAppend(channelId, cacheUpdates);
@@ -87125,7 +87267,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
         seqCounters.set(message.channelId, decision.seqNo);
         const { channelId: _channelId, ...rest } = message;
         const line = JSON.stringify(rest);
-        await appendFile3(channelPath(message.channelId), `${line}
+        await appendFile4(channelPath(message.channelId), `${line}
 `, "utf-8");
         await refreshCacheAfterAppend(message.channelId, {
           ...rest,
@@ -87145,7 +87287,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
       channelQueues.set(message.channelId, next);
       return resultPromise;
     },
-    async stampSdkUuid(channelId, primaryCorrelationId, sdkUuid, batchCorrelationIds) {
+    async stampSdkUuid(channelId, messageId, sdkUuid, batchCorrelationIds) {
       let resolveVoid;
       let rejectVoid;
       const voidPromise = new Promise((resolve15, reject) => {
@@ -87154,30 +87296,13 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
       });
       const prev = channelQueues.get(channelId) ?? Promise.resolve();
       const next = prev.then(async () => {
-        const messages = await readLines(channelId);
-        const target = messages.find(
-          (m2) => m2.senderKind === "human" && m2.correlationId === primaryCorrelationId && !m2.sdkUuid
-        );
-        if (!target) {
-          resolveVoid();
-          return;
-        }
+        await ensureDir();
         const secondaryIds = batchCorrelationIds && batchCorrelationIds.length > 0 ? batchCorrelationIds : void 0;
-        const lines = messages.map((m2) => {
-          const { seqNo: _seqNo, channelId: _channelId, ...rest } = m2;
-          if (m2.seqNo === target.seqNo) {
-            return JSON.stringify({
-              ...rest,
-              sdkUuid,
-              ...secondaryIds ? { batchCorrelationIds: secondaryIds } : {}
-            });
-          }
-          return JSON.stringify(rest);
+        await stampSidecar.append(channelId, {
+          messageId,
+          sdkUuid,
+          ...secondaryIds ? { batchCorrelationIds: secondaryIds } : {}
         });
-        const content = lines.length > 0 ? `${lines.join("\n")}
-` : "";
-        const filePath = channelPath(channelId);
-        await atomicWriteFile(filePath, content);
         dropCacheEntry(channelId);
         resolveVoid();
       }).catch((err3) => {
@@ -87245,7 +87370,7 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
       });
       const prev = channelQueues.get(channelId) ?? Promise.resolve();
       const next = prev.then(async () => {
-        const messages = await readLines(channelId);
+        const { messages } = await readLines(channelId);
         const kept = messages.filter((m2) => m2.seqNo <= targetSeqNo);
         const removed = messages.length - kept.length;
         if (removed === 0) {
@@ -87263,6 +87388,13 @@ function buildJsonlConversationStore(dataDir, opts = {}) {
         await atomicWriteFile(filePath, content);
         seqCounters.set(channelId, kept.length > 0 ? kept.length - 1 : -1);
         dropCacheEntry(channelId);
+        const discardedStamps = await stampSidecar.discard(channelId);
+        logPerf({
+          event: "perf_jsonl_stamps_discarded",
+          channelId,
+          existed: discardedStamps,
+          keptLines: kept.length
+        });
         resolveCount(removed);
       }).catch((err3) => {
         dropCacheEntry(channelId);
@@ -87326,8 +87458,8 @@ function buildObservableConversationStore(inner) {
       }
       return result;
     },
-    stampSdkUuid(channelId, correlationId, sdkUuid, batchCorrelationIds) {
-      return inner.stampSdkUuid(channelId, correlationId, sdkUuid, batchCorrelationIds);
+    stampSdkUuid(channelId, messageId, sdkUuid, batchCorrelationIds) {
+      return inner.stampSdkUuid(channelId, messageId, sdkUuid, batchCorrelationIds);
     },
     countSenderTurns(channelId) {
       return inner.countSenderTurns(channelId);
@@ -87366,7 +87498,7 @@ function buildObservableConversationStore(inner) {
 
 // src/services/storage/projects-store.ts
 import { randomUUID as randomUUID21 } from "crypto";
-import { mkdir as mkdir32, readFile as readFile41 } from "fs/promises";
+import { mkdir as mkdir32, readFile as readFile42 } from "fs/promises";
 import { dirname as dirname32 } from "path";
 var ProjectsArraySchema = external_exports.array(ProjectSchema);
 function buildProjectsStore(filePath) {
@@ -87388,7 +87520,7 @@ function buildProjectsStore(filePath) {
   async function readStore() {
     if (cache2) return cache2;
     try {
-      const raw = await readFile41(filePath, "utf-8");
+      const raw = await readFile42(filePath, "utf-8");
       const parsed = JSON.parse(raw);
       const migrated = migrateProjectsStore(parsed);
       cache2 = migrated.projects;
@@ -87417,7 +87549,7 @@ function buildProjectsStore(filePath) {
   }
   async function readFromDisk() {
     try {
-      const raw = await readFile41(filePath, "utf-8");
+      const raw = await readFile42(filePath, "utf-8");
       return migrateProjectsStore(JSON.parse(raw)).projects;
     } catch (err3) {
       if (isEnoent(err3)) return [];
@@ -87538,8 +87670,8 @@ function buildProjectsStore(filePath) {
 }
 
 // src/services/storage/rate-limit-store.ts
-import { mkdir as mkdir33, readFile as readFile42 } from "fs/promises";
-import { dirname as dirname33, join as join74 } from "path";
+import { mkdir as mkdir33, readFile as readFile43 } from "fs/promises";
+import { dirname as dirname33, join as join75 } from "path";
 var RATE_LIMIT_STORE_VERSION = 4;
 var RateLimitRecordSchema = external_exports.object({
   info: RateLimitInfoSchema,
@@ -87578,7 +87710,7 @@ function isWindowKey(x2) {
   return x2 !== void 0 && WINDOW_KEYS.has(x2);
 }
 async function buildRateLimitStore(dataDir, opts) {
-  const filePath = join74(dataDir, "rate-limits.json");
+  const filePath = join75(dataDir, "rate-limits.json");
   const lockPath2 = `${filePath}.lock`;
   const initial = await loadStoreFile(filePath, opts.logger);
   const records = { ...initial.records };
@@ -87728,7 +87860,7 @@ function mergeEvent(prev, incoming, eventTime) {
 }
 async function loadStoreFile(filePath, logger2) {
   try {
-    const raw = await readFile42(filePath, "utf-8");
+    const raw = await readFile43(filePath, "utf-8");
     const parsed = JSON.parse(raw);
     const v4 = StoreFileSchemaV4.safeParse(parsed);
     if (v4.success) return v4.data;
@@ -87831,8 +87963,8 @@ async function atomicWrite4(filePath, data) {
 }
 
 // src/services/storage/schedule-store.ts
-import { mkdir as mkdir34, readFile as readFile43, writeFile as writeFile26 } from "fs/promises";
-import { dirname as dirname34, join as join75 } from "path";
+import { mkdir as mkdir34, readFile as readFile44, writeFile as writeFile26 } from "fs/promises";
+import { dirname as dirname34, join as join76 } from "path";
 import properLockfile from "proper-lockfile";
 var STORE_FILE = "schedules.json";
 function emptyState() {
@@ -87874,7 +88006,7 @@ function notify(listeners, event) {
   }
 }
 function buildScheduleStore(dataDir, options = {}) {
-  const filePath = join75(dataDir, STORE_FILE);
+  const filePath = join76(dataDir, STORE_FILE);
   const lockPath2 = `${filePath}.automation-lock`;
   const listeners = /* @__PURE__ */ new Set();
   const staleMs = options.lockStaleMs ?? 6e4;
@@ -87917,7 +88049,7 @@ function buildScheduleStore(dataDir, options = {}) {
   async function loadFromDisk() {
     let source;
     try {
-      source = await readFile43(filePath, "utf-8");
+      source = await readFile44(filePath, "utf-8");
     } catch (error) {
       if (isEnoent(error)) return { state: emptyState(), source: null, migratedFromVersion: null };
       throw error;
@@ -87942,7 +88074,7 @@ function buildScheduleStore(dataDir, options = {}) {
       if (typeof error !== "object" || error === null || !("code" in error) || error.code !== "EEXIST") {
         throw error;
       }
-      const existingBackup = await readFile43(backupPath, "utf-8");
+      const existingBackup = await readFile44(backupPath, "utf-8");
       if (existingBackup !== loaded.source) {
         throw new Error(`Schedule migration backup does not match source: ${backupPath}`);
       }
@@ -88052,8 +88184,8 @@ function buildScheduleStore(dataDir, options = {}) {
 }
 
 // src/services/storage/session-persistence.ts
-import { mkdir as mkdir35, readdir as readdir21, readFile as readFile44, rm as rm12 } from "fs/promises";
-import { join as join76 } from "path";
+import { mkdir as mkdir35, readdir as readdir21, readFile as readFile45, rm as rm13 } from "fs/promises";
+import { join as join77 } from "path";
 var PersistedSessionSchema = external_exports.object({
   sessionId: external_exports.string(),
   channelId: external_exports.string(),
@@ -88084,7 +88216,7 @@ var PersistedSessionSchema = external_exports.object({
 }));
 async function loadOneSessionFile(originalPath, corruptionLogger) {
   try {
-    const raw = await readFile44(originalPath, "utf-8");
+    const raw = await readFile45(originalPath, "utf-8");
     return PersistedSessionSchema.parse(JSON.parse(raw));
   } catch (err3) {
     if (isCorruptionError(err3)) {
@@ -88110,9 +88242,9 @@ async function loadOneSessionFile(originalPath, corruptionLogger) {
   }
 }
 function buildSessionPersistence(dataDir, corruptionLogger) {
-  const channelsDir = join76(dataDir, "channels");
+  const channelsDir = join77(dataDir, "channels");
   function sessionPath(channelId) {
-    return join76(channelsDir, `${channelId}.session.json`);
+    return join77(channelsDir, `${channelId}.session.json`);
   }
   async function ensureDir() {
     await mkdir35(channelsDir, { recursive: true });
@@ -88126,7 +88258,7 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
     async load(channelId) {
       const path8 = sessionPath(channelId);
       try {
-        const raw = await readFile44(path8, "utf-8");
+        const raw = await readFile45(path8, "utf-8");
         return PersistedSessionSchema.parse(JSON.parse(raw));
       } catch (err3) {
         if (isEnoent(err3)) return null;
@@ -88146,7 +88278,7 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
     },
     async clear(channelId) {
       try {
-        await rm12(sessionPath(channelId));
+        await rm13(sessionPath(channelId));
       } catch (err3) {
         if (isEnoent(err3)) return;
         throw err3;
@@ -88170,7 +88302,7 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
           if (i >= sessionEntries.length) return;
           const entry = sessionEntries[i];
           if (!entry) return;
-          results[i] = await loadOneSessionFile(join76(channelsDir, entry), corruptionLogger);
+          results[i] = await loadOneSessionFile(join77(channelsDir, entry), corruptionLogger);
         }
       }
       const workers = Array.from(
@@ -88184,12 +88316,12 @@ function buildSessionPersistence(dataDir, corruptionLogger) {
 }
 
 // src/services/storage/template-store.ts
-import { join as join77 } from "path";
+import { join as join78 } from "path";
 function buildTemplateStore(dataDir) {
   const store = buildJsonDocumentStore({
     storeName: "templates",
     docType: "template",
-    filePath: join77(dataDir, "templates.json"),
+    filePath: join78(dataDir, "templates.json"),
     recordSchema: TaskTemplateRecordSchema,
     currentVersion: TEMPLATE_STORE_VERSION,
     migrate(raw) {
@@ -88227,7 +88359,7 @@ function buildTemplateStore(dataDir) {
 }
 
 // src/services/storage/user-settings-store.ts
-import { mkdir as mkdir36, readFile as readFile45 } from "fs/promises";
+import { mkdir as mkdir36, readFile as readFile46 } from "fs/promises";
 import { dirname as dirname35 } from "path";
 function buildUserSettingsStore(filePath) {
   let cache2 = null;
@@ -88248,7 +88380,7 @@ function buildUserSettingsStore(filePath) {
   async function readStore() {
     if (cache2) return cache2;
     try {
-      const raw = await readFile45(filePath, "utf-8");
+      const raw = await readFile46(filePath, "utf-8");
       const parsed = JSON.parse(raw);
       const migrated = migrateUserSettingsStore(parsed);
       cache2 = migrated.settings;
@@ -88295,7 +88427,7 @@ function buildUserSettingsStore(filePath) {
   }
   async function readSettingsFromDisk() {
     try {
-      const raw = await readFile45(filePath, "utf-8");
+      const raw = await readFile46(filePath, "utf-8");
       return migrateUserSettingsStore(JSON.parse(raw)).settings;
     } catch (err3) {
       if (isEnoent(err3)) return { ...DEFAULT_USER_SETTINGS };
@@ -93614,7 +93746,11 @@ var ThreadEventProcessor = class {
     }
     this.#deps.callbacks.onMessageStored?.(result.seqNo, echoMsgId, "human", event.mark);
     if (meta?.correlationId) {
-      this.#deps.callbacks.onUserMessageConfirmed?.(meta.correlationId, event.mark);
+      this.#deps.callbacks.onUserMessageConfirmed?.(
+        meta.correlationId,
+        event.mark,
+        result.existingMessage?.messageId ?? echoMsgId
+      );
     }
   }
   async #handleInitReceived(event) {
@@ -94847,9 +94983,9 @@ var Thread = class {
 // src/services/plan/plan-handler.ts
 import { randomUUID as randomUUID23 } from "crypto";
 import { existsSync as existsSync11, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
-import { mkdir as mkdir37, readFile as readFile47, writeFile as writeFile28 } from "fs/promises";
+import { mkdir as mkdir37, readFile as readFile48, writeFile as writeFile28 } from "fs/promises";
 import { homedir as homedir13 } from "os";
-import { dirname as dirname37, join as join79 } from "path";
+import { dirname as dirname37, join as join80 } from "path";
 
 // src/services/plan-backfill/plan-lazy-rebuild.ts
 var SETTLE_BUDGET_MS = 2e3;
@@ -95022,7 +95158,7 @@ function decideWatchResolved(trigger, snapshot) {
 // src/services/plan/plan-file-bridge.ts
 import { createHash as createHash15, randomUUID as randomUUID22 } from "crypto";
 import { existsSync as existsSync9 } from "fs";
-import { readFile as readFile46, rename as rename18, stat as stat20, writeFile as writeFile27 } from "fs/promises";
+import { readFile as readFile47, rename as rename18, stat as stat21, writeFile as writeFile27 } from "fs/promises";
 import { basename as basename13, dirname as dirname36 } from "path";
 var FILE_READ_MAX_RETRIES = 3;
 var FILE_READ_RETRY_BASE_MS = 200;
@@ -95439,7 +95575,7 @@ var PlanFileBridge = class _PlanFileBridge {
   async #existingFileSize() {
     if (!this.#filePath) return 0;
     try {
-      return (await stat20(this.#filePath)).size;
+      return (await stat21(this.#filePath)).size;
     } catch {
       return 0;
     }
@@ -95448,7 +95584,7 @@ var PlanFileBridge = class _PlanFileBridge {
     let lastError;
     for (let attempt = 0; attempt < FILE_READ_MAX_RETRIES; attempt++) {
       try {
-        return await readFile46(filePath, "utf-8");
+        return await readFile47(filePath, "utf-8");
       } catch (err3) {
         lastError = err3;
         const msg = err3 instanceof Error ? err3.message : String(err3);
@@ -95728,8 +95864,8 @@ function greedyLCS(a, b2) {
 // src/services/plan/plan-file-watcher.ts
 import { existsSync as existsSync10 } from "fs";
 import { homedir as homedir12 } from "os";
-import { join as join78 } from "path";
-var DEFAULT_PLANS_DIR = join78(homedir12(), ".claude", "plans");
+import { join as join79 } from "path";
+var DEFAULT_PLANS_DIR = join79(homedir12(), ".claude", "plans");
 var PLAN_WATCH_TIMEOUT_MS = 1e4;
 var PLAN_WATCH_DEBOUNCE_MS = 250;
 function createPlanFileWatcher(deps) {
@@ -96364,7 +96500,7 @@ var PlanHandler = class {
   }
   async #readFileForRehydrate(filePath) {
     try {
-      return await readFile47(filePath, "utf-8");
+      return await readFile48(filePath, "utf-8");
     } catch (err3) {
       this.#deps.log({
         event: "plan_bridge_rehydrate_read_failed",
@@ -96511,7 +96647,7 @@ var PlanHandler = class {
    * Called when a Write tool result mentions a file in ~/.claude/plans/.
    */
   trackCreatedFile(filePath) {
-    const plansDir = join79(homedir13(), ".claude", "plans");
+    const plansDir = join80(homedir13(), ".claude", "plans");
     if (filePath.startsWith(plansDir) && filePath.endsWith(".md")) {
       this.#createdPlanFiles.add(filePath);
       this.#deps.log({
@@ -96605,7 +96741,7 @@ var PlanHandler = class {
     this.#assertNativePlanOwner(threadId);
     this.#nativeThreadId = threadId;
     this.#nativeRevisionPending = true;
-    const filePath = join79(getShipyardHome(), "plans", `${this.#deps.taskId}.md`);
+    const filePath = join80(getShipyardHome(), "plans", `${this.#deps.taskId}.md`);
     try {
       await mkdir37(dirname37(filePath), { recursive: true });
       await writeFile28(filePath, content, "utf-8");
@@ -97129,12 +97265,12 @@ var PlanHandler = class {
       }).filter((f2) => f2 !== null).sort((a, b2) => b2.mtime - a.mtime)[0];
       return newest?.path ?? null;
     }
-    const plansDir = join79(homedir13(), ".claude", "plans");
+    const plansDir = join80(homedir13(), ".claude", "plans");
     if (!existsSync11(plansDir)) return null;
     try {
       const files = readdirSync5(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
-        path: join79(plansDir, f2),
-        mtime: statSync5(join79(plansDir, f2)).mtimeMs
+        path: join80(plansDir, f2),
+        mtime: statSync5(join80(plansDir, f2)).mtimeMs
       })).sort((a, b2) => b2.mtime - a.mtime);
       const recent = files[0];
       if (recent && Date.now() - recent.mtime < 3e4) return recent.path;
@@ -99687,8 +99823,8 @@ var RewindCheckpointHandler = class _RewindCheckpointHandler {
 };
 
 // src/services/task/side-thread-registry.ts
-import { mkdir as mkdir38, readFile as readFile48, rename as rename19, writeFile as writeFile29 } from "fs/promises";
-import { dirname as dirname38, join as join80 } from "path";
+import { mkdir as mkdir38, readFile as readFile49, rename as rename19, writeFile as writeFile29 } from "fs/promises";
+import { dirname as dirname38, join as join81 } from "path";
 var ThreadFileSchema = external_exports.object({
   threads: external_exports.record(external_exports.string(), ThreadMetadataSchema)
 });
@@ -100207,7 +100343,7 @@ var SideThreadRegistry = class {
   }
   /** Persistence */
   #filePath() {
-    return join80(this.#deps.dataDir, "threads", `${this.#deps.taskId}.json`);
+    return join81(this.#deps.dataDir, "threads", `${this.#deps.taskId}.json`);
   }
   async #ensureLoaded() {
     if (this.#loadedFromDisk.has(this.#deps.taskId)) return;
@@ -100227,7 +100363,7 @@ var SideThreadRegistry = class {
     const filePath = this.#filePath();
     let raw;
     try {
-      raw = await readFile48(filePath, "utf-8");
+      raw = await readFile49(filePath, "utf-8");
     } catch (err3) {
       if (isEnoent(err3)) return;
       throw err3;
@@ -103317,9 +103453,9 @@ function buildProfileRewindCapability(resolve15, runtimeId, primary) {
 
 // src/services/task/cc-task-file-store.ts
 import { existsSync as existsSync12 } from "fs";
-import { readdir as readdir22, readFile as readFile49 } from "fs/promises";
+import { readdir as readdir22, readFile as readFile50 } from "fs/promises";
 import { homedir as homedir14 } from "os";
-import { basename as basename14, dirname as dirname39, join as join81 } from "path";
+import { basename as basename14, dirname as dirname39, join as join82 } from "path";
 var VALID_STATUSES = /* @__PURE__ */ new Set(["pending", "in_progress", "completed"]);
 var IDLE_DETACH_MS = 5 * 60 * 1e3;
 var IDLE_SWEEP_INTERVAL_MS = 6e4;
@@ -103335,7 +103471,7 @@ function isCCTaskFile(value) {
 }
 function createCCTaskFileWatcher(listId, log) {
   const sanitizedId = sanitize(listId);
-  const dir = join81(homedir14(), ".claude", "tasks", sanitizedId);
+  const dir = join82(homedir14(), ".claude", "tasks", sanitizedId);
   const targetDirName = basename14(dir);
   const parentDir = dirname39(dir);
   const watchState = {
@@ -103371,9 +103507,9 @@ function createCCTaskFileWatcher(listId, log) {
     return tasks;
   }
   async function readTask(taskId) {
-    const filePath = join81(dir, `${taskId}.json`);
+    const filePath = join82(dir, `${taskId}.json`);
     try {
-      const raw = await readFile49(filePath, "utf-8");
+      const raw = await readFile50(filePath, "utf-8");
       const parsed = JSON.parse(raw);
       if (isCCTaskFile(parsed)) return parsed;
       log?.({
@@ -103438,7 +103574,7 @@ function createCCTaskFileWatcher(listId, log) {
         watchState.parentSub = null;
         return;
       }
-      if (ev.path.endsWith(targetDirName) || ev.path === join81(parentDir, targetDirName)) {
+      if (ev.path.endsWith(targetDirName) || ev.path === join82(parentDir, targetDirName)) {
         void ensureDirWatcher();
         break;
       }
@@ -103555,7 +103691,7 @@ function createCCTaskFileWatcher(listId, log) {
 // src/services/task/cc-task-file-writer.ts
 import { createHash as createHash16 } from "crypto";
 import { mkdir as mkdir39, readdir as readdir23, rename as rename20, unlink as unlink14, writeFile as writeFile30 } from "fs/promises";
-import { join as join82 } from "path";
+import { join as join83 } from "path";
 function contentHash2(data) {
   return createHash16("sha256").update(data).digest("hex").slice(0, 16);
 }
@@ -103571,7 +103707,7 @@ async function writeTasks(dir, tasks, hashes) {
     const json = JSON.stringify(structuredTaskToCCFile(task), null, 2);
     const hash = contentHash2(json);
     if (hashes.get(id) === hash) continue;
-    await atomicWriteFile2(join82(dir, `${id}.json`), json);
+    await atomicWriteFile2(join83(dir, `${id}.json`), json);
     hashes.set(id, hash);
   }
   return targetIds;
@@ -103587,7 +103723,7 @@ async function removeStaleFiles(dir, targetIds, hashes) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
     if (!targetIds.has(id) && hashes.has(id)) {
-      await unlink14(join82(dir, entry)).catch(() => {
+      await unlink14(join83(dir, entry)).catch(() => {
       });
       hashes.delete(id);
     }
@@ -104219,10 +104355,10 @@ var StructuredTaskTracker = class {
 import { unwatchFile, watchFile } from "fs";
 import { open as open5 } from "fs/promises";
 import { homedir as homedir15 } from "os";
-import { join as join83 } from "path";
+import { join as join84 } from "path";
 function computeTranscriptPath(cwd, sessionId, taskId) {
   const cwdSlug = cwd.replace(/[^a-zA-Z0-9]/g, "-").slice(0, 200);
-  return join83(
+  return join84(
     homedir15(),
     ".claude",
     "projects",
@@ -104403,9 +104539,9 @@ var SubagentTranscriptWatcher = class {
     let fh = null;
     try {
       fh = await open5(this.#config.transcriptPath, "r");
-      const stat22 = await fh.stat();
-      if (stat22.size <= this.#bytesRead) return;
-      const bytesToRead = stat22.size - this.#bytesRead;
+      const stat23 = await fh.stat();
+      if (stat23.size <= this.#bytesRead) return;
+      const bytesToRead = stat23.size - this.#bytesRead;
       const buffer = Buffer.alloc(bytesToRead);
       const { bytesRead } = await fh.read(buffer, 0, bytesToRead, this.#bytesRead);
       this.#bytesRead += bytesRead;
@@ -104955,13 +105091,40 @@ function trackPlanFileCreation(content, onPlanFile) {
   }
 }
 
+// src/services/task/orchestrator/task-unpushed-selection.ts
+function isUnconfirmedHuman(message, excludeCorrelationIds) {
+  if (message.senderKind !== "human") return false;
+  const { correlationId } = message;
+  if (!correlationId) return false;
+  if (message.sdkUuid) return false;
+  return !excludeCorrelationIds?.has(correlationId);
+}
+function selectUnpushedMessages(messages, excludeCorrelationIds) {
+  let lastAgentIndex = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i]?.senderKind === "agent") {
+      lastAgentIndex = i;
+      break;
+    }
+  }
+  const selected = [];
+  let supersededByAgentReply = 0;
+  for (let i = 0; i < messages.length; i++) {
+    const message = messages[i];
+    if (message === void 0 || !isUnconfirmedHuman(message, excludeCorrelationIds)) continue;
+    if (i < lastAgentIndex) supersededByAgentReply++;
+    else selected.push(message);
+  }
+  return { messages: selected, supersededByAgentReply };
+}
+
 // src/services/token-counter.ts
 import { spawn as spawn13 } from "child_process";
 import { createHash as createHash17 } from "crypto";
 import { unlink as unlink15, writeFile as writeFile31 } from "fs/promises";
 import { createRequire as createRequire4 } from "module";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 function spawnCollect(bin, args, opts) {
   return new Promise((resolve15, reject) => {
     const child = spawn13(bin, args, {
@@ -105019,7 +105182,7 @@ function resolveDaemonNodeModules(log) {
   } catch {
   }
   try {
-    const cwdRequire = createRequire4(join84(process.cwd(), "package.json"));
+    const cwdRequire = createRequire4(join85(process.cwd(), "package.json"));
     const sdkPath = cwdRequire.resolve("@modelcontextprotocol/sdk/server/mcp.js");
     const idx = sdkPath.lastIndexOf("node_modules");
     if (idx >= 0) return sdkPath.slice(0, idx + "node_modules".length);
@@ -105029,7 +105192,7 @@ function resolveDaemonNodeModules(log) {
       error: err3 instanceof Error ? err3.message : String(err3)
     });
   }
-  return join84(process.cwd(), "node_modules");
+  return join85(process.cwd(), "node_modules");
 }
 function planTokenCount(systemPrompt, metadata, cwd, model, mcpServers) {
   return {
@@ -105228,7 +105391,7 @@ async function serializeMcpConfig(servers, allToolNames, daemonNodeModules, rese
     if (isReservedMcpServerName(serverName, reservedServerNames)) continue;
     const script = buildStubServerScript(serverName, tools);
     if (!script) continue;
-    const stubPath = join84(tmpdir2(), `shipyard-mcp-stub-${serverName}-${Date.now()}.cjs`);
+    const stubPath = join85(tmpdir2(), `shipyard-mcp-stub-${serverName}-${Date.now()}.cjs`);
     await writeFile31(stubPath, script, "utf-8");
     stubPaths.push(stubPath);
     mcpServers[serverName] = {
@@ -105254,7 +105417,7 @@ async function prepareTokenCountArgs(plan, log, reservedServerNames = SDK_RESERV
     reservedServerNames
   );
   if (!serialized.config) return { args, mcpConfigPath: null, stubPaths: serialized.stubPaths };
-  const mcpConfigPath = join84(tmpdir2(), `shipyard-mcp-${Date.now()}.json`);
+  const mcpConfigPath = join85(tmpdir2(), `shipyard-mcp-${Date.now()}.json`);
   await writeFile31(mcpConfigPath, JSON.stringify(serialized.config), "utf-8");
   args.push("--mcp-config", mcpConfigPath);
   return { args, mcpConfigPath, stubPaths: serialized.stubPaths };
@@ -105816,22 +105979,21 @@ var Task = class {
           correlationId: meta?.correlationIds[0]
         };
       },
-      onUserMessageConfirmed: (correlationId, mark) => {
+      onUserMessageConfirmed: (correlationId, mark, storedMessageId) => {
         const currentMeta = this.#pendingMessageMeta[0];
         const idsToAck = currentMeta?.correlationIds ?? [correlationId];
         if (mark) {
-          const [primary, ...secondary] = idsToAck;
-          const primaryId = primary ?? correlationId;
+          const [, ...secondary] = idsToAck;
           this.#deps.store.stampSdkUuid(
             this.#deps.channelId,
-            primaryId,
+            storedMessageId,
             mark.ref,
             secondary.length > 0 ? secondary : void 0
           ).catch((err3) => {
             this.#deps.log({
               event: "stamp_sdk_uuid_failed",
               taskId: this.#deps.taskId,
-              correlationId: primaryId,
+              messageId: storedMessageId,
               error: err3 instanceof Error ? err3.message : String(err3)
             });
           });
@@ -106692,21 +106854,23 @@ var Task = class {
   }
   /**
    * Sub-phase 7b: Rehydrate persisted-but-unpushed user messages after daemon restart.
-   *
-   * Scans the JSONL store for rows where correlationId is set but sdkUuid is null
-   * (persisted but not confirmed by SDK). Re-injects them as pushMessage content
-   * so the next subprocess spawn receives them in order.
-   *
-   * Pass excludeCorrelationIds to skip messages already handled by rehydrateCollabQueue,
-   * preventing double-send of the same message to the subprocess.
-   *
-   * Returns the number of messages re-injected.
+   * Bounded to the trailing human segment — selectUnpushedMessages explains why
+   * an agent reply outranks a missing sdkUuid. Pass excludeCorrelationIds to skip
+   * messages already handled by rehydrateCollabQueue. Returns the count injected.
    */
   async rehydrateUnpushedMessages(excludeCorrelationIds) {
     const messages = await this.#deps.store.getMessages(this.#deps.channelId);
-    const unpushed = messages.filter(
-      (m2) => m2.senderKind === "human" && m2.correlationId && !m2.sdkUuid && !(excludeCorrelationIds && m2.correlationId && excludeCorrelationIds.has(m2.correlationId))
+    const { messages: unpushed, supersededByAgentReply } = selectUnpushedMessages(
+      messages,
+      excludeCorrelationIds
     );
+    if (supersededByAgentReply > 0) {
+      this.#deps.log({
+        event: "unpushed_messages_superseded",
+        taskId: this.#deps.taskId,
+        count: supersededByAgentReply
+      });
+    }
     if (unpushed.length === 0) return 0;
     this.#ensureFileWatcherAttached();
     for (const msg of unpushed) {
@@ -111877,7 +112041,7 @@ async function createDaemon(deps) {
   const annotationStore = buildAnnotationStore(deps.dataDir);
   const deliverableStore = buildDeliverableStore(deps.dataDir);
   const resourceRegistry = createResourceRegistry();
-  const assetStore = buildAssetStore(join85(deps.dataDir, "assets"));
+  const assetStore = buildAssetStore(join86(deps.dataDir, "assets"));
   const shipyardResolver = createShipyardResolver();
   shipyardResolver.addSubResolver("asset", createAssetResolver(assetStore));
   const pluginResourceResolver = new PluginResourceResolver(deps.log);
@@ -111908,10 +112072,10 @@ async function createDaemon(deps) {
     workspaceRoot: deps.workspaceRoot,
     log: deps.log
   });
-  const userSettingsStore = buildUserSettingsStore(join85(deps.dataDir, "user-settings.json"));
-  const projectsStore = buildProjectsStore(join85(deps.dataDir, "projects.json"));
+  const userSettingsStore = buildUserSettingsStore(join86(deps.dataDir, "user-settings.json"));
+  const projectsStore = buildProjectsStore(join86(deps.dataDir, "projects.json"));
   const credentialsVaultStore = buildCredentialsVaultStore(
-    join85(deps.dataDir, "credentials-vault.json")
+    join86(deps.dataDir, "credentials-vault.json")
   );
   const cursorVaultKeyRef = { current: null };
   let resolveCursorVaultKey;
@@ -112379,7 +112543,7 @@ async function createDaemon(deps) {
       taskId: args.taskId,
       agentSystem: args.agentSystem,
       environmentKey: args.cwd,
-      pluginsDir: join85(deps.shipyardHome, "plugins"),
+      pluginsDir: join86(deps.shipyardHome, "plugins"),
       vizWatcher: getOrCreateVizWatcher(args.taskId).watcher,
       mode: "task",
       ownerUserId: deps.auth.userId,
@@ -112517,7 +112681,7 @@ async function createDaemon(deps) {
       /** Claude in-process harness — Codex uses the HTTP path with 'codex' above. */
       agentSystem: AGENT_SYSTEM_CLAUDE_CODE,
       environmentKey: args.cwd,
-      pluginsDir: join85(deps.shipyardHome, "plugins"),
+      pluginsDir: join86(deps.shipyardHome, "plugins"),
       vizWatcher: args.vizWatcher,
       mode: args.mode ?? "task",
       ownerUserId: deps.auth.userId,
@@ -113596,7 +113760,7 @@ async function createDaemon(deps) {
     deps.metricsCollector
   );
   const planDocGapReporter = startPlanDocPersistenceGapReporter({
-    loroDir: join85(deps.dataDir, "loro"),
+    loroDir: join86(deps.dataDir, "loro"),
     listTasks: () => taskStateStore.listTasks(),
     log: deps.log,
     metricsCollector: deps.metricsCollector
@@ -113612,7 +113776,7 @@ async function createDaemon(deps) {
   const stallProfilerConfig = getStallProfilerConfig();
   const stallProfiler = new StallProfiler({
     log: deps.log,
-    outDir: join85(deps.dataDir, "stall-profiles"),
+    outDir: join86(deps.dataDir, "stall-profiles"),
     thresholdMs: stallProfilerConfig.thresholdMs,
     captureMs: stallProfilerConfig.captureMs,
     rateLimitMs: stallProfilerConfig.rateLimitMs
@@ -114264,8 +114428,8 @@ import { existsSync as existsSync14 } from "fs";
 // src/services/bootstrap/self-update.ts
 import { execFile as execFile13, spawn as spawn14 } from "child_process";
 import { createHash as createHash18 } from "crypto";
-import { chmod as chmod4, mkdir as mkdir41, readFile as readFile50, rename as rename21, unlink as unlink16, writeFile as writeFile32 } from "fs/promises";
-import { join as join86 } from "path";
+import { chmod as chmod4, mkdir as mkdir41, readFile as readFile51, rename as rename21, unlink as unlink16, writeFile as writeFile32 } from "fs/promises";
+import { join as join87 } from "path";
 
 // src/services/bootstrap/self-update-installer-scripts.ts
 function buildPosixInstallerScript(params) {
@@ -114667,7 +114831,7 @@ async function downloadTarball(url2, destPath, fetchFn) {
       throw new Error(`download failed: HTTP ${response.status} ${response.statusText}`);
     }
     const bytes = new Uint8Array(await response.arrayBuffer());
-    await mkdir41(join86(destPath, ".."), { recursive: true });
+    await mkdir41(join87(destPath, ".."), { recursive: true });
     try {
       await writeFile32(tmpPath, bytes);
       await rename21(tmpPath, destPath);
@@ -114686,7 +114850,7 @@ async function downloadTarball(url2, destPath, fetchFn) {
 }
 async function verifyChecksum(path8, expectedHash) {
   const algo = expectedHash.length === 40 ? "sha1" : "sha256";
-  const raw = await readFile50(path8);
+  const raw = await readFile51(path8);
   const actual = createHash18(algo).update(raw).digest("hex");
   if (actual !== expectedHash) {
     try {
@@ -114697,7 +114861,7 @@ async function verifyChecksum(path8, expectedHash) {
   }
 }
 async function stageInstallerScript(scriptPath, params) {
-  await mkdir41(join86(scriptPath, ".."), { recursive: true });
+  await mkdir41(join87(scriptPath, ".."), { recursive: true });
   const body = process.platform === "win32" ? buildWindowsInstallerScript(params) : buildPosixInstallerScript(params);
   await writeFile32(scriptPath, body);
   await chmod4(scriptPath, 493);
@@ -114747,16 +114911,16 @@ function buildInstallerParams(state, deps) {
     targetVersion: state.resolved.version,
     previousVersion: deps.currentVersion,
     parentPid: deps.pid,
-    statusFilePath: join86(deps.shipyardHome, "update-status.json"),
-    pidFilePath: join86(deps.shipyardHome, "daemon.pid"),
-    logPath: join86(deps.shipyardHome, "updates", `install-${deps.pid}.log`),
-    snapshotPath: join86(deps.shipyardHome, "updates", `rollback-${deps.currentVersion}`),
+    statusFilePath: join87(deps.shipyardHome, "update-status.json"),
+    pidFilePath: join87(deps.shipyardHome, "daemon.pid"),
+    logPath: join87(deps.shipyardHome, "updates", `install-${deps.pid}.log`),
+    snapshotPath: join87(deps.shipyardHome, "updates", `rollback-${deps.currentVersion}`),
     npmBin: "npm"
   };
 }
 function tarballPathFor(shipyardHome, version, shasum) {
   const shaPrefix = shasum.slice(0, 12);
-  return join86(shipyardHome, "updates", `${version}-${shaPrefix}.tgz`);
+  return join87(shipyardHome, "updates", `${version}-${shaPrefix}.tgz`);
 }
 async function runResolveStep(step, state, deps) {
   const resolver = deps.resolveVersion ?? defaultResolveVersion;
@@ -115804,8 +115968,8 @@ function buildLocalDirectChannelCallbacks(deps) {
 }
 
 // src/services/skills-cache/codex-skills-cache.ts
-import { mkdir as mkdir42, readFile as readFile51, rename as rename22, writeFile as writeFile33 } from "fs/promises";
-import { dirname as dirname41, join as join87 } from "path";
+import { mkdir as mkdir42, readFile as readFile52, rename as rename22, writeFile as writeFile33 } from "fs/promises";
+import { dirname as dirname41, join as join88 } from "path";
 var CACHE_FILENAME = "codex-skills-cache.json";
 var SkillInfoCacheEntrySchema = external_exports.object({
   name: external_exports.string(),
@@ -115822,12 +115986,12 @@ var CodexSkillsCacheFileSchema = external_exports.object({
   skills: external_exports.array(SkillInfoCacheEntrySchema)
 });
 function defaultCodexSkillsCachePath(shipyardHome) {
-  return join87(shipyardHome, "state", CACHE_FILENAME);
+  return join88(shipyardHome, "state", CACHE_FILENAME);
 }
 async function loadCodexSkillsCache(path8) {
   let raw;
   try {
-    raw = await readFile51(path8, "utf-8");
+    raw = await readFile52(path8, "utf-8");
   } catch (err3) {
     if (isEnoent(err3)) return null;
     logger.warn(
@@ -115884,13 +116048,13 @@ async function saveCodexSkillsCache(path8, cache2) {
 }
 
 // src/services/skills-mirror/manager.ts
-import { lstat as lstat6, mkdir as mkdir44, readlink, stat as stat21, symlink, unlink as unlink18 } from "fs/promises";
+import { lstat as lstat6, mkdir as mkdir44, readlink, stat as stat22, symlink, unlink as unlink18 } from "fs/promises";
 import { homedir as homedir16 } from "os";
-import { dirname as dirname43, join as join89 } from "path";
+import { dirname as dirname43, join as join90 } from "path";
 
 // src/services/skills-mirror/manifest.ts
-import { mkdir as mkdir43, readFile as readFile52, rename as rename23, unlink as unlink17, writeFile as writeFile34 } from "fs/promises";
-import { dirname as dirname42, join as join88 } from "path";
+import { mkdir as mkdir43, readFile as readFile53, rename as rename23, unlink as unlink17, writeFile as writeFile34 } from "fs/promises";
+import { dirname as dirname42, join as join89 } from "path";
 var MANIFEST_VERSION = 1;
 var ManifestEntrySchema = external_exports.object({
   /** Display name of the skill (e.g. `qa`, or `plugin:name` when namespaced). */
@@ -115910,11 +116074,11 @@ function emptyManifest() {
   return { version: MANIFEST_VERSION, entries: [] };
 }
 function defaultManifestPath(shipyardHome) {
-  return join88(shipyardHome, "state", "skill-mirror-manifest.json");
+  return join89(shipyardHome, "state", "skill-mirror-manifest.json");
 }
 async function loadManifest(path8) {
   try {
-    const raw = await readFile52(path8, "utf-8");
+    const raw = await readFile53(path8, "utf-8");
     const parsed = ManifestFileSchema.safeParse(JSON.parse(raw));
     if (!parsed.success) return emptyManifest();
     return parsed.data;
@@ -115941,15 +116105,15 @@ async function deleteManifest(path8) {
 function defaultPaths() {
   const home = homedir16();
   return {
-    claudeSkillsDir: join89(home, ".claude", "skills"),
-    codexSkillsDir: join89(home, ".agents", "skills"),
+    claudeSkillsDir: join90(home, ".claude", "skills"),
+    codexSkillsDir: join90(home, ".agents", "skills"),
     manifestPath: defaultManifestPath(getShipyardHome())
   };
 }
 function plannedSymlinkPath(skill, paths) {
   const linkName = skill.namespace ? `${skill.namespace}:${skill.name}` : skill.name;
-  if (skill.sourceAgent === "claude-code") return join89(paths.codexSkillsDir, linkName);
-  if (skill.sourceAgent === "codex") return join89(paths.claudeSkillsDir, linkName);
+  if (skill.sourceAgent === "claude-code") return join90(paths.codexSkillsDir, linkName);
+  if (skill.sourceAgent === "codex") return join90(paths.claudeSkillsDir, linkName);
   return null;
 }
 function isPermissionError(err3) {
@@ -116096,7 +116260,7 @@ function planMirrorActions(skills, paths) {
 }
 async function classifyManifestEntry(entry) {
   try {
-    await stat21(entry.target);
+    await stat22(entry.target);
     return "retain";
   } catch (err3) {
     if (isEnoent(err3)) return "sweep-dangling";
@@ -116161,8 +116325,8 @@ async function ensureMirror(skills, config, paths = defaultPaths()) {
 }
 
 // src/services/skills-mirror/prefs.ts
-import { mkdir as mkdir45, readFile as readFile53, rename as rename24, writeFile as writeFile35 } from "fs/promises";
-import { dirname as dirname44, join as join90 } from "path";
+import { mkdir as mkdir45, readFile as readFile54, rename as rename24, writeFile as writeFile35 } from "fs/promises";
+import { dirname as dirname44, join as join91 } from "path";
 var SkillsMirrorPrefsSchema = external_exports.object({
   enabled: external_exports.boolean().default(false)
 });
@@ -116171,11 +116335,11 @@ function defaultSkillsMirrorPrefs() {
   return { enabled: false };
 }
 function prefsPath(dataDir) {
-  return join90(dataDir, FILENAME);
+  return join91(dataDir, FILENAME);
 }
 async function loadSkillsMirrorPrefs(dataDir) {
   try {
-    const raw = await readFile53(prefsPath(dataDir), "utf-8");
+    const raw = await readFile54(prefsPath(dataDir), "utf-8");
     const parsed = SkillsMirrorPrefsSchema.safeParse(JSON.parse(raw));
     if (!parsed.success) return defaultSkillsMirrorPrefs();
     return parsed.data;
@@ -116219,8 +116383,8 @@ async function reconcileSkillsMirror(args) {
 
 // src/services/storage/daemon-settings-store.ts
 import { createHash as createHash19 } from "crypto";
-import { mkdir as mkdir46, readFile as readFile54 } from "fs/promises";
-import { join as join91 } from "path";
+import { mkdir as mkdir46, readFile as readFile55 } from "fs/promises";
+import { join as join92 } from "path";
 var ProjectSettingsSchema = external_exports.object({
   disabledMcpServers: external_exports.array(external_exports.string()).optional(),
   previewMigrationV36Done: external_exports.boolean().default(false)
@@ -116229,9 +116393,9 @@ function hashProjectPath(projectPath) {
   return createHash19("sha256").update(projectPath).digest("hex").slice(0, 16);
 }
 function buildDaemonSettingsStore(dataDir) {
-  const settingsDir = join91(dataDir, "settings");
+  const settingsDir = join92(dataDir, "settings");
   function settingsPath(projectPath) {
-    return join91(settingsDir, `${hashProjectPath(projectPath)}.json`);
+    return join92(settingsDir, `${hashProjectPath(projectPath)}.json`);
   }
   async function ensureDir() {
     await mkdir46(settingsDir, { recursive: true });
@@ -116239,7 +116403,7 @@ function buildDaemonSettingsStore(dataDir) {
   return {
     async load(projectPath) {
       try {
-        const raw = await readFile54(settingsPath(projectPath), "utf-8");
+        const raw = await readFile55(settingsPath(projectPath), "utf-8");
         return ProjectSettingsSchema.parse(JSON.parse(raw));
       } catch (err3) {
         if (isEnoent(err3)) return ProjectSettingsSchema.parse({});
@@ -116255,18 +116419,18 @@ function buildDaemonSettingsStore(dataDir) {
 }
 
 // src/services/storage/plugin-config-store.ts
-import { mkdir as mkdir47, readFile as readFile55 } from "fs/promises";
-import { join as join92 } from "path";
+import { mkdir as mkdir47, readFile as readFile56 } from "fs/promises";
+import { join as join93 } from "path";
 function buildPluginConfigStore(pluginsDir) {
   const cache2 = /* @__PURE__ */ new Map();
   const writeQueues = /* @__PURE__ */ new Map();
   function configPath(pluginId) {
-    return join92(pluginsDir, pluginId, "config.json");
+    return join93(pluginsDir, pluginId, "config.json");
   }
   async function readConfigFromDisk(pluginId) {
     const fp = configPath(pluginId);
     try {
-      const raw = await readFile55(fp, "utf-8");
+      const raw = await readFile56(fp, "utf-8");
       const parsed = JSON.parse(raw);
       if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
         return Object.fromEntries(Object.entries(parsed));
@@ -116315,7 +116479,7 @@ function buildPluginConfigStore(pluginsDir) {
           const fresh = await readConfigFromDisk(pluginId);
           fresh[key] = value;
           cache2.set(pluginId, fresh);
-          await mkdir47(join92(pluginsDir, pluginId), { recursive: true });
+          await mkdir47(join93(pluginsDir, pluginId), { recursive: true });
           await atomicWriteFile(configPath(pluginId), JSON.stringify(fresh, null, 2));
         })
       );
@@ -116543,7 +116707,7 @@ async function serve(options = {}) {
 }
 async function runServeBody(options, captureRefs) {
   const shipyardHome = options.shipyardHome ?? getShipyardHome();
-  const dataDir = join93(shipyardHome, options.isDev ? "data-dev" : "data");
+  const dataDir = join94(shipyardHome, options.isDev ? "data-dev" : "data");
   const log = createChildLogger({ mode: "serve" });
   log.info(
     { event: "daemon_start", version: getDaemonVersion(), pid: process.pid },
@@ -116551,7 +116715,7 @@ async function runServeBody(options, captureRefs) {
   );
   const { workspaceRoot, unscopedWorkspace, unscopedReason } = await resolveWorkspaceScope();
   registerBuiltinPlugins();
-  const pluginConfigStore = buildPluginConfigStore(join93(dataDir, "plugins"));
+  const pluginConfigStore = buildPluginConfigStore(join94(dataDir, "plugins"));
   await mkdir48(dataDir, { recursive: true });
   log.info(
     {
@@ -116644,9 +116808,9 @@ async function runServeBody(options, captureRefs) {
   await bootstrapPhase("pid_sweep_orphans", () => pidTracker.sweepOrphans(logAdapter));
   await bootstrapPhase(
     "legacy_epoch_prune",
-    () => pruneOldEpochData(join93(dataDir, "loro"), logAdapter)
+    () => pruneOldEpochData(join94(dataDir, "loro"), logAdapter)
   );
-  const storage = new FileStorageAdapter(join93(dataDir, "loro"));
+  const storage = new FileStorageAdapter(join94(dataDir, "loro"));
   const personalWebrtcAdapter = new WebRtcDataChannelAdapter();
   const peerRoleRegistry = createPeerRoleRegistry();
   const presencePoolRef = { pool: {} };
@@ -116754,14 +116918,14 @@ async function runServeBody(options, captureRefs) {
     current: []
   };
   const terminalPtys = /* @__PURE__ */ new Map();
-  const terminalLogsDir = join93(shipyardHome, "data", "terminals");
+  const terminalLogsDir = join94(shipyardHome, "data", "terminals");
   await mkdir48(terminalLogsDir, { recursive: true, mode: 448 });
   const publishedArtifactStore = createPublishedArtifactStore({
-    rootDir: join93(dataDir, "published"),
+    rootDir: join94(dataDir, "published"),
     log: logAdapter
   });
   const previewStateStore = createPreviewStateStore({
-    rootDir: join93(dataDir, "preview-state"),
+    rootDir: join94(dataDir, "preview-state"),
     logger: log
   });
   let codexSkillsApplyScopedPatchRef = null;
@@ -116845,7 +117009,7 @@ async function runServeBody(options, captureRefs) {
   daemon.healthMetrics.start();
   publishedArtifactStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
   previewStateStore.setSendControlMessage((msg) => daemon.taskManager.broadcastControl(msg));
-  const pluginsDir = join93(shipyardHome, "plugins");
+  const pluginsDir = join94(shipyardHome, "plugins");
   await mkdir48(pluginsDir, { recursive: true });
   let loadedPlugins = [];
   const loadedPluginsRef = {
@@ -117410,4 +117574,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-3TQOIJID.js.map
+//# sourceMappingURL=serve-JEU6SMZX.js.map