@goodtek/vibeops 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to VibeOps are documented here.
 
 ## Unreleased
 
+## 1.1.2 - 2026-06-03
+
+### Fixed
+
+- **`task done` two-phase close:** after push/MR, writes Status Done and Git Context (`doneAt`, MR URL from the prior step), commits closure metadata (`docs(task-nnn): close task metadata`), and pushes again so the remote task branch matches the TASK file instead of leaving governance changes uncommitted locally.
+
+## 1.1.1 - 2026-05-27
+
 ### Fixed
 
 - Removed dead `task-merge.ts` (local merge no longer used).

package/README.md

@@ -87,7 +87,7 @@ pnpm install && pnpm build && pnpm smoke
 
 - **Init** records branch policy in `.vibeops.json` (`integrationBranch`, `productionBranch`, `host`).
 - **`task add`**: branch `task/<slug>` from the **integration** branch (e.g. `develop`).
-- **`task done`**: commit if needed → `git push` → `gh pr create` / `glab mr create` (LLM title/body). **You merge on GitHub/GitLab**; CI deploys.
+- **`task done`**: commit implementation → `git push` → `gh pr create` / `glab mr create` → commit TASK closure (Status Done, Git Context) → push again. **You merge on GitHub/GitLab**; CI deploys.
 - Commit messages: `feat(task-nnn): …`
 - No force-push to shared branches
 

package/dist/bootstrap/manifest.js

@@ -23,13 +23,3 @@ export async function loadInstallManifest(clients) {
 export function resolveDestination(entry, projectRoot) {
     return join(projectRoot, entry.relativePath);
 }
-/** @deprecated Use loadInstallManifest — walks entire templates/ (legacy). */
-export async function loadManifest() {
-    const files = await walk(TEMPLATES_ROOT);
-    return files
-        .map((abs) => ({
-        relativePath: relative(TEMPLATES_ROOT, abs),
-        sourceAbs: abs,
-    }))
-        .sort((a, b) => a.relativePath.localeCompare(b.relativePath));
-}

package/dist/commands/task-done.js

@@ -5,13 +5,17 @@ import { projectPaths } from "../lib/paths.js";
 import { resolveTask, taskNotFoundMessage } from "../lib/resolve-task.js";
 import { applyTaskDoneMemory, fallbackResultSections, llmCompleteTaskDone, writeTaskResultSections, } from "../lib/task-done-llm.js";
 import { relPath } from "../lib/task-context.js";
-import { gitAddPaths, listWorkingTreeRelPaths, partitionPathsForAutoCommit, readGitInfo, runGit, } from "../lib/git.js";
+import { requireGitConfig } from "../lib/git-config.js";
+import { gitAddPaths, gitPush, listWorkingTreeRelPaths, partitionPathsForAutoCommit, readGitInfo, runGit, } from "../lib/git.js";
 import { hasNonEmptySection, markGitContextDone, parseTaskFilename, readGitContext, readTaskFile, updateInlineStatus, } from "../lib/task.js";
 import { finishTaskWithPullRequest } from "../lib/task-push-pr.js";
 function commitMessageFor(taskId, title) {
     const slug = title.replace(/^TASK-\d+\s*[:\-]\s*/i, "").trim() || taskId;
     return `feat(${taskId.toLowerCase()}): ${slug}`;
 }
+function closureCommitMessageFor(taskId) {
+    return `docs(${taskId.toLowerCase()}): close task metadata`;
+}
 async function tryCommitDirty(cwd, message, dryRun) {
     const git = await readGitInfo(cwd);
     if (!git.isRepo || git.dirty !== true)
@@ -31,6 +35,41 @@ async function tryCommitDirty(cwd, message, dryRun) {
     log.ok(`Committed: ${message}`);
     return true;
 }
+/**
+ * After push/MR: write Status Done + Git Context closure, commit, push so the remote
+ * branch matches local TASK metadata (canonical two-phase close).
+ */
+async function commitClosureMetadataAndPush(opts) {
+    if (opts.dryRun) {
+        log.info(dim("  would set Status → Done and update Git Context (doneAt)"));
+        log.info(dim("  would commit closure metadata"));
+        if (opts.push !== null) {
+            log.info(dim(`  would git push ${opts.push.remote} ${opts.push.branch} (closure commit)`));
+        }
+        return true;
+    }
+    await updateInlineStatus(opts.taskFile, "done");
+    await markGitContextDone(opts.taskFile);
+    log.ok("Status → Done");
+    const committed = await tryCommitDirty(opts.cwd, closureCommitMessageFor(opts.taskId), false);
+    if (!committed) {
+        log.warn("No file changes for closure commit — verify TASK Status and Git Context on the remote branch.");
+        return true;
+    }
+    if (opts.push === null)
+        return true;
+    try {
+        await gitPush(opts.cwd, opts.push.remote, opts.push.branch, false);
+        log.ok(`Pushed closure commit → ${opts.push.remote}/${opts.push.branch}`);
+        return true;
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        log.error(`Closure commit push failed: ${msg}`);
+        log.info(dim(`Fix auth/remote, then: git push ${opts.push.remote} ${opts.push.branch}`));
+        return false;
+    }
+}
 export async function taskDoneCommand(taskRef, options = {}) {
     const cwd = resolve(options.cwd ?? process.cwd());
     const paths = projectPaths(cwd);
@@ -96,14 +135,27 @@ export async function taskDoneCommand(taskRef, options = {}) {
         if (!resultOk || !testOk) {
             log.info("  · LLM fill Result / Test Result + patch docs/project/*");
         }
-        log.info("  · commit if dirty, push task branch, open MR/PR (unless --no-pr)");
-        log.info("  · Status → Done after push/MR succeed");
+        log.info("  · commit implementation, push task branch, open MR/PR (unless --no-pr)");
+        log.info("  · Status → Done; commit closure metadata; push again");
         await finishTaskWithPullRequest({
             cwd,
             taskFile,
             dryRun: true,
             skipPr: options.noPr === true,
         });
+        const gitCtxDry = await readGitContext(taskFile);
+        const gitCfgDry = gitCtxDry !== null
+            ? await requireGitConfig(cwd).catch(() => null)
+            : null;
+        await commitClosureMetadataAndPush({
+            cwd,
+            taskFile,
+            taskId,
+            dryRun: true,
+            push: gitCtxDry !== null && gitCfgDry !== null
+                ? { remote: gitCfgDry.remote, branch: gitCtxDry.taskBranch }
+                : null,
+        });
         return;
     }
     const parts = parseTaskFilename(taskFile);
@@ -129,9 +181,30 @@ export async function taskDoneCommand(taskRef, options = {}) {
     else {
         log.info(dim("No Git Context — push/MR skipped."));
     }
-    await updateInlineStatus(taskFile, "done");
-    await markGitContextDone(taskFile);
-    log.ok("Status → Done");
+    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 closed = await commitClosureMetadataAndPush({
+        cwd,
+        taskFile,
+        taskId: parts.id,
+        dryRun: false,
+        push: pushTarget,
+    });
+    if (!closed) {
+        log.error("TASK metadata is Done locally but closure push failed — push manually, then continue.");
+        process.exitCode = 1;
+        return;
+    }
     log.blank();
     log.info(`Next: ${cyan("vibeops task add")} or ${cyan("vibeops status")}`);
 }

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@goodtek/vibeops",
-  "version": "1.1.1",
+  "version": "1.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": {
@@ -30,16 +29,6 @@
   "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",
@@ -58,5 +47,14 @@
     "@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"
   }
-}
+}

package/templates/.cursor/rules/02-git-safety.mdc

@@ -1,12 +0,0 @@
----
-description: Git safety for task branches and merge requests
-alwaysApply: true
----
-
-# Git safety
-
-- Branch policy lives in `.vibeops.json` (`integrationBranch`, `productionBranch`).
-- `vibeops task add` creates `task/*` from the **integration** branch (e.g. `develop`).
-- Include the TASK id in commit messages, e.g. `feat(task-015): short title`.
-- **`vibeops task done`** pushes the branch and opens an MR/PR — it does **not** merge locally.
-- Merge on GitHub/GitLab; CI deploys after merge. No force-push to shared branches.

package/templates/AGENTS.md

@@ -1,38 +0,0 @@
-# {{PROJECT_NAME}} — AI agent guide
-
-> Installed by **VibeOps**. Cursor reads this repo, not chat history.
-
-## Source of truth
-
-| What | Where |
-|------|--------|
-| Current work | `docs/tasks/TASK-NNN-*.md` |
-| Project memory | `docs/project/05-current-state.md`, `03-architecture.md`, `06-decisions.md` |
-| Change history | Git commits on task branches |
-| **Not** trusted | Cursor chat, Slack |
-
-## Before you code
-
-1. `docs/project/05-current-state.md`
-2. `docs/project/03-architecture.md` and `06-decisions.md` when relevant
-3. **The full current TASK file** under `docs/tasks/`
-
-## Workflow (human + CLI)
-
-```bash
-vibeops init              # once
-vibeops task add          # new TASK + branch
-# Plan in Cursor Ask: @docs/tasks/TASK-NNN-….md
-# Build in Cursor Agent: same file + Scope / Acceptance Criteria
-vibeops task done         # close TASK, update project docs, push + open MR/PR
-vibeops status            # briefing
-vibeops llm connect       # set up LLM providers and pick default
-```
-
-## Rules
-
-- **One TASK at a time** — stay inside Scope and Acceptance Criteria.
-- **Search** before adding files; reuse existing patterns.
-- When the TASK is finished, **Result** and **Test Result** must be filled before `vibeops task done`.
-
-Details: `.cursor/rules/`.