@goodtek/vibeops 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to VibeOps are documented here.
 
 ## Unreleased
 
+## 2.2.1 - 2026-06-09
+
+### Fixed
+
+- **`vibeops task reship --allow-open-mr`**: push then reuse the open MR/PR instead of failing on duplicate `gh pr create`. Skips reship metadata archive when updating the same PR.
+- **`finishTaskWithPullRequest`**: push before checking for an open MR so follow-up commits reach the remote.
+
 ## 2.2.0 - 2026-06-09
 
 ### Added

package/dist/cli.js

@@ -95,7 +95,7 @@ task
     .option("--no-integrate", "Skip merging integration branch into task branch")
     .option("--recreate-branch", "Create task branch from integration instead of reusing local/remote ref")
     .option("--skip-llm", "Do not run LLM for Result / Test Result")
-    .option("--allow-open-mr", "Allow reship while the recorded MR is still open")
+    .option("--allow-open-mr", "Update the open MR/PR with new commits (merge before reship for a new PR)")
     .option("--cwd <path>", "Target directory")
     .action(async (taskRef, opts) => {
     await taskReshipCommand(taskRef, {

package/dist/commands/task-reship.js

@@ -44,7 +44,8 @@ export async function taskReshipCommand(taskRef, options = {}) {
     }
     const integrationBranch = gitCfg?.integrationBranch ?? "develop";
     const remote = gitCfg?.remote ?? "origin";
-    if (!dryRun && !(await assertMergeRequestNotOpen(cwd, taskFile, options.allowOpenMr === true))) {
+    const updateOpenMr = options.allowOpenMr === true;
+    if (!dryRun && !(await assertMergeRequestNotOpen(cwd, taskFile, updateOpenMr))) {
         process.exitCode = 1;
         return;
     }
@@ -113,7 +114,12 @@ export async function taskReshipCommand(taskRef, options = {}) {
     log.blank();
     if (dryRun) {
         log.info(bold("dry-run — would also:"));
-        log.info("  · feat commit + reship metadata, then push once and open MR/PR (unless --no-pr)");
+        if (updateOpenMr) {
+            log.info("  · feat commit, push, update open MR/PR (unless --no-pr)");
+        }
+        else {
+            log.info("  · feat commit + reship metadata, then push once and open MR/PR (unless --no-pr)");
+        }
         log.blank();
         log.info(`Next: ${cyan("vibeops task merge")}, then optional ${cyan("task sync")}`);
         return;
@@ -137,19 +143,24 @@ export async function taskReshipCommand(taskRef, options = {}) {
         process.exitCode = 1;
         return;
     }
-    gitCtx = await refreshGitContextBaseCommit(taskFile, gitCtx, cwd);
-    gitCtx = await prepareGitContextForReship(cwd, taskFile, gitCtx);
-    await commitReshipMetadata({
-        cwd,
-        taskFile,
-        taskId: parts.id,
-        dryRun: false,
-    });
+    if (updateOpenMr) {
+        log.info(dim("Updating open MR/PR (--allow-open-mr)."));
+    }
+    else {
+        gitCtx = await refreshGitContextBaseCommit(taskFile, gitCtx, cwd);
+        gitCtx = await prepareGitContextForReship(cwd, taskFile, gitCtx);
+        await commitReshipMetadata({
+            cwd,
+            taskFile,
+            taskId: parts.id,
+            dryRun: false,
+        });
+    }
     const prResult = await finishTaskWithPullRequest({
         cwd,
         taskFile,
         skipPr: options.noPr === true,
-        forceNewMergeRequest: true,
+        forceNewMergeRequest: !updateOpenMr,
     });
     if (!prResult.ok) {
         log.error("Reship failed — fix push/MR, then rerun task reship.");

package/dist/lib/task-push-pr.js

@@ -7,6 +7,12 @@ import { dim, log } from "./logger.js";
 import { createMergeRequest, findMergeRequestByBranches, probeMergeRequestCli, } from "./pr-create.js";
 import { fallbackTaskPr, generateTaskPrWithLlm } from "./task-pr-llm.js";
 import { readGitContext, readTaskFile } from "./task.js";
+function mergeRequestAlreadyExistsMessage(msg) {
+    const lower = msg.toLowerCase();
+    return (lower.includes("already exists") ||
+        lower.includes("merge request already exists") ||
+        lower.includes("pull request already exists"));
+}
 async function buildDiffSummary(cwd, gitCtx) {
     const files = await gitDiffNameOnly(cwd, `${gitCtx.baseCommit}..HEAD`);
     const commits = await gitLogOneline(cwd, `${gitCtx.baseCommit}..HEAD`);
@@ -55,19 +61,6 @@ export async function finishTaskWithPullRequest(opts) {
     if (git.branch !== gitCtx.taskBranch) {
         log.warn(`Current branch is ${git.branch ?? "(detached)"}, not ${gitCtx.taskBranch}. Push may fail.`);
     }
-    if (opts.skipPr !== true && opts.forceNewMergeRequest !== true) {
-        const existing = await findMergeRequestByBranches({
-            cwd: opts.cwd,
-            host: gitCfg.host,
-            headBranch: gitCtx.taskBranch,
-            baseBranch: gitCtx.baseBranch,
-            state: "open",
-        });
-        if (existing !== null) {
-            log.info(dim(`Open ${label} already exists: ${existing.url}`));
-            return { ok: true, mergeRequestUrl: existing.url, pushed: true };
-        }
-    }
     const ahead = await gitCommitsAhead(opts.cwd, gitCtx.baseCommit, "HEAD");
     if (ahead === 0) {
         log.warn("No commits ahead of base — pushing branch anyway.");
@@ -85,6 +78,20 @@ export async function finishTaskWithPullRequest(opts) {
         log.info(dim("Merge request creation skipped (--no-pr)."));
         return { ok: true, pushed: true };
     }
+    if (opts.forceNewMergeRequest !== true) {
+        const existing = await findMergeRequestByBranches({
+            cwd: opts.cwd,
+            host: gitCfg.host,
+            headBranch: gitCtx.taskBranch,
+            baseBranch: gitCtx.baseBranch,
+            state: "open",
+        });
+        if (existing !== null) {
+            log.ok(`Open ${label} updated: ${existing.url}`);
+            log.info(dim("MR/PR URL is on the host — not written to TASK md (use task merge)."));
+            return { ok: true, mergeRequestUrl: existing.url, pushed: true };
+        }
+    }
     const cliOk = await probeMergeRequestCli(gitCfg.host);
     if (!cliOk) {
         const tool = gitCfg.host === "gitlab" ? "glab" : "gh";
@@ -121,6 +128,20 @@ export async function finishTaskWithPullRequest(opts) {
     }
     catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
+        if (mergeRequestAlreadyExistsMessage(msg)) {
+            const existing = await findMergeRequestByBranches({
+                cwd: opts.cwd,
+                host: gitCfg.host,
+                headBranch: gitCtx.taskBranch,
+                baseBranch: gitCtx.baseBranch,
+                state: "open",
+            });
+            if (existing !== null) {
+                log.ok(`Open ${label} updated: ${existing.url}`);
+                log.info(dim("MR/PR URL is on the host — not written to TASK md (use task merge)."));
+                return { ok: true, mergeRequestUrl: existing.url, pushed: true };
+            }
+        }
         log.error(`Could not create merge request: ${msg}`);
         log.info(dim(`Branch was pushed. Create MR manually: ${gitCtx.taskBranch} → ${gitCtx.baseBranch}`));
         return { ok: false, pushed: true };

package/package.json

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