agentplane 0.3.14 → 0.3.16

package/dist/commands/shared/git-ops.js

@@ -1,155 +1,9 @@
-import { execFileAsync, gitEnv } from "./git.js";
-import { setPinnedBaseBranch } from "@agentplaneorg/core";
+import { execFileAsync, gitBranchExists, gitCurrentBranch, gitAddPaths, gitCommit, gitListBranches, gitEnv, gitStagedPaths, setPinnedBaseBranch, } from "@agentplaneorg/core";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { promptChoice, promptInput } from "../../cli/prompts.js";
 import { CliError } from "../../shared/errors.js";
-export async function gitRevParse(cwd, args) {
-    const { stdout } = await execFileAsync("git", ["rev-parse", ...args], { cwd, env: gitEnv() });
-    const trimmed = stdout.trim();
-    if (!trimmed)
-        throw new Error("Failed to resolve git path");
-    return trimmed;
-}
-export async function gitCurrentBranch(cwd) {
-    try {
-        const { stdout } = await execFileAsync("git", ["symbolic-ref", "--short", "HEAD"], {
-            cwd,
-            env: gitEnv(),
-        });
-        const trimmed = stdout.trim();
-        if (trimmed)
-            return trimmed;
-    }
-    catch {
-        // fall through
-    }
-    const { stdout } = await execFileAsync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
-        cwd,
-        env: gitEnv(),
-    });
-    const trimmed = stdout.trim();
-    if (!trimmed || trimmed === "HEAD") {
-        throw new CliError({
-            code: "E_GIT",
-            exitCode: exitCodeForError("E_GIT"),
-            message: "Detached HEAD: failed to resolve current branch",
-        });
-    }
-    return trimmed;
-}
-export async function gitBranchExists(cwd, branch) {
-    try {
-        await execFileAsync("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], {
-            cwd,
-            env: gitEnv(),
-        });
-        return true;
-    }
-    catch (err) {
-        const code = err?.code;
-        if (code === 1)
-            return false;
-        throw err;
-    }
-}
-export async function gitIsAncestor(cwd, maybeAncestor, descendant) {
-    try {
-        await execFileAsync("git", ["merge-base", "--is-ancestor", maybeAncestor, descendant], {
-            cwd,
-            env: gitEnv(),
-        });
-        return true;
-    }
-    catch (err) {
-        const code = err?.code;
-        if (code === 1)
-            return false;
-        throw err;
-    }
-}
-export async function gitBranchUpstream(cwd, branch) {
-    try {
-        const { stdout } = await execFileAsync("git", ["for-each-ref", "--format=%(upstream:short)", `refs/heads/${branch}`], {
-            cwd,
-            env: gitEnv(),
-        });
-        const trimmed = stdout.trim();
-        return trimmed.length > 0 ? trimmed : null;
-    }
-    catch {
-        return null;
-    }
-}
-export async function gitListBranches(cwd) {
-    const { stdout } = await execFileAsync("git", ["branch", "--format=%(refname:short)"], {
-        cwd,
-        env: gitEnv(),
-    });
-    return stdout
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0);
-}
-export async function gitStagedPaths(cwd) {
-    const { stdout } = await execFileAsync("git", ["diff", "--cached", "--name-only"], {
-        cwd,
-        env: gitEnv(),
-    });
-    return stdout
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0);
-}
-export async function gitAddPaths(cwd, paths) {
-    if (paths.length === 0)
-        return;
-    await execFileAsync("git", ["add", "--", ...paths], { cwd, env: gitEnv() });
-}
-export async function gitCommit(cwd, message, opts) {
-    const args = ["commit", "-m", message];
-    if (opts?.skipHooks)
-        args.push("--no-verify");
-    const env = opts?.env ? { ...gitEnv(), ...opts.env } : gitEnv();
-    await execFileAsync("git", args, { cwd, env });
-}
-export async function gitInitRepo(cwd, branch) {
-    try {
-        await execFileAsync("git", ["init", "-q", "-b", branch], { cwd, env: gitEnv() });
-        return;
-    }
-    catch {
-        await execFileAsync("git", ["init", "-q"], { cwd, env: gitEnv() });
-    }
-    try {
-        const current = await gitCurrentBranch(cwd);
-        if (current !== branch) {
-            await execFileAsync("git", ["checkout", "-q", "-b", branch], { cwd, env: gitEnv() });
-        }
-    }
-    catch {
-        await execFileAsync("git", ["checkout", "-q", "-b", branch], { cwd, env: gitEnv() });
-    }
-}
-export async function resolveInitBaseBranch(gitRoot, fallback) {
-    let current = null;
-    try {
-        current = await gitCurrentBranch(gitRoot);
-    }
-    catch {
-        current = null;
-    }
-    const branches = await gitListBranches(gitRoot);
-    if (current)
-        return current;
-    if (branches.includes(fallback))
-        return fallback;
-    if (branches.length > 0) {
-        const first = branches[0];
-        if (first)
-            return first;
-    }
-    return fallback;
-}
+import { emitTraceEvent } from "../../shared/trace-events.js";
+export { gitBranchExists, gitBranchUpstream, gitCurrentBranch, gitIsAncestor, gitListBranches, gitRevParse, gitAddPaths, gitCommit, gitInitRepo, gitStagedPaths, resolveInitBaseBranch, } from "@agentplaneorg/core";
 export async function promptInitBaseBranch(opts) {
     const branches = await gitListBranches(opts.gitRoot);
     let current = null;
@@ -192,6 +46,11 @@ export async function promptInitBaseBranch(opts) {
     return choice;
 }
 export async function ensureInitCommit(opts) {
+    emitTraceEvent({
+        component: "git-ops",
+        event: "init_commit_started",
+        details: { base_branch: opts.baseBranch, path_count: opts.installPaths.length },
+    });
     const stagedBefore = await gitStagedPaths(opts.gitRoot);
     if (stagedBefore.length > 0) {
         throw new CliError({
@@ -208,8 +67,19 @@ export async function ensureInitCommit(opts) {
     const dedupedPaths = [...new Set(opts.installPaths)].filter((entry) => entry.length > 0);
     await gitAddPaths(opts.gitRoot, dedupedPaths);
     const staged = await gitStagedPaths(opts.gitRoot);
-    if (staged.length === 0)
+    if (staged.length === 0) {
+        emitTraceEvent({
+            component: "git-ops",
+            event: "init_commit_skipped",
+            details: { reason: "no_staged_changes" },
+        });
         return;
+    }
     const message = `chore: install agentplane ${opts.version}`;
     await gitCommit(opts.gitRoot, message, { skipHooks: opts.skipHooks });
+    emitTraceEvent({
+        component: "git-ops",
+        event: "init_commit_completed",
+        details: { staged_path_count: staged.length, skip_hooks: opts.skipHooks },
+    });
 }

package/dist/commands/shared/git-worktree.d.ts

@@ -1,10 +1,2 @@
-export declare function listWorktrees(cwd: string): Promise<{
-    path: string;
-    branch: string | null;
-}[]>;
-export declare function findWorktreeForBranch(cwd: string, branch: string): Promise<string | null>;
-export declare function parseTaskIdFromBranch(prefix: string, branch: string): string | null;
-export declare function parseTaskIdFromCloseBranch(branch: string): string | null;
-export declare function gitListBranchesByPrefixes(cwd: string, prefixes: string[]): Promise<string[]>;
-export declare function gitListTaskBranches(cwd: string, prefix: string): Promise<string[]>;
+export { findWorktreeForBranch, gitListBranchesByPrefixes, gitListTaskBranches, listWorktrees, parseTaskIdFromBranch, parseTaskIdFromCloseBranch, } from "@agentplaneorg/core";
 //# sourceMappingURL=git-worktree.d.ts.map

package/dist/commands/shared/git-worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-worktree.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git-worktree.ts"],"names":[],"mappings":"AAEA,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,CAAC,CAoBpD;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQ/F;AAMD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMnF;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAkBnB;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAExF"}
+{"version":3,"file":"git-worktree.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git-worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC"}

package/dist/commands/shared/git-worktree.js

@@ -1,68 +1 @@
-import { execFileAsync, gitEnv } from "./git.js";
-export async function listWorktrees(cwd) {
-    const { stdout } = await execFileAsync("git", ["worktree", "list", "--porcelain"], {
-        cwd,
-        env: gitEnv(),
-    });
-    const worktrees = [];
-    const lines = stdout.split("\n");
-    let current = null;
-    for (const line of lines) {
-        if (line.startsWith("worktree ")) {
-            if (current)
-                worktrees.push(current);
-            current = { path: line.slice("worktree ".length).trim(), branch: null };
-            continue;
-        }
-        if (line.startsWith("branch ") && current) {
-            current.branch = line.slice("branch ".length).trim();
-        }
-    }
-    if (current)
-        worktrees.push(current);
-    return worktrees;
-}
-export async function findWorktreeForBranch(cwd, branch) {
-    const target = branch.startsWith("refs/heads/") ? branch : `refs/heads/${branch}`;
-    const worktrees = await listWorktrees(cwd);
-    const match = worktrees.find((entry) => entry.branch === branch || entry.branch === target || entry.branch === `refs/heads/${branch}`);
-    return match ? match.path : null;
-}
-function stripBranchRef(branch) {
-    return branch.startsWith("refs/heads/") ? branch.slice("refs/heads/".length) : branch;
-}
-export function parseTaskIdFromBranch(prefix, branch) {
-    const normalized = stripBranchRef(branch);
-    if (!normalized.startsWith(`${prefix}/`))
-        return null;
-    const rest = normalized.slice(prefix.length + 1);
-    const taskId = rest.split("/", 1)[0];
-    return taskId ? taskId.trim() : null;
-}
-export function parseTaskIdFromCloseBranch(branch) {
-    const normalized = stripBranchRef(branch);
-    if (!normalized.startsWith("task-close/"))
-        return null;
-    const rest = normalized.slice("task-close/".length);
-    const taskId = rest.split("/", 1)[0];
-    return taskId ? taskId.trim() : null;
-}
-export async function gitListBranchesByPrefixes(cwd, prefixes) {
-    const patterns = prefixes
-        .map((prefix) => prefix.trim())
-        .filter((prefix) => prefix.length > 0)
-        .map((prefix) => `refs/heads/${prefix}`);
-    if (patterns.length === 0)
-        return [];
-    const { stdout } = await execFileAsync("git", ["for-each-ref", "--format=%(refname:short)", ...patterns], {
-        cwd,
-        env: gitEnv(),
-    });
-    return stdout
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0);
-}
-export async function gitListTaskBranches(cwd, prefix) {
-    return await gitListBranchesByPrefixes(cwd, [prefix]);
-}
+export { findWorktreeForBranch, gitListBranchesByPrefixes, gitListTaskBranches, listWorktrees, parseTaskIdFromBranch, parseTaskIdFromCloseBranch, } from "@agentplaneorg/core";

package/dist/commands/shared/git.d.ts

@@ -1,4 +1,2 @@
-import { execFile } from "node:child_process";
-export declare const execFileAsync: typeof execFile.__promisify__;
-export declare function gitEnv(): NodeJS.ProcessEnv;
+export { execFileAsync, gitEnv } from "@agentplaneorg/core";
 //# sourceMappingURL=git.d.ts.map

package/dist/commands/shared/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG9C,eAAO,MAAM,aAAa,+BAAsB,CAAC;AAGjD,wBAAgB,MAAM,IAAI,MAAM,CAAC,UAAU,CAS1C"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/commands/shared/git.js

@@ -1,14 +1 @@
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
-export const execFileAsync = promisify(execFile);
-// Avoid leaking worktree-index overrides into git subprocesses.
-export function gitEnv() {
-    const env = { ...process.env };
-    delete env.GIT_DIR;
-    delete env.GIT_WORK_TREE;
-    delete env.GIT_COMMON_DIR;
-    delete env.GIT_INDEX_FILE;
-    delete env.GIT_OBJECT_DIRECTORY;
-    delete env.GIT_ALTERNATE_OBJECT_DIRECTORIES;
-    return env;
-}
+export { execFileAsync, gitEnv } from "@agentplaneorg/core";

package/dist/commands/shared/policy-deny.d.ts

@@ -1,3 +1,3 @@
-import type { PolicyResult } from "../../policy/types.js";
+import type { PolicyResult } from "../../policy/model.js";
 export declare function throwIfPolicyDenied(res: PolicyResult): void;
 //# sourceMappingURL=policy-deny.d.ts.map

package/dist/commands/shared/reconcile-check.js

@@ -1,5 +1,5 @@
 import { exitCodeForError } from "../../cli/exit-codes.js";
-import { withDiagnosticContext } from "../../shared/diagnostics.js";
+import { withDiagnosticContext } from "./diagnostics.js";
 import { CliError } from "../../shared/errors.js";
 import path from "node:path";
 import { backendUsesLocalTaskStore, listTaskSummariesMemo, loadTaskFromBranchSnapshot, } from "./task-backend.js";

package/dist/commands/shared/task-backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-backend.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-backend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-backend.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-backend.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,OAAO,EACL,eAAe,EAEf,KAAK,uBAAuB,EAC5B,KAAK,WAAW,EAEhB,KAAK,QAAQ,EACb,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC9D,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,UAAU,CAAC;IAEhB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AASF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAW3E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2C7E;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,cAAc,2BAmB7D;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAE3E;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAErE;AAED,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAE/E;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEtE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,GAAG,OAAO,CAAC,cAAc,CAAC,CA0B1B;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyCpB;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmBzB;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CA2E3B;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IACV,OAAO,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC5C,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC,CAaD;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC,EACtD,KAAK,EAAE,SAAS,QAAQ,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBvF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAQ3F;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAchB"}

package/dist/commands/shared/task-backend.js

@@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { resolveTaskDocUpdatedBy, parseTaskReadme, taskDocToSectionMap, validateTaskReadmeFrontmatter, withTaskReadmeFrontmatterDefaults, } from "@agentplaneorg/core";
 import { CliError } from "../../shared/errors.js";
+import { emitTraceEvent } from "../../shared/trace-events.js";
 import { loadTaskBackend, taskRecordToData, toTaskSummary, } from "../../backends/task-backend.js";
 import { gitShowFile, toGitPath } from "./git-diff.js";
 import { GitContext } from "./git-context.js";
@@ -101,6 +102,15 @@ export async function loadCommandContext(opts) {
         config: opts.config,
     });
     const { backend, backendId, backendConfigPath, resolved, config } = backendLoaded;
+    emitTraceEvent({
+        component: "backend-ops",
+        event: "command_context_loaded",
+        details: {
+            backend: backendId,
+            config_path: path.relative(resolved.gitRoot, backendConfigPath),
+            canonical_source: backend.capabilities?.canonical_source ?? null,
+        },
+    });
     return {
         resolvedProject: resolved,
         config,
@@ -126,11 +136,23 @@ export async function loadTaskFromContext(opts) {
             return preferredBranchTask;
     }
     const task = await opts.ctx.taskBackend.getTask(opts.taskId);
-    if (task)
+    if (task) {
+        emitTraceEvent({
+            component: "backend-ops",
+            event: "task_loaded",
+            details: { task_id: opts.taskId, backend: opts.ctx.backendId },
+        });
         return task;
+    }
     const fallbackTask = await branchFallback();
-    if (fallbackTask)
+    if (fallbackTask) {
+        emitTraceEvent({
+            component: "backend-ops",
+            event: "task_loaded_from_branch_snapshot",
+            details: { task_id: opts.taskId, backend: opts.ctx.backendId },
+        });
         return fallbackTask;
+    }
     throw new CliError({
         exitCode: 4,
         code: "E_IO",

package/dist/commands/shared/task-store/intents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intents.d.ts","sourceRoot":"","sources":["../../../../src/commands/shared/task-store/intents.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAK7E,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EAEX,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,wBAAwB,EACxB,cAAc,EACd,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,eAAe,CAE7E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,eAAe,CAEjF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,GAAG,eAAe,CAE7E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,CAE3E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe,CAEvE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,GAAG,eAAe,CAElB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,GAAG,eAAe,CAElB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;CACZ,GACL,eAAe,CAEjB;AAuFD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,qBAAqB,GAC7B,cAAc,GAAG,IAAI,GAAG,SAAS,CA2DnC;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,EACtF,IAAI,GAAE,wBAA6B,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAS/C;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,qBAAqB,EAC9B,IAAI,GAAE;IACJ,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CAClB,GACL,QAAQ,CA0GV;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,QAAQ,CAI7F;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,GAAG,eAAe,EAAE,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,EAAE,CAEjG"}
+{"version":3,"file":"intents.d.ts","sourceRoot":"","sources":["../../../../src/commands/shared/task-store/intents.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE7E,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EAEX,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,wBAAwB,EACxB,cAAc,EACd,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,eAAe,CAE7E;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,eAAe,CAEjF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,GAAG,eAAe,CAE7E;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,CAE3E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe,CAEvE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,GAAG,eAAe,CAElB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,GAAG,eAAe,CAElB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;CACZ,GACL,eAAe,CAEjB;AAuFD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,qBAAqB,GAC7B,cAAc,GAAG,IAAI,GAAG,SAAS,CA2DnC;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,EACtF,IAAI,GAAE,wBAA6B,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAS/C;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,qBAAqB,EAC9B,IAAI,GAAE;IACJ,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CAClB,GACL,QAAQ,CA0GV;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,QAAQ,CAI7F;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,GAAG,eAAe,EAAE,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe,EAAE,CAEjG"}

package/dist/commands/shared/task-store/intents.js

@@ -1,5 +1,5 @@
 import { applyTaskDocMutations, normalizeTaskDocVersion, taskDocToSectionMap, } from "@agentplaneorg/core";
-import { assertExpectedTaskDoc, assertExpectedTaskSection, } from "../../../shared/task-doc-conflicts.js";
+import { assertExpectedTaskDoc, assertExpectedTaskSection } from "../../../task-doc/conflicts.js";
 export function setTaskFieldsIntent(task) {
     return { kind: "set-task-fields", task };
 }

package/dist/commands/start.spec.js

@@ -1,5 +1,5 @@
 import { usageError } from "../cli/spec/errors.js";
-import { findRepoWideAllowPrefixes, repoWideAllowPrefixMessage, } from "../shared/allow-prefix-policy.js";
+import { findRepoWideAllowPrefixes, repoWideAllowPrefixMessage, } from "./shared/allow-prefix-policy.js";
 import { toStringList } from "../cli/spec/parse-utils.js";
 export const startSpec = {
     id: ["start"],

package/dist/commands/task/close-tail-state.d.ts

@@ -0,0 +1,7 @@
+export declare function taskCloseAlreadyRecordedOnBase(opts: {
+    gitRoot: string;
+    workflowDir: string;
+    taskId: string;
+    baseBranch: string;
+}): Promise<boolean>;
+//# sourceMappingURL=close-tail-state.d.ts.map

package/dist/commands/task/close-tail-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"close-tail-state.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-tail-state.ts"],"names":[],"mappings":"AAMA,wBAAsB,8BAA8B,CAAC,IAAI,EAAE;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBnB"}

package/dist/commands/task/close-tail-state.js

@@ -0,0 +1,18 @@
+import path from "node:path";
+import { extractTaskSuffix } from "@agentplaneorg/core";
+import { execFileAsync, gitEnv } from "../shared/git.js";
+export async function taskCloseAlreadyRecordedOnBase(opts) {
+    const readmePath = path.join(opts.gitRoot, opts.workflowDir, opts.taskId, "README.md");
+    const { stdout } = await execFileAsync("git", ["log", opts.baseBranch, "--format=%s", "--", readmePath], {
+        cwd: opts.gitRoot,
+        env: gitEnv(),
+        maxBuffer: 10 * 1024 * 1024,
+    });
+    const suffix = extractTaskSuffix(opts.taskId);
+    const closeNeedle = `${suffix} close:`;
+    const taskNeedle = `(${opts.taskId})`;
+    return stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .some((line) => line.includes(closeNeedle) && line.includes(taskNeedle));
+}

package/dist/commands/task/derive.js

@@ -2,7 +2,7 @@ import { setMarkdownSection } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
 import { unknownEntityMessage, warnMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
-import { buildTaskDocState } from "../../shared/task-doc-state.js";
+import { buildTaskDocState } from "../../task-doc/state.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { buildDefaultVerifyStepsSection, defaultTaskDocV3, TASK_DOC_VERSION_V3, } from "./doc-template.js";
 import { extractTaskObservationSection, normalizeTaskDocVersion, nowIso, requiresVerifyStepsByPrimary, resolvePrimaryTag, toStringArray, warnIfUnknownOwner, } from "./shared.js";

package/dist/commands/task/finish-close.d.ts

@@ -0,0 +1,22 @@
+import type { CommandContext } from "../shared/task-backend.js";
+export declare function clearDirectWorkLockIfMatches(opts: {
+    agentplaneDir: string;
+    taskIds: string[];
+}): Promise<void>;
+export declare function ensureFinishRunsOnBaseBranch(opts: {
+    ctx: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    baseBranchOverride?: string;
+}): Promise<void>;
+export declare function materializeBranchPrCloseTail(opts: {
+    ctx: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    taskId: string;
+    baseBranchOverride?: string;
+    quiet: boolean;
+    closeUnstageOthers?: boolean;
+    allowPolicy?: boolean;
+}): Promise<string | null>;
+//# sourceMappingURL=finish-close.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"finish-close.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish-close.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAYhB;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BhB;AAsBD,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyDzB"}

package/dist/commands/task/finish-close.js

@@ -0,0 +1,119 @@
+import { resolveBaseBranch } from "@agentplaneorg/core";
+import { readFile, rm } from "node:fs/promises";
+import path from "node:path";
+import { exitCodeForError } from "../../cli/exit-codes.js";
+import { CliError } from "../../shared/errors.js";
+import { execFileAsync, gitEnv } from "../shared/git.js";
+import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+import { taskCloseAlreadyRecordedOnBase } from "./close-tail-state.js";
+import { createTaskCloseCommit } from "./finish-shared.js";
+export 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 ensureFinishRunsOnBaseBranch(opts) {
+    if (opts.ctx.config.workflow_mode !== "branch_pr")
+        return;
+    const baseBranch = await resolveBaseBranch({
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride ?? null,
+        cliBaseOpt: opts.baseBranchOverride ?? null,
+        mode: opts.ctx.config.workflow_mode,
+    });
+    if (!baseBranch) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_USAGE"),
+            code: "E_USAGE",
+            message: "Base branch could not be resolved (use `agentplane branch base set` or --base).",
+        });
+    }
+    const currentBranch = await gitCurrentBranch(opts.ctx.resolvedProject.gitRoot);
+    if (currentBranch === baseBranch)
+        return;
+    throw new CliError({
+        exitCode: exitCodeForError("E_GIT"),
+        code: "E_GIT",
+        message: `finish must run on base branch ${baseBranch} in branch_pr mode ` +
+            `(current: ${currentBranch}); integrate first or reconcile from the base checkout.`,
+    });
+}
+async function readHeadCommitHash(gitRoot) {
+    const { stdout } = await execFileAsync("git", ["rev-parse", "HEAD"], {
+        cwd: gitRoot,
+        env: gitEnv(),
+    });
+    const hash = stdout.trim();
+    if (!hash) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_GIT"),
+            code: "E_GIT",
+            message: "Failed to resolve HEAD while preparing a branch_pr close tail.",
+        });
+    }
+    return hash;
+}
+function branchPrCloseBranchName(taskId, headCommitHash) {
+    return `task-close/${taskId}/${headCommitHash.slice(0, 12)}`;
+}
+export async function materializeBranchPrCloseTail(opts) {
+    const gitRoot = opts.ctx.resolvedProject.gitRoot;
+    const baseBranch = await gitCurrentBranch(gitRoot);
+    const alreadyClosedOnBase = await taskCloseAlreadyRecordedOnBase({
+        gitRoot,
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        baseBranch,
+    });
+    if (alreadyClosedOnBase) {
+        return null;
+    }
+    const headCommitHash = await readHeadCommitHash(gitRoot);
+    const closeBranch = branchPrCloseBranchName(opts.taskId, headCommitHash);
+    const branchExists = await gitBranchExists(gitRoot, closeBranch);
+    await execFileAsync("git", branchExists ? ["checkout", closeBranch] : ["checkout", "-b", closeBranch], { cwd: gitRoot, env: gitEnv() });
+    let checkoutError = null;
+    try {
+        await createTaskCloseCommit({
+            ctx: opts.ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            baseBranchOverride: opts.baseBranchOverride,
+            quiet: opts.quiet,
+            closeUnstageOthers: opts.closeUnstageOthers,
+            allowPolicy: opts.allowPolicy,
+        });
+    }
+    finally {
+        try {
+            await execFileAsync("git", ["checkout", baseBranch], {
+                cwd: gitRoot,
+                env: gitEnv(),
+            });
+        }
+        catch (error) {
+            checkoutError = error;
+        }
+    }
+    if (checkoutError) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_GIT"),
+            code: "E_GIT",
+            message: `Created ${closeBranch} but failed to return to ${baseBranch}; ` +
+                "inspect the local checkout before continuing.",
+        });
+    }
+    return closeBranch;
+}

package/dist/commands/task/finish-command.d.ts

@@ -0,0 +1,3 @@
+import type { FinishOptions } from "./finish-types.js";
+export declare function cmdFinish(options: FinishOptions): Promise<number>;
+//# sourceMappingURL=finish-command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"finish-command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish-command.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA8CvE"}