@goodtek/vibeops 2.0.0 → 2.1.1

package/dist/lib/task.js

@@ -3,33 +3,31 @@ import { basename, extname, join } from "node:path";
 import matter from "gray-matter";
 import { isDirectory, readText, writeText } from "./filesystem.js";
 import { readGitInfo } from "./git.js";
-const KNOWN_STATUSES = new Set([
-    "planned",
-    "in_progress",
+const SHIPPED_ALIASES = new Set([
     "review",
-    "blocked",
+    "merged",
     "done",
+    "shipped",
+    "ready_for_review",
 ]);
 export function normalizeStatus(value) {
     if (typeof value === "string") {
         const s = value.toLowerCase().replace(/\s+/g, "_");
-        if (KNOWN_STATUSES.has(s))
-            return s;
+        if (s === "in_progress" || s === "inprogress")
+            return "in_progress";
+        if (SHIPPED_ALIASES.has(s))
+            return "shipped";
+        if (s === "planned" || s === "blocked")
+            return "in_progress";
     }
-    return "planned";
+    return "in_progress";
 }
 export function statusDisplay(status) {
     switch (status) {
-        case "planned":
-            return "Planned";
         case "in_progress":
             return "In Progress";
-        case "review":
-            return "Review";
-        case "blocked":
-            return "Blocked";
-        case "done":
-            return "Done";
+        case "shipped":
+            return "Shipped";
     }
 }
 function extractIdFromFilename(file) {
@@ -89,7 +87,7 @@ export async function readTaskFile(filePath) {
     const title = titleFromFm ?? extractTitleFromBody(body);
     const status = data["status"] !== undefined
         ? normalizeStatus(data["status"])
-        : (extractInlineStatus(body) ?? "planned");
+        : (extractInlineStatus(body) ?? "in_progress");
     const mvpPhaseFromFm = typeof data["mvpPhase"] === "string" ? data["mvpPhase"] : undefined;
     const mvpPhase = mvpPhaseFromFm ?? extractInlineMvpPhase(body);
     const priority = typeof data["priority"] === "string" ? data["priority"] : undefined;
@@ -117,11 +115,8 @@ export async function scanTasks(tasksDir) {
 export function countTasks(tasks) {
     const counts = {
         total: tasks.length,
-        planned: 0,
         in_progress: 0,
-        review: 0,
-        blocked: 0,
-        done: 0,
+        shipped: 0,
     };
     for (const t of tasks)
         counts[t.status]++;
@@ -131,14 +126,7 @@ export function pickInProgressTask(tasks) {
     return tasks.find((t) => t.status === "in_progress") ?? null;
 }
 export function pickNextTask(tasks) {
-    const inProgress = pickInProgressTask(tasks);
-    if (inProgress)
-        return inProgress;
-    const review = tasks.find((t) => t.status === "review");
-    if (review)
-        return review;
-    const planned = tasks.filter((t) => t.status === "planned");
-    return planned[0] ?? null;
+    return pickInProgressTask(tasks);
 }
 const TEMPLATE_TASK_ID = "TASK-000";
 export function filterActionableTasks(tasks) {
@@ -148,19 +136,12 @@ function taskSortKey(id) {
     const m = /^TASK-(\d+)$/i.exec(id.trim());
     return m ? Number.parseInt(m[1], 10) : 0;
 }
-/** Latest finished TASK by numeric id (TASK-mvp sorts after numbered tasks). */
-export function pickLatestDoneTask(tasks) {
-    const done = filterActionableTasks(tasks).filter((t) => t.status === "done");
-    if (done.length === 0)
+/** Latest **Shipped** TASK (for merge / sync targeting). */
+export function pickLatestShippedTask(tasks) {
+    const shipped = filterActionableTasks(tasks).filter((t) => t.status === "shipped");
+    if (shipped.length === 0)
         return null;
-    return [...done].sort((a, b) => taskSortKey(b.id) - taskSortKey(a.id))[0];
-}
-/** Latest TASK in Review (awaiting merge / sync). */
-export function pickLatestReviewTask(tasks) {
-    const review = filterActionableTasks(tasks).filter((t) => t.status === "review");
-    if (review.length === 0)
-        return null;
-    return [...review].sort((a, b) => taskSortKey(b.id) - taskSortKey(a.id))[0];
+    return [...shipped].sort((a, b) => taskSortKey(b.id) - taskSortKey(a.id))[0];
 }
 export async function loadActionableTasks(tasksDir) {
     return filterActionableTasks(await scanTasks(tasksDir));
@@ -185,7 +166,7 @@ export async function pickActiveTask(tasksDir, cwd) {
                 return t;
         }
     }
-    return pickNextTask(actionable);
+    return pickNextTask(actionable.filter((t) => t.status === "in_progress"));
 }
 export async function findTaskFile(tasksDir, taskId) {
     const all = await scanTasks(tasksDir);
@@ -350,6 +331,29 @@ export async function updateTaskSection(filePath, title, content) {
         await writeText(filePath, updated);
     }
 }
+function parsePreviousMergeRequestUrls(content) {
+    const lines = content.split("\n");
+    const urls = [];
+    let inBlock = false;
+    for (const line of lines) {
+        const t = line.trim();
+        if (t.startsWith("- Previous Merge Requests:")) {
+            inBlock = true;
+            continue;
+        }
+        if (inBlock) {
+            const m = /^\s*-\s+(https?:\/\/.+)$/.exec(line);
+            if (m) {
+                urls.push(m[1].trim());
+                continue;
+            }
+            if (t.startsWith("- ") && !line.startsWith("  ")) {
+                break;
+            }
+        }
+    }
+    return urls;
+}
 function renderGitContextBlock(ctx) {
     const lines = [
         `- Base Branch: \`${ctx.baseBranch}\``,
@@ -363,11 +367,39 @@ function renderGitContextBlock(ctx) {
     if (typeof ctx.mergeRequestUrl === "string" && ctx.mergeRequestUrl.length > 0) {
         lines.push(`- Merge Request: ${ctx.mergeRequestUrl}`);
     }
+    const prev = ctx.previousMergeRequestUrls ?? [];
+    if (prev.length > 0) {
+        lines.push("- Previous Merge Requests:");
+        for (const url of prev) {
+            lines.push(`  - ${url}`);
+        }
+    }
     if (typeof ctx.pushedAt === "string" && ctx.pushedAt.length > 0) {
         lines.push(`- Pushed At: \`${ctx.pushedAt}\``);
     }
+    if (typeof ctx.lastReshipAt === "string" && ctx.lastReshipAt.length > 0) {
+        lines.push(`- Last Reship At: \`${ctx.lastReshipAt}\``);
+    }
+    if (typeof ctx.reshipCount === "number" && ctx.reshipCount > 0) {
+        lines.push(`- Reship Count: \`${ctx.reshipCount}\``);
+    }
     return lines.join("\n");
 }
+/** Archive current MR URL and bump reship metadata before opening a follow-up PR. */
+export function archiveMergeRequestForReship(ctx) {
+    const previous = [...(ctx.previousMergeRequestUrls ?? [])];
+    const current = ctx.mergeRequestUrl?.trim();
+    if (typeof current === "string" && current.length > 0) {
+        previous.push(current);
+    }
+    return {
+        ...ctx,
+        previousMergeRequestUrls: previous.length > 0 ? previous : undefined,
+        mergeRequestUrl: undefined,
+        reshipCount: (ctx.reshipCount ?? 0) + 1,
+        lastReshipAt: new Date().toISOString(),
+    };
+}
 export async function upsertGitContext(filePath, ctx) {
     const raw = await readText(filePath);
     const block = renderGitContextBlock(ctx);
@@ -396,6 +428,8 @@ const GIT_CTX_RE = {
     doneAt: /^-\s+Done At:\s*`([^`]+)`/m,
     mergeRequestUrl: /^-\s+Merge Request:\s*(.+)$/m,
     pushedAt: /^-\s+Pushed At:\s*`([^`]+)`/m,
+    lastReshipAt: /^-\s+Last Reship At:\s*`([^`]+)`/m,
+    reshipCount: /^-\s+Reship Count:\s*`(\d+)`/m,
 };
 export async function markGitContextDone(filePath) {
     const ctx = await readGitContext(filePath);
@@ -417,13 +451,27 @@ export async function readGitContext(filePath) {
     const doneAt = content.match(GIT_CTX_RE.doneAt)?.[1];
     const mergeRequestUrl = content.match(GIT_CTX_RE.mergeRequestUrl)?.[1]?.trim();
     const pushedAt = content.match(GIT_CTX_RE.pushedAt)?.[1];
+    const lastReshipAt = content.match(GIT_CTX_RE.lastReshipAt)?.[1];
+    const reshipCountRaw = content.match(GIT_CTX_RE.reshipCount)?.[1];
+    const previousMergeRequestUrls = parsePreviousMergeRequestUrls(content);
     const ctx = { baseBranch, baseCommit, taskBranch, startedAt };
     if (typeof doneAt === "string" && doneAt.length > 0)
         ctx.doneAt = doneAt;
     if (typeof mergeRequestUrl === "string" && mergeRequestUrl.length > 0) {
         ctx.mergeRequestUrl = mergeRequestUrl;
     }
+    if (previousMergeRequestUrls.length > 0) {
+        ctx.previousMergeRequestUrls = previousMergeRequestUrls;
+    }
     if (typeof pushedAt === "string" && pushedAt.length > 0)
         ctx.pushedAt = pushedAt;
+    if (typeof lastReshipAt === "string" && lastReshipAt.length > 0) {
+        ctx.lastReshipAt = lastReshipAt;
+    }
+    if (typeof reshipCountRaw === "string") {
+        const n = Number.parseInt(reshipCountRaw, 10);
+        if (Number.isFinite(n) && n > 0)
+            ctx.reshipCount = n;
+    }
     return ctx;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodtek/vibeops",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Minimal CLI rails for Cursor-based TASK-driven vibe coding.",
   "type": "module",
   "author": "VibeOps contributors",

package/templates/clients/claude/CLAUDE.md

@@ -2,5 +2,5 @@
 
 - Work from `docs/tasks/TASK-NNN-*.md` only.
 - One TASK at a time.
-- Fill **Result** and **Test Result** before telling the human to run `vibeops task ship TASK-NNN`.
-- Do not merge to integration or main unless the human runs `vibeops task merge` / `task release`.
+- Fill **Result** and **Test Result** before telling the human to run `vibeops task ship TASK-NNN` (or `task reship` for Shipped follow-up).
+- Do not merge to integration or main unless the human runs `vibeops task merge` / `task sync` / `task release`.

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

@@ -8,4 +8,4 @@ alwaysApply: true
 - Use branch pattern `task/*` from `vibeops task add`.
 - Include TASK id in commits: `feat(task-nnn): …`.
 - No force-push to shared branches.
-- Run `vibeops task ship`, `task merge`, `task sync` when the human asks — do not merge locally in the IDE unless requested.
+- Run `vibeops task ship`, `task reship`, `task merge`, `task sync` when the human asks — do not merge locally in the IDE unless requested.

package/templates/clients/cursor/.cursor/rules/03-docs-before-ship.mdc

@@ -5,7 +5,7 @@ alwaysApply: true
 
 # Docs before task ship
 
-Before `vibeops task ship`:
+Before `vibeops task ship` or `vibeops task reship`:
 
 1. Fill **Result** and **Test Result** in the TASK file (paths, commands, outcomes — facts only).
 2. If architecture or decisions changed, note them in the TASK; `task ship` can update `docs/project/*` via LLM.

package/templates/core/AGENTS.md

@@ -9,18 +9,33 @@ vibeops task add
 # Plan / build in your agent (@docs/tasks/TASK-NNN-*.md)
 
 vibeops task ship
+vibeops task merge          # CLI or host UI
+vibeops task sync           # optional — branch cleanup only
+
+# Same TASK follow-up (after merge):
+vibeops task reship TASK-NNN
 vibeops task merge
-vibeops task sync
 ```
 
 Optional release to production: `vibeops task release`.
 
+## TASK status (markdown)
+
+Only two values in `## Status`:
+
+| Status | Meaning |
+|--------|---------|
+| **In Progress** | Active slice (`task add`) |
+| **Shipped** | Submitted (`task ship` or `task reship`) |
+
+Merge and sync do **not** change the TASK file.
+
 ```bash
-vibeops llm connect   # optional — task add / task ship
+vibeops llm connect   # optional — task add / ship / reship
 ```
 
 ## Rules
 
-- One TASK at a time; scope from `docs/tasks/TASK-NNN-*.md`.
-- Fill **Result** and **Test Result** before `vibeops task ship`.
-- Agents do not merge or sync unless the human asks.
+- One **In Progress** TASK at a time; **Shipped** does not block `task add`.
+- Fill **Result** and **Test Result** before `vibeops task ship` (or before `task reship` for follow-ups).
+- Agents do not run `task merge`, `task sync`, or `task reship` unless the human asks.

package/templates/core/docs/project/05-current-state.md

@@ -1,6 +1,6 @@
 # Current state
 
-> Facts only. Updated by `vibeops task ship` / humans; stage changes on `task sync`.
+> Facts only. Updated by `vibeops task ship` / humans after merge (not by `task sync`).
 
 ## Stage
 

package/templates/core/docs/project/06-decisions.md

@@ -5,5 +5,5 @@
 ## D-001 · VibeOps workflow
 
 - **Date:** {{CREATED_AT}}
-- **Decision:** TASK-driven development with `vibeops task add` / `task ship` / `merge` / `sync` and Cursor for plan/build.
+- **Decision:** TASK-driven development with `vibeops task add` / `task ship` / `task reship` / `merge` / `sync` and Cursor for plan/build. TASK status: **In Progress** → **Shipped** only.
 - **Why:** Git `docs/tasks` beats chat as source of truth.

package/templates/core/docs/tasks/TASK-000-template.md

@@ -2,7 +2,7 @@
 
 ## Status
 
-Planned
+In Progress
 
 ## Goal
 

package/templates/skills-shared/implement-task/SKILL.md

@@ -8,6 +8,6 @@ description: Implement the current VibeOps TASK file in the repo.
 1. Read the full `docs/tasks/TASK-NNN-*.md` (Scope, Acceptance Criteria, Test Plan).
 2. Search the codebase before adding new patterns.
 3. Implement only within the TASK scope.
-4. Do not run `vibeops task ship`, `merge`, or `sync` — the human runs the CLI lifecycle.
+4. Do not run `vibeops task ship`, `reship`, `merge`, or `sync` — the human runs the CLI lifecycle.
 
-When implementation is ready, tell the human to run `vibeops task ship TASK-NNN`.
+When implementation is ready, tell the human to run `vibeops task ship TASK-NNN`. For a **Shipped** follow-up after merge, use `vibeops task reship TASK-NNN`.