agentplane 0.2.4 → 0.2.5

package/assets/AGENTS.md

@@ -455,7 +455,7 @@ Always follow `workflow_mode` from `.agentplane/config.json`.
 Rules:
 
 - Do all work in the current checkout.
-- Task branches are allowed in `direct` (single working directory). Note: `agentplane work start <task-id> --agent <ROLE> --slug <slug>` will create/checkout `task/<task-id>/<slug>` in-place.
+- In `direct` (single working directory), agentplane uses a single-stream workflow in the current checkout. `agentplane work start <task-id> --agent <ROLE> --slug <slug>` records the active task and keeps the current branch (no task branches).
 - Do not use worktrees in `direct`. `agentplane work start ... --worktree` is `branch_pr`-only.
 - If you only need artifacts/docs without switching branches, prefer `agentplane task scaffold <task-id>`.
 

package/dist/cli/command-guide.js

@@ -89,7 +89,7 @@ const ROLE_GUIDES = [
     {
         role: "CODER",
         lines: [
-            "- direct mode: work in the current checkout; `agentplane work start <task-id> --agent <ROLE> --slug <slug>` creates/checks out `task/<task-id>/<slug>` in-place (no worktree). Use `agentplane task scaffold <task-id>` for docs without switching branches.",
+            "- direct mode: single-stream in the current checkout; `agentplane work start <task-id> --agent <ROLE> --slug <slug>` records the active task and keeps the current branch (no task branches). Use `agentplane task scaffold <task-id>` for docs without switching context.",
             "- branch_pr: `agentplane work start <task-id> --agent <ROLE> --slug <slug> --worktree`",
             '- Status updates: `agentplane start <task-id> --author <ROLE> --body "Start: ..."` / `agentplane block <task-id> --author <ROLE> --body "Blocked: ..."`',
             "- Verify Steps: `agentplane task verify-show <task-id>` (use as the verification contract before recording results).",
@@ -101,7 +101,7 @@ const ROLE_GUIDES = [
     {
         role: "TESTER",
         lines: [
-            "- direct mode: work in the current checkout; `agentplane work start <task-id> --agent <ROLE> --slug <slug>` creates/checks out `task/<task-id>/<slug>` in-place (no worktree). Use `agentplane task scaffold <task-id>` for docs without switching branches.",
+            "- direct mode: single-stream in the current checkout; `agentplane work start <task-id> --agent <ROLE> --slug <slug>` records the active task and keeps the current branch (no task branches). Use `agentplane task scaffold <task-id>` for docs without switching context.",
             "- branch_pr: `agentplane work start <task-id> --agent <ROLE> --slug <slug> --worktree`",
             '- Status updates: `agentplane start <task-id> --author <ROLE> --body "Start: ..."` / `agentplane block <task-id> --author <ROLE> --body "Blocked: ..."`',
             "- Verify Steps: `agentplane task verify-show <task-id>` (treat as the verification contract).",

package/dist/commands/branch/work-start.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-start.command.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAc,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,eAAe,CAgDtD,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAClE,cAAc,CAAC,eAAe,CAAC,CA4BjC"}
+{"version":3,"file":"work-start.command.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAc,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,eAAe,CAkDtD,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAClE,cAAc,CAAC,eAAe,CAAC,CA4BjC"}

package/dist/commands/branch/work-start.command.js

@@ -3,7 +3,7 @@ import { cmdWorkStart } from "./index.js";
 export const workStartSpec = {
     id: ["work", "start"],
     group: "Work",
-    summary: "Create or switch to the task branch (optionally via git worktree).",
+    summary: "Prepare the workspace for a task (direct: single-stream on current branch; branch_pr: task branch/worktree).",
     args: [
         { name: "task-id", required: true, valueHint: "<task-id>", description: "Existing task id." },
     ],
@@ -36,10 +36,11 @@ export const workStartSpec = {
     examples: [
         {
             cmd: "agentplane work start 202602030608-F1Q8AB --agent CODER --slug cli",
-            why: "Start work by checking out / creating the branch in-place (direct mode).",
+            why: "Start work (direct mode records the active task; branch_pr uses a dedicated task branch/worktree).",
         },
     ],
     notes: [
+        "When workflow_mode=direct, agentplane does not create task branches; it records a single active task for the workspace.",
         "When workflow_mode=branch_pr, --worktree is required and the command must be run on the base branch.",
     ],
     parse: (raw) => ({

package/dist/commands/branch/work-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-start.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAKnC,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoHlB"}
+{"version":3,"file":"work-start.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAuFnC,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkJlB"}

package/dist/commands/branch/work-start.js

@@ -1,8 +1,9 @@
-import { mkdir } from "node:fs/promises";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
 import { fileExists } from "../../cli/fs-utils.js";
+import { exitCodeForError } from "../../cli/exit-codes.js";
 import { successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { execFileAsync, gitEnv } from "../shared/git.js";
@@ -11,6 +12,76 @@ import { isPathWithin } from "../shared/path.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
 import { ensurePlanApprovedIfRequired } from "../task/shared.js";
 import { validateWorkAgent, validateWorkSlug } from "./internal/work-validate.js";
+function directWorkLockPath(agentplaneDir) {
+    // Intentionally under cache/ so it stays out of git by default.
+    return path.join(agentplaneDir, "cache", "direct-work.json");
+}
+async function readDirectWorkLock(agentplaneDir) {
+    try {
+        const text = await readFile(directWorkLockPath(agentplaneDir), "utf8");
+        const parsed = JSON.parse(text);
+        if (!parsed || typeof parsed !== "object")
+            return null;
+        if (typeof parsed.task_id !== "string" ||
+            typeof parsed.agent !== "string" ||
+            typeof parsed.slug !== "string" ||
+            typeof parsed.branch !== "string" ||
+            typeof parsed.started_at !== "string") {
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+async function writeDirectWorkLock(agentplaneDir, lock) {
+    const dir = path.dirname(directWorkLockPath(agentplaneDir));
+    await mkdir(dir, { recursive: true });
+    await writeFile(directWorkLockPath(agentplaneDir), JSON.stringify(lock, null, 2) + "\n", "utf8");
+}
+async function ensureGitClean(gitRoot) {
+    const { stdout } = await execFileAsync("git", ["status", "--porcelain"], {
+        cwd: gitRoot,
+        env: gitEnv(),
+    });
+    const lines = stdout
+        .split("\n")
+        .map((line) => line.trimEnd())
+        .filter((line) => line.trim().length > 0);
+    if (lines.length === 0)
+        return;
+    // Allow task workflow artifacts to be dirty. In direct mode we want a single-stream
+    // workflow without task branches, but we still expect task docs to change.
+    const allowedPrefixes = [
+        ".agentplane/tasks/",
+        ".agentplane/tasks.json",
+        ".agentplane/cache/",
+        ".agentplane/.upgrade/",
+        ".agentplane/upgrade/",
+    ];
+    const isAllowed = (p) => allowedPrefixes.some((prefix) => p.startsWith(prefix));
+    const dirty = lines
+        .map((line) => {
+        // Format: XY <path> (we only need the path-ish tail).
+        const rest = line.slice(2).trim();
+        if (!rest)
+            return "";
+        // Rename/copy format: "old -> new"
+        const arrow = rest.lastIndexOf(" -> ");
+        if (arrow === -1)
+            return rest;
+        return rest.slice(arrow + 4).trim();
+    })
+        .filter((p) => p.length > 0 && !isAllowed(p));
+    if (dirty.length === 0)
+        return;
+    throw new CliError({
+        exitCode: exitCodeForError("E_GIT"),
+        code: "E_GIT",
+        message: "Working tree has non-task changes. In workflow_mode=direct, agentplane runs tasks in a single stream on the current branch; commit/stash your changes before starting a different task.",
+    });
+}
 export async function cmdWorkStart(opts) {
     try {
         validateWorkAgent(opts.agent);
@@ -42,6 +113,28 @@ export async function cmdWorkStart(opts) {
         });
         ensurePlanApprovedIfRequired(task, config);
         const currentBranch = await gitCurrentBranch(resolved.gitRoot);
+        // direct mode: single-stream, no task branches.
+        if (mode === "direct") {
+            await ensureGitClean(resolved.gitRoot);
+            const existingLock = await readDirectWorkLock(resolved.agentplaneDir);
+            if (existingLock && existingLock.task_id !== opts.taskId) {
+                throw new CliError({
+                    exitCode: 2,
+                    code: "E_USAGE",
+                    message: `Another task is already active in this workspace (workflow_mode=direct): ${existingLock.task_id}. ` +
+                        `Finish it first, or delete ${path.relative(resolved.gitRoot, directWorkLockPath(resolved.agentplaneDir))} to override.`,
+                });
+            }
+            await writeDirectWorkLock(resolved.agentplaneDir, {
+                task_id: opts.taskId,
+                agent: opts.agent,
+                slug: opts.slug.trim(),
+                branch: currentBranch,
+                started_at: new Date().toISOString(),
+            });
+            process.stdout.write(`${successMessage("work start", opts.taskId, `mode=direct branch=${currentBranch}`)}\n`);
+            return 0;
+        }
         let baseRef = currentBranch;
         if (mode === "branch_pr") {
             const baseBranch = await resolveBaseBranch({
@@ -59,7 +152,7 @@ export async function cmdWorkStart(opts) {
             }
             if (currentBranch !== baseBranch) {
                 throw new CliError({
-                    exitCode: 5,
+                    exitCode: exitCodeForError("E_GIT"),
                     code: "E_GIT",
                     message: `work start must be run on base branch ${baseBranch} (current: ${currentBranch})`,
                 });

package/dist/commands/task/finish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAcnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyLlB"}
+{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA+BnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgMlB"}

package/dist/commands/task/finish.js

@@ -2,10 +2,28 @@ import { mapBackendError } from "../../cli/error-map.js";
 import { successMessage } from "../../cli/output.js";
 import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
 import { CliError } from "../../shared/errors.js";
+import { readFile, rm } from "node:fs/promises";
+import path from "node:path";
 import { commitFromComment } from "../guard/index.js";
 import { loadCommandContext, loadTaskFromContext, } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
 import { appendTaskEvent, defaultCommitEmojiForStatus, enforceStatusCommitPolicy, ensureVerificationSatisfiedIfRequired, nowIso, readCommitInfo, readHeadCommit, requireStructuredComment, } from "./shared.js";
+async function clearDirectWorkLockIfMatches(opts) {
+    const lockPath = path.join(opts.agentplaneDir, "cache", "direct-work.json");
+    try {
+        const text = await readFile(lockPath, "utf8");
+        const parsed = JSON.parse(text);
+        const lockTaskId = parsed && typeof parsed.task_id === "string" ? parsed.task_id : null;
+        if (!lockTaskId)
+            return;
+        if (!opts.taskIds.includes(lockTaskId))
+            return;
+        await rm(lockPath, { force: true });
+    }
+    catch {
+        // best-effort
+    }
+}
 export async function cmdFinish(opts) {
     try {
         const ctx = opts.ctx ??
@@ -162,6 +180,12 @@ export async function cmdFinish(opts) {
                 config: ctx.config,
             });
         }
+        if (ctx.config.workflow_mode === "direct") {
+            await clearDirectWorkLockIfMatches({
+                agentplaneDir: ctx.resolvedProject.agentplaneDir,
+                taskIds: opts.taskIds,
+            });
+        }
         if (!opts.quiet) {
             process.stdout.write(`${successMessage("finished")}\n`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentplane",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Agent Plane CLI for task workflows, recipes, and project automation.",
   "keywords": [
     "agentplane",
@@ -54,7 +54,7 @@
     "prepublishOnly": "npm run prepack"
   },
   "dependencies": {
-    "@agentplaneorg/core": "0.2.4",
+    "@agentplaneorg/core": "0.2.5",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {