@goodtek/vibeops 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -4,14 +4,13 @@ All notable changes to VibeOps are documented here.
 
 ## Unreleased
 
-## 2.1.1 - 2026-06-08
+## 2.1.2 - 2026-06-08
 
 ### Changed
 
-- **Docs:** living markdown, templates, and Cursor rules aligned with 2.1 lifecycle (`task reship`, two-status model, sync does not edit TASK md).
-- **`task sync` CLI help:** description no longer says "mark Done".
+- **`task ship`** / **`task reship`**: commit ship/reship metadata **before** push and MR/PR creation so the branch is pushed once (avoids duplicate `pull_request` CI runs on `opened` + `synchronize`).
 
-## 2.1.0 - 2026-06-03
+## 2.1.1 - 2026-06-08
 
 ### Added
 
@@ -19,6 +18,13 @@ All notable changes to VibeOps are documented here.
 
 ### Changed
 
+- **Docs:** living markdown, templates, and Cursor rules aligned with 2.1 lifecycle (`task reship`, two-status model, sync does not edit TASK md).
+- **`task sync` CLI help:** description no longer says "mark Done".
+
+## 2.1.0 - 2026-06-03
+
+### Changed
+
 - **TASK md status:** only **In Progress** → **Shipped** (`task ship`). Merge (CLI/UI) and **`task sync`** do not edit the TASK file.
 - **`task sync`**: Git cleanup only (integration pull, delete `task/*` branches).
 - **`task add`**: blocks only another **In Progress** TASK (not **Shipped**).

package/README.md

@@ -106,7 +106,7 @@ pnpm install && pnpm build && pnpm smoke
 
 - **Init** records branch policy in `.vibeops.json` (`integrationBranch`, `productionBranch`, `host`).
 - **`task add`**: `task/<slug>` from **integration** (e.g. `develop`).
-- **`task ship`**: commit → push → MR/PR → Status **Shipped** on task branch.
+- **`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 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).

package/dist/commands/task-reship.js

@@ -3,36 +3,21 @@ import { readText } from "../lib/filesystem.js";
 import { bold, cyan, dim, green, log, yellow } from "../lib/logger.js";
 import { projectPaths } from "../lib/paths.js";
 import { relPath } from "../lib/task-context.js";
-import { commitDirtyWorkingTree, docsCommitMessageFor, featCommitMessageFor, pushBranch, } from "../lib/task-git-commit.js";
+import { commitDirtyWorkingTree, docsCommitMessageFor, featCommitMessageFor, } from "../lib/task-git-commit.js";
 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 { listWorkingTreeRelPaths } from "../lib/git.js";
-async function commitReshipMetadataAndPush(opts) {
+async function commitReshipMetadata(opts) {
     if (opts.dryRun) {
         log.info(dim("  would commit reship metadata (Status stays Shipped)"));
-        if (opts.push !== null) {
-            log.info(dim(`  would git push ${opts.push.remote} ${opts.push.branch} (reship metadata)`));
-        }
-        return true;
+        return;
     }
     const committed = await commitDirtyWorkingTree(opts.cwd, docsCommitMessageFor(opts.taskId, "reship metadata"), false);
     if (!committed) {
         log.info(dim("No reship metadata commit (Git Context already on disk)."));
     }
-    if (opts.push === null)
-        return true;
-    try {
-        await pushBranch(opts.cwd, opts.push.remote, opts.push.branch, false);
-        log.ok(`Pushed reship metadata → ${opts.push.remote}/${opts.push.branch}`);
-        return true;
-    }
-    catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        log.error(`Reship metadata push failed: ${msg}`);
-        return false;
-    }
 }
 export async function taskReshipCommand(taskRef, options = {}) {
     const cwd = resolve(options.cwd ?? process.cwd());
@@ -129,8 +114,7 @@ export async function taskReshipCommand(taskRef, options = {}) {
     log.blank();
     if (dryRun) {
         log.info(bold("dry-run — would also:"));
-        log.info("  · archive prior MR URL; open new MR/PR (unless --no-pr)");
-        log.info("  · feat commit + reship metadata push");
+        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;
@@ -157,6 +141,12 @@ export async function taskReshipCommand(taskRef, options = {}) {
     gitCtx = await refreshGitContextBaseCommit(taskFile, gitCtx, cwd);
     gitCtx = await prepareGitContextForReship(taskFile, gitCtx);
     await upsertGitContext(taskFile, gitCtx);
+    await commitReshipMetadata({
+        cwd,
+        taskFile,
+        taskId: parts.id,
+        dryRun: false,
+    });
     const prResult = await finishTaskWithPullRequest({
         cwd,
         taskFile,
@@ -171,22 +161,6 @@ export async function taskReshipCommand(taskRef, options = {}) {
     if (prResult.mergeRequestUrl) {
         log.info(`  ${dim("MR/PR")}     ${prResult.mergeRequestUrl}`);
     }
-    const gitCtxAfter = await readGitContext(taskFile);
-    let pushTarget = null;
-    if (gitCtxAfter !== null && gitCfg !== null) {
-        pushTarget = { remote: gitCfg.remote, branch: gitCtxAfter.taskBranch };
-    }
-    const pushed = await commitReshipMetadataAndPush({
-        cwd,
-        taskFile,
-        taskId: parts.id,
-        dryRun: false,
-        push: pushTarget,
-    });
-    if (!pushed) {
-        process.exitCode = 1;
-        return;
-    }
     log.blank();
     log.info(`Next: ${cyan("vibeops task merge")} (or merge in the host UI), then ${cyan("vibeops task sync")}`);
 }

package/dist/commands/task-ship.js

@@ -1,42 +1,24 @@
 import { resolve } from "node:path";
 import { readText } from "../lib/filesystem.js";
-import { requireGitConfig } from "../lib/git-config.js";
 import { bold, cyan, dim, green, log, yellow } from "../lib/logger.js";
 import { projectPaths } from "../lib/paths.js";
 import { resolveTask, taskNotFoundMessage } from "../lib/resolve-task.js";
 import { relPath } from "../lib/task-context.js";
-import { commitDirtyWorkingTree, docsCommitMessageFor, featCommitMessageFor, pushBranch, } from "../lib/task-git-commit.js";
+import { commitDirtyWorkingTree, docsCommitMessageFor, featCommitMessageFor, } from "../lib/task-git-commit.js";
 import { applyTaskShipMemory, fallbackResultSections, llmCompleteTaskShip, writeTaskResultSections, } from "../lib/task-ship-llm.js";
 import { finishTaskWithPullRequest } from "../lib/task-push-pr.js";
 import { hasNonEmptySection, parseTaskFilename, readGitContext, readTaskFile, updateInlineStatus, } from "../lib/task.js";
-async function commitShipMetadataAndPush(opts) {
+async function commitShipMetadata(opts) {
     if (opts.dryRun) {
         log.info(dim("  would set Status → Shipped"));
         log.info(dim("  would commit ship metadata"));
-        if (opts.push !== null) {
-            log.info(dim(`  would git push ${opts.push.remote} ${opts.push.branch} (ship metadata)`));
-        }
-        return true;
+        return;
     }
     await updateInlineStatus(opts.taskFile, "shipped");
     log.ok("Status → Shipped");
     const committed = await commitDirtyWorkingTree(opts.cwd, docsCommitMessageFor(opts.taskId, "mark shipped"), false);
     if (!committed) {
         log.warn("No file changes for ship metadata commit — check TASK Status on the remote branch.");
-        return true;
-    }
-    if (opts.push === null)
-        return true;
-    try {
-        await pushBranch(opts.cwd, opts.push.remote, opts.push.branch, false);
-        log.ok(`Pushed ship metadata → ${opts.push.remote}/${opts.push.branch}`);
-        return true;
-    }
-    catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        log.error(`Ship metadata push failed: ${msg}`);
-        log.info(dim(`Fix auth/remote, then: git push ${opts.push.remote} ${opts.push.branch}`));
-        return false;
     }
 }
 export async function taskShipCommand(taskRef, options = {}) {
@@ -104,24 +86,20 @@ export async function taskShipCommand(taskRef, options = {}) {
         if (!resultOk || !testOk) {
             log.info("  · LLM fill Result / Test Result + patch docs/project/*");
         }
-        log.info("  · commit implementation, push task branch, open MR/PR (unless --no-pr)");
-        log.info("  · Status → Shipped; commit metadata; push again");
-        await finishTaskWithPullRequest({
+        log.info("  · commit implementation + ship metadata (Status → Shipped)");
+        log.info("  · push task branch once, open MR/PR (unless --no-pr)");
+        const partsDry = parseTaskFilename(taskFile);
+        await commitShipMetadata({
             cwd,
             taskFile,
+            taskId: partsDry.id,
             dryRun: true,
-            skipPr: options.noPr === true,
         });
-        const gitCtxDry = await readGitContext(taskFile);
-        const gitCfgDry = gitCtxDry !== null ? await requireGitConfig(cwd).catch(() => null) : null;
-        await commitShipMetadataAndPush({
+        await finishTaskWithPullRequest({
             cwd,
             taskFile,
-            taskId,
             dryRun: true,
-            push: gitCtxDry !== null && gitCfgDry !== null
-                ? { remote: gitCfgDry.remote, branch: gitCtxDry.taskBranch }
-                : null,
+            skipPr: options.noPr === true,
         });
         return;
     }
@@ -129,6 +107,12 @@ export async function taskShipCommand(taskRef, options = {}) {
     await commitDirtyWorkingTree(cwd, featCommitMessageFor(parts.id, meta.title), false);
     const gitCtx = await readGitContext(taskFile);
     if (gitCtx !== null) {
+        await commitShipMetadata({
+            cwd,
+            taskFile,
+            taskId: parts.id,
+            dryRun: false,
+        });
         const prResult = await finishTaskWithPullRequest({
             cwd,
             taskFile,
@@ -146,30 +130,6 @@ export async function taskShipCommand(taskRef, options = {}) {
     else {
         log.info(dim("No Git Context — push/MR skipped."));
     }
-    const gitCtxAfter = await readGitContext(taskFile);
-    let pushTarget = null;
-    if (gitCtxAfter !== null) {
-        try {
-            const gitCfg = await requireGitConfig(cwd);
-            pushTarget = { remote: gitCfg.remote, branch: gitCtxAfter.taskBranch };
-        }
-        catch (e) {
-            if (e instanceof Error)
-                log.warn(e.message);
-        }
-    }
-    const shipped = await commitShipMetadataAndPush({
-        cwd,
-        taskFile,
-        taskId: parts.id,
-        dryRun: false,
-        push: pushTarget,
-    });
-    if (!shipped) {
-        log.error("Ship metadata push failed — fix manually, then merge the MR.");
-        process.exitCode = 1;
-        return;
-    }
     log.blank();
     log.info(`Next: ${cyan("vibeops task merge")} (or merge in the host UI), then ${cyan("vibeops task sync")}`);
 }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@goodtek/vibeops",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Minimal CLI rails for Cursor-based TASK-driven vibe coding.",
   "type": "module",
+  "packageManager": "pnpm@9.15.9",
   "author": "VibeOps contributors",
   "license": "MIT",
   "repository": {
@@ -29,6 +30,16 @@
   "engines": {
     "node": ">=20"
   },
+  "scripts": {
+    "dev": "tsx src/cli.ts",
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "start": "node dist/cli.js",
+    "smoke": "pnpm typecheck && pnpm build && node scripts/smoke.mjs",
+    "clean": "rm -rf dist",
+    "prepack": "pnpm clean && pnpm build",
+    "publish:dry": "pnpm publish --dry-run --no-git-checks"
+  },
   "keywords": [
     "cursor",
     "ai",
@@ -47,14 +58,5 @@
     "@types/node": "^20.14.0",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4"
-  },
-  "scripts": {
-    "dev": "tsx src/cli.ts",
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "start": "node dist/cli.js",
-    "smoke": "pnpm typecheck && pnpm build && node scripts/smoke.mjs",
-    "clean": "rm -rf dist",
-    "publish:dry": "pnpm publish --dry-run --no-git-checks"
   }
-}
+}