@fractary/faber-cli 1.3.10 → 1.3.12

package/dist/commands/plan/index.js

@@ -279,26 +279,52 @@ async function planSingleIssue(issue, config, repoClient, anthropicClient, optio
         issueNumber: issue.number,
     });
     const planId = plan.plan_id;
-    // Create branch (only if not creating worktree, since worktree creation handles branch creation)
-    if (!options.noBranch && options.noWorktree) {
+    // Create branch without checking it out (so it won't conflict with worktree creation)
+    if (!options.noBranch) {
         if (outputFormat === 'text') {
             console.log(chalk.gray(`  → Creating branch: ${branch}...`));
             process.stdout.write(''); // Force flush
         }
-        await repoClient.createBranch(branch);
+        // Use git branch instead of checkout to avoid switching the main repo
+        const { exec } = await import('child_process');
+        const { promisify } = await import('util');
+        const execAsync = promisify(exec);
+        try {
+            await execAsync(`git branch ${branch} 2>/dev/null || true`);
+        }
+        catch (error) {
+            // Branch might already exist, that's ok
+        }
     }
-    // Create worktree (this will also create the branch automatically)
+    // Create worktree
     let worktreePath = worktree;
     if (!options.noWorktree) {
         if (outputFormat === 'text') {
             console.log(chalk.gray(`  → Creating worktree: ${worktree}...`));
             process.stdout.write(''); // Force flush
         }
-        const worktreeResult = await repoClient.createWorktree({
-            workId: issue.number.toString(),
-            path: worktree,
-        });
-        worktreePath = worktreeResult.absolute_path;
+        try {
+            const worktreeResult = await repoClient.createWorktree({
+                workId: issue.number.toString(),
+                path: worktree,
+            });
+            worktreePath = worktreeResult.absolute_path;
+        }
+        catch (error) {
+            // If worktree already exists, try to use it
+            if (error instanceof Error && error.message.includes('already exists')) {
+                if (outputFormat === 'text') {
+                    console.log(chalk.yellow(`  ⚠️  Worktree already exists, using existing worktree`));
+                }
+                const expandedPath = worktree.startsWith('~')
+                    ? worktree.replace('~', (await import('os')).homedir())
+                    : worktree;
+                worktreePath = path.resolve(expandedPath);
+            }
+            else {
+                throw error;
+            }
+        }
     }
     // Write plan to worktree
     if (!options.noWorktree) {
@@ -328,7 +354,10 @@ async function planSingleIssue(issue, config, repoClient, anthropicClient, optio
     }
     catch (error) {
         // If label doesn't exist, just add comment without label
-        if (error instanceof Error && error.message.includes('not found')) {
+        if (error instanceof Error &&
+            (error.message.includes('not found') ||
+                error.message.includes('faber:planned') ||
+                error.message.includes('--add-label'))) {
             if (outputFormat === 'text') {
                 console.log(chalk.yellow(`  ⚠️  Label 'faber:planned' not found, adding comment only`));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fractary/faber-cli",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "FABER CLI - Command-line interface for FABER development toolkit",
   "main": "dist/index.js",
   "bin": {