code-squad-cli 1.2.22 → 2.0.0

package/dist/adapters/GitAdapter.js

@@ -14,8 +14,20 @@ export class GitAdapter {
         }
     }
     async getCurrentBranch(workspaceRoot) {
-        const { stdout } = await exec(`cd "${workspaceRoot}" && git rev-parse --abbrev-ref HEAD`, execOptions);
-        return stdout.trim();
+        try {
+            const { stdout } = await exec(`cd "${workspaceRoot}" && git rev-parse --abbrev-ref HEAD`, execOptions);
+            return stdout.trim();
+        }
+        catch {
+            // No commits yet — fall back to symbolic-ref (e.g. "main" on fresh repos)
+            try {
+                const { stdout } = await exec(`cd "${workspaceRoot}" && git symbolic-ref --short HEAD`, execOptions);
+                return stdout.trim();
+            }
+            catch {
+                return '';
+            }
+        }
     }
     async listWorktrees(workspaceRoot) {
         try {
@@ -57,10 +69,12 @@ export class GitAdapter {
         }
     }
     async createWorktree(worktreePath, branch, workspaceRoot) {
-        // Extract parent directory and create it if needed
+        // Prune stale worktree entries (e.g. directory was deleted but still registered)
+        await exec(`cd "${workspaceRoot}" && git worktree prune`, execOptions).catch(() => { });
+        // Recursively create parent directory
         const parentDir = worktreePath.substring(0, worktreePath.lastIndexOf('/'));
         const mkdirCmd = parentDir ? `mkdir -p "${parentDir}" && ` : '';
-        await exec(`cd "${workspaceRoot}" && ${mkdirCmd}git worktree add "${worktreePath}" -b "${branch}"`, execOptions);
+        await exec(`cd "${workspaceRoot}" && ${mkdirCmd}git worktree add -f "${worktreePath}" -b "${branch}"`, execOptions);
     }
     async removeWorktree(worktreePath, workspaceRoot, force = false) {
         const forceFlag = force ? ' --force' : '';