canopycms 0.0.60 → 0.0.61-int.75

package/dist/cli/cli.js

@@ -362,6 +362,36 @@ async function retryTask(taskDir, taskId, error, logger = nullLogger) {
   });
   logger.debug("Retrying task", { id: taskId, retryCount, backoffMs });
 }
+async function requeueFailedTask(taskDir, taskId, logger = nullLogger) {
+  const failedPath = path5.join(taskDir, "failed", `${taskId}.json`);
+  let content;
+  try {
+    content = await fs4.readFile(failedPath, "utf-8");
+  } catch (err) {
+    if (isNotFoundError2(err))
+      return { error: "not-found" };
+    throw err;
+  }
+  const original = parseTaskJson(content);
+  if (!original)
+    return { error: "unparseable" };
+  const newTaskId = crypto.randomUUID();
+  const newTask = {
+    id: newTaskId,
+    action: original.action,
+    payload: { ...original.payload, requeuedFrom: taskId },
+    status: "pending",
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    retryCount: 0,
+    maxRetries: original.maxRetries
+  };
+  const pendingPath = path5.join(taskDir, "pending", `${newTaskId}.json`);
+  await atomicWriteFile(pendingPath, JSON.stringify(newTask, null, 2));
+  await fs4.unlink(failedPath).catch(() => {
+  });
+  logger.debug("Requeued failed task", { originalId: taskId, newTaskId });
+  return { newTaskId };
+}
 async function recoverOrphanedTasks(taskDir, maxAgeMs = 5 * 6e4, logger = nullLogger) {
   const processingDir = path5.join(taskDir, "processing");
   const pendingDir = path5.join(taskDir, "pending");
@@ -491,6 +521,46 @@ async function getQueueStats(taskDir) {
   }
   return stats;
 }
+async function listCorruptTaskFiles(taskDir, limit = 50, logger = nullLogger) {
+  const corruptDir = path5.join(taskDir, "corrupt");
+  let files;
+  try {
+    files = await fs4.readdir(corruptDir);
+  } catch (err) {
+    if (isNotFoundError2(err))
+      return [];
+    throw err;
+  }
+  const entries = [];
+  for (const fileName of files.filter((f) => f.endsWith(".json"))) {
+    const filePath = path5.join(corruptDir, fileName);
+    try {
+      const stat = await fs4.stat(filePath);
+      entries.push({
+        fileName,
+        size: stat.size,
+        mtime: stat.mtime.toISOString(),
+        rawSnippet: await readSnippet(filePath, 500)
+      });
+    } catch (err) {
+      if (isNotFoundError2(err))
+        continue;
+      logger.debug("Failed to read corrupt task file", { fileName });
+    }
+  }
+  entries.sort((a, b) => new Date(b.mtime).getTime() - new Date(a.mtime).getTime());
+  return entries.slice(0, limit);
+}
+async function readSnippet(filePath, maxBytes) {
+  const handle = await fs4.open(filePath, "r");
+  try {
+    const buffer = Buffer.alloc(maxBytes);
+    const { bytesRead } = await handle.read(buffer, 0, maxBytes, 0);
+    return buffer.subarray(0, bytesRead).toString("utf-8");
+  } finally {
+    await handle.close();
+  }
+}
 function parseTaskJson(content) {
   try {
     const parsed = JSON.parse(content);
@@ -1271,8 +1341,10 @@ var init_init = __esm({
       getQueueStats: () => getQueueStats,
       getTask: () => getTask,
       getTaskResult: () => getTask,
+      listCorruptTaskFiles: () => listCorruptTaskFiles,
       listTasks: () => listTasks,
       recoverOrphanedTasks: () => recoverOrphanedTasks,
+      requeueFailedTask: () => requeueFailedTask,
       retryTask: () => retryTask
     });
     init_task_queue3 = __esm2({
@@ -3056,6 +3128,8 @@ async function withOccFileLock(filePath, fn) {
     return await fn();
   } finally {
     await release().catch((err) => {
+      if (isNodeError3(err) && err.code === "ENOENT")
+        return;
       log4.warn("lock", `Failed to release lock for ${filePath}`, { error: getErrorMessage3(err) });
     });
   }
@@ -3570,7 +3644,7 @@ async function generateAIContentCLI(options) {
   console.log(`  Output: ${result.outputDir}
 `);
 }
-var __defProp3, __getOwnPropNames3, __esm3, __export3, init_normalize2, ROOT_COLLECTION_ID, init_types3, normalizePathValue, flattenSchema, init_flatten2, ProdClientSafeStrategy2, DevClientSafeStrategy2, clientStrategyCache, init_client_safe_strategy, primitiveFieldTypes2, fieldTypes2, init_types22, fieldBaseSchema2, selectOptionSchema2, referenceOptionSchema2, primitiveFieldSchema2, ASPECT_RATIO_RE2, imageFieldSchema2, selectFieldSchema2, referenceFieldSchema2, fieldHolder2, blockSchema2, blockFieldSchema2, objectFieldSchema2, inlineGroupFieldSchema2, customFieldSchema2, knownFieldSchema2, fieldSchema2, init_field2, relativePathSchema2, entryTypeSchema2, collectionSchema2, init_collection2, mediaSchema2, init_media2, defaultBranchAccessSchema2, defaultPathAccessLevelSchema2, defaultPathAccessLevelsSchema2, defaultPathAccessSchema2, defaultBaseBranchSchema2, defaultRemoteNameSchema2, defaultRemoteUrlSchema2, gitBotAuthorNameSchema2, gitBotAuthorEmailSchema2, githubTokenEnvVarSchema2, operatingModeSchema2, deployedAsSchema2, contentRootSchema2, sourceRootSchema2, deploymentNameSchema2, devContentSyncSchema2, devConfigSchema2, editorConfigSchema2, CanopyConfigSchema2, DEFAULT_PROD_WORKSPACE2, init_config3, permissionTargetSchema2, pathPermissionSchema2, init_permissions2, init_validation2, init_helpers2, init_config22, ProdStrategy2, DevStrategy2, strategyCache2, init_client_unsafe_strategy, operating_mode_exports, init_operating_mode, locks, BASE58_PATTERN, CONTENT_ID_PATTERN, PHYSICAL_SEGMENT_PATTERN, isValidId, EMPTY_LOGICAL_PATH, ContentIdIndex, registry, finalization, LOG_LEVELS2, DebugLogger2, testLogger2, log2, META_DIR, entryTypeMetaSchema, collectionMetaSchema, rootCollectionMetaSchema, isDeployedStatic, isBuildMode, STATIC_DEPLOY_USER, SCHEMA_CACHE_VERSION, MTIME_CHECK_DEBOUNCE_MS, SCHEMA_GENERATION_RESOURCE, BranchSchemaCache, RESOURCE, getFormatExtension, isDataOnlyFormat, asRecord, BranchPathError, resolveContentBranchesRoot, ContentStoreError, ContentConflictError, DEFAULT_INDEX_FRESHNESS_INTERVAL_MS, FORCED_REFRESH_MIN_INTERVAL_MS, STALE_LOOKUP, ContentStore, ATTR_CONTENT, BLOCK_PREFIX, BLOCK_SUFFIX, BLOCK_RESTORE_RE, INLINE_PREFIX, INLINE_SUFFIX, INLINE_RESTORE_RE, FLAT_CELL_TYPES, log22, BASE58_CHAR, ENTRY_LINK_PATTERN, log3, REGISTRY_FILE, REGISTRY_STALE_FILE, REGISTRY_TEMP_FILE, REGISTRY_VERSION, RESOURCE2, GET_MISS_REFRESH_MIN_INTERVAL_MS, BranchRegistry, log4, OccWriteConflictError, BRANCH_META_DIR, BRANCH_META_FILE, CURRENT_SCHEMA_VERSION, BranchMetadataConflictError, BranchMetadataFileManager, getBranchMetadataFileManager, loadBranchContext, NETWORK_SCHEME_PATTERN, TRANSPORT_HELPER_PATTERN, LEADING_OPTION_PATTERN, WINDOWS_DRIVE_PATTERN, COLON_BEFORE_SLASH_PATTERN, log5, GIT_ENV_PASSTHROUGH, remoteInitLocks, GitConflictError, GitManager, log6, workspaceInitLocks, BranchWorkspaceManager, log7, normalizePath, readEntryData, parseTypedFilename, listCollectionEntries, MAX_INPUT_PIXELS, KNOWN_FIELD_TYPES, STRING_FIELD_TYPES, selectOptionValues, jiti;
+var __defProp3, __getOwnPropNames3, __esm3, __export3, init_normalize2, ROOT_COLLECTION_ID, init_types3, normalizePathValue, flattenSchema, init_flatten2, ProdClientSafeStrategy2, DevClientSafeStrategy2, clientStrategyCache, init_client_safe_strategy, primitiveFieldTypes2, fieldTypes2, init_types22, fieldBaseSchema2, selectOptionSchema2, referenceOptionSchema2, primitiveFieldSchema2, ASPECT_RATIO_RE2, imageFieldSchema2, selectFieldSchema2, referenceFieldSchema2, fieldHolder2, blockSchema2, blockFieldSchema2, objectFieldSchema2, inlineGroupFieldSchema2, customFieldSchema2, knownFieldSchema2, fieldSchema2, init_field2, relativePathSchema2, entryTypeSchema2, collectionSchema2, init_collection2, mediaSchema2, init_media2, defaultBranchAccessSchema2, defaultPathAccessLevelSchema2, defaultPathAccessLevelsSchema2, defaultPathAccessSchema2, defaultBaseBranchSchema2, defaultRemoteNameSchema2, defaultRemoteUrlSchema2, gitBotAuthorNameSchema2, gitBotAuthorEmailSchema2, githubTokenEnvVarSchema2, operatingModeSchema2, deployedAsSchema2, contentRootSchema2, sourceRootSchema2, deploymentNameSchema2, devContentSyncSchema2, devConfigSchema2, editorConfigSchema2, CanopyConfigSchema2, DEFAULT_PROD_WORKSPACE2, init_config3, permissionTargetSchema2, pathPermissionSchema2, init_permissions2, init_validation2, init_helpers2, init_config22, ProdStrategy2, DevStrategy2, strategyCache2, init_client_unsafe_strategy, operating_mode_exports, init_operating_mode, locks, BASE58_PATTERN, CONTENT_ID_PATTERN, PHYSICAL_SEGMENT_PATTERN, isValidId, EMPTY_LOGICAL_PATH, ContentIdIndex, registry, finalization, LOG_LEVELS2, DebugLogger2, testLogger2, log2, META_DIR, entryTypeMetaSchema, collectionMetaSchema, rootCollectionMetaSchema, isDeployedStatic, isBuildMode, STATIC_DEPLOY_USER, SCHEMA_CACHE_VERSION, MTIME_CHECK_DEBOUNCE_MS, SCHEMA_GENERATION_RESOURCE, BranchSchemaCache, RESOURCE, getFormatExtension, isDataOnlyFormat, asRecord, BranchPathError, resolveContentBranchesRoot, ContentStoreError, ContentConflictError, DEFAULT_INDEX_FRESHNESS_INTERVAL_MS, FORCED_REFRESH_MIN_INTERVAL_MS, STALE_LOOKUP, ContentStore, ATTR_CONTENT, BLOCK_PREFIX, BLOCK_SUFFIX, BLOCK_RESTORE_RE, INLINE_PREFIX, INLINE_SUFFIX, INLINE_RESTORE_RE, FLAT_CELL_TYPES, log22, BASE58_CHAR, ENTRY_LINK_PATTERN, log3, REGISTRY_FILE, REGISTRY_STALE_FILE, REGISTRY_TEMP_FILE, REGISTRY_VERSION, RESOURCE2, GET_MISS_REFRESH_MIN_INTERVAL_MS, BranchRegistry, log4, OccWriteConflictError, BRANCH_META_DIR, BRANCH_META_FILE, CURRENT_SCHEMA_VERSION, BranchMetadataConflictError, BranchMetadataCorruptError, BranchMetadataFileManager, getBranchMetadataFileManager, loadBranchContext, NETWORK_SCHEME_PATTERN, TRANSPORT_HELPER_PATTERN, LEADING_OPTION_PATTERN, WINDOWS_DRIVE_PATTERN, COLON_BEFORE_SLASH_PATTERN, log5, GIT_ENV_PASSTHROUGH, remoteInitLocks, GitConflictError, GitManager, log6, workspaceInitLocks, BranchWorkspaceManager, log7, normalizePath, readEntryData, parseTypedFilename, listCollectionEntries, MAX_INPUT_PIXELS, KNOWN_FIELD_TYPES, STRING_FIELD_TYPES, selectOptionValues, jiti;
 var init_generate_ai_content = __esm({
   "dist/cli/generate-ai-content.js"() {
     "use strict";
@@ -5541,8 +5615,22 @@ var init_generate_ai_content = __esm({
        * Returns array of entry metadata (relativePath, collection, slug).
        * Returns empty array if the collection doesn't exist.
        */
-      async getCollectionEntryPaths(collectionPath) {
-        const idIndex = await this.idIndex();
+      /**
+       * Resolve a schema collection referenced by name or logical path.
+       *
+       * Accepts either a full logical path ("content/authors") or a bare
+       * collection name ("authors") — the contract reference fields use for
+       * `collections: [...]` (see README). This is the single normalization
+       * point shared by reference-option loading and reference validation so
+       * the dropdown and the write boundary can never disagree.
+       *
+       * CAVEAT: the bare-name fallback matches on the LAST path segment and
+       * returns the first hit in schema order — with two collections sharing a
+       * leaf name (e.g. content/blog/posts and content/news/posts), a bare
+       * 'posts' is ambiguous. Use the full logical path in schemas that nest
+       * same-named collections.
+       */
+      resolveCollectionItem(collectionPath) {
         const normalized = normalizeFilesystemPath(collectionPath);
         let item = this.schemaIndex.get(normalized);
         if (!item) {
@@ -5556,10 +5644,14 @@ var init_generate_ai_content = __esm({
             }
           }
         }
-        if (!item || item.type !== "collection") {
+        return item && item.type === "collection" ? item : void 0;
+      }
+      async getCollectionEntryPaths(collectionPath) {
+        const idIndex = await this.idIndex();
+        const collection = this.resolveCollectionItem(collectionPath);
+        if (!collection) {
           return [];
         }
-        const collection = item;
         const treeEntries = idIndex.getEntriesInCollectionTree(collection.logicalPath);
         const entries = [];
         for (const location of treeEntries) {
@@ -5837,7 +5929,13 @@ var init_generate_ai_content = __esm({
               continue;
             }
             const branchRoot = path10.join(this.root, entry.name);
-            const meta = await BranchMetadataFileManager.loadOnly(branchRoot);
+            let meta;
+            try {
+              meta = await BranchMetadataFileManager.loadOnly(branchRoot);
+            } catch (err) {
+              console.warn(`CanopyCMS: Skipping branch directory '${entry.name}' during registry scan: ${getErrorMessage3(err)}`);
+              continue;
+            }
             if (meta) {
               branches.push({
                 branch: meta.branch,
@@ -5871,6 +5969,14 @@ var init_generate_ai_content = __esm({
         this.name = "BranchMetadataConflictError";
       }
     };
+    BranchMetadataCorruptError = class extends Error {
+      constructor(branchRoot, cause) {
+        super(`Corrupt branch metadata in '${branchRoot}': ${cause}`);
+        this.name = "BranchMetadataCorruptError";
+        this.branchRoot = branchRoot;
+        this.parseCause = cause;
+      }
+    };
     BranchMetadataFileManager = class _BranchMetadataFileManager {
       constructor(branchRoot, baseRoot, options) {
         this.branchRoot = path12.resolve(branchRoot);
@@ -5883,7 +5989,8 @@ var init_generate_ai_content = __esm({
        * Use this for read-only access (e.g., in registry scanning or loadBranchContext).
        */
       static async loadOnly(branchRoot) {
-        const filePath = path12.join(path12.resolve(branchRoot), BRANCH_META_DIR, BRANCH_META_FILE);
+        const resolvedRoot = path12.resolve(branchRoot);
+        const filePath = path12.join(resolvedRoot, BRANCH_META_DIR, BRANCH_META_FILE);
         try {
           const raw = await fs12.readFile(filePath, "utf8");
           return JSON.parse(raw);
@@ -5891,6 +5998,9 @@ var init_generate_ai_content = __esm({
           if (isNotFoundError4(err)) {
             return null;
           }
+          if (err instanceof SyntaxError) {
+            throw new BranchMetadataCorruptError(resolvedRoot, err.message);
+          }
           throw err;
         }
       }
@@ -6556,8 +6666,9 @@ var init_generate_ai_content = __esm({
       }
       async pullBaseInner() {
         await this.git.fetch(this.remote, this.baseBranch);
+        const fetchedTip = (await this.git.revparse(["FETCH_HEAD"])).trim();
         try {
-          await this.git.merge([`${this.remote}/${this.baseBranch}`]);
+          await this.git.merge([fetchedTip]);
         } catch (err) {
           try {
             const status = await this.git.status();
@@ -6612,8 +6723,9 @@ var init_generate_ai_content = __esm({
       }
       async rebaseOntoBaseInner() {
         await this.git.fetch(this.remote, this.baseBranch);
+        const fetchedTip = (await this.git.revparse(["FETCH_HEAD"])).trim();
         try {
-          await this.git.rebase([`${this.remote}/${this.baseBranch}`]);
+          await this.git.rebase([fetchedTip]);
         } catch (err) {
           try {
             const status = await this.git.status();
@@ -8210,7 +8322,7 @@ async function selectBranch(options, branchesDir) {
   let branches = [];
   if (await filePathExists(branchesDir)) {
     const entries = await fs23.readdir(branchesDir, { withFileTypes: true });
-    branches = entries.filter((e) => e.isDirectory()).map((e) => e.name);
+    branches = entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name);
   }
   let branchName = options.branch;
   if (!branchName) {
@@ -8589,11 +8701,19 @@ var init_resolve = __esm({
   }
 });
 
+// dist/paths/branch-name.js
+var init_branch_name = __esm({
+  "dist/paths/branch-name.js"() {
+    "use strict";
+  }
+});
+
 // dist/paths/branch.js
 var init_branch = __esm({
   "dist/paths/branch.js"() {
     "use strict";
     init_operating_mode2();
+    init_branch_name();
   }
 });
 
@@ -8606,6 +8726,7 @@ var init_paths = __esm({
     init_validation3();
     init_resolve();
     init_branch();
+    init_branch_name();
   }
 });
 
@@ -8756,6 +8877,8 @@ async function withOccFileLock2(filePath, fn) {
     return await fn();
   } finally {
     await release().catch((err) => {
+      if (isNodeError(err) && err.code === "ENOENT")
+        return;
       log11.warn("lock", `Failed to release lock for ${filePath}`, { error: getErrorMessage(err) });
     });
   }
@@ -8935,7 +9058,13 @@ var init_branch_registry = __esm({
               continue;
             }
             const branchRoot = path28.join(this.root, entry.name);
-            const meta = await BranchMetadataFileManager2.loadOnly(branchRoot);
+            let meta;
+            try {
+              meta = await BranchMetadataFileManager2.loadOnly(branchRoot);
+            } catch (err) {
+              console.warn(`CanopyCMS: Skipping branch directory '${entry.name}' during registry scan: ${getErrorMessage(err)}`);
+              continue;
+            }
             if (meta) {
               branches.push({
                 branch: meta.branch,
@@ -8959,7 +9088,7 @@ var init_branch_registry = __esm({
 // dist/branch-metadata.js
 import fs26 from "node:fs/promises";
 import path29 from "node:path";
-var BRANCH_META_DIR2, BRANCH_META_FILE2, CURRENT_SCHEMA_VERSION2, BranchMetadataConflictError2, BranchMetadataFileManager2;
+var BRANCH_META_DIR2, BRANCH_META_FILE2, CURRENT_SCHEMA_VERSION2, BranchMetadataConflictError2, BranchMetadataCorruptError2, BranchMetadataFileManager2;
 var init_branch_metadata = __esm({
   "dist/branch-metadata.js"() {
     "use strict";
@@ -8977,6 +9106,14 @@ var init_branch_metadata = __esm({
         this.name = "BranchMetadataConflictError";
       }
     };
+    BranchMetadataCorruptError2 = class extends Error {
+      constructor(branchRoot, cause) {
+        super(`Corrupt branch metadata in '${branchRoot}': ${cause}`);
+        this.name = "BranchMetadataCorruptError";
+        this.branchRoot = branchRoot;
+        this.parseCause = cause;
+      }
+    };
     BranchMetadataFileManager2 = class _BranchMetadataFileManager2 {
       constructor(branchRoot, baseRoot, options) {
         this.branchRoot = path29.resolve(branchRoot);
@@ -8989,7 +9126,8 @@ var init_branch_metadata = __esm({
        * Use this for read-only access (e.g., in registry scanning or loadBranchContext).
        */
       static async loadOnly(branchRoot) {
-        const filePath = path29.join(path29.resolve(branchRoot), BRANCH_META_DIR2, BRANCH_META_FILE2);
+        const resolvedRoot = path29.resolve(branchRoot);
+        const filePath = path29.join(resolvedRoot, BRANCH_META_DIR2, BRANCH_META_FILE2);
         try {
           const raw = await fs26.readFile(filePath, "utf8");
           return JSON.parse(raw);
@@ -8997,6 +9135,9 @@ var init_branch_metadata = __esm({
           if (isNotFoundError(err)) {
             return null;
           }
+          if (err instanceof SyntaxError) {
+            throw new BranchMetadataCorruptError2(resolvedRoot, err.message);
+          }
           throw err;
         }
       }

package/dist/cli/generate-ai-content.js

@@ -1805,14 +1805,18 @@ function validateAndNormalizePath(root, target) {
 init_operating_mode();
 import fs7 from "node:fs/promises";
 import path7 from "node:path";
-var BranchPathError = class extends Error {
-};
+
+// dist/paths/branch-name.js
 function sanitizeBranchName(branchName) {
   const replaced = branchName.replace(/[^a-zA-Z0-9._-]/g, "-");
   const squashed = replaced.replace(/-+/g, "-");
   const trimmedDots = squashed.replace(/^\.+/, "").replace(/(?<!\.)\.+$/, "");
   return trimmedDots || "branch";
 }
+
+// dist/paths/branch.js
+var BranchPathError = class extends Error {
+};
 var resolveContentBranchesRoot = (mode, override) => {
   return operatingStrategy(mode).getContentBranchesRoot(override);
 };
@@ -2644,8 +2648,22 @@ var ContentStore = class {
    * Returns array of entry metadata (relativePath, collection, slug).
    * Returns empty array if the collection doesn't exist.
    */
-  async getCollectionEntryPaths(collectionPath) {
-    const idIndex = await this.idIndex();
+  /**
+   * Resolve a schema collection referenced by name or logical path.
+   *
+   * Accepts either a full logical path ("content/authors") or a bare
+   * collection name ("authors") — the contract reference fields use for
+   * `collections: [...]` (see README). This is the single normalization
+   * point shared by reference-option loading and reference validation so
+   * the dropdown and the write boundary can never disagree.
+   *
+   * CAVEAT: the bare-name fallback matches on the LAST path segment and
+   * returns the first hit in schema order — with two collections sharing a
+   * leaf name (e.g. content/blog/posts and content/news/posts), a bare
+   * 'posts' is ambiguous. Use the full logical path in schemas that nest
+   * same-named collections.
+   */
+  resolveCollectionItem(collectionPath) {
     const normalized = normalizeFilesystemPath(collectionPath);
     let item = this.schemaIndex.get(normalized);
     if (!item) {
@@ -2659,10 +2677,14 @@ var ContentStore = class {
         }
       }
     }
-    if (!item || item.type !== "collection") {
+    return item && item.type === "collection" ? item : void 0;
+  }
+  async getCollectionEntryPaths(collectionPath) {
+    const idIndex = await this.idIndex();
+    const collection = this.resolveCollectionItem(collectionPath);
+    if (!collection) {
       return [];
     }
-    const collection = item;
     const treeEntries = idIndex.getEntriesInCollectionTree(collection.logicalPath);
     const entries = [];
     for (const location of treeEntries) {
@@ -3844,7 +3866,13 @@ var BranchRegistry = class {
           continue;
         }
         const branchRoot = path10.join(this.root, entry.name);
-        const meta = await BranchMetadataFileManager.loadOnly(branchRoot);
+        let meta;
+        try {
+          meta = await BranchMetadataFileManager.loadOnly(branchRoot);
+        } catch (err) {
+          console.warn(`CanopyCMS: Skipping branch directory '${entry.name}' during registry scan: ${getErrorMessage(err)}`);
+          continue;
+        }
         if (meta) {
           branches.push({
             branch: meta.branch,
@@ -3983,6 +4011,8 @@ async function withOccFileLock(filePath, fn) {
     return await fn();
   } finally {
     await release().catch((err) => {
+      if (isNodeError(err) && err.code === "ENOENT")
+        return;
       log4.warn("lock", `Failed to release lock for ${filePath}`, { error: getErrorMessage(err) });
     });
   }
@@ -3998,6 +4028,14 @@ var BranchMetadataConflictError = class extends Error {
     this.name = "BranchMetadataConflictError";
   }
 };
+var BranchMetadataCorruptError = class extends Error {
+  constructor(branchRoot, cause) {
+    super(`Corrupt branch metadata in '${branchRoot}': ${cause}`);
+    this.name = "BranchMetadataCorruptError";
+    this.branchRoot = branchRoot;
+    this.parseCause = cause;
+  }
+};
 var BranchMetadataFileManager = class _BranchMetadataFileManager {
   constructor(branchRoot, baseRoot, options) {
     this.branchRoot = path12.resolve(branchRoot);
@@ -4010,7 +4048,8 @@ var BranchMetadataFileManager = class _BranchMetadataFileManager {
    * Use this for read-only access (e.g., in registry scanning or loadBranchContext).
    */
   static async loadOnly(branchRoot) {
-    const filePath = path12.join(path12.resolve(branchRoot), BRANCH_META_DIR, BRANCH_META_FILE);
+    const resolvedRoot = path12.resolve(branchRoot);
+    const filePath = path12.join(resolvedRoot, BRANCH_META_DIR, BRANCH_META_FILE);
     try {
       const raw = await fs12.readFile(filePath, "utf8");
       return JSON.parse(raw);
@@ -4018,6 +4057,9 @@ var BranchMetadataFileManager = class _BranchMetadataFileManager {
       if (isNotFoundError(err)) {
         return null;
       }
+      if (err instanceof SyntaxError) {
+        throw new BranchMetadataCorruptError(resolvedRoot, err.message);
+      }
       throw err;
     }
   }
@@ -4766,8 +4808,9 @@ var GitManager = class _GitManager {
   }
   async pullBaseInner() {
     await this.git.fetch(this.remote, this.baseBranch);
+    const fetchedTip = (await this.git.revparse(["FETCH_HEAD"])).trim();
     try {
-      await this.git.merge([`${this.remote}/${this.baseBranch}`]);
+      await this.git.merge([fetchedTip]);
     } catch (err) {
       try {
         const status = await this.git.status();
@@ -4822,8 +4865,9 @@ var GitManager = class _GitManager {
   }
   async rebaseOntoBaseInner() {
     await this.git.fetch(this.remote, this.baseBranch);
+    const fetchedTip = (await this.git.revparse(["FETCH_HEAD"])).trim();
     try {
-      await this.git.rebase([`${this.remote}/${this.baseBranch}`]);
+      await this.git.rebase([fetchedTip]);
     } catch (err) {
       try {
         const status = await this.git.status();

package/dist/cli/init.js

@@ -757,6 +757,36 @@ async function retryTask(taskDir, taskId, error, logger = nullLogger) {
   });
   logger.debug("Retrying task", { id: taskId, retryCount, backoffMs });
 }
+async function requeueFailedTask(taskDir, taskId, logger = nullLogger) {
+  const failedPath = path5.join(taskDir, "failed", `${taskId}.json`);
+  let content;
+  try {
+    content = await fs4.readFile(failedPath, "utf-8");
+  } catch (err) {
+    if (isNotFoundError2(err))
+      return { error: "not-found" };
+    throw err;
+  }
+  const original = parseTaskJson(content);
+  if (!original)
+    return { error: "unparseable" };
+  const newTaskId = crypto.randomUUID();
+  const newTask = {
+    id: newTaskId,
+    action: original.action,
+    payload: { ...original.payload, requeuedFrom: taskId },
+    status: "pending",
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    retryCount: 0,
+    maxRetries: original.maxRetries
+  };
+  const pendingPath = path5.join(taskDir, "pending", `${newTaskId}.json`);
+  await atomicWriteFile(pendingPath, JSON.stringify(newTask, null, 2));
+  await fs4.unlink(failedPath).catch(() => {
+  });
+  logger.debug("Requeued failed task", { originalId: taskId, newTaskId });
+  return { newTaskId };
+}
 async function recoverOrphanedTasks(taskDir, maxAgeMs = 5 * 6e4, logger = nullLogger) {
   const processingDir = path5.join(taskDir, "processing");
   const pendingDir = path5.join(taskDir, "pending");
@@ -886,6 +916,46 @@ async function getQueueStats(taskDir) {
   }
   return stats;
 }
+async function listCorruptTaskFiles(taskDir, limit = 50, logger = nullLogger) {
+  const corruptDir = path5.join(taskDir, "corrupt");
+  let files;
+  try {
+    files = await fs4.readdir(corruptDir);
+  } catch (err) {
+    if (isNotFoundError2(err))
+      return [];
+    throw err;
+  }
+  const entries = [];
+  for (const fileName of files.filter((f) => f.endsWith(".json"))) {
+    const filePath = path5.join(corruptDir, fileName);
+    try {
+      const stat = await fs4.stat(filePath);
+      entries.push({
+        fileName,
+        size: stat.size,
+        mtime: stat.mtime.toISOString(),
+        rawSnippet: await readSnippet(filePath, 500)
+      });
+    } catch (err) {
+      if (isNotFoundError2(err))
+        continue;
+      logger.debug("Failed to read corrupt task file", { fileName });
+    }
+  }
+  entries.sort((a, b) => new Date(b.mtime).getTime() - new Date(a.mtime).getTime());
+  return entries.slice(0, limit);
+}
+async function readSnippet(filePath, maxBytes) {
+  const handle = await fs4.open(filePath, "r");
+  try {
+    const buffer = Buffer.alloc(maxBytes);
+    const { bytesRead } = await handle.read(buffer, 0, maxBytes, 0);
+    return buffer.subarray(0, bytesRead).toString("utf-8");
+  } finally {
+    await handle.close();
+  }
+}
 function parseTaskJson(content) {
   try {
     const parsed = JSON.parse(content);
@@ -949,8 +1019,10 @@ __export(task_queue_exports, {
   getQueueStats: () => getQueueStats,
   getTask: () => getTask,
   getTaskResult: () => getTask,
+  listCorruptTaskFiles: () => listCorruptTaskFiles,
   listTasks: () => listTasks,
   recoverOrphanedTasks: () => recoverOrphanedTasks,
+  requeueFailedTask: () => requeueFailedTask,
   retryTask: () => retryTask
 });
 var debugLogger, cmsTaskQueueLogger;

package/dist/cli/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAmBH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;IAC7C,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAkeD;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB5F"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAmBH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;IAC7C,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAqeD;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB5F"}

package/dist/cli/sync.js

@@ -49,7 +49,10 @@ async function selectBranch(options, branchesDir) {
     let branches = [];
     if (await filePathExists(branchesDir)) {
         const entries = await fs.readdir(branchesDir, { withFileTypes: true });
-        branches = entries.filter((e) => e.isDirectory()).map((e) => e.name);
+        // Dot-prefixed dirs are never branch workspaces (.canopy-meta, and now
+        // .trash-*/.{dirName}.init.lock from the admin branch-health recovery
+        // surface) -- same skip rule as BranchRegistry.scanBranchDirectories.
+        branches = entries.filter((e) => e.isDirectory() && !e.name.startsWith('.')).map((e) => e.name);
     }
     let branchName = options.branch;
     if (!branchName) {