agentplane 0.3.13 → 0.3.15

package/dist/commands/task/finish.js

@@ -7,9 +7,10 @@ import { readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { ensureReconciledBeforeMutation } from "../shared/reconcile-check.js";
-import { gitCurrentBranch } from "../shared/git-ops.js";
-import { loadCommandContext } from "../shared/task-backend.js";
-import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
+import { execFileAsync, gitEnv } from "../shared/git.js";
+import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+import { backendUsesLocalTaskStore, loadCommandContext, } from "../shared/task-backend.js";
+import { getTaskStore } from "../shared/task-store.js";
 import { applyTaskMutation } from "../shared/task-mutation.js";
 import { collectTaskIncidents, renderIncidentCollectionPlanOutcome } from "../incidents/shared.js";
 import { createTaskCloseCommit, existingCommitInfo, loadTaskForFinish, writeFinishedTasks, } from "./finish-shared.js";
@@ -57,6 +58,68 @@ async function ensureFinishRunsOnBaseBranch(opts) {
             `(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)}`;
+}
+async function materializeBranchPrCloseTail(opts) {
+    const gitRoot = opts.ctx.resolvedProject.gitRoot;
+    const baseBranch = await gitCurrentBranch(gitRoot);
+    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;
+}
 async function appendFinishStructuredFinding(opts) {
     await applyTaskMutation({
         ctx: opts.ctx,
@@ -175,7 +238,7 @@ export async function cmdFinish(opts) {
                 message: "--status-commit requires --status-commit-allow <path-prefix>",
             });
         }
-        const useStore = backendIsLocalFileBackend(ctx);
+        const useStore = backendUsesLocalTaskStore(ctx);
         const store = useStore ? getTaskStore(ctx) : null;
         const backendWritesTaskReadmes = ctx.taskBackend.capabilities.writes_task_readmes === true;
         const defaultDirectCloseCommit = ctx.config.workflow_mode === "direct" &&
@@ -183,12 +246,18 @@ export async function cmdFinish(opts) {
             opts.taskIds.length === 1 &&
             !opts.commitFromComment &&
             !statusCommitRequested;
+        const defaultBranchPrCloseCommit = ctx.config.workflow_mode === "branch_pr" &&
+            backendWritesTaskReadmes &&
+            opts.taskIds.length === 1 &&
+            !opts.commitFromComment &&
+            !statusCommitRequested;
         const statusPathRequiresTrackedTaskCommit = backendWritesTaskReadmes &&
             opts.taskIds.length === 1 &&
             (opts.commitFromComment || statusCommitRequested);
         const shouldCloseCommit = opts.closeCommit === true ||
             statusPathRequiresTrackedTaskCommit ||
-            (defaultDirectCloseCommit && opts.noCloseCommit !== true);
+            (defaultDirectCloseCommit && opts.noCloseCommit !== true) ||
+            (defaultBranchPrCloseCommit && opts.noCloseCommit !== true);
         const metaTaskId = opts.taskIds.length === 1 ? (opts.taskIds[0] ?? "") : "";
         const wantMeta = typeof opts.result === "string" || typeof opts.risk === "string" || opts.breaking === true;
         const resultProvided = typeof opts.result === "string";
@@ -397,16 +466,34 @@ export async function cmdFinish(opts) {
             if (!opts.quiet) {
                 process.stdout.write(`${infoMessage("task marked DONE; creating deterministic close commit")}\n`);
             }
-            await createTaskCloseCommit({
-                ctx,
-                cwd: opts.cwd,
-                rootOverride: opts.rootOverride,
-                taskId: primaryTaskId,
-                baseBranchOverride: opts.baseBranchOverride,
-                quiet: opts.quiet,
-                closeUnstageOthers: opts.closeCommit === true && opts.closeUnstageOthers === true,
-                allowPolicy: promotedIncidents > 0,
-            });
+            const closeUnstageOthers = opts.closeCommit === true && opts.closeUnstageOthers === true;
+            if (ctx.config.workflow_mode === "branch_pr") {
+                const closeBranch = await materializeBranchPrCloseTail({
+                    ctx,
+                    cwd: opts.cwd,
+                    rootOverride: opts.rootOverride,
+                    taskId: primaryTaskId,
+                    baseBranchOverride: opts.baseBranchOverride,
+                    quiet: opts.quiet,
+                    closeUnstageOthers,
+                    allowPolicy: promotedIncidents > 0,
+                });
+                if (!opts.quiet) {
+                    process.stdout.write(`${infoMessage(`branch_pr close tail ready on ${closeBranch}; push that branch and open it with task hosted-close-pr if hosted automation does not create the closure PR for you.`)}\n`);
+                }
+            }
+            else {
+                await createTaskCloseCommit({
+                    ctx,
+                    cwd: opts.cwd,
+                    rootOverride: opts.rootOverride,
+                    taskId: primaryTaskId,
+                    baseBranchOverride: opts.baseBranchOverride,
+                    quiet: opts.quiet,
+                    closeUnstageOthers,
+                    allowPolicy: promotedIncidents > 0,
+                });
+            }
         }
         if (ctx.config.workflow_mode === "direct") {
             await clearDirectWorkLockIfMatches({

package/dist/commands/task/hosted-close.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-close.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-close.command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAStE,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAOrF,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,qBAAqB,CAqClE,CAAC;AAmYF,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC9E,KAAK,UAAU,EAAE,QAAQ,qBAAqB,KAAG,OAAO,CAAC,MAAM,CAAC,CA2B/E"}
+{"version":3,"file":"hosted-close.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-close.command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAStE,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAOrF,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,qBAAqB,CAqClE,CAAC;AAyZF,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC9E,KAAK,UAAU,EAAE,QAAQ,qBAAqB,KAAG,OAAO,CAAC,MAAM,CAAC,CA2B/E"}

package/dist/commands/task/hosted-close.command.js

@@ -243,18 +243,33 @@ async function closeHostedTask(opts) {
     const gitRoot = opts.ctx.resolvedProject.gitRoot;
     const taskDirRelative = path.join(opts.ctx.config.paths.workflow_dir, target.taskId);
     const taskReadmePath = path.join(gitRoot, taskDirRelative, "README.md");
+    const existingMetaPath = path.join(gitRoot, taskDirRelative, "pr", "meta.json");
+    let existingMeta = null;
+    if (await fileExists(existingMetaPath)) {
+        existingMeta = parsePrMeta(await readFile(existingMetaPath, "utf8"), target.taskId);
+    }
+    const existingMergeCommit = existingMeta?.merge_commit?.trim() ?? "";
+    const existingMetaAlreadyMerged = existingMeta?.status === "MERGED" &&
+        existingMergeCommit.length > 0 &&
+        existingMergeCommit === target.mergedPr.mergeCommit.oid;
     let task;
     try {
         task = await loadTaskFromContext({
             ctx: opts.ctx,
             taskId: target.taskId,
-            preferBranchSnapshot: true,
-            branchSnapshotBranch: target.branch,
+            preferBranchSnapshot: !existingMetaAlreadyMerged,
+            branchSnapshotBranch: existingMetaAlreadyMerged ? null : target.branch,
         });
     }
     catch (err) {
         if (!isMissingTaskReadmeError(err, taskReadmePath))
             throw err;
+        if (existingMetaAlreadyMerged) {
+            return {
+                outcome: "noop",
+                detail: `${target.taskId} is already closed for merge ${target.mergedPr.mergeCommit.oid.slice(0, 12)}`,
+            };
+        }
         const recovered = await buildHostedTaskFromTrackedPrArtifacts({
             gitRoot,
             taskDirRelative,
@@ -286,6 +301,12 @@ async function closeHostedTask(opts) {
                 `${task.commit?.hash} != ${target.mergedPr.mergeCommit.oid}`,
         });
     }
+    if (alreadyClosed && existingMetaAlreadyMerged) {
+        return {
+            outcome: "noop",
+            detail: `${target.taskId} is already closed for merge ${target.mergedPr.mergeCommit.oid.slice(0, 12)}`,
+        };
+    }
     const nextMeta = buildIntegratedPrMeta({
         meta,
         branch: target.branch,

package/dist/commands/task/hosted-merge-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-merge-sync.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-merge-sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosted-merge-sync.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-merge-sync.ts"],"names":[],"mappings":"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"}

package/dist/commands/task/hosted-merge-sync.js

@@ -7,6 +7,7 @@ import { execFileAsync } from "../shared/git.js";
 import { withGhTransportRetry } from "../shared/gh-transport.js";
 import { parseTaskIdFromBranch } from "../shared/git-worktree.js";
 import { parsePrMeta } from "../shared/pr-meta.js";
+import { backendUsesLocalTaskStore } from "../shared/task-backend.js";
 import { ghEnv } from "../pr/internal/gh-api.js";
 import { appendTaskEvent } from "./shared.js";
 function normalizeMergedPr(value) {
@@ -346,7 +347,7 @@ function needsHostedMergeSync(opts) {
     return false;
 }
 export async function syncHostedMergedTask(opts) {
-    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
         return { tasks: opts.tasks, synced: 0 };
     }
     const task = opts.tasks.find((entry) => entry.id === opts.target.taskId);
@@ -393,7 +394,7 @@ export async function syncHostedMergedTask(opts) {
     };
 }
 export async function findLocallyShippedBranchPrTasks(opts) {
-    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
         return [];
     }
     const matches = [];
@@ -446,7 +447,7 @@ export async function findLocallyShippedBranchPrTasks(opts) {
     return matches;
 }
 export async function findDoneBranchPrTasksWithOpenPrArtifacts(opts) {
-    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
         return [];
     }
     const matches = [];
@@ -461,6 +462,10 @@ export async function findDoneBranchPrTasksWithOpenPrArtifacts(opts) {
         const branch = meta.branch?.trim() ?? "";
         if (!branch)
             continue;
+        const branchStillExists = (await gitRefExists({ cwd: opts.ctx.resolvedProject.gitRoot, ref: branch })) ||
+            (await gitRefExists({ cwd: opts.ctx.resolvedProject.gitRoot, ref: `origin/${branch}` }));
+        if (!branchStillExists)
+            continue;
         if (isStackedBranchAliasDoneTask({ task, branch }))
             continue;
         // Missing implementation commits are handled by a dedicated doctor check, and duplicate/no-op
@@ -504,7 +509,7 @@ export async function syncLocallyShippedBranchPrTasks(opts) {
     };
 }
 export async function syncHostedMergedTasks(opts) {
-    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
         return { tasks: opts.tasks, synced: 0 };
     }
     const nextTasks = [];

package/dist/commands/task/list.run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.run.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACvE,KAAK,UAAU,EAAE,GAAG,cAAc,KAAG,OAAO,CAAC,MAAM,CAAC,CAOnE"}
+{"version":3,"file":"list.run.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACvE,KAAK,UAAU,EAAE,GAAG,cAAc,KAAG,OAAO,CAAC,MAAM,CAAC,CAiBnE"}

package/dist/commands/task/list.run.js

@@ -1,9 +1,19 @@
-import { taskListUsecase } from "../../usecases/task/task-list-usecase.js";
+import { makeReadOnlyExecutionContext } from "../../runtime/execution-context.js";
+import { cmdTaskList } from "./list.js";
 export function makeRunTaskListHandler(getCtx) {
     return async (ctx, p) => {
-        return await taskListUsecase({
-            cli: ctx,
-            command: await getCtx("task list"),
+        const command = await getCtx("task list");
+        const execution = await makeReadOnlyExecutionContext(command);
+        void execution.policy.evaluate({
+            action: "task_list",
+            config: execution.config,
+            taskId: "",
+            git: { stagedPaths: [] },
+        });
+        return await cmdTaskList({
+            ctx: execution.command,
+            cwd: ctx.cwd,
+            rootOverride: ctx.rootOverride,
             filters: p.filters,
         });
     };

package/dist/commands/task/new.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAClE,cAAc,CAAC,aAAa,CAAC,CAI/B"}
+{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,wBAAwB,CAAC;AAGzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAClE,cAAc,CAAC,aAAa,CAAC,CAkB/B"}

package/dist/commands/task/new.command.js

@@ -1,7 +1,21 @@
-import { taskNewUsecase } from "../../usecases/task/task-new-usecase.js";
+import { makeExecutionContext } from "../../runtime/execution-context.js";
+import { runTaskNewParsed } from "./new.js";
 export { taskNewSpec } from "./new.spec.js";
 export function makeRunTaskNewHandler(getCtx) {
     return async (ctx, p) => {
-        return await taskNewUsecase({ cli: ctx, command: await getCtx("task new"), parsed: p });
+        const command = await getCtx("task new");
+        const execution = await makeExecutionContext(command);
+        void execution.policy.evaluate({
+            action: "task_new",
+            config: execution.config,
+            taskId: "",
+            git: { stagedPaths: [] },
+        });
+        return await runTaskNewParsed({
+            ctx: execution.command,
+            cwd: ctx.cwd,
+            rootOverride: ctx.rootOverride,
+            parsed: p,
+        });
     };
 }

package/dist/commands/task/new.js

@@ -2,9 +2,9 @@ import { setMarkdownSection } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
 import { backendNotSupportedMessage, warnMessage } from "../../cli/output.js";
 import { createClarificationContract, createTaskGraphDraft, createTaskIntakeContext, materializeTaskGraphDraft, } from "../../runtime/task-intake/index.js";
+import { makeReadOnlyExecutionContext } from "../../runtime/execution-context.js";
 import { CliError } from "../../shared/errors.js";
 import { buildTaskDocState } from "../../shared/task-doc-state.js";
-import { makeReadOnlyUsecaseContext } from "../../usecases/context/resolve-context.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { ensureTaskDependsOnGraphIsAcyclic, nowIso, requiresVerifyStepsByPrimary, resolvePrimaryTag, warnIfUnknownOwner, } from "./shared.js";
 import { buildDefaultVerifyStepsSection, defaultTaskDocV3, TASK_DOC_VERSION_V3, } from "./doc-template.js";
@@ -139,7 +139,7 @@ export async function runTaskNewParsed(opts) {
             });
         }
         const taskId = await ctx.taskBackend.generateTaskId({ length: suffixLength, attempts: 1000 });
-        const executionContext = await makeReadOnlyUsecaseContext(ctx);
+        const executionContext = await makeReadOnlyExecutionContext(ctx);
         const createdAt = nowIso();
         const docState = buildTaskDocState({
             doc: defaultTaskDocV3({ title: p.title, description: p.description }),

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

@@ -1 +1 @@
-{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/task/show.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA4BnC,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsClB"}
+{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/task/show.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA4BnC,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsClB"}

package/dist/commands/task/show.js

@@ -3,9 +3,9 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { mapBackendError } from "../../cli/error-map.js";
 import { CliError } from "../../shared/errors.js";
-import { loadCommandContext, loadTaskFromContext, taskDataToFrontmatter, } from "../shared/task-backend.js";
+import { backendSupportsTaskBranchSnapshots, loadCommandContext, loadTaskFromContext, taskDataToFrontmatter, } from "../shared/task-backend.js";
 async function detectLocalTaskMetadataErrors(ctx, taskId) {
-    if (ctx.backendId !== "local")
+    if (!backendSupportsTaskBranchSnapshots(ctx))
         return null;
     const readmePath = taskReadmePath(path.join(ctx.resolvedProject.gitRoot, ctx.config.paths.workflow_dir), taskId);
     try {
@@ -32,7 +32,7 @@ export async function cmdTaskShow(opts) {
                 (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
         const task = await loadTaskFromContext({ ctx, taskId: opts.taskId });
         const frontmatter = taskDataToFrontmatter(task);
-        if (ctx.backendId === "local") {
+        if (backendSupportsTaskBranchSnapshots(ctx)) {
             const metadataErrors = validateTaskDocMetadata(frontmatter);
             if (metadataErrors.length > 0) {
                 throw new CliError({

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

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/task/update.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAWpF,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ElB"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/task/update.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAapF,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAiFlB"}

package/dist/commands/task/update.js

@@ -1,8 +1,9 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { successMessage, unknownEntityMessage, warnMessage } from "../../cli/output.js";
+import { createCliEmitter, emitCommandResult, unknownEntityMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { dedupeStrings, ensureTaskDependsOnGraphIsAcyclic, requiresVerifyStepsByPrimary, readTaskTagPolicy, resolvePrimaryTag, toStringArray, warnIfUnknownOwner, } from "./shared.js";
+const output = createCliEmitter();
 export async function cmdTaskUpdate(opts) {
     try {
         const ctx = opts.ctx ??
@@ -46,7 +47,10 @@ export async function cmdTaskUpdate(opts) {
         const hasSpike = mergedTags.some((tag) => tag.trim().toLowerCase() === spikeTag);
         const hasImplementationTags = requiresVerifyStepsByPrimary(mergedTags, ctx.config);
         if (hasSpike && hasImplementationTags) {
-            process.stderr.write(`${warnMessage("spike is combined with a primary tag that requires verify steps; consider splitting spike vs implementation tasks")}\n`);
+            emitCommandResult(output, {
+                kind: "warn",
+                message: "spike is combined with a primary tag that requires verify steps; consider splitting spike vs implementation tasks",
+            });
         }
         const existingDepends = opts.replaceDependsOn
             ? []
@@ -62,7 +66,11 @@ export async function cmdTaskUpdate(opts) {
         const mergedVerify = dedupeStrings([...existingVerify, ...opts.verify]);
         next.verify = mergedVerify;
         await ctx.taskBackend.writeTask(next);
-        process.stdout.write(`${successMessage("updated", opts.taskId)}\n`);
+        emitCommandResult(output, {
+            kind: "success",
+            action: "updated",
+            target: opts.taskId,
+        });
         return 0;
     }
     catch (err) {

package/dist/runner/adapters/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/runner/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AAIrB,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAkMrB,qBAAa,kBAAmB,YAAW,aAAa;IACtD,QAAQ,CAAC,EAAE,EAAG,OAAO,CAAU;IAE/B,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,yBAAyB;IAI7E,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiD/D,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;CAkN7D"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/runner/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AAIrB,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAmKrB,qBAAa,kBAAmB,YAAW,aAAa;IACtD,QAAQ,CAAC,EAAE,EAAG,OAAO,CAAU;IAE/B,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,yBAAyB;IAI7E,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiD/D,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;CAkN7D"}

package/dist/runner/adapters/codex.js

@@ -3,7 +3,8 @@ import path from "node:path";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { CliError } from "../../shared/errors.js";
 import { evolveRunnerRunState } from "../artifacts.js";
-import { runnerArtifactsFromSpecs, runnerAdapterCancelledResult, runnerAdapterFailureResult, runnerAdapterSuccessResult, } from "./shared.js";
+import { runnerAdapterCancelledResult, runnerAdapterFailureResult, runnerAdapterSuccessResult, } from "./shared.js";
+import { buildInvocationEventData, buildRunnerExecutionArtifacts, durationMs, } from "./runtime-shared.js";
 import { exitCodeForSignal, runSupervisedProcess, } from "../process-supervision.js";
 import { InvalidRunnerResultManifestError, applyRunnerResultManifest, manifestFromRunnerResult, preserveRunnerResultManifestSource, preserveInvalidRunnerResultManifest, readRunnerResultManifest, writeRunnerResultManifest, } from "../result-manifest.js";
 import { RunnerRunRepository } from "../run-repository.js";
@@ -31,26 +32,6 @@ const CODEX_RUN_PROFILE_CAPABILITIES = {
 function byteLength(text) {
     return Buffer.byteLength(text ?? "", "utf8");
 }
-function durationMs(startedAt, endedAt) {
-    const started = Date.parse(startedAt);
-    const ended = Date.parse(endedAt);
-    if (Number.isNaN(started) || Number.isNaN(ended))
-        return undefined;
-    return Math.max(0, ended - started);
-}
-function buildInvocationEventData(invocation) {
-    return {
-        executable: invocation.argv[0] ?? null,
-        argv_count: invocation.argv.length,
-        cwd: invocation.run_dir,
-        env_keys: Object.keys(invocation.env).toSorted(),
-        trace_policy: invocation.trace_policy,
-        timeout_policy: invocation.timeout_policy,
-        has_bootstrap_path: typeof invocation.bootstrap_path === "string" && invocation.bootstrap_path.trim().length > 0,
-        has_output_last_message_path: typeof invocation.output_last_message_path === "string" &&
-            invocation.output_last_message_path.trim().length > 0,
-    };
-}
 async function readOptionalText(filePath) {
     if (!filePath?.trim())
         return null;
@@ -62,18 +43,7 @@ async function readOptionalText(filePath) {
     }
 }
 function buildCodexArtifacts(opts) {
-    return (runnerArtifactsFromSpecs([
-        { path: opts.invocation.bundle_path, label: "bundle" },
-        { path: opts.invocation.bootstrap_path, label: "bootstrap" },
-        { path: opts.trace_artifact_path, label: "raw-trace" },
-        { path: opts.trace_archive_path, label: "raw-trace-gzip" },
-        { path: opts.stderr_artifact_path, label: "stderr-log" },
-        { path: opts.stderr_archive_path, label: "stderr-log-gzip" },
-        { path: opts.source_manifest_path, label: "source-result-manifest" },
-        { path: opts.invocation.output_last_message_path, label: "assistant-last-message" },
-        { path: opts.invalid_manifest_path, label: "invalid-result-manifest" },
-        { path: opts.invocation.result_path, label: "result-manifest" },
-    ]) ?? []);
+    return buildRunnerExecutionArtifacts({ ...opts, include_output_last_message: true });
 }
 function assertCodexBundle(bundle) {
     if (bundle.execution.adapter_id !== "codex") {

package/dist/runner/adapters/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../src/runner/adapters/custom.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAI9D,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,gBAAgB,EAEhB,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AA+TrB,qBAAa,mBAAoB,YAAW,aAAa;IAG3C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,QAAQ,CAAC,EAAE,EAAG,QAAQ,CAAU;gBAEH,MAAM,EAAE,kBAAkB,GAAG,SAAS;IAEnE,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,yBAAyB;IAI7E,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmD/D,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;CAqN7D"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../src/runner/adapters/custom.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAI9D,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,gBAAgB,EAEhB,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAoSrB,qBAAa,mBAAoB,YAAW,aAAa;IAG3C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,QAAQ,CAAC,EAAE,EAAG,QAAQ,CAAU;gBAEH,MAAM,EAAE,kBAAkB,GAAG,SAAS;IAEnE,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,yBAAyB;IAI7E,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmD/D,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC;CAqN7D"}

package/dist/runner/adapters/custom.js

@@ -2,7 +2,8 @@ import { readFile } from "node:fs/promises";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { CliError } from "../../shared/errors.js";
 import { evolveRunnerRunState } from "../artifacts.js";
-import { runnerArtifactsFromSpecs, runnerAdapterCancelledResult, runnerAdapterFailureResult, runnerAdapterSuccessResult, } from "./shared.js";
+import { runnerAdapterCancelledResult, runnerAdapterFailureResult, runnerAdapterSuccessResult, } from "./shared.js";
+import { buildInvocationEventData, buildRunnerExecutionArtifacts, durationMs, } from "./runtime-shared.js";
 import { exitCodeForSignal, runSupervisedProcess, } from "../process-supervision.js";
 import { InvalidRunnerResultManifestError, manifestFromRunnerResult, preserveRunnerResultManifestSource, preserveInvalidRunnerResultManifest, readRunnerResultManifest, writeRunnerResultManifest, } from "../result-manifest.js";
 import { RunnerRunRepository } from "../run-repository.js";
@@ -144,24 +145,6 @@ function buildCustomCommand(opts) {
         ...opts.command,
     ];
 }
-function durationMs(startedAt, endedAt) {
-    const started = Date.parse(startedAt);
-    const ended = Date.parse(endedAt);
-    if (Number.isNaN(started) || Number.isNaN(ended))
-        return undefined;
-    return Math.max(0, ended - started);
-}
-function buildInvocationEventData(invocation) {
-    return {
-        executable: invocation.argv[0] ?? null,
-        argv_count: invocation.argv.length,
-        cwd: invocation.run_dir,
-        env_keys: Object.keys(invocation.env).toSorted(),
-        trace_policy: invocation.trace_policy,
-        timeout_policy: invocation.timeout_policy,
-        has_bootstrap_path: typeof invocation.bootstrap_path === "string" && invocation.bootstrap_path.trim().length > 0,
-    };
-}
 function normalizeCustomCommand(value) {
     return Array.isArray(value)
         ? value.map((entry) => entry.trim()).filter((entry) => entry.length > 0)
@@ -179,17 +162,7 @@ function assertCustomBundle(bundle) {
     }
 }
 function buildCustomArtifacts(opts) {
-    return (runnerArtifactsFromSpecs([
-        { path: opts.invocation.bundle_path, label: "bundle" },
-        { path: opts.invocation.bootstrap_path, label: "bootstrap" },
-        { path: opts.trace_artifact_path, label: "raw-trace" },
-        { path: opts.trace_archive_path, label: "raw-trace-gzip" },
-        { path: opts.stderr_artifact_path, label: "stderr-log" },
-        { path: opts.stderr_archive_path, label: "stderr-log-gzip" },
-        { path: opts.source_manifest_path, label: "source-result-manifest" },
-        { path: opts.invalid_manifest_path, label: "invalid-result-manifest" },
-        { path: opts.invocation.result_path, label: "result-manifest" },
-    ]) ?? []);
+    return buildRunnerExecutionArtifacts({ ...opts, include_output_last_message: false });
 }
 function mergeRunnerArtifacts(base, extra) {
     const merged = [];

package/dist/runner/adapters/runtime-shared.d.ts

@@ -0,0 +1,14 @@
+import type { RunnerInvocation, RunnerResult } from "../types.js";
+export declare function durationMs(startedAt: string, endedAt: string): number | undefined;
+export declare function buildInvocationEventData(invocation: RunnerInvocation, extra?: Record<string, unknown>): Record<string, unknown>;
+export declare function buildRunnerExecutionArtifacts(opts: {
+    invocation: RunnerInvocation;
+    trace_artifact_path?: string | null;
+    trace_archive_path?: string | null;
+    stderr_artifact_path?: string | null;
+    stderr_archive_path?: string | null;
+    source_manifest_path?: string | null;
+    invalid_manifest_path?: string | null;
+    include_output_last_message?: boolean;
+}): NonNullable<RunnerResult["artifacts"]>;
+//# sourceMappingURL=runtime-shared.d.ts.map

package/dist/runner/adapters/runtime-shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-shared.d.ts","sourceRoot":"","sources":["../../../src/runner/adapters/runtime-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGlE,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKjF;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,gBAAgB,EAC5B,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYzB;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,UAAU,EAAE,gBAAgB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GAAG,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAiBzC"}

package/dist/runner/adapters/runtime-shared.js

@@ -0,0 +1,36 @@
+import { runnerArtifactsFromSpecs } from "./shared.js";
+export function durationMs(startedAt, endedAt) {
+    const started = Date.parse(startedAt);
+    const ended = Date.parse(endedAt);
+    if (Number.isNaN(started) || Number.isNaN(ended))
+        return undefined;
+    return Math.max(0, ended - started);
+}
+export function buildInvocationEventData(invocation, extra = {}) {
+    return {
+        executable: invocation.argv[0] ?? null,
+        argv_count: invocation.argv.length,
+        cwd: invocation.run_dir,
+        env_keys: Object.keys(invocation.env).toSorted(),
+        trace_policy: invocation.trace_policy,
+        timeout_policy: invocation.timeout_policy,
+        has_bootstrap_path: typeof invocation.bootstrap_path === "string" && invocation.bootstrap_path.trim().length > 0,
+        ...extra,
+    };
+}
+export function buildRunnerExecutionArtifacts(opts) {
+    return (runnerArtifactsFromSpecs([
+        { path: opts.invocation.bundle_path, label: "bundle" },
+        { path: opts.invocation.bootstrap_path, label: "bootstrap" },
+        { path: opts.trace_artifact_path, label: "raw-trace" },
+        { path: opts.trace_archive_path, label: "raw-trace-gzip" },
+        { path: opts.stderr_artifact_path, label: "stderr-log" },
+        { path: opts.stderr_archive_path, label: "stderr-log-gzip" },
+        { path: opts.source_manifest_path, label: "source-result-manifest" },
+        ...(opts.include_output_last_message
+            ? [{ path: opts.invocation.output_last_message_path, label: "assistant-last-message" }]
+            : []),
+        { path: opts.invalid_manifest_path, label: "invalid-result-manifest" },
+        { path: opts.invocation.result_path, label: "result-manifest" },
+    ]) ?? []);
+}