@goodtek/vibeops 2.1.2 → 2.2.0

package/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to VibeOps are documented here.
 
 ## Unreleased
 
+## 2.2.0 - 2026-06-09
+
+### Added
+
+- **`vibeops pull`** — one command: `git fetch`, switch to integration branch (e.g. `develop`), fast-forward pull.
+
+### Changed
+
+- **`vibeops task reship`**: no longer blocks on a dirty working tree — uncommitted edits (including on `develop`) are carried onto the task branch. When the task branch is missing locally and on the remote (e.g. after `task sync`), it is **created automatically** from the integration branch. Removed `--allow-dirty` (behavior is now default).
+
+## 2.1.3 - 2026-06-08
+
+### Changed
+
+- **MR/PR resolution:** `task merge`, `status`, and `task sync` resolve the open PR by **`(taskBranch, baseBranch)`** via `gh` / `glab` (host is source of truth).
+- **`task ship` / `task reship`:** no longer write `Merge Request` or `Pushed At` into TASK md after PR creation — **single push, clean working tree**, CI once per PR.
+- **`task reship`:** archives the current open PR URL into `Previous Merge Requests` (from host lookup) in the reship metadata commit.
+- **Legacy TASK files** that still have `Merge Request:` in Git Context remain supported as a fallback.
+
 ## 2.1.2 - 2026-06-08
 
 ### Changed

package/README.md

@@ -14,10 +14,11 @@ VibeOps bootstraps an **agent-friendly repo**, starts numbered **TASK** files on
 | `vibeops init` | Core docs + agent packs (cursor / claude / codex) |
 | `vibeops task add` | New `TASK-NNN` file + task branch |
 | `vibeops task ship` | LLM summary, commit, push, open MR/PR (Status → **Shipped**) |
-| `vibeops task reship` | Shipped TASK follow-up: integrate develop, new MR/PR (Status stays Shipped) |
+| `vibeops task reship` | Shipped follow-up: move uncommitted work to task branch, commit, new MR/PR (Status stays Shipped) |
 | `vibeops task merge` | Merge TASK MR/PR into integration branch (default: squash) |
 | `vibeops task sync` | After merge: ff-only integration pull, delete task branches (no TASK md edits) |
 | `vibeops task release` | Release PR: integration → production (GitFlow) |
+| `vibeops pull` | Fetch remote + update integration branch (e.g. develop) |
 | `vibeops status` | Briefing: TASK, Git, LLM, clients |
 | `vibeops llm` | Connect LLM providers (`connect` · `status` · `use`) |
 
@@ -53,6 +54,7 @@ vibeops task add
 
 vibeops task ship
 vibeops task merge
+vibeops pull
 # Follow-up on same TASK (after merge):
 vibeops task reship TASK-NNN
 vibeops task merge
@@ -96,20 +98,22 @@ pnpm install && pnpm build && pnpm smoke
 - **`init`**: `--clients`, `--yes`, `--dry-run`, `--force`, `--git`, `--initial-commit`, `--git-policy gitflow|trunk`, `--integration-branch`, `--production-branch`, `--allow-no-remote`, `--cwd`
 - **`task add`**: `--dry-run`, `--non-interactive --idea "…"`
 - **`task ship`**: `--dry-run`, `--no-pr`
-- **`task reship`**: `--dry-run`, `--no-pr`, `--no-integrate`, `--recreate-branch`, `--skip-llm`, `--allow-open-mr`, `--allow-dirty`
+- **`task reship`**: `--dry-run`, `--no-pr`, `--no-integrate`, `--recreate-branch`, `--skip-llm`, `--allow-open-mr`
 - **`task merge`**: `--dry-run`, `--merge`, `--rebase`
 - **`task sync`**: `--dry-run`, `--no-remote-delete`, `--force`
 - **`task release`**: `--dry-run`, `--no-merge`, `--merge`, `--rebase`
+- **`pull`**: `--dry-run`
 - **`status`**: `--json`
 
 ## Git
 
 - **Init** records branch policy in `.vibeops.json` (`integrationBranch`, `productionBranch`, `host`).
 - **`task add`**: `task/<slug>` from **integration** (e.g. `develop`).
-- **`task ship`**: commit implementation + ship metadata (Status **Shipped**) → push once → MR/PR.
-- **`task reship`**: Shipped TASK only; integrates `develop`; opens **new** PR (archives previous MR in Git Context).
+- **`task ship`**: commit implementation + ship metadata (Status **Shipped**) → push once → MR/PR (URL on host; `task merge` resolves by branch).
+- **`task reship`**: Shipped TASK follow-up — carries uncommitted work onto the task branch (creates it from integration when missing after sync), integrates `develop`, commit → push → **new** PR.
 - **`task merge`**: merge MR/PR into integration (CLI or host UI; TASK md unchanged).
 - **`task sync`**: integration ff-only pull → delete `task/*` branches (TASK md unchanged).
+- **`pull`**: fetch + switch to integration branch + `git pull --ff-only` (one command).
 - **`task release`**: integration → production PR + merge (skipped on trunk policy).
 - No force-push to shared branches.
 

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import { pullCommand } from "./commands/pull.js";
 import { initCommand } from "./commands/init.js";
 import { llmConnectCommand, llmStatusCommand, llmUseCommand } from "./commands/llm.js";
 import { statusCommand } from "./commands/status.js";
@@ -14,7 +15,7 @@ import { VERSION } from "./version.js";
 const program = new Command();
 program
     .name("vibeops")
-    .description("VibeOps — TASK workflow (init · task add/ship/reship/merge/sync · status · llm)")
+    .description("VibeOps — TASK workflow (init · task · pull · status · llm)")
     .version(VERSION, "-v, --version", "Print the VibeOps version");
 program.hook("preAction", async (_thisCommand, actionCommand) => {
     const opts = actionCommand.opts();
@@ -88,14 +89,13 @@ task
 });
 task
     .command("reship [taskRef]")
-    .description("Follow-up on Shipped TASK: integrate develop, commit, new MR/PR")
+    .description("Follow-up on Shipped TASK: move uncommitted work to task branch, commit, new MR/PR")
     .option("--dry-run", "Plan only")
     .option("--no-pr", "Push only; skip creating MR/PR")
     .option("--no-integrate", "Skip merging integration branch into task branch")
-    .option("--recreate-branch", "Recreate task branch from integration if missing")
+    .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-dirty", "Proceed when only governance paths are dirty")
     .option("--cwd <path>", "Target directory")
     .action(async (taskRef, opts) => {
     await taskReshipCommand(taskRef, {
@@ -105,7 +105,6 @@ task
         recreateBranch: Boolean(opts.recreateBranch),
         skipLlm: Boolean(opts.skipLlm),
         allowOpenMr: Boolean(opts.allowOpenMr),
-        allowDirty: Boolean(opts.allowDirty),
         cwd: opts.cwd,
     });
 });
@@ -156,6 +155,17 @@ task
         cwd: opts.cwd,
     });
 });
+program
+    .command("pull")
+    .description("Fetch remote and update integration branch (e.g. develop)")
+    .option("--dry-run", "Plan only")
+    .option("--cwd <path>", "Target directory")
+    .action(async (opts) => {
+    await pullCommand({
+        dryRun: Boolean(opts.dryRun),
+        cwd: opts.cwd,
+    });
+});
 program
     .command("status")
     .description("Briefing: active TASK, Git, LLM, next hint")

package/dist/commands/pull.js

@@ -0,0 +1,79 @@
+import { resolve } from "node:path";
+import { GitConfigError, requireGitConfig } from "../lib/git-config.js";
+import { gitFetchRemote, gitPullFastForwardOnly, gitRemoteBranchExists, gitRemoteUrl, gitSwitchToBranch, readGitInfo, } from "../lib/git.js";
+import { bold, cyan, dim, log } from "../lib/logger.js";
+/**
+ * One-step remote sync: fetch, switch to integration branch, fast-forward pull.
+ */
+export async function pullCommand(options = {}) {
+    const cwd = resolve(options.cwd ?? process.cwd());
+    const dryRun = options.dryRun === true;
+    let gitCfg;
+    try {
+        gitCfg = await requireGitConfig(cwd);
+    }
+    catch (e) {
+        if (e instanceof GitConfigError) {
+            log.error(e.message);
+            process.exitCode = 1;
+            return;
+        }
+        throw e;
+    }
+    const { remote, integrationBranch } = gitCfg;
+    log.info(bold("vibeops pull"));
+    log.info(`  ${dim("remote")}       ${remote}`);
+    log.info(`  ${dim("integration")}  ${cyan(integrationBranch)}`);
+    log.blank();
+    const git = await readGitInfo(cwd);
+    if (!git.isRepo) {
+        log.error("Not a git repository.");
+        process.exitCode = 1;
+        return;
+    }
+    const needsSwitch = git.branch !== integrationBranch;
+    if (dryRun) {
+        log.info(bold("dry-run — would:"));
+        log.info(`  · git fetch ${remote} --prune`);
+        if (needsSwitch) {
+            log.info(`  · git switch ${integrationBranch}`);
+        }
+        log.info(`  · git pull --ff-only ${remote} ${integrationBranch}`);
+        return;
+    }
+    if ((await gitRemoteUrl(cwd, remote)) === null) {
+        log.error(`No remote "${remote}". Add a remote or re-run vibeops init.`);
+        process.exitCode = 1;
+        return;
+    }
+    try {
+        await gitFetchRemote(cwd, remote);
+        log.ok(`Fetched ${remote}`);
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.warn(`git fetch failed (${msg}). Continuing with local refs.`);
+    }
+    if (needsSwitch) {
+        const switched = await gitSwitchToBranch(cwd, integrationBranch, remote);
+        if (!switched) {
+            log.error(`Branch "${integrationBranch}" not found locally or on ${remote}. Push integration first or check the remote URL.`);
+            process.exitCode = 1;
+            return;
+        }
+        log.ok(`On ${integrationBranch}`);
+    }
+    if (!(await gitRemoteBranchExists(cwd, remote, integrationBranch))) {
+        log.warn(`No ${remote}/${integrationBranch} on the remote yet — fetch only.`);
+        return;
+    }
+    try {
+        await gitPullFastForwardOnly(cwd, remote, integrationBranch);
+        log.ok(`Up to date with ${remote}/${integrationBranch}`);
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.error(`Could not fast-forward ${integrationBranch}: ${msg}. Commit or stash local changes, then rerun \`vibeops pull\`.`);
+        process.exitCode = 1;
+    }
+}

package/dist/commands/status.js

@@ -8,7 +8,7 @@ import { bold, cyan, dim, green, log, yellow } from "../lib/logger.js";
 import { projectPaths } from "../lib/paths.js";
 import { VERSION } from "../version.js";
 import { computeNextHint, hintToText, listInProgressTasks, pickFocusTask, relPath, taskBranchExistsFor, } from "../lib/task-context.js";
-import { isMergeRequestMerged, taskNeedsSync } from "../lib/task-effective-status.js";
+import { hasOpenTaskMergeRequest, isMergeRequestMerged, resolveTaskMergeRequestUrl, taskNeedsSync, } from "../lib/task-effective-status.js";
 import { countTasks, hasNonEmptySection, isOnTaskBranch, loadActionableTasks, readGitContext, statusDisplay, } from "../lib/task.js";
 import { summarizeGoal } from "../lib/task-summary.js";
 async function buildReport(cwd) {
@@ -42,7 +42,7 @@ async function buildReport(cwd) {
         testFilled = hasNonEmptySection(body, "Test Result");
         const ctx = await readGitContext(focus.filePath);
         taskBranch = ctx?.taskBranch ?? null;
-        mergeRequestUrl = ctx?.mergeRequestUrl ?? null;
+        mergeRequestUrl = await resolveTaskMergeRequestUrl(cwd, focus.filePath);
         onTaskBranch = isOnTaskBranch(git.branch, ctx);
         branchExists = await taskBranchExistsFor(cwd, focus);
         mergeRequestMerged = await isMergeRequestMerged(cwd, focus);
@@ -67,7 +67,9 @@ async function buildReport(cwd) {
         resultFilled,
         testFilled,
         onTaskBranch,
-        hasMergeRequest: typeof mergeRequestUrl === "string" && mergeRequestUrl.length > 0,
+        hasMergeRequest: focus !== null
+            ? await hasOpenTaskMergeRequest(cwd, focus.filePath)
+            : false,
         mergeRequestMerged,
         needsSync,
         hasLocalChanges: git.dirty === true,

package/dist/commands/task-merge.js

@@ -8,6 +8,7 @@ import { taskNotFoundMessage } from "../lib/resolve-task.js";
 import { getMergeRequestState, mergeMergeRequest, probeMergeRequestCli, } from "../lib/pr-create.js";
 import { relPath } from "../lib/task-context.js";
 import { resolveLifecycleTarget } from "../lib/task-lifecycle-target.js";
+import { resolveOpenTaskMergeRequest } from "../lib/task-effective-status.js";
 import { readGitContext } from "../lib/task.js";
 function resolveMergeMethod(opts) {
     if (opts.rebase === true)
@@ -49,26 +50,26 @@ export async function taskMergeCommand(taskRef, options = {}) {
         process.exitCode = 1;
         return;
     }
-    if (!ctx.mergeRequestUrl) {
-        if (dryRun) {
-            log.info(dim(`would merge ${ctx.taskBranch} → ${ctx.baseBranch} after MR exists (run task ship)`));
-            log.blank();
-            log.info(`Next: ${cyan("vibeops task sync")}`);
-            return;
-        }
-        log.error("No Merge Request URL on TASK — run task ship first.");
+    const resolvedMr = dryRun
+        ? null
+        : await resolveOpenTaskMergeRequest(cwd, target.taskFile);
+    if (!dryRun && resolvedMr === null) {
+        log.error(`No open MR/PR for ${ctx.taskBranch} → ${ctx.baseBranch}. Run task ship or task reship first.`);
         process.exitCode = 1;
         return;
     }
+    const mergeRequestUrl = resolvedMr?.url ??
+        `(dry-run: would resolve open MR for ${ctx.taskBranch} → ${ctx.baseBranch})`;
     const remoteUrl = await gitRemoteUrl(cwd, gitCfg.remote);
-    const host = remoteUrl !== null && detectGitHost(remoteUrl) !== null
-        ? detectGitHost(remoteUrl)
-        : gitCfg.host;
+    const host = resolvedMr?.host ??
+        (remoteUrl !== null && detectGitHost(remoteUrl) !== null
+            ? detectGitHost(remoteUrl)
+            : gitCfg.host);
     const method = resolveMergeMethod(options);
     const label = mergeRequestLabel(host);
     log.info(bold(`vibeops task merge ${target.taskId}`));
     log.info(`  ${dim("file")}       ${relPath(cwd, target.taskFile)}`);
-    log.info(`  ${dim("MR/PR")}      ${ctx.mergeRequestUrl}`);
+    log.info(`  ${dim("MR/PR")}      ${mergeRequestUrl}`);
     log.info(`  ${dim("target")}     ${ctx.baseBranch} (${gitCfg.integrationBranch})`);
     log.info(`  ${dim("method")}     ${method}`);
     log.blank();
@@ -76,7 +77,7 @@ export async function taskMergeCommand(taskRef, options = {}) {
         await mergeMergeRequest({
             cwd,
             host,
-            url: ctx.mergeRequestUrl,
+            url: mergeRequestUrl,
             method,
             dryRun: true,
         });
@@ -84,7 +85,7 @@ export async function taskMergeCommand(taskRef, options = {}) {
         log.info(`Next: ${cyan("vibeops task sync")}`);
         return;
     }
-    const state = await getMergeRequestState(cwd, host, ctx.mergeRequestUrl);
+    const state = await getMergeRequestState(cwd, host, mergeRequestUrl);
     if (state === "merged") {
         log.ok(`${label} already merged.`);
         log.blank();
@@ -100,7 +101,7 @@ export async function taskMergeCommand(taskRef, options = {}) {
             return;
         }
         try {
-            await mergeMergeRequest({ cwd, host, url: ctx.mergeRequestUrl, method });
+            await mergeMergeRequest({ cwd, host, url: mergeRequestUrl, method });
             log.ok(`${label} merged into ${ctx.baseBranch}.`);
         }
         catch (e) {
@@ -119,7 +120,7 @@ export async function taskMergeCommand(taskRef, options = {}) {
     else {
         log.warn(`Could not read ${label} state — attempting merge anyway.`);
         try {
-            await mergeMergeRequest({ cwd, host, url: ctx.mergeRequestUrl, method });
+            await mergeMergeRequest({ cwd, host, url: mergeRequestUrl, method });
             log.ok(`${label} merge command completed.`);
         }
         catch (e) {

package/dist/commands/task-reship.js

@@ -7,7 +7,7 @@ import { commitDirtyWorkingTree, docsCommitMessageFor, featCommitMessageFor, } f
 import { finishTaskWithPullRequest } from "../lib/task-push-pr.js";
 import { applyTaskShipMemory, llmCompleteTaskReship, writeTaskResultSections, } from "../lib/task-ship-llm.js";
 import { assertMergeRequestNotOpen, ensureTaskBranchForReship, integrateIntegrationIntoTaskBranch, loadGitConfigForReship, prepareGitContextForReship, refreshGitContextBaseCommit, resolveReshipTarget, } from "../lib/task-reship.js";
-import { hasNonEmptySection, parseTaskFilename, readGitContext, upsertGitContext, } from "../lib/task.js";
+import { hasNonEmptySection, parseTaskFilename, readGitContext, } from "../lib/task.js";
 import { listWorkingTreeRelPaths } from "../lib/git.js";
 async function commitReshipMetadata(opts) {
     if (opts.dryRun) {
@@ -56,7 +56,6 @@ export async function taskReshipCommand(taskRef, options = {}) {
         remote,
         recreateBranch: options.recreateBranch === true,
         dryRun,
-        allowDirty: options.allowDirty === true,
     });
     if (!branchOk) {
         process.exitCode = 1;
@@ -126,7 +125,7 @@ export async function taskReshipCommand(taskRef, options = {}) {
     }
     const dirtyBefore = await listWorkingTreeRelPaths(cwd);
     if (dirtyBefore.length === 0) {
-        log.error("No changes to reship. Edit files on the task branch, then rerun.");
+        log.error("No changes to reship. Edit files (e.g. on develop), then rerun.");
         process.exitCode = 1;
         return;
     }
@@ -139,8 +138,7 @@ export async function taskReshipCommand(taskRef, options = {}) {
         return;
     }
     gitCtx = await refreshGitContextBaseCommit(taskFile, gitCtx, cwd);
-    gitCtx = await prepareGitContextForReship(taskFile, gitCtx);
-    await upsertGitContext(taskFile, gitCtx);
+    gitCtx = await prepareGitContextForReship(cwd, taskFile, gitCtx);
     await commitReshipMetadata({
         cwd,
         taskFile,

package/dist/commands/task-sync.js

@@ -7,9 +7,9 @@ import { probeMergeRequestCli } from "../lib/pr-create.js";
 import { projectPaths } from "../lib/paths.js";
 import { taskNotFoundMessage } from "../lib/resolve-task.js";
 import { relPath } from "../lib/task-context.js";
-import { getMergeRequestStateForTask, isMergeRequestMerged, } from "../lib/task-effective-status.js";
+import { getTaskMergeRequestLifecycle, isMergeRequestMerged, } from "../lib/task-effective-status.js";
 import { resolveLifecycleTarget } from "../lib/task-lifecycle-target.js";
-import { readGitContext, readTaskFile } from "../lib/task.js";
+import { readTaskFile } from "../lib/task.js";
 function isProtectedBranch(name, integration, production) {
     return name === integration || name === production || name === "main" || name === "master";
 }
@@ -42,7 +42,6 @@ export async function taskSyncCommand(taskRef, options = {}) {
     }
     const { integrationBranch, productionBranch, remote } = gitCfg;
     const { taskId, taskBranch, taskFile } = target;
-    const ctx = await readGitContext(taskFile);
     if (isProtectedBranch(taskBranch, integrationBranch, productionBranch)) {
         log.error(`Refusing to delete protected branch: ${taskBranch}`);
         process.exitCode = 1;
@@ -55,18 +54,18 @@ export async function taskSyncCommand(taskRef, options = {}) {
     log.info(`  ${dim("note")}        ${dim("Git cleanup only — TASK md stays Shipped")}`);
     log.blank();
     const meta = await readTaskFile(taskFile);
-    if (ctx?.mergeRequestUrl && !dryRun) {
-        const state = await getMergeRequestStateForTask(cwd, taskFile);
-        if (state !== null) {
+    if (!dryRun) {
+        const lifecycle = await getTaskMergeRequestLifecycle(cwd, taskFile);
+        if (lifecycle !== "none") {
             const remoteUrl = await gitRemoteUrl(cwd, remote);
             const host = remoteUrl !== null && detectGitHost(remoteUrl) !== null
                 ? detectGitHost(remoteUrl)
                 : gitCfg.host;
             const label = mergeRequestLabel(host);
-            if (state === "open") {
+            if (lifecycle === "open") {
                 log.warn(`${yellow(label)} still open — merge with task merge or the host UI before sync.`);
             }
-            else if (state === "merged") {
+            else if (lifecycle === "merged") {
                 log.ok(`${label} merged.`);
             }
         }

package/dist/lib/pr-create.js

@@ -64,6 +64,99 @@ export async function probeMergeRequestCli(host) {
         return false;
     }
 }
+function normalizeGhMergeRequestState(raw) {
+    const state = raw.trim().toUpperCase();
+    if (state === "MERGED")
+        return "merged";
+    if (state === "OPEN")
+        return "open";
+    if (state === "CLOSED")
+        return "closed";
+    return "unknown";
+}
+function normalizeGlabMergeRequestState(raw) {
+    const state = raw.trim().toLowerCase();
+    if (state === "merged")
+        return "merged";
+    if (state === "opened" || state === "open")
+        return "open";
+    if (state === "closed")
+        return "closed";
+    return "unknown";
+}
+async function ghFindMergeRequestByBranches(opts) {
+    const state = opts.state ?? "open";
+    const { stdout } = await execFileAsync("gh", [
+        "pr",
+        "list",
+        "--head",
+        opts.headBranch,
+        "--base",
+        opts.baseBranch,
+        "--state",
+        state,
+        "--limit",
+        "1",
+        "--json",
+        "url,state",
+    ], { cwd: opts.cwd, maxBuffer: 1024 * 1024 });
+    const trimmed = stdout.trim();
+    if (trimmed.length === 0 || trimmed === "[]")
+        return null;
+    const rows = JSON.parse(trimmed);
+    const row = rows[0];
+    if (row?.url === undefined || row.url.length === 0)
+        return null;
+    return {
+        url: row.url,
+        state: normalizeGhMergeRequestState(row.state ?? ""),
+    };
+}
+async function glabFindMergeRequestByBranches(opts) {
+    const state = opts.state ?? "open";
+    const glabState = state === "open" ? "opened" : state === "merged" ? "merged" : state === "closed" ? "closed" : "all";
+    const { stdout } = await execFileAsync("glab", [
+        "mr",
+        "list",
+        "--source-branch",
+        opts.headBranch,
+        "--target-branch",
+        opts.baseBranch,
+        "-S",
+        glabState,
+        "-P",
+        "1",
+        "--output",
+        "json",
+        "web_url,state",
+    ], { cwd: opts.cwd, maxBuffer: 1024 * 1024 });
+    const trimmed = stdout.trim();
+    if (trimmed.length === 0 || trimmed === "[]")
+        return null;
+    const rows = JSON.parse(trimmed);
+    const row = rows[0];
+    const url = row?.web_url?.trim();
+    if (url === undefined || url.length === 0)
+        return null;
+    return {
+        url,
+        state: normalizeGlabMergeRequestState(row.state ?? ""),
+    };
+}
+/** Resolve MR/PR by `(headBranch, baseBranch)` — source of truth for ship/reship (no TASK URL). */
+export async function findMergeRequestByBranches(opts) {
+    try {
+        if (!(await probeMergeRequestCli(opts.host)))
+            return null;
+        if (opts.host === "gitlab") {
+            return glabFindMergeRequestByBranches(opts);
+        }
+        return ghFindMergeRequestByBranches(opts);
+    }
+    catch {
+        return null;
+    }
+}
 function prRefFromUrl(url) {
     const trimmed = url.trim();
     const pullMatch = /\/pull\/(\d+)/i.exec(trimmed);

package/dist/lib/task-context.js

@@ -48,7 +48,7 @@ export function computeNextHint(input) {
             return "task-sync";
         if (input.hasMergeRequest && !input.mergeRequestMerged)
             return "task-merge";
-        if (input.hasLocalChanges && input.onTaskBranch === true)
+        if (input.hasLocalChanges)
             return "task-reship";
         return "task-add";
     }
@@ -67,7 +67,7 @@ export function hintToText(hint, cwd, task) {
             return task ? `Run \`vibeops task ship ${task.id}\`.` : "Run `vibeops task ship`.";
         case "task-reship":
             return task
-                ? `Follow-up on ${task.id}? Edit on task branch, then \`vibeops task reship ${task.id}\`.`
+                ? `Follow-up on ${task.id}? Edit files (develop is fine), then \`vibeops task reship ${task.id}\`.`
                 : "Run `vibeops task reship TASK-NNN` for a Shipped follow-up.";
         case "task-merge":
             return task

package/dist/lib/task-effective-status.js

@@ -1,37 +1,103 @@
 import { GitConfigError, requireGitConfig } from "./git-config.js";
 import { detectGitHost } from "./git-host.js";
 import { gitBranchExists, gitRemoteBranchExists, gitRemoteUrl, } from "./git.js";
-import { getMergeRequestState, probeMergeRequestCli } from "./pr-create.js";
+import { findMergeRequestByBranches, getMergeRequestState, probeMergeRequestCli, } from "./pr-create.js";
 import { readGitContext } from "./task.js";
-/** MR state for a TASK file, or `null` when there is no MR URL or host CLI is unavailable. */
-export async function getMergeRequestStateForTask(cwd, taskFile) {
-    const ctx = await readGitContext(taskFile);
-    const url = ctx?.mergeRequestUrl?.trim();
-    if (url === undefined || url.length === 0)
-        return null;
-    let host;
+export async function resolveGitHostForCwd(cwd) {
     try {
         const gitCfg = await requireGitConfig(cwd);
         const remoteUrl = await gitRemoteUrl(cwd, gitCfg.remote);
-        host =
-            remoteUrl !== null && detectGitHost(remoteUrl) !== null
-                ? detectGitHost(remoteUrl)
-                : gitCfg.host;
+        if (remoteUrl !== null && detectGitHost(remoteUrl) !== null) {
+            return detectGitHost(remoteUrl);
+        }
+        return gitCfg.host;
     }
     catch (e) {
         if (e instanceof GitConfigError)
             return null;
         throw e;
     }
-    if (!(await probeMergeRequestCli(host)))
+}
+async function readTaskGitContext(taskFile) {
+    return readGitContext(taskFile);
+}
+async function resolveFromBranches(cwd, ctx, state) {
+    try {
+        const host = await resolveGitHostForCwd(cwd);
+        if (host === null)
+            return null;
+        const found = await findMergeRequestByBranches({
+            cwd,
+            host,
+            headBranch: ctx.taskBranch,
+            baseBranch: ctx.baseBranch,
+            state,
+        });
+        if (found === null)
+            return null;
+        return { url: found.url, host, state: found.state, source: "branch" };
+    }
+    catch {
+        return null;
+    }
+}
+async function resolveFromTaskFileUrl(cwd, ctx) {
+    const url = ctx.mergeRequestUrl?.trim();
+    if (url === undefined || url.length === 0)
+        return null;
+    const host = await resolveGitHostForCwd(cwd);
+    if (host === null || !(await probeMergeRequestCli(host)))
         return null;
-    return getMergeRequestState(cwd, host, url);
+    const state = await getMergeRequestState(cwd, host, url);
+    return { url, host, state, source: "task-file" };
+}
+/** Open MR/PR for a TASK — branch lookup first, legacy TASK URL fallback. */
+export async function resolveOpenTaskMergeRequest(cwd, taskFile) {
+    const ctx = await readTaskGitContext(taskFile);
+    if (ctx === null)
+        return null;
+    const fromBranch = await resolveFromBranches(cwd, ctx, "open");
+    if (fromBranch !== null)
+        return fromBranch;
+    const legacy = await resolveFromTaskFileUrl(cwd, ctx);
+    if (legacy !== null && legacy.state === "open")
+        return legacy;
+    return null;
+}
+/** MR lifecycle for hints, sync, and status — prefers host branch lookup. */
+export async function getTaskMergeRequestLifecycle(cwd, taskFile) {
+    const ctx = await readTaskGitContext(taskFile);
+    if (ctx === null)
+        return "none";
+    const open = await resolveFromBranches(cwd, ctx, "open");
+    if (open !== null)
+        return "open";
+    const merged = await resolveFromBranches(cwd, ctx, "merged");
+    if (merged !== null)
+        return "merged";
+    const legacy = await resolveFromTaskFileUrl(cwd, ctx);
+    if (legacy !== null)
+        return legacy.state;
+    return "none";
+}
+/** @deprecated Use {@link getTaskMergeRequestLifecycle} or {@link resolveOpenTaskMergeRequest}. */
+export async function getMergeRequestStateForTask(cwd, taskFile) {
+    const lifecycle = await getTaskMergeRequestLifecycle(cwd, taskFile);
+    if (lifecycle === "none")
+        return null;
+    return lifecycle;
+}
+export async function hasOpenTaskMergeRequest(cwd, taskFile) {
+    return (await getTaskMergeRequestLifecycle(cwd, taskFile)) === "open";
+}
+export async function resolveTaskMergeRequestUrl(cwd, taskFile) {
+    const open = await resolveOpenTaskMergeRequest(cwd, taskFile);
+    return open?.url ?? null;
 }
 export async function isMergeRequestMerged(cwd, task) {
     if (task.status !== "shipped")
         return false;
-    const state = await getMergeRequestStateForTask(cwd, task.filePath);
-    return state === "merged";
+    return (await getTaskMergeRequestLifecycle(cwd, task.filePath)) === "merged";
 }
 /**
  * After ship: optional `task sync` when MR is merged (or no MR) but `task/*` still exists.
@@ -39,15 +105,12 @@ export async function isMergeRequestMerged(cwd, task) {
 export async function taskNeedsSync(cwd, task) {
     if (task.status !== "shipped")
         return false;
-    const ctx = await readGitContext(task.filePath);
+    const ctx = await readTaskGitContext(task.filePath);
     if (ctx === null)
         return false;
-    const mrUrl = ctx.mergeRequestUrl?.trim();
-    if (mrUrl !== undefined && mrUrl.length > 0) {
-        const state = await getMergeRequestStateForTask(cwd, task.filePath);
-        if (state !== "merged")
-            return false;
-    }
+    const lifecycle = await getTaskMergeRequestLifecycle(cwd, task.filePath);
+    if (lifecycle === "open")
+        return false;
     if (await gitBranchExists(cwd, ctx.taskBranch))
         return true;
     try {

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

@@ -4,9 +4,9 @@ import { detectGitHost, mergeRequestLabel } from "./git-host.js";
 import { requireGitConfig } from "./git-config.js";
 import { gitCommitsAhead, gitDiffNameOnly, gitLogOneline, gitPush, gitRemoteUrl, readGitInfo, } from "./git.js";
 import { dim, log } from "./logger.js";
-import { createMergeRequest, probeMergeRequestCli } from "./pr-create.js";
+import { createMergeRequest, findMergeRequestByBranches, probeMergeRequestCli, } from "./pr-create.js";
 import { fallbackTaskPr, generateTaskPrWithLlm } from "./task-pr-llm.js";
-import { readGitContext, readTaskFile, upsertGitContext } from "./task.js";
+import { readGitContext, readTaskFile } from "./task.js";
 async function buildDiffSummary(cwd, gitCtx) {
     const files = await gitDiffNameOnly(cwd, `${gitCtx.baseCommit}..HEAD`);
     const commits = await gitLogOneline(cwd, `${gitCtx.baseCommit}..HEAD`);
@@ -28,12 +28,7 @@ async function buildDiffSummary(cwd, gitCtx) {
     }
     return lines.join("\n") || "(no commits since task start)";
 }
-function isExistingMergeRequestUrl(url) {
-    if (typeof url !== "string" || url.length === 0)
-        return false;
-    return url.startsWith("http://") || url.startsWith("https://");
-}
-/** Push task branch and open MR/PR (idempotent when URL already in Git Context). */
+/** Push task branch and open MR/PR. Does not write MR URL into TASK md (host is source of truth). */
 export async function finishTaskWithPullRequest(opts) {
     let gitCfg = await requireGitConfig(opts.cwd);
     const gitCtx = await readGitContext(opts.taskFile);
@@ -41,8 +36,9 @@ export async function finishTaskWithPullRequest(opts) {
         log.warn("No Git Context on TASK — push and merge request skipped.");
         return { ok: true };
     }
+    const label = mergeRequestLabel(gitCfg.host);
     if (opts.dryRun) {
-        log.info(dim(`would git push -u ${gitCfg.remote} ${gitCtx.taskBranch} and open ${mergeRequestLabel(gitCfg.host)} → ${gitCtx.baseBranch}`));
+        log.info(dim(`would git push -u ${gitCfg.remote} ${gitCtx.taskBranch} and open ${label} → ${gitCtx.baseBranch}`));
         return { ok: true, mergeRequestUrl: "(dry-run)" };
     }
     const remoteUrl = await gitRemoteUrl(opts.cwd, gitCfg.remote);
@@ -59,10 +55,18 @@ 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 (isExistingMergeRequestUrl(gitCtx.mergeRequestUrl) &&
-        opts.forceNewMergeRequest !== true) {
-        log.info(dim(`Merge request already recorded: ${gitCtx.mergeRequestUrl}`));
-        return { ok: true, mergeRequestUrl: gitCtx.mergeRequestUrl, pushed: true };
+    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) {
@@ -77,17 +81,14 @@ export async function finishTaskWithPullRequest(opts) {
         log.error(`git push failed: ${msg}`);
         return { ok: false };
     }
-    const pushedAt = new Date().toISOString();
     if (opts.skipPr === true) {
-        await upsertGitContext(opts.taskFile, { ...gitCtx, pushedAt });
         log.info(dim("Merge request creation skipped (--no-pr)."));
         return { ok: true, pushed: true };
     }
     const cliOk = await probeMergeRequestCli(gitCfg.host);
     if (!cliOk) {
         const tool = gitCfg.host === "gitlab" ? "glab" : "gh";
-        await upsertGitContext(opts.taskFile, { ...gitCtx, pushedAt });
-        log.warn(`${tool} CLI not found — create the ${mergeRequestLabel(gitCfg.host)} manually: ${gitCtx.taskBranch} → ${gitCtx.baseBranch}`);
+        log.warn(`${tool} CLI not found — create the ${label} manually: ${gitCtx.taskBranch} → ${gitCtx.baseBranch}`);
         return { ok: true, pushed: true };
     }
     const config = await readConfig(opts.cwd);
@@ -114,18 +115,13 @@ export async function finishTaskWithPullRequest(opts) {
             title: prTitle,
             body: prBody,
         });
-        log.ok(`${mergeRequestLabel(gitCfg.host)}: ${url}`);
-        await upsertGitContext(opts.taskFile, {
-            ...gitCtx,
-            mergeRequestUrl: url,
-            pushedAt,
-        });
+        log.ok(`${label}: ${url}`);
+        log.info(dim("MR/PR URL is on the host — not written to TASK md (use task merge)."));
         return { ok: true, mergeRequestUrl: url, pushed: true };
     }
     catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
         log.error(`Could not create merge request: ${msg}`);
-        await upsertGitContext(opts.taskFile, { ...gitCtx, pushedAt });
         log.info(dim(`Branch was pushed. Create MR manually: ${gitCtx.taskBranch} → ${gitCtx.baseBranch}`));
         return { ok: false, pushed: true };
     }

package/dist/lib/task-reship.js

@@ -1,10 +1,11 @@
 import { resolve } from "node:path";
 import { GitConfigError, requireGitConfig } from "./git-config.js";
-import { gitBranchExists, gitCheckout, gitCheckoutNewBranch, gitFetchRemote, gitGovernanceOnlyDirty, gitHeadCommit, gitMergeRemoteBranch, gitMergeInProgress, gitPullFastForwardOnly, gitRemoteBranchExists, gitSwitchToBranch, listUnmergedRelPaths, readGitInfo, } from "./git.js";
+import { gitBranchExists, gitCheckout, gitCheckoutNewBranch, gitDeleteBranch, gitFetchRemote, gitHeadCommit, gitMergeRemoteBranch, gitMergeInProgress, gitPullFastForwardOnly, gitRemoteBranchExists, gitSwitchToBranch, listUnmergedRelPaths, readGitInfo, } from "./git.js";
 import { dim, log } from "./logger.js";
-import { getMergeRequestStateForTask } from "./task-effective-status.js";
+import { findMergeRequestByBranches } from "./pr-create.js";
 import { normalizeTaskRef } from "./resolve-task.js";
-import { archiveMergeRequestForReship, findTaskFile, loadActionableTasks, pickLatestShippedTask, readGitContext, readTaskFile, upsertGitContext, } from "./task.js";
+import { getTaskMergeRequestLifecycle, resolveGitHostForCwd, } from "./task-effective-status.js";
+import { findTaskFile, loadActionableTasks, pickLatestShippedTask, readGitContext, readTaskFile, upsertGitContext, } from "./task.js";
 export async function resolveReshipTarget(paths, cwd, taskRef) {
     const trimmed = taskRef?.trim();
     let taskId;
@@ -44,52 +45,44 @@ export function reshipNotFoundMessage(taskRef) {
     }
     return "No Shipped TASK found. Pass `vibeops task reship TASK-NNN`.";
 }
-/** Checkout or recreate the task branch without changing TASK Status. */
-export async function ensureTaskBranchForReship(opts) {
-    const cwd = resolve(opts.cwd);
-    const { taskBranch } = opts.gitCtx;
-    const git = await readGitInfo(cwd);
-    if (!git.isRepo) {
-        log.error("Not a git repository.");
-        return false;
+async function switchToTaskBranch(cwd, taskBranch) {
+    try {
+        await gitCheckout(cwd, taskBranch);
+        return true;
     }
-    if (git.dirty === true && !opts.allowDirty) {
-        const gov = await gitGovernanceOnlyDirty(cwd);
-        if (!gov.onlyGovernance) {
-            log.error("Working tree is dirty. Commit or stash, or rerun with --allow-dirty.");
-            return false;
-        }
-        log.warn("Only governance paths are dirty — proceeding.");
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.error(`Could not switch to ${taskBranch} with uncommitted changes. Commit, stash, or resolve conflicts, then rerun.`);
+        if (msg.length > 0)
+            log.info(dim(msg));
+        return false;
     }
-    const localExists = await gitBranchExists(cwd, taskBranch);
-    const remoteExists = await gitRemoteBranchExists(cwd, opts.remote, taskBranch);
-    if (opts.dryRun) {
-        if (localExists) {
-            log.info(dim(`  would git switch ${taskBranch}`));
-        }
-        else if (opts.recreateBranch) {
-            log.info(dim(`  would recreate ${taskBranch} from ${opts.integrationBranch}`));
-        }
-        else {
-            log.error(`Local branch ${taskBranch} missing. Rerun with --recreate-branch.`);
+}
+async function removeLocalTaskBranch(cwd, taskBranch, integrationBranch, remote) {
+    if (!(await gitBranchExists(cwd, taskBranch)))
+        return true;
+    const git = await readGitInfo(cwd);
+    if (git.branch === taskBranch) {
+        const ok = await gitSwitchToBranch(cwd, integrationBranch, remote);
+        if (!ok) {
+            log.error(`Integration branch "${integrationBranch}" not found.`);
             return false;
         }
-        return true;
     }
-    if (localExists) {
-        await gitCheckout(cwd, taskBranch);
-        log.ok(`On ${taskBranch}`);
-        return true;
+    try {
+        await gitDeleteBranch(cwd, taskBranch, { force: true });
+        log.info(dim(`Removed local ${taskBranch}.`));
     }
-    if (!opts.recreateBranch) {
-        if (remoteExists) {
-            log.error(`Local ${taskBranch} missing. Fetch/checkout the branch or rerun with --recreate-branch.`);
-        }
-        else {
-            log.error(`Branch ${taskBranch} not found locally or on ${opts.remote}. Use --recreate-branch.`);
-        }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.error(`Could not remove local ${taskBranch}: ${msg}`);
         return false;
     }
+    return true;
+}
+async function recreateTaskBranchFromIntegration(opts) {
+    const cwd = resolve(opts.cwd);
+    const { taskBranch } = opts.gitCtx;
     const ok = await gitSwitchToBranch(cwd, opts.integrationBranch, opts.remote);
     if (!ok) {
         log.error(`Integration branch "${opts.integrationBranch}" not found.`);
@@ -110,15 +103,75 @@ export async function ensureTaskBranchForReship(opts) {
         log.error("Integration branch has no commits.");
         return false;
     }
-    await gitCheckoutNewBranch(cwd, taskBranch, opts.integrationBranch);
+    try {
+        await gitCheckoutNewBranch(cwd, taskBranch, opts.integrationBranch);
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.error(`Could not create ${taskBranch} from ${opts.integrationBranch} with uncommitted changes.`);
+        if (msg.length > 0)
+            log.info(dim(msg));
+        return false;
+    }
     await upsertGitContext(opts.taskFile, {
         ...opts.gitCtx,
         baseBranch: opts.integrationBranch,
         baseCommit: head,
     });
-    log.ok(`Recreated ${taskBranch} from ${opts.integrationBranch}`);
+    log.ok(`Created ${taskBranch} from ${opts.integrationBranch}`);
     return true;
 }
+/** Checkout or recreate the task branch without changing TASK Status. */
+export async function ensureTaskBranchForReship(opts) {
+    const cwd = resolve(opts.cwd);
+    const { taskBranch } = opts.gitCtx;
+    const git = await readGitInfo(cwd);
+    if (!git.isRepo) {
+        log.error("Not a git repository.");
+        return false;
+    }
+    if (git.dirty === true) {
+        log.info(dim("Uncommitted changes will be carried onto the task branch."));
+    }
+    const localExists = await gitBranchExists(cwd, taskBranch);
+    const remoteExists = await gitRemoteBranchExists(cwd, opts.remote, taskBranch);
+    const recreateFromIntegration = opts.recreateBranch === true || (!localExists && !remoteExists);
+    if (opts.dryRun) {
+        if (localExists && !opts.recreateBranch) {
+            log.info(dim(`  would git switch ${taskBranch}`));
+        }
+        else if (!recreateFromIntegration && remoteExists) {
+            log.info(dim(`  would checkout ${taskBranch} from ${opts.remote}`));
+        }
+        else {
+            if (localExists && opts.recreateBranch) {
+                log.info(dim(`  would remove local ${taskBranch}`));
+            }
+            log.info(dim(`  would create ${taskBranch} from ${opts.integrationBranch}`));
+        }
+        return true;
+    }
+    if (localExists && !opts.recreateBranch) {
+        if (!(await switchToTaskBranch(cwd, taskBranch)))
+            return false;
+        log.ok(`On ${taskBranch}`);
+        return true;
+    }
+    if (!recreateFromIntegration && remoteExists) {
+        const checkedOut = await gitSwitchToBranch(cwd, taskBranch, opts.remote);
+        if (checkedOut) {
+            log.ok(`Checked out ${taskBranch} from ${opts.remote}`);
+            return true;
+        }
+        log.warn(`Could not checkout ${opts.remote}/${taskBranch}; creating from integration.`);
+    }
+    if (localExists) {
+        const removed = await removeLocalTaskBranch(cwd, taskBranch, opts.integrationBranch, opts.remote);
+        if (!removed)
+            return false;
+    }
+    return recreateTaskBranchFromIntegration(opts);
+}
 /** Merge latest integration into the current task branch. */
 export async function integrateIntegrationIntoTaskBranch(opts) {
     const cwd = resolve(opts.cwd);
@@ -160,7 +213,7 @@ export async function integrateIntegrationIntoTaskBranch(opts) {
 export async function assertMergeRequestNotOpen(cwd, taskFile, allowOpenMr) {
     if (allowOpenMr)
         return true;
-    const state = await getMergeRequestStateForTask(cwd, taskFile);
+    const state = await getTaskMergeRequestLifecycle(cwd, taskFile);
     if (state !== "open")
         return true;
     log.error("Current MR/PR is still open. Merge or close it first, or rerun with --allow-open-mr.");
@@ -172,8 +225,32 @@ export async function refreshGitContextBaseCommit(taskFile, gitCtx, cwd) {
         return gitCtx;
     return { ...gitCtx, baseCommit: head };
 }
-export async function prepareGitContextForReship(taskFile, gitCtx) {
-    const archived = archiveMergeRequestForReship(gitCtx);
+export async function prepareGitContextForReship(cwd, taskFile, gitCtx) {
+    const previous = [...(gitCtx.previousMergeRequestUrls ?? [])];
+    const host = await resolveGitHostForCwd(cwd);
+    if (host !== null) {
+        const open = await findMergeRequestByBranches({
+            cwd,
+            host,
+            headBranch: gitCtx.taskBranch,
+            baseBranch: gitCtx.baseBranch,
+            state: "open",
+        });
+        if (open !== null) {
+            previous.push(open.url);
+        }
+    }
+    const legacy = gitCtx.mergeRequestUrl?.trim();
+    if (legacy !== undefined && legacy.length > 0 && !previous.includes(legacy)) {
+        previous.push(legacy);
+    }
+    const archived = {
+        ...gitCtx,
+        previousMergeRequestUrls: previous.length > 0 ? previous : undefined,
+        mergeRequestUrl: undefined,
+        reshipCount: (gitCtx.reshipCount ?? 0) + 1,
+        lastReshipAt: new Date().toISOString(),
+    };
     await upsertGitContext(taskFile, archived);
     return archived;
 }

package/package.json

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