@goodtek/vibeops 2.5.1 → 2.5.2

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to VibeOps are documented here.
 
 ## Unreleased
 
+## 2.5.2 - 2026-07-20
+
+### Fixed
+
+- **`task add` / integration sync:** Governance-only dirt (`.vibeops.json`, `AGENTS.md`, `.vibeops/`, docs, `.cursor/rules/`) no longer blocks preflight. Right after `init`, `task add` works without stash. App-file dirt still fails and lists the blocking paths.
+
 ## 2.5.1 - 2026-07-20
 
 ### Fixed

package/README.md

@@ -111,7 +111,7 @@ vibeops task release
 
 Only one TASK **In Progress** at a time (`task add` blocks otherwise). **Shipped** slices do not block the next add; merge on the host or with `task merge`, then optional `task sync`.
 
-`task add` fast-forward-pulls the integration branch first. If that fails (diverged / dirty / local-ahead), it prints the cause and fix commands and **does not** create a TASK file. If a previous run left a TASK file without a branch, rerun `task add` to resume.
+`task add` fast-forward-pulls the integration branch first. If that fails (diverged / **app** dirty / local-ahead), it prints the cause and fix commands and **does not** create a TASK file. VibeOps/governance-only changes (e.g. `.vibeops.json` after `init`) do **not** block. If a previous run left a TASK file without a branch, rerun `task add` to resume.
 
 ## Status
 

package/dist/lib/git-integration-sync.js

@@ -1,4 +1,4 @@
-import { gitFetchRemote, gitLeftRightCount, gitPullFastForwardOnly, gitRemoteBranchExists, gitRemoteUrl, gitRevParse, gitSwitchToBranch, readGitInfo, } from "./git.js";
+import { gitFetchRemote, gitGovernanceOnlyDirty, gitLeftRightCount, gitPullFastForwardOnly, gitRemoteBranchExists, gitRemoteUrl, gitRevParse, gitSwitchToBranch, readGitInfo, restoreGovernanceStashAfterSwitch, stashGovernanceIfBlocking, } from "./git.js";
 import { cyan, dim, log } from "./logger.js";
 function remoteRef(remote, branch) {
     return `${remote}/${branch}`;
@@ -6,6 +6,9 @@ function remoteRef(remote, branch) {
 /**
  * Classify why `git pull --ff-only` would fail for the integration branch.
  * Call after fetch when possible so `origin/branch` is current.
+ *
+ * Governance-only dirt (`.vibeops.json`, docs/, `.vibeops/`, …) does **not**
+ * block — `task add` right after `init` must work.
  */
 export async function diagnoseIntegrationSync(cwd, remote, integrationBranch) {
     if ((await gitRemoteUrl(cwd, remote)) === null) {
@@ -26,19 +29,28 @@ export async function diagnoseIntegrationSync(cwd, remote, integrationBranch) {
     }
     const git = await readGitInfo(cwd);
     if (git.dirty === true) {
-        return {
-            ok: false,
-            kind: "dirty",
-            summary: `Working tree is dirty — cannot fast-forward ${integrationBranch}.`,
-            fixes: [
-                "git status",
-                "git stash push -u -m \"vibeops: before sync\"",
-                `git checkout ${integrationBranch}`,
-                `git pull --ff-only ${remote} ${integrationBranch}`,
-                "git stash pop   # if you stashed",
-                "vibeops task add",
-            ],
-        };
+        const gov = await gitGovernanceOnlyDirty(cwd);
+        if (!gov.onlyGovernance) {
+            const blocking = gov.nonGovernancePaths.slice(0, 8);
+            const more = gov.nonGovernancePaths.length > blocking.length
+                ? ` (+${gov.nonGovernancePaths.length - blocking.length} more)`
+                : "";
+            return {
+                ok: false,
+                kind: "dirty",
+                summary: `Working tree has app changes — cannot fast-forward ${integrationBranch}.`,
+                fixes: [
+                    "git status",
+                    `# Blocking (non-governance): ${blocking.join(", ")}${more}`,
+                    "git stash push -u -m \"vibeops: before sync\"",
+                    `git checkout ${integrationBranch}`,
+                    `git pull --ff-only ${remote} ${integrationBranch}`,
+                    "git stash pop   # if you stashed",
+                    "vibeops task add",
+                ],
+            };
+        }
+        // Governance-only dirty (.vibeops.json after init, docs, …) — proceed.
     }
     const localSha = await gitRevParse(cwd, integrationBranch);
     const remoteSha = await gitRevParse(cwd, remoteRef(remote, integrationBranch));
@@ -129,6 +141,7 @@ export function printIntegrationSyncDiagnosis(d) {
 /**
  * Fetch + ensure local integration can be used as the base for a new task branch.
  * Switches to the integration branch, then `--ff-only` pull when needed. Never force-resets.
+ * Governance-only dirt is stashed around switch/pull so post-`init` `.vibeops.json` edits do not block.
  */
 export async function ensureIntegrationSynced(opts) {
     const { cwd, remote, integrationBranch } = opts;
@@ -184,6 +197,8 @@ export async function ensureIntegrationSynced(opts) {
     if (localSha !== null && remoteSha !== null && localSha === remoteSha) {
         return { ok: true, diagnosis, pulled: false };
     }
+    // Stash governance dirt so ff-only pull cannot be blocked by `.vibeops.json` etc.
+    const stashed = await stashGovernanceIfBlocking(cwd);
     try {
         await gitPullFastForwardOnly(cwd, remote, integrationBranch);
         diagnosis = {
@@ -211,4 +226,7 @@ export async function ensureIntegrationSynced(opts) {
         }
         return { ok: false, diagnosis, pulled: false };
     }
+    finally {
+        await restoreGovernanceStashAfterSwitch(cwd, stashed);
+    }
 }

package/dist/lib/git.js

@@ -299,12 +299,17 @@ const GOVERNANCE_DOC_REL_PREFIXES = [
     "docs/project/",
     "docs/logs/",
     ".vibeops/",
+    ".cursor/rules/",
 ];
+/** Root files owned by vibeops init / config (not under `.vibeops/`). */
+const GOVERNANCE_DOC_EXACT = new Set([".vibeops.json", "AGENTS.md"]);
 function normalizeRepoRelPath(p) {
     return p.replace(/\\/g, "/").replace(/^\/+/, "");
 }
 export function isGovernanceDocumentationPath(repoRelativePath) {
     const n = normalizeRepoRelPath(repoRelativePath);
+    if (GOVERNANCE_DOC_EXACT.has(n))
+        return true;
     for (const prefix of GOVERNANCE_DOC_REL_PREFIXES) {
         if (n.startsWith(prefix))
             return true;

package/package.json

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