@goodtek/vibeops 1.1.2 → 2.1.0

package/dist/lib/task-lifecycle-target.js

@@ -0,0 +1,41 @@
+import { readGitInfo } from "./git.js";
+import { isOnTaskBranch, loadActionableTasks, pickLatestShippedTask, readGitContext, } from "./task.js";
+import { resolveTask } from "./resolve-task.js";
+/** Resolve TASK + task branch for ship / merge / sync. */
+export async function resolveLifecycleTarget(paths, cwd, taskRef) {
+    const trimmed = taskRef?.trim();
+    if (trimmed !== undefined && trimmed.length > 0) {
+        const resolved = await resolveTask(paths, cwd, trimmed);
+        if (resolved === null)
+            return null;
+        const ctx = await readGitContext(resolved.taskFile);
+        if (ctx === null)
+            return null;
+        return {
+            taskId: resolved.taskId,
+            taskBranch: ctx.taskBranch,
+            taskFile: resolved.taskFile,
+        };
+    }
+    const git = await readGitInfo(cwd);
+    if (git.isRepo && typeof git.branch === "string" && git.branch.startsWith("task/")) {
+        const tasks = await loadActionableTasks(paths.docsTasks);
+        for (const t of tasks) {
+            const ctx = await readGitContext(t.filePath);
+            if (isOnTaskBranch(git.branch, ctx)) {
+                return { taskId: t.id, taskBranch: git.branch, taskFile: t.filePath };
+            }
+        }
+    }
+    const shipped = pickLatestShippedTask(await loadActionableTasks(paths.docsTasks));
+    if (shipped === null)
+        return null;
+    const ctx = await readGitContext(shipped.filePath);
+    if (ctx === null)
+        return null;
+    return {
+        taskId: shipped.id,
+        taskBranch: ctx.taskBranch,
+        taskFile: shipped.filePath,
+    };
+}

package/dist/lib/task-scaffold.js

@@ -28,7 +28,7 @@ export function buildMinimalTaskMarkdown(draft) {
 
 ## Status
 
-${statusDisplay("planned")}
+${statusDisplay("in_progress")}
 
 ## Goal
 
@@ -45,7 +45,7 @@ ${draft.idea.trim()}
 ## Acceptance Criteria
 
 1. Goal and Scope are met and verifiable via Test Plan.
-2. Result and Test Result are filled before \`vibeops task done\`.
+2. Result and Test Result are filled before \`vibeops task ship\`.
 
 ## Test Plan
 

package/dist/lib/{task-done-llm.js → task-ship-llm.js}

@@ -17,7 +17,7 @@ function localDateFilename() {
 async function readOptional(path) {
     return readTextOrNull(path);
 }
-export async function llmCompleteTaskDone(params) {
+export async function llmCompleteTaskShip(params) {
     const git = await readGitInfo(params.cwd);
     let diffSummary = "";
     if (git.isRepo) {
@@ -31,7 +31,7 @@ export async function llmCompleteTaskDone(params) {
     const messages = [
         {
             role: "system",
-            content: `You close a VibeOps TASK. Reply with JSON only:
+            content: `You ship a VibeOps TASK (Status → Shipped). Reply with JSON only:
 {
   "result": "markdown for TASK Result section — facts, paths, commands",
   "testResult": "markdown for Test Result — commands and outcomes",
@@ -91,7 +91,7 @@ Be factual. Do not invent files not in the diff.`,
                 : null,
             logLine: typeof parsed.logLine === "string" && parsed.logLine.trim().length > 0
                 ? parsed.logLine.trim()
-                : `${params.taskId} done.`,
+                : `${params.taskId} shipped.`,
             provider,
         };
     }
@@ -99,7 +99,7 @@ Be factual. Do not invent files not in the diff.`,
         return null;
     }
 }
-export async function applyTaskDoneMemory(cwd, patch) {
+export async function applyTaskShipMemory(cwd, patch) {
     const paths = projectPaths(cwd);
     const updated = [];
     const skipped = [];
@@ -142,12 +142,15 @@ export async function writeTaskResultSections(taskFile, result, testResult) {
     await updateTaskSection(taskFile, "Result", result);
     await updateTaskSection(taskFile, "Test Result", testResult);
 }
-/** Minimal fallback when LLM unavailable — git-only sections from diff. */
 export async function fallbackResultSections(cwd, taskId, taskFile) {
     const names = await gitDiffNameOnly(cwd);
     const body = await readText(taskFile);
     const goal = readSection(body, "Goal").slice(0, 200);
-    const result = [`Completed ${taskId}.`, goal.length > 0 ? `Goal: ${goal}` : "", names.length > 0 ? `Paths: ${names.slice(0, 15).join(", ")}` : ""]
+    const result = [
+        `Shipped ${taskId}.`,
+        goal.length > 0 ? `Goal: ${goal}` : "",
+        names.length > 0 ? `Paths: ${names.slice(0, 15).join(", ")}` : "",
+    ]
         .filter((l) => l.length > 0)
         .join("\n");
     const testResult = names.length > 0 ? `Changed: ${names.join(", ")}` : "Manual verification required.";

package/dist/lib/task-start.js

@@ -81,7 +81,7 @@ export async function startTaskBranch(opts) {
     log.info(`  ${dim("task branch")}  ${cyan(taskBranch)}`);
     if (branchExists) {
         await gitCheckout(cwd, taskBranch);
-        if (meta.status === "planned") {
+        if (meta.status !== "shipped") {
             await updateInlineStatus(taskFile, "in_progress");
         }
         if (existingCtx === null) {

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,12 +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];
+    return [...shipped].sort((a, b) => taskSortKey(b.id) - taskSortKey(a.id))[0];
 }
 export async function loadActionableTasks(tasksDir) {
     return filterActionableTasks(await scanTasks(tasksDir));
@@ -178,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);

package/package.json

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

package/templates/clients/claude/CLAUDE.md

@@ -1,28 +1,6 @@
-# {{PROJECT_NAME}} — Claude Code
+# Claude Code — VibeOps
 
-Read **`AGENTS.md`** first (VibeOps workflow and source of truth).
-
-## Skills (project)
-
-| Skill | When |
-|-------|------|
-| `/plan-task` | Refine `docs/tasks/TASK-NNN-*.md` before coding |
-| `/implement-task` | Build per TASK Scope and Acceptance Criteria |
-
-Skills live in `.claude/skills/`.
-
-## Session start
-
-1. `docs/project/05-current-state.md`
-2. The **full** current `docs/tasks/TASK-NNN-*.md` file
-3. `docs/project/03-architecture.md` and `06-decisions.md` when relevant
-
-## Git
-
-- Branch: `task/*` from `vibeops task add`
-- Commit messages include the TASK id, e.g. `feat(task-015): short title`
-- Do not merge to main unless the human runs `vibeops task done` or asks
-
-## Finishing
-
-Fill **Result** and **Test Result** in the TASK file, then tell the human to run `vibeops task done TASK-NNN`.
+- 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`.

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

@@ -1,11 +1,11 @@
 ---
-description: Git safety for task branches and commits
+description: Git safety for TASK branches
 alwaysApply: true
 ---
 
 # Git safety
 
-- Use branch pattern `task/*` created by `vibeops task add`.
-- Include the TASK id in commit messages, e.g. `feat(task-015): short title`.
-- **No force-push** to shared branches (`main`, `master`).
-- Do not merge or push unless the human runs `vibeops task done` or asks explicitly.
+- 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.

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

@@ -0,0 +1,13 @@
+---
+description: Update TASK Result and project memory before shipping
+alwaysApply: true
+---
+
+# Docs before task ship
+
+Before `vibeops task ship`:
+
+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.
+
+Do not ship with placeholder `(not yet)` sections.

package/templates/core/AGENTS.md

@@ -1,44 +1,26 @@
-# {{PROJECT_NAME}} — AI agent guide
+# Project — AI Agent Guide
 
-> Installed by **VibeOps**. Agents read this repo and `docs/tasks/`, not chat history.
+> Installed by VibeOps. Read before coding.
 
-## Source of truth
+## TASK workflow
 
-| 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 | Chat history, Slack |
-
-## Before you code
+```bash
+vibeops task add
+# Plan / build in your agent (@docs/tasks/TASK-NNN-*.md)
 
-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/`
+vibeops task ship
+vibeops task merge
+vibeops task sync
+```
 
-## Workflow (human + CLI)
+Optional release to production: `vibeops task release`.
 
 ```bash
-vibeops init              # once (pick Cursor / Claude Code / Codex packs)
-vibeops task add          # new TASK + branch
-# Plan: refine TASK file with your agent (see client skills below)
-# Build: implement per TASK Scope / Acceptance Criteria
-vibeops task done         # close TASK, update project docs, merge
-vibeops status            # briefing
-vibeops llm connect       # LLM for task add / task done
+vibeops llm connect   # optional — task add / task ship
 ```
 
-## Client packs (installed at init)
-
-| Tool | Rules / guide | Skills |
-|------|----------------|--------|
-| **Cursor** | `.cursor/rules/` | `.cursor/skills/` (`plan-task`, `implement-task`) |
-| **Claude Code** | `CLAUDE.md` | `.claude/skills/` |
-| **Codex CLI** | `AGENTS.md` (this file) | `.agents/skills/` |
-
-## Rules (all agents)
+## Rules
 
-- **One TASK at a time** — stay inside Scope and Acceptance Criteria.
-- **Search** before adding files; reuse existing patterns.
-- Fill **Result** and **Test Result** before `vibeops task done`.
+- 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.

package/templates/core/docs/logs/README.md

@@ -2,6 +2,6 @@
 
 Append-only files: `docs/logs/YYYY-MM-DD.md`.
 
-`vibeops task done` may append a short entry when a TASK closes.
+`vibeops task ship` may append a short entry via LLM when shipping a TASK.
 
 Keep entries factual: TASK id, paths touched, commands run.

package/templates/core/docs/project/03-architecture.md

@@ -1,6 +1,6 @@
 # Architecture
 
-> Living overview. Update when structure or major paths change (often via `vibeops task done`).
+> Living overview. Update when structure or major paths change (often via `vibeops task ship`).
 
 ## System
 

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

@@ -1,6 +1,6 @@
 # Current state
 
-> Facts only. Updated by `vibeops task done` and humans.
+> 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 done` and Cursor for plan/build.
+- **Decision:** TASK-driven development with `vibeops task add` / `task ship` / `merge` / `sync` and Cursor for plan/build.
 - **Why:** Git `docs/tasks` beats chat as source of truth.

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

@@ -1,22 +1,13 @@
 ---
 name: implement-task
-description: Implements the current VibeOps TASK per Scope and Acceptance Criteria. Use when building features for docs/tasks/TASK-NNN.md.
-disable-model-invocation: true
+description: Implement the current VibeOps TASK file in the repo.
 ---
 
-# Implement a TASK
+# Implement TASK
 
-## Read first
+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.
 
-1. `AGENTS.md` and your agent rules (e.g. `.cursor/rules/`, `CLAUDE.md`)
-2. `docs/project/05-current-state.md`, `03-architecture.md`, `06-decisions.md`
-3. The TASK file referenced by the human
-
-## Instructions
-
-1. Work **only** within Scope and Acceptance Criteria.
-2. Search the repo before adding files; match existing patterns.
-3. Fill **Result** and **Test Result** with facts when done.
-4. Do not run `vibeops task done` or merge — the human closes the TASK.
-
-Tell the human to run `vibeops task done TASK-NNN` when ready.
+When implementation is ready, tell the human to run `vibeops task ship TASK-NNN`.

package/templates/clients/cursor/.cursor/rules/03-docs-on-done.mdc

@@ -1,13 +0,0 @@
----
-description: Update TASK Result and project memory when finishing work
-alwaysApply: true
----
-
-# Docs when finishing a TASK
-
-Before `vibeops task done`:
-
-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 done` updates `docs/project/*`.
-
-Do not mark a TASK complete with placeholder `(not yet)` sections.