reorder prompt sections: task-first with dynamic TOC (#513)

* reorder prompt sections: task-first with dynamic TOC

put the actual task at the top of the prompt for primacy, add a
dynamic table of contents, and push system/runtime metadata to the end.

new section order: TOC → YOUR TASK → PROCEDURE → EVENT CONTEXT →
SYSTEM → LEARNINGS → RUNTIME

Made-with: Cursor

* enforce clean working tree: continue session if agent leaves uncommitted changes

after each agent run, check `git status --porcelain`. if dirty, resume
the same session with instructions to commit on a new branch, push, and
open a PR. retries up to 3 times before giving up.

- claude code: capture session_id from result event, use --resume <id>
- opencode: use --continue to resume the last session
- remove --no-session-persistence from claude (needed for --resume)
- update Task mode to clarify branch/push/PR is the default finalize step

Made-with: Cursor

* log full prompt in collapsible group for debugging

Made-with: Cursor

* fix: format tool refs in buildCommitPrompt via formatMcpToolRef

* enforce clean git status: general instructions, stop hook, and Task mode

Made-with: Cursor

* fix: rename stale titleBody references after body leak fix

Made-with: Cursor

---------

Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com>
This commit is contained in:
Colin McDonnell
2026-04-04 19:37:44 +00:00
committed by pullfrog[bot]
parent 6b93e6b368
commit b9b6503315
16 changed files with 677 additions and 413 deletions
+29 -6
View File
@@ -16,7 +16,7 @@ import { execFileSync } from "node:child_process";
import { mkdirSync } from "node:fs";
import { join } from "node:path";
import { performance } from "node:perf_hooks";
import { ghPullfrogMcpName } from "../external.ts";
import { pullfrogMcpName } from "../external.ts";
import { modelAliases } from "../models.ts";
import { getIdleMs, markActivity } from "../utils/activity.ts";
import { log } from "../utils/cli.ts";
@@ -32,6 +32,9 @@ import {
type AgentRunContext,
type AgentUsage,
agent,
buildCommitPrompt,
getGitStatus,
MAX_COMMIT_RETRIES,
MAX_STDERR_LINES,
} from "./shared.ts";
@@ -66,7 +69,7 @@ function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): s
skill: "allow",
},
mcp: {
[ghPullfrogMcpName]: { type: "remote", url: ctx.mcpServerUrl },
[pullfrogMcpName]: { type: "remote", url: ctx.mcpServerUrl },
},
};
@@ -627,7 +630,8 @@ export const opentoad = agent({
agent: "opencode",
});
const args = ["run", ctx.instructions.full, "--format", "json", "--print-logs"];
// base args shared between initial run and continue runs
const baseArgs = ["run", "--format", "json", "--print-logs"];
// OPENCODE_PERMISSION has absolute highest precedence (merged after managed/MDM configs).
// external_directory gates ALL native filesystem tools (Read, Write, Edit, Glob, Grep, etc.)
@@ -647,16 +651,35 @@ export const opentoad = agent({
const repoDir = process.cwd();
log.debug(`» starting Pullfrog (OpenCode): ${cliPath} ${args.join(" ")}`);
log.debug(`» starting Pullfrog (OpenCode): ${cliPath} ${baseArgs.join(" ")}`);
log.debug(`» working directory: ${repoDir}`);
return runOpenCode({
const runParams = {
label: "Pullfrog",
cliPath,
args,
cwd: repoDir,
env,
todoTracker: ctx.todoTracker,
};
let result = await runOpenCode({
...runParams,
args: [...baseArgs, ctx.instructions.full],
});
// post-run: if the working tree is dirty, continue the session and ask the agent to commit
for (let attempt = 0; attempt < MAX_COMMIT_RETRIES; attempt++) {
if (!result.success) break;
const status = getGitStatus();
if (!status) break;
log.info(`» dirty working tree (attempt ${attempt + 1}/${MAX_COMMIT_RETRIES}):\n${status}`);
result = await runOpenCode({
...runParams,
args: [...baseArgs, "--continue", buildCommitPrompt("opentoad", status)],
});
}
return result;
},
});