@schoolai/shipyard 3.4.0-nightly.20260430.0 → 3.4.0

package/dist/index.js

@@ -111,7 +111,7 @@ async function handleSubcommand() {
     return true;
   }
   if (subcommand === "start") {
-    const { startCommand } = await import("./start-LMIPVOCM.js");
+    const { startCommand } = await import("./start-6AQMLAOX.js");
     await startCommand();
     return true;
   }
@@ -128,7 +128,7 @@ async function main() {
   const args = parseCliArgs();
   if (args.serve) {
     await loadAuthFromConfig(env);
-    const { serve } = await import("./serve-TUBBJN36.js");
+    const { serve } = await import("./serve-QENWMCVP.js");
     return serve({ isDev: env.SHIPYARD_DEV });
   }
   logger.error("Use `shipyard start` to run the daemon. Use --help for usage.");

package/dist/{serve-TUBBJN36.js → serve-QENWMCVP.js}

@@ -24152,9 +24152,9 @@ var MarkdownSerializerState = class {
   /**
   Get the markdown string for a given opening or closing mark.
   */
-  markString(mark, open3, parent, index) {
+  markString(mark, open2, parent, index) {
     let info = this.getMark(mark.type.name);
-    let value = open3 ? info.open : info.close;
+    let value = open2 ? info.open : info.close;
     return typeof value == "string" ? value : value(this, mark, parent, index);
   }
   /**
@@ -69406,8 +69406,8 @@ var Fitter = class {
     this.frontier.push({ type, match: type.contentMatch });
   }
   closeFrontierNode() {
-    let open3 = this.frontier.pop();
-    let add2 = open3.match.fillBefore(Fragment.empty, true);
+    let open2 = this.frontier.pop();
+    let add2 = open2.match.fillBefore(Fragment.empty, true);
     if (add2.childCount)
       this.placed = addToFragment(this.placed, this.frontier.length, add2);
   }
@@ -69440,8 +69440,8 @@ function closeNodeStart(node, openStart, openEnd) {
   }
   return node.copy(frag);
 }
-function contentAfterFits($to, depth, type, match2, open3) {
-  let node = $to.node(depth), index = open3 ? $to.indexAfter(depth) : $to.index(depth);
+function contentAfterFits($to, depth, type, match2, open2) {
+  let node = $to.node(depth), index = open2 ? $to.indexAfter(depth) : $to.index(depth);
   if (index == node.childCount && !type.compatibleContent(node.type))
     return null;
   let fit = match2.fillBefore(node.content, true, index);
@@ -92602,13 +92602,13 @@ function parseTaskNotificationXml(content) {
   return { type: "background_agent_result", taskId, result };
 }
 function extractXmlTag(xml, tag) {
-  const open3 = `<${tag}>`;
+  const open2 = `<${tag}>`;
   const close2 = `</${tag}>`;
-  const start = xml.indexOf(open3);
+  const start = xml.indexOf(open2);
   if (start === -1) return null;
-  const end = xml.indexOf(close2, start + open3.length);
+  const end = xml.indexOf(close2, start + open2.length);
   if (end === -1) return null;
-  return xml.slice(start + open3.length, end);
+  return xml.slice(start + open2.length, end);
 }
 function classifyMessage(message, log) {
   switch (message.type) {
@@ -101790,7 +101790,7 @@ function buildCredentialsVaultStore(filePath) {
 }
 
 // src/services/storage/jsonl-conversation-store.ts
-import { appendFile as appendFile3, mkdir as mkdir18, open, readFile as readFile34, rename as rename17, stat as stat14, writeFile as writeFile24 } from "fs/promises";
+import { appendFile as appendFile3, mkdir as mkdir18, readFile as readFile34, rename as rename17, stat as stat14, writeFile as writeFile24 } from "fs/promises";
 import { join as join46 } from "path";
 var StoredMessageSchema = MessageSchema.omit({ seqNo: true, channelId: true });
 function logPerf(entry) {
@@ -101811,21 +101811,6 @@ function buildJsonlConversationStore(dataDir) {
   async function ensureDir() {
     await mkdir18(channelsDir, { recursive: true });
   }
-  function parseJsonlBlob(raw, channelId) {
-    const lines = raw.split("\n");
-    if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
-    const messages = [];
-    for (let seqNo = 0; seqNo < lines.length; seqNo++) {
-      const line = lines[seqNo];
-      if (!line) continue;
-      try {
-        const parsed = StoredMessageSchema.parse(JSON.parse(line));
-        messages.push({ ...parsed, seqNo, channelId });
-      } catch {
-      }
-    }
-    return messages;
-  }
   async function readLines(channelId) {
     const startedAt = Date.now();
     logPerf({ event: "perf_jsonl_read_start", channelId });
@@ -101833,146 +101818,44 @@ function buildJsonlConversationStore(dataDir) {
     try {
       raw = await readFile34(channelPath(channelId), "utf-8");
     } catch (err) {
-      if (!isEnoent(err)) throw err;
-      logPerf({
-        event: "perf_jsonl_read_done",
-        channelId,
-        bytes: 0,
-        linesParsed: 0,
-        durationMs: Date.now() - startedAt
-      });
-      return [];
-    }
-    const messages = parseJsonlBlob(raw, channelId);
-    logPerf({
-      event: "perf_jsonl_read_done",
-      channelId,
-      bytes: Buffer.byteLength(raw, "utf-8"),
-      linesParsed: messages.length,
-      durationMs: Date.now() - startedAt
-    });
-    return messages;
-  }
-  async function countLinesInFile(path2) {
-    let fh;
-    try {
-      fh = await open(path2, "r");
-    } catch (err) {
-      if (isEnoent(err)) return 0;
-      throw err;
-    }
-    try {
-      const s2 = await fh.stat();
-      return await countNewlinesInRange(fh, 0, s2.size);
-    } finally {
-      await fh.close();
-    }
-  }
-  async function readBackwardChunks(fh, fileSize, targetNewlines) {
-    const CHUNK = 64 * 1024;
-    const chunks = [];
-    let newlines = 0;
-    let cursor = fileSize;
-    while (cursor > 0 && newlines <= targetNewlines) {
-      const readLen = Math.min(CHUNK, cursor);
-      const nextStart = cursor - readLen;
-      const buf = Buffer.allocUnsafe(readLen);
-      const { bytesRead } = await fh.read(buf, 0, readLen, nextStart);
-      const slice2 = bytesRead === readLen ? buf : buf.subarray(0, bytesRead);
-      for (let i = 0; i < slice2.length; i++) {
-        if (slice2[i] === 10) newlines++;
-      }
-      chunks.unshift(slice2);
-      cursor = nextStart;
-    }
-    return { chunks, newlines, startByte: cursor };
-  }
-  async function countNewlinesInRange(fh, start, end) {
-    if (start >= end) return 0;
-    const CHUNK = 64 * 1024;
-    const buf = Buffer.allocUnsafe(CHUNK);
-    let count = 0;
-    let pos = start;
-    while (pos < end) {
-      const readLen = Math.min(CHUNK, end - pos);
-      const { bytesRead } = await fh.read(buf, 0, readLen, pos);
-      for (let i = 0; i < bytesRead; i++) {
-        if (buf[i] === 10) count++;
+      if (isEnoent(err)) {
+        logPerf({
+          event: "perf_jsonl_read_done",
+          channelId,
+          bytes: 0,
+          linesParsed: 0,
+          durationMs: Date.now() - startedAt
+        });
+        return [];
       }
-      pos += bytesRead;
+      throw err;
     }
-    return count;
-  }
-  function extractTailLines(chunks, chunkedFromOffset, limit) {
-    const raw = Buffer.concat(chunks).toString("utf-8");
-    let lines = raw.split("\n");
-    if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
-    if (chunkedFromOffset > 0 && lines.length > 0) lines = lines.slice(1);
-    return lines.length <= limit ? lines : lines.slice(-limit);
-  }
-  function parseTailLines(lines, startSeqNo, channelId) {
+    const lines = raw.split("\n").filter((line) => line.length > 0);
     const messages = [];
+    let seqNo = 0;
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i];
       if (!line) continue;
       try {
         const parsed = StoredMessageSchema.parse(JSON.parse(line));
-        messages.push({ ...parsed, seqNo: startSeqNo + i, channelId });
+        messages.push({
+          ...parsed,
+          seqNo,
+          channelId
+        });
+        seqNo++;
       } catch {
-        return null;
       }
     }
+    logPerf({
+      event: "perf_jsonl_read_done",
+      channelId,
+      bytes: Buffer.byteLength(raw, "utf-8"),
+      linesParsed: messages.length,
+      durationMs: Date.now() - startedAt
+    });
     return messages;
   }
-  async function streamTailFromDisk(channelId, fileSize, limit) {
-    let fh;
-    try {
-      fh = await open(channelPath(channelId), "r");
-    } catch (err) {
-      if (isEnoent(err)) return { messages: [], totalLines: 0 };
-      throw err;
-    }
-    try {
-      const tail = await readBackwardChunks(fh, fileSize, limit);
-      const prefixNewlines = await countNewlinesInRange(fh, 0, tail.startByte);
-      const tailLines = extractTailLines(tail.chunks, tail.startByte, limit);
-      const totalLines = prefixNewlines + tail.newlines;
-      const startSeqNo = totalLines - tailLines.length;
-      const messages = parseTailLines(tailLines, startSeqNo, channelId);
-      if (messages === null) return null;
-      return { messages, totalLines };
-    } finally {
-      await fh.close();
-    }
-  }
-  async function statFreshness(path2) {
-    try {
-      const s2 = await stat14(path2);
-      return { size: s2.size, mtimeMs: s2.mtimeMs };
-    } catch (err) {
-      if (isEnoent(err)) return null;
-      throw err;
-    }
-  }
-  function readTailFromCache(channelId, limit, fileStat) {
-    const hit = readCache.get(channelId);
-    if (!hit || hit.size !== fileStat.size || hit.mtimeMs !== fileStat.mtimeMs) return null;
-    const tail = hit.messages.length <= limit ? [...hit.messages] : hit.messages.slice(-limit);
-    return { messages: tail, totalLines: hit.messages.length };
-  }
-  async function readTail(channelId, limit) {
-    if (limit <= 0) return { messages: [], totalLines: 0 };
-    const fileStat = await statFreshness(channelPath(channelId));
-    if (fileStat === null || fileStat.size === 0) return { messages: [], totalLines: 0 };
-    const cached2 = readTailFromCache(channelId, limit, fileStat);
-    if (cached2 !== null) return cached2;
-    if (fileStat.size <= 256 * 1024) {
-      const all = await readLinesCached(channelId);
-      const tail = all.length <= limit ? all : all.slice(-limit);
-      return { messages: tail, totalLines: all.length };
-    }
-    return streamTailFromDisk(channelId, fileStat.size, limit);
-  }
   async function readLinesCached(channelId) {
     const path2 = channelPath(channelId);
     let fileStat = null;
@@ -101995,22 +101878,14 @@ function buildJsonlConversationStore(dataDir) {
     });
     return [...fresh];
   }
-  function pushIntoLiveCache(channelId, appended, fileStat) {
-    const liveHit = readCache.get(channelId);
-    if (!liveHit) return;
-    const lastSeqNo = liveHit.messages[liveHit.messages.length - 1]?.seqNo ?? -1;
-    const incoming = Array.isArray(appended) ? appended : [appended];
-    for (const m2 of incoming) {
-      if (m2.seqNo > lastSeqNo) liveHit.messages.push(m2);
-    }
-    liveHit.size = fileStat.size;
-    liveHit.mtimeMs = fileStat.mtimeMs;
-  }
   async function refreshCacheAfterAppend(channelId, appended) {
-    if (!readCache.get(channelId)) return;
+    const hit = readCache.get(channelId);
+    if (!hit) return;
     try {
       const s2 = await stat14(channelPath(channelId));
-      pushIntoLiveCache(channelId, appended, { size: s2.size, mtimeMs: s2.mtimeMs });
+      hit.messages.push(appended);
+      hit.size = s2.size;
+      hit.mtimeMs = s2.mtimeMs;
     } catch (err) {
       if (isEnoent(err)) {
         readCache.delete(channelId);
@@ -102057,14 +101932,15 @@ function buildJsonlConversationStore(dataDir) {
     if (!found2) return null;
     return { kind: "duplicate", seqNo: found2.seqNo, dedupKey: `fp:${fingerprint}` };
   }
-  function classifyDedupResult(existing, message, nextSeqNo, dedupWindowMs, now) {
+  function classifyDedupResult(existing, message, currentSeq, dedupWindowMs, now) {
     const byCorr = decideDedupByCorrelation(existing, message);
     if (byCorr) return byCorr;
     const bySdk = decideDedupBySdkUuid(existing, message);
     if (bySdk) return bySdk;
     const byFp = decideDedupByFingerprint(existing, message, dedupWindowMs, now);
     if (byFp) return byFp;
-    return { kind: "append", seqNo: nextSeqNo };
+    const seqNo = currentSeq !== void 0 ? currentSeq + 1 : existing.length;
+    return { kind: "append", seqNo };
   }
   return {
     async appendMessage(message) {
@@ -102082,18 +101958,15 @@ function buildJsonlConversationStore(dataDir) {
         if (currentSeq !== void 0) {
           seqNo = currentSeq + 1;
         } else {
-          seqNo = await countLinesInFile(channelPath(message.channelId));
+          const existing = await readLines(message.channelId);
+          seqNo = existing.length;
         }
         seqCounters.set(message.channelId, seqNo);
         const { channelId: _channelId, ...rest } = message;
         const line = JSON.stringify(rest);
         await appendFile3(channelPath(message.channelId), `${line}
 `, "utf-8");
-        await refreshCacheAfterAppend(message.channelId, {
-          ...rest,
-          channelId: message.channelId,
-          seqNo
-        });
+        readCache.delete(message.channelId);
         resolveSeqNo(seqNo);
       }).catch((err) => {
         readCache.delete(message.channelId);
@@ -102127,24 +102000,22 @@ function buildJsonlConversationStore(dataDir) {
         if (currentSeq !== void 0) {
           startSeqNo = currentSeq + 1;
         } else {
-          startSeqNo = await countLinesInFile(channelPath(channelId));
+          const existing = await readLines(channelId);
+          startSeqNo = existing.length;
         }
         const seqNos = [];
         const lines = [];
-        const cacheUpdates = [];
         for (let i = 0; i < messages.length; i++) {
           const msg = messages[i];
           if (!msg) continue;
-          const seqNo = startSeqNo + i;
-          seqNos.push(seqNo);
+          seqNos.push(startSeqNo + i);
           const { channelId: _cid, ...rest } = msg;
           lines.push(JSON.stringify(rest));
-          cacheUpdates.push({ ...rest, channelId, seqNo });
         }
         await appendFile3(channelPath(channelId), `${lines.join("\n")}
 `, "utf-8");
         seqCounters.set(channelId, startSeqNo + messages.length - 1);
-        await refreshCacheAfterAppend(channelId, cacheUpdates);
+        readCache.delete(channelId);
         resolveSeqNos(seqNos);
       }).catch((err) => {
         readCache.delete(channelId);
@@ -102166,11 +102037,10 @@ function buildJsonlConversationStore(dataDir) {
         await ensureDir();
         const existing = await readLinesCached(message.channelId);
         const currentSeq = seqCounters.get(message.channelId);
-        const nextSeqNo = currentSeq !== void 0 ? currentSeq + 1 : await countLinesInFile(channelPath(message.channelId));
         const decision = classifyDedupResult(
           existing,
           message,
-          nextSeqNo,
+          currentSeq,
           DEDUP_WINDOW_MS,
           Date.now()
         );
@@ -102272,16 +102142,6 @@ function buildJsonlConversationStore(dataDir) {
       };
     },
     async getMessagesBefore(channelId, beforeSeqNo, limit) {
-      if (limit <= 0) return { messages: [], hasMore: false };
-      if (beforeSeqNo === Number.POSITIVE_INFINITY) {
-        const tail = await readTail(channelId, limit);
-        if (tail !== null) {
-          return {
-            messages: tail.messages,
-            hasMore: tail.totalLines > tail.messages.length
-          };
-        }
-      }
       const all = await readLinesCached(channelId);
       if (beforeSeqNo === Number.POSITIVE_INFINITY && all.length <= limit) {
         return { messages: all, hasMore: false };
@@ -110594,7 +110454,7 @@ var StructuredTaskTracker = class {
 
 // src/services/task/subagent-transcript-watcher.ts
 import { unwatchFile, watchFile } from "fs";
-import { open as open2 } from "fs/promises";
+import { open } from "fs/promises";
 import { homedir as homedir9 } from "os";
 import { join as join56 } from "path";
 function computeTranscriptPath(cwd, sessionId, taskId) {
@@ -110775,7 +110635,7 @@ var SubagentTranscriptWatcher = class {
   async #readNewData() {
     let fh = null;
     try {
-      fh = await open2(this.#config.transcriptPath, "r");
+      fh = await open(this.#config.transcriptPath, "r");
       const stat15 = await fh.stat();
       if (stat15.size <= this.#bytesRead) return;
       const bytesToRead = stat15.size - this.#bytesRead;
@@ -118359,8 +118219,8 @@ function wireAutoOpenBrowser(connection, signalingClient, authToken, signalingUr
       const webUrl = getWebAppUrl(signalingUrl);
       const url = `${webUrl}?bcode=${encodeURIComponent(code2)}`;
       log.info({ url: webUrl }, "Opening browser");
-      const open3 = await import("./open-OYFTLGDC.js");
-      await open3.default(url);
+      const open2 = await import("./open-OYFTLGDC.js");
+      await open2.default(url);
     }).catch((err) => {
       log.warn(
         { error: err instanceof Error ? err.message : String(err) },
@@ -119555,4 +119415,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-TUBBJN36.js.map
+//# sourceMappingURL=serve-QENWMCVP.js.map