@schoolai/shipyard 3.24.0 → 3.25.0

package/dist/{chunk-JZTUQVHQ.js → chunk-IRS6HYMU.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getDaemonVersion
-} from "./chunk-DDC5OQOC.js";
+} from "./chunk-XNH6FVIX.js";
 import {
   WorkerCommandCodec,
   WorkerReplyCodec
@@ -1116,4 +1116,4 @@ export {
   shutdownFileWatcherGuard,
   guardedSubscribe
 };
-//# sourceMappingURL=chunk-JZTUQVHQ.js.map
+//# sourceMappingURL=chunk-IRS6HYMU.js.map

package/dist/{chunk-UK3IMOSP.js → chunk-VQCBF7X5.js}

@@ -31,7 +31,7 @@ import {
   parseShipyardDeliverableUrl,
   planEditorSerializer,
   toTaskIndexEntry
-} from "./chunk-BGJ6QJNS.js";
+} from "./chunk-FC3HWVYQ.js";
 import {
   assertNever
 } from "./chunk-X3MULCV5.js";
@@ -7360,6 +7360,13 @@ var StorageAdapter = class extends Adapter {
 // src/shared/file-storage-adapter.ts
 import { access, mkdir, open, readdir, readFile, rename, unlink } from "fs/promises";
 import { dirname, join, sep } from "path";
+function errnoOf(err) {
+  if (err !== null && typeof err === "object" && "code" in err) {
+    const code = Reflect.get(err, "code");
+    if (typeof code === "string") return code;
+  }
+  return "UNKNOWN";
+}
 var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
   #dataDir;
   /**
@@ -7490,6 +7497,12 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
    * Returns true if the directory for the given docId exists on disk.
    * Uses a single fs.access call — avoids loading any Loro data.
    * docId is the first key segment (e.g. "canvas:<taskId>:<epoch>").
+   *
+   * A truthy result means ONLY that the directory exists. `#saveAtomic` mkdir's
+   * the chunk directory before the first `rename` lands, compaction can remove
+   * every chunk under a directory it leaves in place, and a directory the
+   * filesystem refuses to list still passes `access`. Callers asking "does real
+   * data exist here?" must use {@link probeDocChunks} instead — see #5266.
    */
   async hasDoc(docId) {
     const dirPath = join(this.#dataDir, encodeURIComponent(docId));
@@ -7500,6 +7513,54 @@ var FileStorageAdapter = class _FileStorageAdapter extends StorageAdapter {
       return false;
     }
   }
+  /**
+   * What is ACTUALLY on disk for a docId: how many non-`.tmp` chunk files the
+   * directory holds, or the errno if the filesystem refused to list it. Still
+   * cheap — `readdir` only, no chunk bytes are read and no Loro import runs.
+   *
+   * Exists because `hasDoc`'s boolean cannot distinguish an empty directory from
+   * one holding real chunks, nor either from an EACCES/EIO refusal, and a caller
+   * that infers "dir exists therefore chunks exist therefore an empty read must be
+   * a transient load failure" misdiagnoses a genuinely-empty doc (#5266).
+   */
+  async probeDocChunks(docId) {
+    const dirPath = join(this.#dataDir, encodeURIComponent(docId));
+    try {
+      const chunkCount = await this.#countChunkFiles(dirPath);
+      return chunkCount === 0 ? { kind: "absent" } : { kind: "chunks", chunkCount, path: dirPath };
+    } catch (err) {
+      const code = errnoOf(err);
+      if (code === "ENOENT") return { kind: "absent" };
+      return {
+        kind: "unreadable",
+        path: dirPath,
+        code,
+        message: err instanceof Error ? err.message : String(err)
+      };
+    }
+  }
+  /**
+   * Chunk files under `dir`, recursively. A directory that does not exist — the
+   * doc has never been written, or compaction removed a subtree mid-walk — counts
+   * as zero, so the caller reports `absent`. Any OTHER errno propagates, so a
+   * directory we were refused (EACCES/EIO/EMFILE) is reported as `unreadable`
+   * rather than silently under-counted as an empty doc.
+   */
+  async #countChunkFiles(dir) {
+    let entries;
+    try {
+      entries = await readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      if (errnoOf(err) === "ENOENT") return 0;
+      throw err;
+    }
+    let count = 0;
+    for (const entry of entries) {
+      if (entry.isDirectory()) count += await this.#countChunkFiles(join(dir, entry.name));
+      else if (entry.isFile() && !entry.name.endsWith(".tmp")) count += 1;
+    }
+    return count;
+  }
   async removeRange(keyPrefix) {
     if (isWholeDocumentKey(keyPrefix)) return;
     const chunks = await this.#collectChunks(keyPrefix);
@@ -33518,9 +33579,12 @@ function replay(planRepo, taskId, versions) {
     });
   }
 }
-function resolveFileFallback(taskId, sources) {
-  if (sources.planVersions.length > 0 || !sources.planFilePath) return Promise.resolve(null);
-  return readPlanFileFallback(sources.planFilePath, taskId);
+async function resolveFileFallback(taskId, sources, bookmarks) {
+  if (sources.planVersions.length > 0 || !sources.planFilePath) return null;
+  const version = await readPlanFileFallback(sources.planFilePath, taskId);
+  if (!version) return null;
+  if (bookmarks?.hasVersionBookmark(taskId, version.timestamp, version.toolUseId)) return null;
+  return version;
 }
 
 // src/services/plan-backfill/plan-backfill-executor.ts
@@ -33660,7 +33724,7 @@ async function processDryRunTask(ctx, docId, isResident) {
       ctx.deps.shipyardHome
     );
     const hasOnDiskPlanDoc = await ctx.adapter.hasDoc(docId);
-    const fileFallback = await resolveFileFallback(ctx.taskId, sources);
+    const fileFallback = await resolveFileFallback(ctx.taskId, sources, null);
     return planBackfill({
       taskId: ctx.taskId,
       docHasContent: hasOnDiskPlanDoc,
@@ -33683,7 +33747,7 @@ async function processWriteTask(ctx, iso, docId, isResident) {
     );
     const hasOnDiskPlanDoc = await ctx.adapter.hasDoc(docId);
     const docHasContent = await checkContent(iso, ctx.taskId, hasOnDiskPlanDoc, isResident);
-    const fileFallback = await resolveFileFallback(ctx.taskId, sources);
+    const fileFallback = await resolveFileFallback(ctx.taskId, sources, iso.planRepo);
     const action = planBackfill({
       taskId: ctx.taskId,
       docHasContent,
@@ -34783,4 +34847,4 @@ export {
   runPlanBackfill,
   buildTaskStateStore
 };
-//# sourceMappingURL=chunk-UK3IMOSP.js.map
+//# sourceMappingURL=chunk-VQCBF7X5.js.map