agentplane 0.3.11 → 0.3.13

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

@@ -82,6 +82,154 @@ async function hasTaskArtifactChanges(opts) {
     });
     return stdout.trim().length > 0;
 }
+function buildFallbackPrMeta(opts) {
+    const at = opts.mergedPr.mergedAt ?? new Date().toISOString();
+    const headShaRaw = opts.mergedPr.headRefOid?.trim();
+    const headSha = headShaRaw && headShaRaw.length > 0 ? headShaRaw : undefined;
+    const prUrlRaw = opts.mergedPr.url?.trim();
+    const prUrl = prUrlRaw && prUrlRaw.length > 0 ? prUrlRaw : undefined;
+    return {
+        schema_version: 1,
+        task_id: opts.taskId,
+        branch: opts.branch,
+        ...(opts.mergedPr.baseRefName ? { base: opts.mergedPr.baseRefName } : {}),
+        pr_number: opts.mergedPr.number,
+        ...(prUrl ? { pr_url: prUrl } : {}),
+        created_at: at,
+        updated_at: at,
+        status: "OPEN",
+        ...(headSha ? { head_sha: headSha } : {}),
+        last_verified_sha: null,
+        last_verified_at: null,
+        verify: { status: "skipped" },
+    };
+}
+function escapeRegExp(value) {
+    return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
+}
+function extractMarkdownSection(markdown, heading) {
+    const pattern = new RegExp(String.raw `^## ${escapeRegExp(heading)}\n\n([\s\S]*?)(?=\n## [^\n]+\n|$)`, "m");
+    const match = pattern.exec(markdown);
+    return match?.[1]?.trim() ?? "";
+}
+function fallbackTaskTitleFromPrTitle(taskId, prTitle) {
+    const trimmed = prTitle?.trim() ?? "";
+    if (!trimmed)
+        return `Hosted close recovery for ${taskId}`;
+    const suffix = taskId.split("-").at(-1)?.trim();
+    if (suffix) {
+        const stripped = trimmed.replace(new RegExp(String.raw `\s*\(${escapeRegExp(suffix)}\)\s*$`), "");
+        if (stripped.trim().length > 0)
+            return stripped.trim();
+    }
+    return trimmed;
+}
+function isMissingTaskReadmeError(err, readmePath) {
+    if (!(err instanceof CliError))
+        return false;
+    return err.code === "E_IO" && err.message.includes(readmePath);
+}
+async function buildHostedTaskFromTrackedPrArtifacts(opts) {
+    const bodyPath = path.join(opts.gitRoot, opts.taskDirRelative, "pr", "github-body.md");
+    let bodyText = "";
+    try {
+        bodyText = await readFile(bodyPath, "utf8");
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === "ENOENT")
+            return null;
+        throw err;
+    }
+    const summary = extractMarkdownSection(bodyText, "Summary");
+    const scope = extractMarkdownSection(bodyText, "Scope");
+    const verification = extractMarkdownSection(bodyText, "Verification");
+    const handoff = extractMarkdownSection(bodyText, "Handoff Notes");
+    const summaryLines = summary
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+    const title = summaryLines[0] || fallbackTaskTitleFromPrTitle(opts.taskId, opts.mergedPr.title);
+    const description = summaryLines.slice(1).join("\n").trim() ||
+        `Recovered hosted-close state from tracked PR artifacts for merged PR #${opts.mergedPr.number}.`;
+    const scopeText = scope || `- In scope: record canonical task closure for merged PR #${opts.mergedPr.number}.`;
+    const verificationText = verification || "- State: pending\n- Note: Recovered during hosted-close.";
+    const handoffText = handoff || "- No handoff notes recorded.";
+    const planText = `Recovered hosted-close state from tracked PR artifacts for merged PR #${opts.mergedPr.number}.`;
+    const rollbackText = [
+        "- Revert the hosted closure commit if the merged PR metadata was recorded incorrectly.",
+        "- Re-run the required checks after rollback.",
+    ].join("\n");
+    const doc = [
+        "## Summary",
+        "",
+        title,
+        "",
+        description,
+        "",
+        "## Scope",
+        "",
+        scopeText,
+        "",
+        "## Plan",
+        "",
+        planText,
+        "",
+        "## Verification",
+        "",
+        verificationText,
+        "",
+        "## Rollback Plan",
+        "",
+        rollbackText,
+        "",
+        "## Handoff Notes",
+        "",
+        handoffText,
+        "",
+        "## Findings",
+        "",
+    ].join("\n");
+    return {
+        id: opts.taskId,
+        title,
+        description,
+        status: "DOING",
+        priority: "med",
+        owner: "INTEGRATOR",
+        revision: 1,
+        origin: { system: "manual" },
+        depends_on: [],
+        tags: [],
+        verify: [],
+        plan_approval: { state: "pending", updated_at: null, updated_by: null, note: null },
+        verification: { state: "pending", updated_at: null, updated_by: null, note: null },
+        commit: null,
+        doc,
+        doc_version: 3,
+        doc_updated_at: opts.mergedPr.mergedAt ?? new Date().toISOString(),
+        doc_updated_by: "INTEGRATOR",
+        id_source: "generated",
+    };
+}
+async function readHostedPrMetaOrFallback(opts) {
+    const metaPath = path.join(opts.gitRoot, opts.taskDirRelative, "pr", "meta.json");
+    if (!(await fileExists(metaPath))) {
+        return {
+            metaPath,
+            meta: buildFallbackPrMeta({
+                taskId: opts.target.taskId,
+                branch: opts.target.branch,
+                mergedPr: opts.target.mergedPr,
+            }),
+        };
+    }
+    const rawMeta = await readFile(metaPath, "utf8");
+    return {
+        metaPath,
+        meta: parsePrMeta(rawMeta, opts.target.taskId),
+    };
+}
 async function closeHostedTask(opts) {
     const rawEvent = await readFile(opts.eventJson, "utf8");
     const parsedEvent = JSON.parse(rawEvent);
@@ -94,24 +242,43 @@ async function closeHostedTask(opts) {
     }
     const gitRoot = opts.ctx.resolvedProject.gitRoot;
     const taskDirRelative = path.join(opts.ctx.config.paths.workflow_dir, target.taskId);
-    const task = await loadTaskFromContext({ ctx: opts.ctx, taskId: target.taskId });
-    const metaPath = path.join(gitRoot, taskDirRelative, "pr", "meta.json");
-    if (!(await fileExists(metaPath))) {
-        throw new CliError({
-            exitCode: 3,
-            code: "E_VALIDATION",
-            message: `Hosted task closure could not find pr/meta.json for ${target.taskId}`,
+    const taskReadmePath = path.join(gitRoot, taskDirRelative, "README.md");
+    let task;
+    try {
+        task = await loadTaskFromContext({
+            ctx: opts.ctx,
+            taskId: target.taskId,
+            preferBranchSnapshot: true,
+            branchSnapshotBranch: target.branch,
         });
     }
-    const rawMeta = await readFile(metaPath, "utf8");
-    const meta = parsePrMeta(rawMeta, target.taskId);
-    const alreadyClosed = String(task.status || "TODO").toUpperCase() === "DONE" &&
-        (task.commit?.hash ?? "") === target.mergedPr.mergeCommit.oid &&
-        meta.status === "MERGED" &&
-        (meta.merge_commit ?? "") === target.mergedPr.mergeCommit.oid;
-    if (String(task.status || "TODO").toUpperCase() === "DONE" &&
-        (task.commit?.hash ?? "") !== "" &&
-        (task.commit?.hash ?? "") !== target.mergedPr.mergeCommit.oid) {
+    catch (err) {
+        if (!isMissingTaskReadmeError(err, taskReadmePath))
+            throw err;
+        const recovered = await buildHostedTaskFromTrackedPrArtifacts({
+            gitRoot,
+            taskDirRelative,
+            taskId: target.taskId,
+            mergedPr: target.mergedPr,
+        });
+        if (!recovered)
+            throw err;
+        task = recovered;
+    }
+    if (!(await fileExists(taskReadmePath))) {
+        await opts.ctx.taskBackend.writeTask(task);
+    }
+    const { metaPath, meta } = await readHostedPrMetaOrFallback({
+        gitRoot,
+        taskDirRelative,
+        target,
+    });
+    const taskStatus = String(task.status || "TODO").toUpperCase();
+    const taskCommitHash = task.commit?.hash ?? "";
+    const alreadyClosed = taskStatus === "DONE" && taskCommitHash === target.mergedPr.mergeCommit.oid;
+    if (taskStatus === "DONE" &&
+        taskCommitHash !== "" &&
+        taskCommitHash !== target.mergedPr.mergeCommit.oid) {
         throw new CliError({
             exitCode: 3,
             code: "E_VALIDATION",
@@ -144,7 +311,7 @@ async function closeHostedTask(opts) {
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
             taskId: target.taskId,
-            baseBranchOverride: target.mergedPr.baseRefName ?? meta.base ?? "main",
+            baseBranchOverride: nextMeta.base ?? "main",
             quiet: opts.quiet,
         });
         return {
@@ -197,7 +364,7 @@ async function closeHostedTask(opts) {
         cwd: opts.cwd,
         rootOverride: opts.rootOverride,
         taskId: target.taskId,
-        baseBranchOverride: target.mergedPr.baseRefName ?? meta.base ?? "main",
+        baseBranchOverride: nextMeta.base ?? "main",
         quiet: opts.quiet,
         allowPolicy: collectedIncidents.wrote,
     });

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

@@ -27,7 +27,10 @@ export type LocalBranchPrSyncCandidate = {
     branch: string;
     base: string;
     commitHash: string;
-    verificationSource: "task" | "pr";
+    verificationSource: "task" | "pr" | null;
+    metaPath: string | null;
+    meta: TaskPrMeta | null;
+    taskStatus: string;
 };
 export type LocalDoneBranchPrDrift = {
     taskId: string;

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

@@ -292,6 +292,28 @@ function buildLocallySyncedTask(opts) {
         doc_updated_by: "INTEGRATOR",
     };
 }
+function buildLocallySyncedPrMeta(opts) {
+    const at = new Date().toISOString();
+    return {
+        ...opts.meta,
+        branch: opts.candidate.branch,
+        base: opts.candidate.base,
+        status: "MERGED",
+        merged_at: opts.meta.merged_at ?? at,
+        merge_commit: opts.meta.merge_commit ?? opts.candidate.commitHash,
+        head_sha: opts.meta.head_sha ?? opts.candidate.commitHash,
+        updated_at: at,
+    };
+}
+function isStackedBranchAliasDoneTask(opts) {
+    const branchTaskId = parseTaskIdFromBranch("task", opts.branch);
+    if (!branchTaskId || branchTaskId === opts.task.id)
+        return false;
+    const summary = opts.task.result_summary?.trim().toLowerCase() ?? "";
+    if (!summary.includes("stacked branch_pr merge rooted at"))
+        return false;
+    return summary.includes(branchTaskId.toLowerCase());
+}
 async function readPrMetaIfPresent(opts) {
     const metaPath = path.join(opts.ctx.resolvedProject.gitRoot, opts.ctx.config.paths.workflow_dir, opts.taskId, "pr", "meta.json");
     try {
@@ -377,21 +399,21 @@ export async function findLocallyShippedBranchPrTasks(opts) {
     const matches = [];
     for (const task of opts.tasks) {
         const currentStatus = String(task.status || "TODO").toUpperCase();
-        if (currentStatus === "DONE")
-            continue;
         const prMetaRecord = await readPrMetaIfPresent({ ctx: opts.ctx, taskId: task.id });
+        const meta = prMetaRecord?.meta ?? null;
+        const branch = meta?.branch?.trim() ?? "";
+        if (!branch)
+            continue;
         const verificationSource = hasTaskVerificationForLocalSync({
             task,
-            meta: prMetaRecord?.meta ?? null,
+            meta,
         });
-        if (!verificationSource)
-            continue;
-        const commitHash = task.commit?.hash?.trim() ?? "";
+        const commitHash = task.commit?.hash?.trim() ?? meta?.merge_commit?.trim() ?? meta?.head_sha?.trim() ?? "";
         if (!commitHash)
             continue;
         const base = await resolveSyncBaseBranch({
             ctx: opts.ctx,
-            meta: prMetaRecord?.meta ?? null,
+            meta,
         });
         if (!base)
             continue;
@@ -404,12 +426,21 @@ export async function findLocallyShippedBranchPrTasks(opts) {
         }))) {
             continue;
         }
+        const metaNeedsSync = Boolean(meta && meta.status !== "MERGED");
+        const taskNeedsSync = currentStatus !== "DONE" && verificationSource !== null;
+        if (!taskNeedsSync && !metaNeedsSync)
+            continue;
+        if (!taskNeedsSync && currentStatus !== "DONE")
+            continue;
         matches.push({
             taskId: task.id,
-            branch: prMetaRecord?.meta.branch?.trim() ?? "",
+            branch,
             base,
             commitHash,
             verificationSource,
+            metaPath: prMetaRecord?.metaPath ?? null,
+            meta,
+            taskStatus: currentStatus,
         });
     }
     return matches;
@@ -430,7 +461,11 @@ export async function findDoneBranchPrTasksWithOpenPrArtifacts(opts) {
         const branch = meta.branch?.trim() ?? "";
         if (!branch)
             continue;
-        const commitHash = task.commit?.hash?.trim() ?? meta.head_sha?.trim() ?? "";
+        if (isStackedBranchAliasDoneTask({ task, branch }))
+            continue;
+        // Missing implementation commits are handled by a dedicated doctor check, and duplicate/no-op
+        // tasks should not also surface as stale mergeable PR drift just because meta.head_sha exists.
+        const commitHash = task.commit?.hash?.trim() ?? "";
         if (!commitHash)
             continue;
         const base = await resolveSyncBaseBranch({
@@ -452,11 +487,18 @@ export async function syncLocallyShippedBranchPrTasks(opts) {
     const matches = await findLocallyShippedBranchPrTasks(opts);
     if (matches.length === 0)
         return { tasks: opts.tasks, synced: 0 };
+    for (const candidate of matches) {
+        if (candidate.meta && candidate.metaPath && candidate.meta.status !== "MERGED") {
+            await writeJsonStableIfChanged(candidate.metaPath, buildLocallySyncedPrMeta({ meta: candidate.meta, candidate }));
+        }
+    }
     const byTaskId = new Map(matches.map((entry) => [entry.taskId, entry]));
     return {
         tasks: opts.tasks.map((task) => {
             const candidate = byTaskId.get(task.id);
-            return candidate ? buildLocallySyncedTask({ task, candidate }) : task;
+            if (!candidate)
+                return task;
+            return candidate.taskStatus === "DONE" ? task : buildLocallySyncedTask({ task, candidate });
         }),
         synced: matches.length,
     };

package/dist/commands/task/start-ready.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-ready.d.ts","sourceRoot":"","sources":["../../../src/commands/task/start-ready.ts"],"names":[],"mappings":"AAUA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAkGpF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB"}
+{"version":3,"file":"start-ready.d.ts","sourceRoot":"","sources":["../../../src/commands/task/start-ready.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKpF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuClB"}

package/dist/commands/task/start-ready.js

@@ -1,90 +1,10 @@
-import { mkdir, readFile, realpath } from "node:fs/promises";
-import path from "node:path";
-import { resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
 import { infoMessage, successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { renderIncidentAdvice } from "../../runtime/incidents/index.js";
-import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { adviseTaskIncidents } from "../incidents/shared.js";
-import { findWorktreeForBranch, listWorktrees, parseTaskIdFromBranch, parseTaskIdFromCloseBranch, } from "../shared/git-worktree.js";
 import { cmdStart } from "./start.js";
-async function syncTaskReadmeAcrossRelevantWorktrees(opts) {
-    const canonicalizeWorktreePath = async (value) => {
-        try {
-            return await realpath(value);
-        }
-        catch {
-            return path.resolve(value);
-        }
-    };
-    const currentRoot = path.resolve(opts.rootOverride ?? opts.ctx.resolvedProject.gitRoot);
-    const currentCanonicalRoot = await canonicalizeWorktreePath(currentRoot);
-    const workflowDir = opts.ctx.config.paths.workflow_dir;
-    const sourceReadmePath = path.join(currentRoot, workflowDir, opts.taskId, "README.md");
-    let sourceText = "";
-    try {
-        sourceText = await readFile(sourceReadmePath, "utf8");
-    }
-    catch {
-        return;
-    }
-    const worktrees = await listWorktrees(currentRoot).catch(() => []);
-    const normalizedWorktrees = await Promise.all(worktrees.map(async (entry) => ({
-        ...entry,
-        canonicalPath: await canonicalizeWorktreePath(entry.path),
-    })));
-    const targetRoots = new Set();
-    const baseBranch = await resolveBaseBranch({
-        cwd: opts.cwd,
-        rootOverride: opts.rootOverride ?? null,
-        cliBaseOpt: null,
-        mode: opts.ctx.config.workflow_mode,
-    });
-    if (baseBranch) {
-        const baseWorktree = await findWorktreeForBranch(currentRoot, baseBranch);
-        if (baseWorktree) {
-            const canonicalBaseWorktree = await canonicalizeWorktreePath(baseWorktree);
-            if (canonicalBaseWorktree !== currentCanonicalRoot) {
-                targetRoots.add(canonicalBaseWorktree);
-            }
-        }
-    }
-    if (targetRoots.size === 0) {
-        const mainWorktree = normalizedWorktrees.find((entry) => entry.branch === "main" || entry.branch === "refs/heads/main");
-        if (mainWorktree && mainWorktree.canonicalPath !== currentCanonicalRoot) {
-            targetRoots.add(mainWorktree.canonicalPath);
-        }
-    }
-    if (targetRoots.size === 0) {
-        const nonTaskWorktrees = normalizedWorktrees.filter((entry) => {
-            if (!entry.branch)
-                return false;
-            if (entry.canonicalPath === currentCanonicalRoot)
-                return false;
-            if (parseTaskIdFromBranch(opts.ctx.config.branch.task_prefix, entry.branch))
-                return false;
-            if (parseTaskIdFromCloseBranch(entry.branch))
-                return false;
-            return true;
-        });
-        if (nonTaskWorktrees.length === 1) {
-            targetRoots.add(nonTaskWorktrees[0].canonicalPath);
-        }
-    }
-    const matchingTaskWorktrees = normalizedWorktrees.filter((entry) => typeof entry.branch === "string" &&
-        parseTaskIdFromBranch(opts.ctx.config.branch.task_prefix, entry.branch) === opts.taskId &&
-        entry.canonicalPath !== currentCanonicalRoot);
-    if (matchingTaskWorktrees.length === 1) {
-        targetRoots.add(matchingTaskWorktrees[0].canonicalPath);
-    }
-    for (const targetRoot of targetRoots) {
-        const targetReadmePath = path.join(targetRoot, workflowDir, opts.taskId, "README.md");
-        await mkdir(path.dirname(targetReadmePath), { recursive: true });
-        await writeTextIfChanged(targetReadmePath, sourceText);
-    }
-}
 export async function cmdTaskStartReady(opts) {
     try {
         const ctx = opts.ctx ??
@@ -106,12 +26,6 @@ export async function cmdTaskStartReady(opts) {
             yes: opts.yes,
             quiet: true,
         });
-        await syncTaskReadmeAcrossRelevantWorktrees({
-            ctx,
-            cwd: opts.cwd,
-            rootOverride: opts.rootOverride,
-            taskId: opts.taskId,
-        });
         if (!opts.quiet) {
             process.stdout.write(`${successMessage("ready", opts.taskId)}\n`);
             const advice = await adviseTaskIncidents({

package/dist/runner/context/base-prompts.d.ts

@@ -2,7 +2,7 @@ import { type ResolvedBehavior } from "../../runtime/behavior/index.js";
 import { type PolicyGatewayFlavor } from "../../shared/policy-gateway.js";
 import type { ResolvedExecutionProfileRuntime } from "../../runtime/execution-profile/index.js";
 import type { ResolvedHarnessContract } from "../../runtime/harness/index.js";
-import type { RunnerPromptBlock, RunnerRecipeContext } from "../types.js";
+import type { RunnerPromptBlock, RunnerRecipeContext, RunnerTaskContext } from "../types.js";
 type PromptSourcePayload = {
     source: string;
     title: string;
@@ -27,6 +27,7 @@ export declare function collectRunnerBasePrompts(opts: {
     owner_id: string;
     agents_dir?: string;
     fallback_policy_gateway_flavor?: PolicyGatewayFlavor;
+    task?: RunnerTaskContext;
     recipe?: RunnerRecipeContext;
     harness?: ResolvedHarnessContract;
     execution_profile?: ResolvedExecutionProfileRuntime;

package/dist/runner/context/base-prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-prompts.d.ts","sourceRoot":"","sources":["../../../src/runner/context/base-prompts.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAoB,mBAAmB,EAAE,MAAM,aAAa,CAAC;AA8D5F,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,oBAAoB,GAAG,gBAAgB,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;AAmD7F,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA2ChC;AAwCD,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC3D,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,mBAAmB,CAAC;IACrC,OAAO,CAAC,EAAE,uBAAuB,CAAC;CACnC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAyChC;AA8MD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B,CAAC,EAAE,mBAAmB,CAAC;IACrD,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,iBAAiB,CAAC,EAAE,+BAA+B,CAAC;CACrD,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAgC/B"}
+{"version":3,"file":"base-prompts.d.ts","sourceRoot":"","sources":["../../../src/runner/context/base-prompts.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AA8IrB,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,oBAAoB,GAAG,gBAAgB,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;AAmD7F,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA2ChC;AAwCD,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC3D,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,mBAAmB,CAAC;IACrC,OAAO,CAAC,EAAE,uBAAuB,CAAC;CACnC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAyChC;AAgOD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B,CAAC,EAAE,mBAAmB,CAAC;IACrD,IAAI,CAAC,EAAE,iBAAiB,CAAC;IACzB,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,iBAAiB,CAAC,EAAE,+BAA+B,CAAC;CACrD,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAoC/B"}