codebyplan 1.10.0 → 1.10.2

package/dist/cli.js

@@ -14,7 +14,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "1.10.0";
+    VERSION = "1.10.2";
     PACKAGE_NAME = "codebyplan";
   }
 });
@@ -516,8 +516,8 @@ async function resolveAndCacheWorktreeId(repoId, projectPath, options) {
     });
     if (match) worktreeId = match.id;
   } catch (err) {
-    console.error(
-      `Worktree lookup failed: ${err instanceof Error ? err.message : String(err)}`
+    console.warn(
+      `Worktree self-heal skipped (non-fatal): worktree lookup failed: ${err instanceof Error ? err.message : String(err)}. Continuing.`
     );
     return void 0;
   }
@@ -585,8 +585,8 @@ async function resolveWorktreeByBranch({
     }
     return match?.id ?? null;
   } catch (err) {
-    console.error(
-      `Branch worktree resolve failed: ${err instanceof Error ? err.message : String(err)}`
+    console.warn(
+      `Worktree self-heal skipped (non-fatal): branch worktree resolve failed: ${err instanceof Error ? err.message : String(err)}. Continuing.`
     );
     return null;
   }
@@ -604,8 +604,8 @@ async function resolveWorktreeId({
     );
     return res.worktree_id ?? null;
   } catch (err) {
-    console.error(
-      `Tuple worktree resolve failed: ${err instanceof Error ? err.message : String(err)}`
+    console.warn(
+      `Worktree self-heal skipped (non-fatal): ${err instanceof Error ? err.message : String(err)}. Continuing \u2014 run \`codebyplan config\` again later to retry.`
     );
     return null;
   }
@@ -4153,7 +4153,27 @@ async function syncConfigToFile(repoId, projectPath, dryRun) {
       `  Warning: failed to cache worktree_id (self-heal skipped): ${msg}`
     );
   }
-  const repoRes = await apiGet(`/repos/${repoId}`);
+  let repoRes;
+  try {
+    repoRes = await apiGet(`/repos/${repoId}`);
+  } catch (err) {
+    let message;
+    if (err instanceof ApiError) {
+      if (err.status === 401) {
+        message = "Session expired. Run `codebyplan login` and try again.";
+      } else if (err.status === 403 || err.status === 404) {
+        message = "Repo not found or not accessible to your account. Confirm the repo_id in .codebyplan/repo.json and that you are logged in as the right user.";
+      } else if (err.status >= 500) {
+        message = `CodeByPlan server error (status ${err.status}). Please try again shortly.`;
+      } else {
+        message = `Unexpected API error (status ${err.status}). Please try again.`;
+      }
+    } else {
+      message = "Failed to reach the CodeByPlan API. Check your network connection and try again.";
+    }
+    process.stderr.write(message + "\n");
+    process.exit(1);
+  }
   const repo = repoRes.data;
   let portAllocations = [];
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebyplan",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "CLI for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {

package/templates/skills/cbp-merge-main/SKILL.md

@@ -10,12 +10,12 @@ effort: high
 
 Codifies the long-lived-branch-integration auto-memory rule (`[[feedback_long-lived-branch-integration]]`): when working on a feat branch that has diverged from main, merge main INTO the feat branch (not the reverse), resolve conflicts with the user, run a scoped QA pass, then return control to the caller — never rebase, never force-push, never push automatically.
 
-Triggered by `/cbp-task-start` (Step 3.6, optional stale-check), `/cbp-task-complete` (Step 4.5, mandatory pre-complete), and `/cbp-checkpoint-end` (Step 0, mandatory pre-shipment). User can also invoke manually at any time.
+Triggered by `/cbp-task-start` (Step 3.6, optional stale-check), `/cbp-task-complete` (Step 5.5, mandatory pre-push — runs after the task commit on a clean tree), and `/cbp-checkpoint-end` (Step 0, mandatory pre-shipment). User can also invoke manually at any time.
 
 ## When to Use
 
 - **Auto-trigger (optional)**: `/cbp-task-start` Step 3.6 detects the feat branch is >10 commits behind `origin/{BASE}` OR the last fetch is >24h old.
-- **Auto-trigger (mandatory)**: `/cbp-task-complete` Step 4.5 — always run before marking a task complete to ensure the feat branch includes the latest main work.
+- **Auto-trigger (mandatory)**: `/cbp-task-complete` Step 5.5 — mandatory pre-push, after the task commit; runs on a clean tree to ensure the feat branch includes the latest main work before the single trailing push.
 - **Auto-trigger (mandatory)**: `/cbp-checkpoint-end` Step 0 — always run before shipment to ensure no main drift reaches production.
 - **Manual invocation**: user runs `/cbp-merge-main` directly when they know main has advanced and want to pull it in immediately.
 
@@ -219,7 +219,7 @@ Return control to the caller. **This skill NEVER pushes** — the caller decides
 
 - **Triggered by**:
   - `/cbp-task-start` Step 3.6 (optional stale-check: >10 commits behind OR >24h fetch age)
-  - `/cbp-task-complete` Step 4.5 (mandatory pre-complete)
+  - `/cbp-task-complete` Step 5.5 (mandatory pre-push, after task commit)
   - `/cbp-checkpoint-end` Step 0 (mandatory pre-shipment)
   - User-invocable manually
 - **Reads**: `.codebyplan/git.json`, MCP `get_checkpoints`, MCP `get_tasks`, git state

package/templates/skills/cbp-task-complete/SKILL.md

@@ -102,26 +102,34 @@ Load `task.qa` and `task.files_changed`:
 
 Collect all files_changed from task. Deduplicate (latest action wins).
 
-### Step 4.5: Merge Production Branch Before Commit (mandatory)
+### Step 5: Git Commit (no push)
 
-Before committing task work, ensure the feat branch is current with the latest production (main) work. This prevents shipping a stale PR and surfaces conflicts at task-complete time rather than at PR review.
+Commit the task work FIRST, so the merge in Step 5.5 runs against a clean tree. `/cbp-merge-main` must never run before the task commit.
 
-1. Trigger `/cbp-merge-main`.
-2. If the skill exits with failure (offline, unresolved conflicts, user-aborted): surface the failure and STOP — do NOT proceed to Step 5 (commit). The user resolves and re-invokes `/cbp-task-complete`.
-3. If the skill exits with QA warnings the user chose to commit-as-is: continue to Step 5; surface a soft warning in the Step 9 output (`⚠ Merged with QA failures pending fix in follow-up`).
-4. On clean success: continue to Step 5.
+**Zero-file guard**: if `aggregated_files` is empty (investigative or DB-only tasks), skip the commit. Record "No git commit: zero files changed" in the Step 9 summary, then continue to Step 5.5 (the branch may still need a main sync).
+
+**Already-committed guard**: if the aggregated files are already committed (working tree clean for them — e.g. a re-invoke after a Step 5.5 merge failure), skip the commit and continue to Step 5.5; the prior run's task commit still stands.
+
+Otherwise: invoke `/cbp-git-commit` to stage approved files and create the commit. Claude does NOT git add directly. Do NOT push here — the push in Step 5.7 carries both this commit and the merge commit.
 
-### Step 5: Git Commit and Push
+### Step 5.5: Merge Production Branch (mandatory)
+
+Now that task work is committed, ensure the feat branch is current with the latest production (main) work. Running the merge AFTER the commit means `/cbp-merge-main` resolves conflicts against committed work on a clean tree — no dirty-tree interleave, no Step-0 dirty-tree prompt for the task files. This still prevents shipping a stale PR and surfaces conflicts at task-complete time rather than at PR review.
+
+1. Trigger `/cbp-merge-main`.
+2. If the skill exits with failure (offline, unresolved conflicts, user-aborted): surface the failure and STOP — do NOT proceed to Step 5.7 (push) or Step 7 (complete). The task commit from Step 5 persists; the user resolves and re-invokes `/cbp-task-complete`, which re-runs the merge on the now-clean tree.
+3. If the skill exits with QA warnings the user chose to commit-as-is: continue to Step 5.7; surface a soft warning in the Step 9 output (`⚠ Merged with QA failures pending fix in follow-up`).
+4. On clean success: continue to Step 5.7.
 
-**Zero-file guard**: if `aggregated_files` is empty (investigative or DB-only tasks), skip commit and push. Record "No git commit: zero files changed" in the Step 9 summary.
+### Step 5.7: Push
 
-Otherwise: invoke `/cbp-git-commit` to stage approved files and create the commit. Claude does NOT git add directly. After commit:
+Push once, carrying BOTH the task commit (Step 5) and the merge commit (Step 5.5):
 
 ```bash
 git push origin $(git branch --show-current)
 ```
 
-If push fails, investigate and fix per migration-infrastructure rule — never skip.
+Skip the push only when nothing was committed in Step 5 AND `/cbp-merge-main` reported already-up-to-date (nothing to push). If push fails, investigate and fix per migration-infrastructure rule — never skip.
 
 ### Step 6: Update Task Files