gsd-pi 2.60.0-dev.d9052f5 → 2.61.0-dev.7aed0bf

package/dist/resources/extensions/gsd/auto-worktree.js

@@ -18,7 +18,7 @@ import { createWorktree, removeWorktree, resolveGitDir, worktreePath, } from "./
 import { detectWorktreeName, nudgeGitBranchCache, } from "./worktree.js";
 import { MergeConflictError, readIntegrationBranch, RUNTIME_EXCLUSION_PATHS } from "./git-service.js";
 import { debugLog } from "./debug-logger.js";
-import { logWarning } from "./workflow-logger.js";
+import { logWarning, logError } from "./workflow-logger.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeWorkingTreeStatus, nativeAddAllWithExclusions, nativeCommit, nativeCheckoutBranch, nativeMergeSquash, nativeConflictFiles, nativeCheckoutTheirs, nativeAddPaths, nativeRmForce, nativeBranchDelete, nativeBranchExists, nativeDiffNumstat, nativeUpdateRef, nativeIsAncestor, nativeMergeAbort, } from "./native-git-bridge.js";
 const gsdHome = process.env.GSD_HOME || join(homedir(), ".gsd");
@@ -53,7 +53,8 @@ function isSamePath(a, b) {
     try {
         return realpathSync(a) === realpathSync(b);
     }
-    catch {
+    catch (e) {
+        logWarning("worktree", `isSamePath failed: ${e.message}`);
         return false;
     }
 }
@@ -102,18 +103,21 @@ function forceOverwriteAssessmentsWithVerdict(srcMilestoneDir, dstMilestoneDir)
                         mkdirSync(dstSliceDir, { recursive: true });
                         safeCopy(srcFile, join(dstSliceDir, fileEntry.name), { force: true });
                     }
-                    catch {
+                    catch (err) {
                         /* non-fatal per file */
+                        logWarning("worktree", `assessment force-copy failed: ${err instanceof Error ? err.message : String(err)}`);
                     }
                 }
             }
-            catch {
+            catch (err) {
                 /* non-fatal per slice */
+                logWarning("worktree", `assessment slice scan failed: ${err instanceof Error ? err.message : String(err)}`);
             }
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal */
+        logWarning("worktree", `assessment sync failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
 // ─── Module State ──────────────────────────────────────────────────────────
@@ -130,8 +134,9 @@ function clearProjectRootStateFiles(basePath, milestoneId) {
         try {
             unlinkSync(file);
         }
-        catch {
+        catch (err) {
             /* non-fatal — file may not exist */
+            logWarning("worktree", `file unlink failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     // Clean up entire synced milestone directory and runtime/units.
@@ -154,15 +159,17 @@ function clearProjectRootStateFiles(basePath, milestoneId) {
                         try {
                             unlinkSync(join(basePath, f));
                         }
-                        catch {
+                        catch (err) {
                             /* non-fatal */
+                            logWarning("worktree", `untracked file unlink failed: ${err instanceof Error ? err.message : String(err)}`);
                         }
                     }
                 }
             }
         }
-        catch {
+        catch (err) {
             /* non-fatal — git command may fail if not in repo */
+            logWarning("worktree", `untracked file cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
 }
@@ -234,8 +241,9 @@ export function syncProjectRootToWorktree(projectRoot, worktreePath_, milestoneI
             }
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal */
+        logWarning("worktree", `worktree DB cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
 /**
@@ -286,7 +294,8 @@ export function readResourceVersion() {
             ? manifest.gsdVersion
             : null;
     }
-    catch {
+    catch (e) {
+        logWarning("worktree", `readResourceVersion failed: ${e.message}`);
         return null;
     }
 }
@@ -346,8 +355,9 @@ export function escapeStaleWorktree(base) {
     try {
         process.chdir(projectRoot);
     }
-    catch {
+    catch (e) {
         // If chdir fails, return the original — caller will handle errors downstream
+        logWarning("worktree", `escapeStaleWorktree chdir failed: ${e.message}`);
         return base;
     }
     return projectRoot;
@@ -376,14 +386,16 @@ export function cleanStaleRuntimeUnits(gsdRootPath, hasMilestoneSummary) {
                     unlinkSync(join(runtimeUnitsDir, file));
                     cleaned++;
                 }
-                catch {
+                catch (err) {
                     /* non-fatal */
+                    logWarning("worktree", `stale runtime unit unlink failed (${file}): ${err instanceof Error ? err.message : String(err)}`);
                 }
             }
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal */
+        logWarning("worktree", `stale runtime unit cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     return cleaned;
 }
@@ -420,8 +432,9 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                 cpSync(src, dst);
                 synced.push(f);
             }
-            catch {
+            catch (err) {
                 /* non-fatal */
+                logWarning("worktree", `file copy failed (${f}): ${err instanceof Error ? err.message : String(err)}`);
             }
         }
     }
@@ -440,8 +453,9 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                         cpSync(src, dst);
                         synced.push(file);
                     }
-                    catch {
+                    catch (err) {
                         /* non-fatal */
+                        logWarning("worktree", `preferences copy failed (${file}): ${err instanceof Error ? err.message : String(err)}`);
                     }
                     break;
                 }
@@ -468,8 +482,9 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                         cpSync(srcDir, dstDir, { recursive: true });
                         synced.push(`milestones/${mid}/`);
                     }
-                    catch {
+                    catch (err) {
                         /* non-fatal */
+                        logWarning("worktree", `milestone copy failed (${mid}): ${err instanceof Error ? err.message : String(err)}`);
                     }
                 }
                 else {
@@ -488,8 +503,9 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                                         synced.push(`milestones/${mid}/${f}`);
                                     }
                                 }
-                                catch {
+                                catch (err) {
                                     /* non-fatal */
+                                    logWarning("worktree", `milestone file copy failed (${mid}/${f}): ${err instanceof Error ? err.message : String(err)}`);
                                 }
                             }
                         }
@@ -501,8 +517,9 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                                 cpSync(srcSlicesDir, dstSlicesDir, { recursive: true });
                                 synced.push(`milestones/${mid}/slices/`);
                             }
-                            catch {
+                            catch (err) {
                                 /* non-fatal */
+                                logWarning("worktree", `slices copy failed (${mid}): ${err instanceof Error ? err.message : String(err)}`);
                             }
                         }
                         else if (existsSync(srcSlicesDir) && existsSync(dstSlicesDir)) {
@@ -520,21 +537,24 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
                                         cpSync(srcSlice, dstSlice, { recursive: true });
                                         synced.push(`milestones/${mid}/slices/${sid}/`);
                                     }
-                                    catch {
+                                    catch (err) {
                                         /* non-fatal */
+                                        logWarning("worktree", `slice copy failed (${mid}/${sid}): ${err instanceof Error ? err.message : String(err)}`);
                                     }
                                 }
                             }
                         }
                     }
-                    catch {
+                    catch (err) {
                         /* non-fatal */
+                        logWarning("worktree", `milestone file sync failed: ${err instanceof Error ? err.message : String(err)}`);
                     }
                 }
             }
         }
-        catch {
+        catch (err) {
             /* non-fatal */
+            logWarning("worktree", `milestone directory sync failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     return { synced };
@@ -580,8 +600,9 @@ export function syncWorktreeStateBack(mainBasePath, worktreePath, milestoneId) {
             reconcileWorktreeDb(mainDb, wtLocalDb);
             synced.push("gsd.db (pre-upgrade reconcile)");
         }
-        catch {
+        catch (err) {
             // Non-fatal — file sync below is the fallback
+            logError("worktree", `DB reconciliation failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     // ── 1. Sync root-level .gsd/ files back ──────────────────────────────
@@ -598,8 +619,9 @@ export function syncWorktreeStateBack(mainBasePath, worktreePath, milestoneId) {
                 cpSync(src, dst, { force: true });
                 synced.push(f);
             }
-            catch {
+            catch (err) {
                 /* non-fatal */
+                logWarning("worktree", `state file copy-back failed (${f}): ${err instanceof Error ? err.message : String(err)}`);
             }
         }
     }
@@ -618,8 +640,9 @@ export function syncWorktreeStateBack(mainBasePath, worktreePath, milestoneId) {
             syncMilestoneDir(wtGsd, mainGsd, mid, synced);
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal */
+        logWarning("worktree", `milestone sync-back failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     return { synced };
 }
@@ -637,13 +660,15 @@ function syncDirFiles(srcDir, dstDir, filter, synced, prefix) {
                 cpSync(join(srcDir, entry.name), join(dstDir, entry.name), { force: true });
                 synced.push(`${prefix}${entry.name}`);
             }
-            catch {
+            catch (err) {
                 /* non-fatal */
+                logWarning("worktree", `file copy failed (${prefix}${entry.name}): ${err instanceof Error ? err.message : String(err)}`);
             }
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal — srcDir may not be readable */
+        logWarning("worktree", `directory read failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
 function syncMilestoneDir(wtGsd, mainGsd, mid, synced) {
@@ -677,8 +702,9 @@ function syncMilestoneDir(wtGsd, mainGsd, mid, synced) {
             }
         }
     }
-    catch {
+    catch (err) {
         /* non-fatal */
+        logWarning("worktree", `milestone slice sync failed (${mid}): ${err instanceof Error ? err.message : String(err)}`);
     }
 }
 // ─── Worktree Post-Create Hook (#597) ────────────────────────────────────────
@@ -708,7 +734,9 @@ export function runWorktreePostCreateHook(sourceDir, worktreeDir, hookPath) {
         try {
             resolved = realpathSync.native(resolved);
         }
-        catch { /* keep original */ }
+        catch (err) { /* keep original */
+            logWarning("worktree", `realpath failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
     }
     try {
         // .bat/.cmd files on Windows require shell mode — execFileSync cannot
@@ -785,8 +813,9 @@ function reconcilePlanCheckboxes(projectRoot, wtPath, milestoneId) {
                 }
             }
         }
-        catch {
+        catch (err) {
             /* non-fatal */
+            logWarning("worktree", `walkMd directory read failed: ${err instanceof Error ? err.message : String(err)}`);
         }
         return results;
     }
@@ -801,7 +830,8 @@ function reconcilePlanCheckboxes(projectRoot, wtPath, milestoneId) {
             srcContent = readFileSync(srcFile, "utf-8");
             dstContent = readFileSync(dstFile, "utf-8");
         }
-        catch {
+        catch (e) {
+            logWarning("worktree", `reconcilePlanCheckboxes read failed: ${e.message}`);
             continue;
         }
         if (srcContent === dstContent)
@@ -829,8 +859,9 @@ function reconcilePlanCheckboxes(projectRoot, wtPath, milestoneId) {
             try {
                 atomicWriteSync(dstFile, updated, "utf-8");
             }
-            catch {
+            catch (err) {
                 /* non-fatal */
+                logWarning("worktree", `plan checkbox reconcile write failed: ${err instanceof Error ? err.message : String(err)}`);
             }
         }
     }
@@ -979,8 +1010,9 @@ export function teardownAutoWorktree(originalBasePath, milestoneId, opts = {}) {
         try {
             rmSync(wtDir, { recursive: true, force: true });
         }
-        catch {
+        catch (err) {
             // Non-fatal — the warning above tells the user how to clean up
+            logWarning("worktree", `worktree directory removal failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
 }
@@ -1021,7 +1053,8 @@ export function getAutoWorktreePath(basePath, milestoneId) {
         if (!content.startsWith("gitdir: "))
             return null;
     }
-    catch {
+    catch (e) {
+        logWarning("worktree", `getAutoWorktreePath .git read failed: ${e.message}`);
         return null;
     }
     return p;
@@ -1148,8 +1181,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 reconcileWorktreeDb(mainDbPath, worktreeDbPath);
             }
         }
-        catch {
+        catch (err) {
             /* non-fatal */
+            logError("worktree", `DB reconciliation failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     // 2. Get completed slices for commit message
@@ -1285,9 +1319,10 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             stashed = true;
         }
     }
-    catch {
+    catch (err) {
         // Stash failure is non-fatal — proceed without stash and let the merge
         // report the dirty tree if it fails.
+        logWarning("worktree", `git stash failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     // 7a. Shelter queued milestone directories before the squash merge (#2505).
     // The milestone branch may contain copies of queued milestone dirs (via
@@ -1308,12 +1343,16 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 mkdirSync(milestonesDir, { recursive: true });
                 cpSync(join(shelterDir, dirName), join(milestonesDir, dirName), { recursive: true, force: true });
             }
-            catch { /* best-effort */ }
+            catch (err) { /* best-effort */
+                logError("worktree", `shelter restore failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
         }
         try {
             rmSync(shelterDir, { recursive: true, force: true });
         }
-        catch { /* best-effort */ }
+        catch (err) { /* best-effort */
+            logWarning("worktree", `shelter cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
     };
     try {
         if (existsSync(milestonesDir)) {
@@ -1332,14 +1371,16 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                     rmSync(srcDir, { recursive: true, force: true });
                     shelteredDirs.push(entry.name);
                 }
-                catch {
+                catch (err) {
                     // Non-fatal — if shelter fails, the merge may still succeed
+                    logWarning("worktree", `milestone shelter failed (${entry.name}): ${err instanceof Error ? err.message : String(err)}`);
                 }
             }
         }
     }
-    catch {
+    catch (err) {
         // Non-fatal — proceed with merge; untracked files may block it
+        logWarning("worktree", `milestone shelter operation failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     // 7b. Clean up stale merge state before attempting squash merge (#2912).
     // A leftover MERGE_HEAD (from a previous failed merge, libgit2 native path,
@@ -1354,7 +1395,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 unlinkSync(p);
         }
     }
-    catch { /* best-effort */ }
+    catch (err) { /* best-effort */
+        logError("worktree", `merge state cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     // 8. Squash merge — auto-resolve .gsd/ state file conflicts (#530)
     const mergeResult = nativeMergeSquash(originalBasePath_, milestoneBranch);
     if (!mergeResult.success) {
@@ -1372,7 +1415,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         unlinkSync(p);
                 }
             }
-            catch { /* best-effort */ }
+            catch (err) { /* best-effort */
+                logError("worktree", `merge state cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
             // Pop stash before throwing so local work is not lost.
             if (stashed) {
                 try {
@@ -1382,7 +1427,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         encoding: "utf-8",
                     });
                 }
-                catch { /* stash pop conflict is non-fatal */ }
+                catch (err) { /* stash pop conflict is non-fatal */
+                    logWarning("worktree", `git stash pop failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
             }
             restoreShelter();
             // Restore cwd so the caller is not stranded on the integration branch
@@ -1413,9 +1460,10 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         nativeCheckoutTheirs(originalBasePath_, [safeFile]);
                         nativeAddPaths(originalBasePath_, [safeFile]);
                     }
-                    catch {
+                    catch (e) {
                         // If checkout --theirs fails, try removing the file from the merge
                         // (it's a runtime file that shouldn't be committed anyway)
+                        logWarning("worktree", `checkout --theirs failed for ${safeFile}, removing: ${e.message}`);
                         nativeRmForce(originalBasePath_, [safeFile]);
                     }
                 }
@@ -1428,7 +1476,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 try {
                     nativeMergeAbort(originalBasePath_);
                 }
-                catch { /* best-effort */ }
+                catch (err) { /* best-effort */
+                    logError("worktree", `git merge-abort failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
                 try {
                     const gitDir_ = resolveGitDir(originalBasePath_);
                     for (const f of ["SQUASH_MSG", "MERGE_MSG", "MERGE_HEAD"]) {
@@ -1437,7 +1487,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                             unlinkSync(p);
                     }
                 }
-                catch { /* best-effort */ }
+                catch (err) { /* best-effort */
+                    logError("worktree", `merge state file cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
                 // Pop stash before throwing so local work is not lost (#2151).
                 if (stashed) {
                     try {
@@ -1447,7 +1499,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                             encoding: "utf-8",
                         });
                     }
-                    catch { /* stash pop conflict is non-fatal */ }
+                    catch (err) { /* stash pop conflict is non-fatal */
+                        logWarning("worktree", `git stash pop failed: ${err instanceof Error ? err.message : String(err)}`);
+                    }
                 }
                 restoreShelter();
                 throw new MergeConflictError(codeConflicts, "squash", milestoneBranch, mainBranch);
@@ -1472,7 +1526,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 unlinkSync(p);
         }
     }
-    catch { /* best-effort */ }
+    catch (err) { /* best-effort */
+        logError("worktree", `post-commit merge state cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     // 9a-ii. Restore stashed files now that the merge+commit is complete (#2151).
     // Pop after commit so stashed changes do not interfere with the squash merge
     // or the commit content.  Conflict on pop is non-fatal — the stash entry is
@@ -1485,7 +1541,8 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 encoding: "utf-8",
             });
         }
-        catch {
+        catch (e) {
+            logWarning("worktree", `git stash pop failed, attempting conflict resolution: ${e.message}`);
             // Stash pop after squash merge can conflict on .gsd/ state files that
             // diverged between branches.  Left unresolved, these UU entries block
             // every subsequent merge.  Auto-resolve them the same way we handle
@@ -1505,8 +1562,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         });
                         nativeAddPaths(originalBasePath_, [f]);
                     }
-                    catch {
+                    catch (e) {
                         // Last resort: remove the conflicted state file
+                        logWarning("worktree", `checkout HEAD failed for ${f}, removing: ${e.message}`);
                         nativeRmForce(originalBasePath_, [f]);
                     }
                 }
@@ -1520,7 +1578,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         encoding: "utf-8",
                     });
                 }
-                catch { /* stash may already be consumed */ }
+                catch (err) { /* stash may already be consumed */
+                    logWarning("worktree", `git stash drop failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
             }
             else {
                 // Non-.gsd conflicts remain — leave stash for manual resolution
@@ -1557,8 +1617,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             const mergedFiles = nativeDiffNumstat(originalBasePath_, "HEAD~1", "HEAD");
             codeFilesChanged = mergedFiles.some((entry) => !entry.path.startsWith(".gsd/"));
         }
-        catch {
+        catch (e) {
             // If HEAD~1 doesn't exist (first commit), assume code was changed
+            logWarning("worktree", `diff numstat failed (assuming code changed): ${e.message}`);
             codeFilesChanged = true;
         }
     }
@@ -1574,8 +1635,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             });
             pushed = true;
         }
-        catch {
+        catch (err) {
             // Push failure is non-fatal
+            logWarning("worktree", `git push failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     // 9b. Auto-create PR if enabled (#2302: no longer gated on pushed/auto_push)
@@ -1604,8 +1666,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             });
             prCreated = true;
         }
-        catch {
+        catch (err) {
             // PR creation failure is non-fatal — gh may not be installed or authenticated
+            logWarning("worktree", `PR creation failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
     // 11. Guard removed — step 9b (#1792) now handles this with a smarter check:
@@ -1642,15 +1705,17 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             deleteBranch: false,
         });
     }
-    catch {
+    catch (err) {
         // Best-effort -- worktree dir may already be gone
+        logWarning("worktree", `worktree removal failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     // 13. Delete milestone branch (after worktree removal so ref is unlocked)
     try {
         nativeBranchDelete(originalBasePath_, milestoneBranch);
     }
-    catch {
+    catch (err) {
         // Best-effort
+        logWarning("worktree", `git branch-delete failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     // 14. Clear module state
     originalBase = null;