@goodtek/vibeops 2.5.2 → 3.1.0

package/dist/lib/task-start.js

@@ -1,6 +1,7 @@
 import { relative, resolve } from "node:path";
 import { branchNameForTaskFile, readGitContext, readTaskFile, updateInlineStatus, upsertGitContext, } from "./task.js";
-import { gitBranchExists, gitCheckout, gitCheckoutNewBranch, gitGovernanceOnlyDirty, gitHeadCommit, gitSwitchToBranch, readGitInfo, } from "./git.js";
+import { gitBranchExists, gitCheckout, gitCheckoutNewBranch, gitGovernanceOnlyDirty, gitRevParse, readGitInfo, } from "./git.js";
+import { resolveIntegrationBaseRef } from "./git-worktree.js";
 import { ensureIntegrationSynced, printIntegrationSyncDiagnosis, } from "./git-integration-sync.js";
 import { cyan, dim, log } from "./logger.js";
 function relOrAbs(root, p) {
@@ -42,40 +43,48 @@ export async function startTaskBranch(opts) {
     const existingCtx = await readGitContext(taskFile);
     const branchExists = await gitBranchExists(cwd, taskBranch);
     if (opts.dryRun) {
+        const base = (await resolveIntegrationBaseRef(cwd, remote, integrationBranch)) ??
+            `${remote}/${integrationBranch}`;
         log.info(`  ${dim("integration")}  ${integrationBranch}`);
         log.info(`  ${dim("task branch")}  ${cyan(taskBranch)}`);
         log.info(dim(branchExists
             ? `dry-run — would git switch ${taskBranch}`
-            : `dry-run — would checkout ${integrationBranch}, then git switch -c ${taskBranch}`));
+            : `dry-run — would git fetch ${remote} ${integrationBranch}, then git switch -c ${taskBranch} --no-track ${base}`));
         return true;
     }
-    if (!branchExists && git.branch !== integrationBranch) {
-        const ok = await gitSwitchToBranch(cwd, integrationBranch, remote);
-        if (!ok) {
-            log.error(`Integration branch "${integrationBranch}" not found locally or on ${remote}. Run vibeops init or create the branch.`);
-            return false;
+    // Worktree-safe (D-006): never check out the integration branch — another
+    // worktree may own it. New task branches start from <remote>/<integration>.
+    let baseRef = null;
+    if (!branchExists) {
+        if (opts.skipIntegrationPull === true) {
+            baseRef = await resolveIntegrationBaseRef(cwd, remote, integrationBranch);
         }
-    }
-    // Ensure integration branch is up-to-date before creating a new task branch.
-    if (!branchExists && opts.skipIntegrationPull !== true) {
-        const synced = await ensureIntegrationSynced({
-            cwd,
-            remote,
-            integrationBranch,
-            fetch: true,
-        });
-        if (!synced.ok) {
-            printIntegrationSyncDiagnosis(synced.diagnosis);
-            log.blank();
-            log.info(dim(`TASK file is already created — after fixing sync, rerun ${cyan("vibeops task add")} to resume the branch (does not create a second TASK).`));
-            return false;
+        else {
+            const synced = await ensureIntegrationSynced({
+                cwd,
+                remote,
+                integrationBranch,
+                fetch: true,
+            });
+            if (!synced.ok) {
+                printIntegrationSyncDiagnosis(synced.diagnosis);
+                log.blank();
+                log.info(dim(`TASK file is already created — after fixing sync, rerun ${cyan("vibeops task add")} to resume the branch (does not create a second TASK).`));
+                return false;
+            }
+            if (synced.pulled) {
+                log.info(dim(synced.diagnosis.summary));
+            }
+            baseRef = synced.baseRef;
         }
-        if (synced.pulled) {
-            log.info(dim(synced.diagnosis.summary));
+        if (baseRef === null) {
+            log.error(`Integration branch "${integrationBranch}" not found locally or on ${remote}. Run vibeops init or create the branch.`);
+            return false;
         }
     }
     const baseBranch = integrationBranch;
-    const baseCommit = (await gitHeadCommit(cwd)) ?? "";
+    // Full SHA: unambiguous base for later diff ranges (display is shortened below).
+    const baseCommit = baseRef !== null ? ((await gitRevParse(cwd, `${baseRef}^{commit}`)) ?? "") : "";
     if (baseCommit.length === 0 && !branchExists) {
         log.error("No commits on integration branch. Create an initial commit first.");
         return false;
@@ -86,7 +95,7 @@ export async function startTaskBranch(opts) {
         taskBranch,
         startedAt: existingCtx?.startedAt ?? new Date().toISOString(),
     };
-    log.info(`  ${dim("integration")}  ${baseBranch} @ ${ctx.baseCommit.slice(0, 7)}`);
+    log.info(`  ${dim("integration")}  ${baseRef ?? baseBranch} @ ${ctx.baseCommit.slice(0, 7)}`);
     log.info(`  ${dim("task branch")}  ${cyan(taskBranch)}`);
     if (branchExists) {
         await gitCheckout(cwd, taskBranch);
@@ -99,7 +108,7 @@ export async function startTaskBranch(opts) {
         log.ok(`Resumed ${taskBranch}`);
     }
     else {
-        await gitCheckoutNewBranch(cwd, taskBranch, baseBranch);
+        await gitCheckoutNewBranch(cwd, taskBranch, baseRef, { noTrack: true });
         await updateInlineStatus(taskFile, "in_progress");
         await upsertGitContext(taskFile, ctx);
         log.ok(`Branch ${taskBranch} ready`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodtek/vibeops",
-  "version": "2.5.2",
+  "version": "3.1.0",
   "description": "Minimal CLI rails for Cursor-based TASK-driven vibe coding.",
   "type": "module",
   "packageManager": "pnpm@9.15.9",