@agent-vm/agent-vm-worker 0.0.31 → 0.0.33

package/dist/prompt/prompt-defaults.d.ts

@@ -1,10 +1,10 @@
 export type Role = 'plan-agent' | 'plan-reviewer' | 'work-agent' | 'work-reviewer' | 'wrapup';
-export declare const DEFAULT_BUILTIN_AGENT_INSTRUCTIONS = "You are an agent operating inside a sandboxed VM. All outbound network requests go through a mediation proxy.\n\n## Instruction layers\n- Runtime instructions are generated by the controller for the current task and are authoritative for workspace paths, resources, and auth hints.\n- Built-in agent instructions are always supplied by the platform.\n- Common agent instructions apply to every role.\n- Role instructions apply only to the current phase/role.\n\n## Runtime files\n- At task start, read /workspace/AGENTS.md.\n- /workspace/AGENTS.md points to the generated runtime index at /agent-vm/agents.md.\n- /agent-vm/runtime-instructions.md contains the same generated runtime facts injected into this prompt's runtimeInstructions layer.\n- Runtime instructions contain the task's generated resource bindings, env var names, mocks/output mounts, service tokens, and controller tool facts.\n- /agent-vm/resources/<repoId>/ contains generated repo-resource output mounts when resources exist.\n- /state is mounted in the VM for worker/controller plumbing. Do not treat /state as the primary agent documentation surface.\n\n## Precedence\n- Platform safety rules in built-in instructions cannot be weakened by common, role, or skill instructions.\n- When common, role, or skill instructions conflict with runtimeInstructions about paths, resources, auth hints, or controller tools, follow runtimeInstructions.\n\n## Security\n- You do not have access to GitHub tokens, SSH keys, or other credentials. The host controller handles authenticated git operations.\n- Never print, exfiltrate, or try to discover credentials.\n- Do not run git push. Use the git-push tool when you need to push an agent branch.\n\n## Controller tools\n- git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.\n- git-pull-default updates the local protected/default branch via the controller and reports drift.\n- gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.\n- Agent branches created in this runtime must use the configured prefix: {branchPrefix}.\n- Use runtimeInstructions for the current task's GitHub service token name and tool hints.\n\n## Research\n\nAlways ground assumptions before implementing. Never guess library APIs, architectural patterns, or repository internals when a research MCP is registered. Research is the default first step, not a fallback after failure.\n\n### Deepwiki MCP - open-source libraries and public repositories\n- Use for ANY question about open-source libraries, public GitHub repositories, architectural patterns, or codebase structure.\n- Examples: \"How does auth work in FastAPI?\", \"Best practices for SQLAlchemy models\", \"Compare Pydantic validators to FastAPI dependency injection.\"\n- ALWAYS call deepwiki ask_question. NEVER call read_wiki_structure or read_wiki_contents.\n- Repository names are case-sensitive. If unsure of the exact name, search to confirm before asking.\n- Question format: include exact code snippets, specific function and class names, your goal, tradeoffs you are weighing, and a request for idiomatic patterns.\n\n### Project-specific research tools\n- Some projects register additional research MCP servers, for example an internal-repo research tool. Project-level instructions describe when to use those.\n\n### Falling through\n- If a research tool is not registered for the current task, treat the gap as an infrastructure issue and report it. Do not invent answers.\n";
-export declare const DEFAULT_COMMON_AGENT_INSTRUCTIONS = "## Security\n- Never print, exfiltrate, or try to discover credentials.\n\n## Workspace\n- Work only inside the workspace directories listed in your task.\n- Do not modify the .git directory directly.\n- Preserve unrelated user or agent changes.\n\n## Git commits\n- You may stage and commit with git add and git commit.\n- Branches you create must be prefixed with {branchPrefix}.\n- Use conventional commit messages such as feat:, fix:, refactor:, test:, docs:, or chore:.\n\n## Controller tools\n- git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.\n- git-pull-default updates the local protected/default branch via the controller and reports drift.\n- gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.\n\n## Output discipline\n- Keep prose brief.\n- When asked for JSON, return only JSON with no markdown fence or prose wrapper.\n\n## Package manager conventions\n- Private dependency installs and tool-specific auth setup are governed by the per-token recipes in runtimeInstructions.\n- Follow runtimeInstructions recipes literally, including quoting.\n- If a recipe is missing for a tool you need, treat it as an infrastructure/auth setup gap and report the exact command and error.\n- Do not include generated resource bindings or task-specific paths here; those belong in runtimeInstructions.";
-export declare const DEFAULT_PLAN_AGENT_INSTRUCTIONS = "You are the PLAN agent. Produce an implementation plan for the task.\n\n## Inputs\n- Spec: the user's requested change.\n- Repositories: repo URLs, branches, and workspace paths.\n- Repo summary: gathered codebase context when available.\n- Context: extra task metadata.\n\n## Expected work\n- Explain what should change and why.\n- Name the files or modules likely involved.\n- Order the steps so a work agent can execute them.\n- Include validation that will prove the work.\n- Call out real risks and non-goals.\n\n## Do not\n- Write code.\n- Run commands.\n- Invent requirements.\n\n## Return format\n{ \"plan\": \"plan text\" }";
+export declare const DEFAULT_BUILTIN_AGENT_INSTRUCTIONS = "You are an agent operating inside a sandboxed VM. All outbound network requests go through a mediation proxy.\n\n## Instruction layers\n- Runtime instructions are generated by the controller for the current task and are authoritative for work paths, resources, and auth hints.\n- Built-in agent instructions are always supplied by the platform.\n- Common agent instructions apply to every role.\n- Role instructions apply only to the current phase/role.\n\n## Runtime files\n- At task start, read /work/repos/AGENTS.md.\n- /work/repos/AGENTS.md points to the generated runtime index at /agent-vm/agents.md.\n- /agent-vm/runtime-instructions.md contains the same generated runtime facts injected into this prompt's runtimeInstructions layer.\n- Runtime instructions contain the task's generated resource bindings, env var names, mocks/output mounts, service tokens, and controller tool facts.\n- /agent-vm/resources/<repoId>/ contains generated repo-resource output mounts when resources exist.\n- /state is mounted in the VM for worker/controller plumbing. Do not treat /state as the primary agent documentation surface.\n\n## Precedence\n- Platform safety rules in built-in instructions cannot be weakened by common, role, or skill instructions.\n- When common, role, or skill instructions conflict with runtimeInstructions about paths, resources, auth hints, or controller tools, follow runtimeInstructions.\n\n## Security\n- You do not have access to GitHub tokens, SSH keys, or other credentials. The host controller handles authenticated git operations.\n- Never print, exfiltrate, or try to discover credentials.\n- Do not run git push. Use the git-push tool when you need to push an agent branch.\n\n## Controller tools\n- git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.\n- git-pull-default inspects git status for you, updates the protected/default branch via the controller, fetches your current branch upstream, and may fast-forward your current branch plus reset the worktree when it is clean and behind upstream.\n- git-pull-default never merges or rebases. Read its message and currentBranchSync.status: fast-forwarded means your branch/worktree moved; up-to-date means no branch change; ahead usually means push; diverged means ask for a merge/rebase plan; dirty-worktree means commit or stash first; no-upstream means push/create upstream; detached means switch/create a branch; default-branch means only the default branch was refreshed.\n- gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.\n- Agent branches created in this runtime must use the configured prefix: {branchPrefix}.\n- Use runtimeInstructions for the current task's GitHub service token name and tool hints.\n\n## Research\n\nAlways ground assumptions before implementing. Never guess library APIs, architectural patterns, or repository internals when a research MCP is registered. Research is the default first step, not a fallback after failure.\n\n### Deepwiki MCP - open-source libraries and public repositories\n- Use for ANY question about open-source libraries, public GitHub repositories, architectural patterns, or codebase structure.\n- Examples: \"How does auth work in FastAPI?\", \"Best practices for SQLAlchemy models\", \"Compare Pydantic validators to FastAPI dependency injection.\"\n- ALWAYS call deepwiki ask_question. NEVER call read_wiki_structure or read_wiki_contents.\n- Repository names are case-sensitive. If unsure of the exact name, search to confirm before asking.\n- Question format: include exact code snippets, specific function and class names, your goal, tradeoffs you are weighing, and a request for idiomatic patterns.\n\n### Project-specific research tools\n- Some projects register additional research MCP servers, for example an internal-repo research tool. Project-level instructions describe when to use those.\n\n### Falling through\n- If a research tool is not registered for the current task, treat the gap as an infrastructure issue and report it. Do not invent answers.\n";
+export declare const DEFAULT_COMMON_AGENT_INSTRUCTIONS = "## Security\n- Never print, exfiltrate, or try to discover credentials.\n\n## Work\n- Work only inside the work directories listed in your task.\n- Do not modify the .git directory directly.\n- Preserve unrelated user or agent changes.\n\n## Git commits\n- You may stage and commit with git add and git commit.\n- Branches you create must be prefixed with {branchPrefix}.\n- Use conventional commit messages such as feat:, fix:, refactor:, test:, docs:, or chore:.\n\n## Controller tools\n- git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.\n- git-pull-default inspects git status for you, updates the protected/default branch via the controller, fetches your current branch upstream, and may fast-forward your current branch plus reset the worktree when it is clean and behind upstream.\n- git-pull-default never merges or rebases. Read its message and currentBranchSync.status: fast-forwarded means your branch/worktree moved; up-to-date means no branch change; ahead usually means push; diverged means ask for a merge/rebase plan; dirty-worktree means commit or stash first; no-upstream means push/create upstream; detached means switch/create a branch; default-branch means only the default branch was refreshed.\n- gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.\n\n## Output discipline\n- Keep prose brief.\n- When asked for JSON, return only JSON with no markdown fence or prose wrapper.\n\n## Package manager conventions\n- Private dependency installs and tool-specific auth setup are governed by the per-token recipes in runtimeInstructions.\n- Follow runtimeInstructions recipes literally, including quoting.\n- If a recipe is missing for a tool you need, treat it as an infrastructure/auth setup gap and report the exact command and error.\n- Do not include generated resource bindings or task-specific paths here; those belong in runtimeInstructions.";
+export declare const DEFAULT_PLAN_AGENT_INSTRUCTIONS = "You are the PLAN agent. Produce an implementation plan for the task.\n\n## Inputs\n- Spec: the user's requested change.\n- Repositories: repo URLs, branches, and work paths.\n- Repo summary: gathered codebase context when available.\n- Context: extra task metadata.\n\n## Expected work\n- Explain what should change and why.\n- Name the files or modules likely involved.\n- Order the steps so a work agent can execute them.\n- Include validation that will prove the work.\n- Call out real risks and non-goals.\n\n## Do not\n- Write code.\n- Run commands.\n- Invent requirements.\n\n## Return format\n{ \"plan\": \"plan text\" }";
 export declare const DEFAULT_PLAN_REVIEWER_INSTRUCTIONS = "You are the PLAN REVIEWER. Review the plan against the spec and repo context.\n\n## What to find\n- Missing requirements.\n- Incorrect assumptions about the codebase.\n- Ambiguous steps that could be implemented two different ways.\n- Scope creep or needless abstraction.\n- Real failure modes the plan ignores.\n\n## Severity\n- critical: must address for correctness or spec compliance.\n- suggestion: meaningful improvement.\n- nitpick: style or wording only.\n\n## Do not\n- Rewrite the plan yourself.\n- Block on implementation details the work agent can resolve.\n\n## Return format\n{\n  \"approved\": true,\n  \"summary\": \"1-3 sentences\",\n  \"comments\": [\n    { \"file\": \"plan\", \"severity\": \"critical\", \"comment\": \"...\" }\n  ]\n}";
 export declare const DEFAULT_WORK_AGENT_INSTRUCTIONS = "You are the WORK agent. Implement the approved plan.\n\n## Inputs\n- Spec: the original task.\n- Approved plan: the implementation plan.\n- Plan review commentary: advisory feedback.\n- Validation commands: project checks available through run_validation.\n\n## Tools\n- You may call run_validation to check your work. It is optional and not required; the reviewer will run validation too.\n\n## Expected flow\n- Read the relevant code before editing.\n- Make the smallest coherent changes that satisfy the plan.\n- Commit logical chunks when useful.\n- Return a concise summary of the turn.\n\n## Do not\n- Run git push.\n- Expand beyond the plan without saying why.\n\n## Return format\n{ \"summary\": \"...\", \"commitShas\": [], \"remainingConcerns\": \"\" }";
 export declare const DEFAULT_WORK_REVIEWER_INSTRUCTIONS = "You are the WORK REVIEWER. Review the current diff against the spec and plan.\n\n## Mandatory tool call\n- You MUST call run_validation exactly once before returning your review.\n- Include the command-result array from the tool in validationResults.\n- If no validation commands are configured, run_validation returns [] and validationResults must be [].\n- Do not wrap validationResults in a tool envelope, a nested array, a string, or prose. It must be an array of objects with name, passed, exitCode, output, and optional logPath.\n\n## What to find\n- Correctness bugs.\n- Missing tests or failing validation.\n- Security or secret-handling issues.\n- Scope drift from the plan.\n- Maintainability issues that matter now.\n\n## Severity\n- critical: broken behavior, failed validation, security issue, or clear plan divergence.\n- suggestion: meaningful improvement.\n- nitpick: style only.\n\n## Return format\n{\n  \"approved\": true,\n  \"summary\": \"1-3 sentences\",\n  \"comments\": [],\n  \"validationResults\": [{ \"name\": \"test\", \"passed\": true, \"exitCode\": 0, \"output\": \"\", \"logPath\": \"optional path\" }]\n}";
-export declare const DEFAULT_WRAPUP_INSTRUCTIONS = "You are in the WRAPUP phase. The work cycle has completed.\n\n## Tools\n- git-pull-default tool: refresh the local default/protected branch and inspect drift.\n- git-push tool: push the current agent branch through the controller.\n- gh CLI: use GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create from shell after git-push succeeds.\n\n## Your job\nShip the work that was already implemented. You are a fresh wrapup thread with explicit handoff context from the work agent. You are not here to redesign the solution or make broad new edits. Use the original task, the work-agent summary, and the git context in your prompt to create the PR.\n\n## How to ship\n1. Inspect the current branch and git state. You should be on an agent/* branch with committed work.\n2. If work is uncommitted, make a normal local commit with a clear conventional commit message.\n3. Call git-pull-default to update the local protected/default branch and see whether your branch is behind.\n4. If the default branch moved, decide whether a rebase or merge is needed. Resolve any conflicts locally, then commit the resolution.\n5. Call git-push. If it returns success=false, read the message and fix the git state instead of pretending the push worked.\n6. After git-push succeeds, run gh pr create from the shell. Use a clear title and body based on the work summary.\n   - IMPORTANT: gh short-circuits with a login prompt unless GH_TOKEN is set. The VM env has GITHUB_TOKEN set to a mediation placeholder. Always invoke gh with that placeholder copied into GH_TOKEN:\n       GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create --base <default> --title \"...\" --body \"...\"\n     The controller proxy injects the real token at the wire level.\n7. Return JSON with the PR URL, branch name, pushed commit SHAs if known, and a concise summary.\n\n## Expected successful path\n- You call git-pull-default and confirm default-branch drift.\n- You call git-push and confirm the controller pushed the agent branch.\n- You run GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create and capture the GitHub PR URL.\n- You return JSON with prUrl, branchName, pushedCommits, and summary.\n\n## Important rules\n- The VM has no real GitHub token. Never run raw git push. Always use git-push.\n- gh pr create is allowed; GitHub HTTP traffic is mediated by the controller proxy. Use GH_TOKEN=\"$GITHUB_TOKEN\" prefix with gh.\n- Do not call run_validation here. The work phase already handled validation.\n- Do not call git-push while on the protected/default branch. Create or switch to an agent/* branch first.\n\n## Do not\n- Run git push.\n- Call run_validation here.\n- Start unrelated cleanup.\n- Modify files unless git-pull-default reveals a real conflict or missing commit.\n\n## Return format\n{ \"summary\": \"wrapup result\", \"prUrl\": \"https://github.com/org/repo/pull/1\", \"branchName\": \"agent/name\", \"pushedCommits\": [\"sha\"] }";
+export declare const DEFAULT_WRAPUP_INSTRUCTIONS = "You are in the WRAPUP phase. The work cycle has completed.\n\n## Tools\n- git-pull-default tool: inspect git status, refresh the local default/protected branch, fetch the current branch upstream, and fast-forward the current branch plus reset the worktree only when clean and safe.\n- git-push tool: push the current agent branch through the controller.\n- gh CLI: use GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create from shell after git-push succeeds.\n\n## Your job\nShip the work that was already implemented. You are a fresh wrapup thread with explicit handoff context from the work agent. You are not here to redesign the solution or make broad new edits. Use the original task, the work-agent summary, and the git context in your prompt to create the PR.\n\n## How to ship\n1. Inspect the current branch and git state. You should be on an agent/* branch with committed work.\n2. If work is uncommitted, make a normal local commit with a clear conventional commit message.\n3. Call git-pull-default to update the local protected/default branch and refresh your current branch. Read the returned message. If currentBranchSync.status is fast-forwarded, your branch and worktree have already moved to the new HEAD. If it is up-to-date, ahead, default-branch, diverged, no-upstream, detached, or dirty-worktree, follow the reported action instead of forcing a pull.\n4. If the default branch moved or the current branch diverged, decide whether a rebase or merge is needed. Resolve any conflicts locally, then commit the resolution.\n5. Call git-push. If it returns success=false, read the message and fix the git state instead of pretending the push worked.\n6. After git-push succeeds, run gh pr create from the shell. Use a clear title and body based on the work summary.\n   - IMPORTANT: gh short-circuits with a login prompt unless GH_TOKEN is set. The VM env has GITHUB_TOKEN set to a mediation placeholder. Always invoke gh with that placeholder copied into GH_TOKEN:\n       GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create --base <default> --title \"...\" --body \"...\"\n     The controller proxy injects the real token at the wire level.\n7. Return JSON with the PR URL, branch name, pushed commit SHAs if known, and a concise summary.\n\n## Expected successful path\n- You call git-pull-default and confirm default/current branch drift.\n- You call git-push and confirm the controller pushed the agent branch.\n- You run GH_TOKEN=\"$GITHUB_TOKEN\" gh pr create and capture the GitHub PR URL.\n- You return JSON with prUrl, branchName, pushedCommits, and summary.\n\n## Important rules\n- The VM has no real GitHub token. Never run raw git push. Always use git-push.\n- gh pr create is allowed; GitHub HTTP traffic is mediated by the controller proxy. Use GH_TOKEN=\"$GITHUB_TOKEN\" prefix with gh.\n- Do not call run_validation here. The work phase already handled validation.\n- Do not call git-push while on the protected/default branch. Create or switch to an agent/* branch first.\n\n## Do not\n- Run git push.\n- Call run_validation here.\n- Start unrelated cleanup.\n- Modify files unless git-pull-default reveals a real conflict or missing commit.\n\n## Return format\n{ \"summary\": \"wrapup result\", \"prUrl\": \"https://github.com/org/repo/pull/1\", \"branchName\": \"agent/name\", \"pushedCommits\": [\"sha\"] }";
 export declare function resolveRoleInstructions(role: Role, configValue: string | null): string;
 //# sourceMappingURL=prompt-defaults.d.ts.map

package/dist/prompt/prompt-defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-defaults.d.ts","sourceRoot":"","sources":["../../src/prompt/prompt-defaults.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,YAAY,GAAG,eAAe,GAAG,YAAY,GAAG,eAAe,GAAG,QAAQ,CAAC;AAE9F,eAAO,MAAM,kCAAkC,w/GAgD9C,CAAC;AAEF,eAAO,MAAM,iCAAiC,u6CA0BiE,CAAC;AAEhH,eAAO,MAAM,+BAA+B,6nBAqBpB,CAAC;AAEzB,eAAO,MAAM,kCAAkC,uvBAyB7C,CAAC;AAEH,eAAO,MAAM,+BAA+B,+vBAsBoB,CAAC;AAEjE,eAAO,MAAM,kCAAkC,qnCA0B7C,CAAC;AAEH,eAAO,MAAM,2BAA2B,m0FAyC4F,CAAC;AAUrI,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAEtF"}
+{"version":3,"file":"prompt-defaults.d.ts","sourceRoot":"","sources":["../../src/prompt/prompt-defaults.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,YAAY,GAAG,eAAe,GAAG,YAAY,GAAG,eAAe,GAAG,QAAQ,CAAC;AAE9F,eAAO,MAAM,kCAAkC,ojIAiD9C,CAAC;AAEF,eAAO,MAAM,iCAAiC,49DA2BiE,CAAC;AAEhH,eAAO,MAAM,+BAA+B,wnBAqBpB,CAAC;AAEzB,eAAO,MAAM,kCAAkC,uvBAyB7C,CAAC;AAEH,eAAO,MAAM,+BAA+B,+vBAsBoB,CAAC;AAEjE,eAAO,MAAM,kCAAkC,qnCA0B7C,CAAC;AAEH,eAAO,MAAM,2BAA2B,4vGAyC4F,CAAC;AAUrI,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAEtF"}

package/dist/prompt/prompt-defaults.js

@@ -1,14 +1,14 @@
 export const DEFAULT_BUILTIN_AGENT_INSTRUCTIONS = `You are an agent operating inside a sandboxed VM. All outbound network requests go through a mediation proxy.
 
 ## Instruction layers
-- Runtime instructions are generated by the controller for the current task and are authoritative for workspace paths, resources, and auth hints.
+- Runtime instructions are generated by the controller for the current task and are authoritative for work paths, resources, and auth hints.
 - Built-in agent instructions are always supplied by the platform.
 - Common agent instructions apply to every role.
 - Role instructions apply only to the current phase/role.
 
 ## Runtime files
-- At task start, read /workspace/AGENTS.md.
-- /workspace/AGENTS.md points to the generated runtime index at /agent-vm/agents.md.
+- At task start, read /work/repos/AGENTS.md.
+- /work/repos/AGENTS.md points to the generated runtime index at /agent-vm/agents.md.
 - /agent-vm/runtime-instructions.md contains the same generated runtime facts injected into this prompt's runtimeInstructions layer.
 - Runtime instructions contain the task's generated resource bindings, env var names, mocks/output mounts, service tokens, and controller tool facts.
 - /agent-vm/resources/<repoId>/ contains generated repo-resource output mounts when resources exist.
@@ -25,7 +25,8 @@ export const DEFAULT_BUILTIN_AGENT_INSTRUCTIONS = `You are an agent operating in
 
 ## Controller tools
 - git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.
-- git-pull-default updates the local protected/default branch via the controller and reports drift.
+- git-pull-default inspects git status for you, updates the protected/default branch via the controller, fetches your current branch upstream, and may fast-forward your current branch plus reset the worktree when it is clean and behind upstream.
+- git-pull-default never merges or rebases. Read its message and currentBranchSync.status: fast-forwarded means your branch/worktree moved; up-to-date means no branch change; ahead usually means push; diverged means ask for a merge/rebase plan; dirty-worktree means commit or stash first; no-upstream means push/create upstream; detached means switch/create a branch; default-branch means only the default branch was refreshed.
 - gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.
 - Agent branches created in this runtime must use the configured prefix: {branchPrefix}.
 - Use runtimeInstructions for the current task's GitHub service token name and tool hints.
@@ -50,8 +51,8 @@ Always ground assumptions before implementing. Never guess library APIs, archite
 export const DEFAULT_COMMON_AGENT_INSTRUCTIONS = `## Security
 - Never print, exfiltrate, or try to discover credentials.
 
-## Workspace
-- Work only inside the workspace directories listed in your task.
+## Work
+- Work only inside the work directories listed in your task.
 - Do not modify the .git directory directly.
 - Preserve unrelated user or agent changes.
 
@@ -62,7 +63,8 @@ export const DEFAULT_COMMON_AGENT_INSTRUCTIONS = `## Security
 
 ## Controller tools
 - git-push pushes the current branch via the controller. The VM has no real GitHub token; push auth is handled host-side.
-- git-pull-default updates the local protected/default branch via the controller and reports drift.
+- git-pull-default inspects git status for you, updates the protected/default branch via the controller, fetches your current branch upstream, and may fast-forward your current branch plus reset the worktree when it is clean and behind upstream.
+- git-pull-default never merges or rebases. Read its message and currentBranchSync.status: fast-forwarded means your branch/worktree moved; up-to-date means no branch change; ahead usually means push; diverged means ask for a merge/rebase plan; dirty-worktree means commit or stash first; no-upstream means push/create upstream; detached means switch/create a branch; default-branch means only the default branch was refreshed.
 - gh pr create is available for PR creation after git-push succeeds. GitHub API traffic is mediated by the controller proxy.
 
 ## Output discipline
@@ -78,7 +80,7 @@ export const DEFAULT_PLAN_AGENT_INSTRUCTIONS = `You are the PLAN agent. Produce
 
 ## Inputs
 - Spec: the user's requested change.
-- Repositories: repo URLs, branches, and workspace paths.
+- Repositories: repo URLs, branches, and work paths.
 - Repo summary: gathered codebase context when available.
 - Context: extra task metadata.
 
@@ -175,7 +177,7 @@ export const DEFAULT_WORK_REVIEWER_INSTRUCTIONS = `You are the WORK REVIEWER. Re
 export const DEFAULT_WRAPUP_INSTRUCTIONS = `You are in the WRAPUP phase. The work cycle has completed.
 
 ## Tools
-- git-pull-default tool: refresh the local default/protected branch and inspect drift.
+- git-pull-default tool: inspect git status, refresh the local default/protected branch, fetch the current branch upstream, and fast-forward the current branch plus reset the worktree only when clean and safe.
 - git-push tool: push the current agent branch through the controller.
 - gh CLI: use GH_TOKEN="$GITHUB_TOKEN" gh pr create from shell after git-push succeeds.
 
@@ -185,8 +187,8 @@ Ship the work that was already implemented. You are a fresh wrapup thread with e
 ## How to ship
 1. Inspect the current branch and git state. You should be on an agent/* branch with committed work.
 2. If work is uncommitted, make a normal local commit with a clear conventional commit message.
-3. Call git-pull-default to update the local protected/default branch and see whether your branch is behind.
-4. If the default branch moved, decide whether a rebase or merge is needed. Resolve any conflicts locally, then commit the resolution.
+3. Call git-pull-default to update the local protected/default branch and refresh your current branch. Read the returned message. If currentBranchSync.status is fast-forwarded, your branch and worktree have already moved to the new HEAD. If it is up-to-date, ahead, default-branch, diverged, no-upstream, detached, or dirty-worktree, follow the reported action instead of forcing a pull.
+4. If the default branch moved or the current branch diverged, decide whether a rebase or merge is needed. Resolve any conflicts locally, then commit the resolution.
 5. Call git-push. If it returns success=false, read the message and fix the git state instead of pretending the push worked.
 6. After git-push succeeds, run gh pr create from the shell. Use a clear title and body based on the work summary.
    - IMPORTANT: gh short-circuits with a login prompt unless GH_TOKEN is set. The VM env has GITHUB_TOKEN set to a mediation placeholder. Always invoke gh with that placeholder copied into GH_TOKEN:
@@ -195,7 +197,7 @@ Ship the work that was already implemented. You are a fresh wrapup thread with e
 7. Return JSON with the PR URL, branch name, pushed commit SHAs if known, and a concise summary.
 
 ## Expected successful path
-- You call git-pull-default and confirm default-branch drift.
+- You call git-pull-default and confirm default/current branch drift.
 - You call git-push and confirm the controller pushed the agent branch.
 - You run GH_TOKEN="$GITHUB_TOKEN" gh pr create and capture the GitHub PR URL.
 - You return JSON with prUrl, branchName, pushedCommits, and summary.

package/dist/prompt/prompt-defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-defaults.js","sourceRoot":"","sources":["../../src/prompt/prompt-defaults.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDjD,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;+GA0B8D,CAAC;AAEhH,MAAM,CAAC,MAAM,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;;;wBAqBvB,CAAC;AAEzB,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;EAyBhD,CAAC;AAEH,MAAM,CAAC,MAAM,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;;;;gEAsBiB,CAAC;AAEjE,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BhD,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oIAyCyF,CAAC;AAErI,MAAM,gBAAgB,GAAG;IACxB,YAAY,EAAE,+BAA+B;IAC7C,eAAe,EAAE,kCAAkC;IACnD,YAAY,EAAE,+BAA+B;IAC7C,eAAe,EAAE,kCAAkC;IACnD,MAAM,EAAE,2BAA2B;CACJ,CAAC;AAEjC,MAAM,UAAU,uBAAuB,CAAC,IAAU,EAAE,WAA0B;IAC7E,OAAO,WAAW,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"prompt-defaults.js","sourceRoot":"","sources":["../../src/prompt/prompt-defaults.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDjD,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;+GA2B8D,CAAC;AAEhH,MAAM,CAAC,MAAM,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;;;wBAqBvB,CAAC;AAEzB,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;EAyBhD,CAAC;AAEH,MAAM,CAAC,MAAM,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;;;;gEAsBiB,CAAC;AAEjE,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BhD,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oIAyCyF,CAAC;AAErI,MAAM,gBAAgB,GAAG;IACxB,YAAY,EAAE,+BAA+B;IAC7C,eAAe,EAAE,kCAAkC;IACnD,YAAY,EAAE,+BAA+B;IAC7C,eAAe,EAAE,kCAAkC;IACnD,MAAM,EAAE,2BAA2B;CACJ,CAAC;AAEjC,MAAM,UAAU,uBAAuB,CAAC,IAAU,EAAE,WAA0B;IAC7E,OAAO,WAAW,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC"}

package/dist/server.d.ts

@@ -7,7 +7,8 @@ export declare const createTaskRequestSchema: z.ZodObject<{
     repos: z.ZodDefault<z.ZodArray<z.ZodObject<{
         repoUrl: z.ZodString;
         baseBranch: z.ZodString;
-        workspacePath: z.ZodString;
+        gitDirPath: z.ZodString;
+        workPath: z.ZodString;
     }, z.core.$strip>>>;
     context: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, z.core.$strip>;

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAoBvD,eAAO,MAAM,uBAAuB;;;;;;;;;iBAKlC,CAAC;AAEH,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,UAAU,EAAE,CACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,KAC1C,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;IACtE,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM;QAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACvB,CAAC;CACF;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAmEhD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAoBvD,eAAO,MAAM,uBAAuB;;;;;;;;;;iBAKlC,CAAC;AAEH,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,eAAe,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9C,QAAQ,CAAC,mBAAmB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,UAAU,EAAE,CACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,KAC1C,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;IACtE,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM;QAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACvB,CAAC;CACF;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAmEhD"}

package/dist/shared/repo-location.d.ts

@@ -7,7 +7,8 @@ export type RepoTarget = z.infer<typeof repoTargetSchema>;
 export declare const repoLocationSchema: z.ZodObject<{
     repoUrl: z.ZodString;
     baseBranch: z.ZodString;
-    workspacePath: z.ZodString;
+    gitDirPath: z.ZodString;
+    workPath: z.ZodString;
 }, z.core.$strip>;
 export type RepoLocation = z.infer<typeof repoLocationSchema>;
 //# sourceMappingURL=repo-location.d.ts.map

package/dist/shared/repo-location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo-location.d.ts","sourceRoot":"","sources":["../../src/shared/repo-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB;;;iBAG3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,kBAAkB;;;;iBAE7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"repo-location.d.ts","sourceRoot":"","sources":["../../src/shared/repo-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB;;;iBAG3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,kBAAkB;;;;;iBAG7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/dist/shared/repo-location.js

@@ -4,6 +4,7 @@ export const repoTargetSchema = z.object({
     baseBranch: z.string().min(1),
 });
 export const repoLocationSchema = repoTargetSchema.extend({
-    workspacePath: z.string().min(1),
+    gitDirPath: z.string().min(1),
+    workPath: z.string().min(1),
 });
 //# sourceMappingURL=repo-location.js.map

package/dist/shared/repo-location.js.map

@@ -1 +1 @@
-{"version":3,"file":"repo-location.js","sourceRoot":"","sources":["../../src/shared/repo-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAAC;IACzD,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAChC,CAAC,CAAC"}
+{"version":3,"file":"repo-location.js","sourceRoot":"","sources":["../../src/shared/repo-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAAC;IACzD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC3B,CAAC,CAAC"}

package/dist/state/task-event-types.d.ts

@@ -25,7 +25,8 @@ export declare const taskConfigSchema: z.ZodObject<{
     repos: z.ZodArray<z.ZodObject<{
         repoUrl: z.ZodString;
         baseBranch: z.ZodString;
-        workspacePath: z.ZodString;
+        gitDirPath: z.ZodString;
+        workPath: z.ZodString;
     }, z.core.$strip>>;
     context: z.ZodRecord<z.ZodString, z.ZodUnknown>;
     effectiveConfig: z.ZodObject<{
@@ -113,7 +114,8 @@ export declare const taskEventSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         repos: z.ZodArray<z.ZodObject<{
             repoUrl: z.ZodString;
             baseBranch: z.ZodString;
-            workspacePath: z.ZodString;
+            gitDirPath: z.ZodString;
+            workPath: z.ZodString;
         }, z.core.$strip>>;
         context: z.ZodRecord<z.ZodString, z.ZodUnknown>;
         effectiveConfig: z.ZodObject<{
@@ -268,6 +270,65 @@ export declare const taskEventSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     prUrl: z.ZodNullable<z.ZodString>;
     branchName: z.ZodNullable<z.ZodString>;
     pushedCommits: z.ZodArray<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    branch: z.ZodString;
+    event: z.ZodLiteral<"controller-git-push-started">;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    branch: z.ZodString;
+    event: z.ZodLiteral<"controller-git-push-retry">;
+    attempts: z.ZodNumber;
+    message: z.ZodString;
+    retryDelaySeconds: z.ZodNumber;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    branch: z.ZodString;
+    event: z.ZodLiteral<"controller-git-push-fetch-retry">;
+    attempts: z.ZodNumber;
+    message: z.ZodString;
+    retryDelaySeconds: z.ZodNumber;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    branch: z.ZodString;
+    event: z.ZodLiteral<"controller-git-push-succeeded">;
+    attempts: z.ZodNumber;
+    localHead: z.ZodOptional<z.ZodString>;
+    remoteBranchHead: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    branch: z.ZodString;
+    event: z.ZodLiteral<"controller-git-push-failed">;
+    attempts: z.ZodNumber;
+    message: z.ZodString;
+    phase: z.ZodOptional<z.ZodEnum<{
+        push: "push";
+        "pre-push-fetch": "pre-push-fetch";
+        "post-push-fetch": "post-push-fetch";
+    }>>;
+    retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    event: z.ZodLiteral<"controller-git-pull-started">;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    event: z.ZodLiteral<"controller-git-pull-retry">;
+    attempts: z.ZodNumber;
+    message: z.ZodString;
+    retryDelaySeconds: z.ZodNumber;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    event: z.ZodLiteral<"controller-git-pull-succeeded">;
+    attempts: z.ZodNumber;
+    defaultBranch: z.ZodString;
+    remoteDefaultHead: z.ZodOptional<z.ZodString>;
+    localDefaultHead: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    repoUrl: z.ZodString;
+    event: z.ZodLiteral<"controller-git-pull-failed">;
+    attempts: z.ZodNumber;
+    message: z.ZodString;
+    retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>, z.ZodObject<{
     event: z.ZodLiteral<"task-completed">;
 }, z.core.$strip>, z.ZodObject<{

package/dist/state/task-event-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-event-types.d.ts","sourceRoot":"","sources":["../../src/state/task-event-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,eAAe;;;;EAAqB,CAAC;AAClD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,gBAAgB,+HAUS,CAAC;AAEvC,eAAO,MAAM,gBAAgB;;;;;;;;;;EAA2B,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,iBAAiB,4CAA6C,CAAC;AAE5E,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAM3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,+BAA+B;;;;;;iBAM1C,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAC;AAExF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAuE1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CACzB"}
+{"version":3,"file":"task-event-types.d.ts","sourceRoot":"","sources":["../../src/state/task-event-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,eAAe;;;;EAAqB,CAAC;AAClD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,gBAAgB,+HAUS,CAAC;AAEvC,eAAO,MAAM,gBAAgB;;;;;;;;;;EAA2B,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,iBAAiB,4CAA6C,CAAC;AAE5E,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAM3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,+BAA+B;;;;;;iBAM1C,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAC;AAWxF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAyH1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CACzB"}

package/dist/state/task-event-types.js

@@ -31,6 +31,13 @@ export const verificationCommandResultSchema = z.object({
     output: z.string(),
     logPath: z.string().optional(),
 });
+const controllerGitPushBaseSchema = z.object({
+    repoUrl: z.string().min(1),
+    branch: z.string().min(1),
+});
+const controllerGitPullBaseSchema = z.object({
+    repoUrl: z.string().min(1),
+});
 export const taskEventSchema = z.discriminatedUnion('event', [
     z.object({
         event: z.literal('task-accepted'),
@@ -92,6 +99,56 @@ export const taskEventSchema = z.discriminatedUnion('event', [
         branchName: z.string().nullable(),
         pushedCommits: z.array(z.string()),
     }),
+    controllerGitPushBaseSchema.extend({
+        event: z.literal('controller-git-push-started'),
+    }),
+    controllerGitPushBaseSchema.extend({
+        event: z.literal('controller-git-push-retry'),
+        attempts: z.number().int().positive(),
+        message: z.string(),
+        retryDelaySeconds: z.number().positive(),
+    }),
+    controllerGitPushBaseSchema.extend({
+        event: z.literal('controller-git-push-fetch-retry'),
+        attempts: z.number().int().positive(),
+        message: z.string(),
+        retryDelaySeconds: z.number().positive(),
+    }),
+    controllerGitPushBaseSchema.extend({
+        event: z.literal('controller-git-push-succeeded'),
+        attempts: z.number().int().positive(),
+        localHead: z.string().optional(),
+        remoteBranchHead: z.string().optional(),
+    }),
+    controllerGitPushBaseSchema.extend({
+        event: z.literal('controller-git-push-failed'),
+        attempts: z.number().int().nonnegative(),
+        message: z.string(),
+        phase: z.enum(['pre-push-fetch', 'push', 'post-push-fetch']).optional(),
+        retryAfterSeconds: z.number().int().positive().optional(),
+    }),
+    controllerGitPullBaseSchema.extend({
+        event: z.literal('controller-git-pull-started'),
+    }),
+    controllerGitPullBaseSchema.extend({
+        event: z.literal('controller-git-pull-retry'),
+        attempts: z.number().int().positive(),
+        message: z.string(),
+        retryDelaySeconds: z.number().positive(),
+    }),
+    controllerGitPullBaseSchema.extend({
+        event: z.literal('controller-git-pull-succeeded'),
+        attempts: z.number().int().positive(),
+        defaultBranch: z.string().min(1),
+        remoteDefaultHead: z.string().optional(),
+        localDefaultHead: z.string().optional(),
+    }),
+    controllerGitPullBaseSchema.extend({
+        event: z.literal('controller-git-pull-failed'),
+        attempts: z.number().int().nonnegative(),
+        message: z.string(),
+        retryAfterSeconds: z.number().int().positive().optional(),
+    }),
     z.object({
         event: z.literal('task-completed'),
     }),

package/dist/state/task-event-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-event-types.js","sourceRoot":"","sources":["../../src/state/task-event-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-event-types.js","sourceRoot":"","sources":["../../src/state/task-event-types.ts"],"names":[],"mappings":"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"}

package/dist/state/task-state.d.ts

@@ -1,5 +1,28 @@
 import type { ReviewResult } from '../shared/review-result.js';
 import type { TaskConfig, TaskEvent, TaskStatus, VerificationCommandResult } from './task-event-types.js';
+export interface ControllerGitPushState {
+    readonly repoUrl: string;
+    readonly branch: string;
+    readonly status: 'started' | 'retrying' | 'succeeded' | 'failed';
+    readonly attempts: number;
+    readonly message: string | null;
+    readonly phase: 'pre-push-fetch' | 'push' | 'post-push-fetch' | null;
+    readonly retryDelaySeconds: number | null;
+    readonly retryAfterSeconds: number | null;
+    readonly localHead: string | null;
+    readonly remoteBranchHead: string | null;
+}
+export interface ControllerGitPullState {
+    readonly repoUrl: string;
+    readonly status: 'started' | 'retrying' | 'succeeded' | 'failed';
+    readonly attempts: number;
+    readonly message: string | null;
+    readonly retryDelaySeconds: number | null;
+    readonly retryAfterSeconds: number | null;
+    readonly defaultBranch: string | null;
+    readonly remoteDefaultHead: string | null;
+    readonly localDefaultHead: string | null;
+}
 export interface TaskState {
     readonly taskId: string;
     readonly status: TaskStatus;
@@ -24,6 +47,10 @@ export interface TaskState {
         readonly branchName: string | null;
         readonly pushedCommits: readonly string[];
     } | null;
+    readonly controllerOperations: {
+        readonly gitPushes: readonly ControllerGitPushState[];
+        readonly gitPulls: readonly ControllerGitPullState[];
+    };
     readonly createdAt: string;
     readonly updatedAt: string;
 }

package/dist/state/task-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-state.d.ts","sourceRoot":"","sources":["../../src/state/task-state.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG/D,OAAO,KAAK,EAEX,UAAU,EACV,SAAS,EACT,UAAU,EACV,yBAAyB,EACzB,MAAM,uBAAuB,CAAC;AAG/B,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,cAAc,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,qBAAqB,EAAE,SAAS,yBAAyB,EAAE,GAAG,IAAI,CAAC;IAC5E,QAAQ,CAAC,YAAY,EAAE;QACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;KAC1C,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC3B;AAUD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,CA0BhF;AAiBD,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS,CAsFxE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAEpD;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA0BtF;AAED,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAyBzF"}
+{"version":3,"file":"task-state.d.ts","sourceRoot":"","sources":["../../src/state/task-state.ts"],"names":[],"mappings":"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"}

package/dist/state/task-state.js

@@ -31,6 +31,10 @@ export function createInitialState(taskId, config) {
         lastWorkReview: null,
         lastValidationResults: null,
         wrapupResult: null,
+        controllerOperations: {
+            gitPushes: [],
+            gitPulls: [],
+        },
         createdAt: now,
         updatedAt: now,
     };
@@ -49,6 +53,26 @@ function maxCyclesForPhase(state, phase) {
     const exhaustivePhase = phase;
     throw new Error(`Unhandled phase '${String(exhaustivePhase)}'.`);
 }
+function upsertGitPushState(state, nextPushState) {
+    const gitPushes = state.controllerOperations.gitPushes.filter((pushState) => pushState.repoUrl !== nextPushState.repoUrl || pushState.branch !== nextPushState.branch);
+    return {
+        ...state,
+        controllerOperations: {
+            ...state.controllerOperations,
+            gitPushes: [...gitPushes, nextPushState],
+        },
+    };
+}
+function upsertGitPullState(state, nextPullState) {
+    const gitPulls = state.controllerOperations.gitPulls.filter((pullState) => pullState.repoUrl !== nextPullState.repoUrl);
+    return {
+        ...state,
+        controllerOperations: {
+            ...state.controllerOperations,
+            gitPulls: [...gitPulls, nextPullState],
+        },
+    };
+}
 export function applyEvent(state, event) {
     const updatedAt = new Date().toISOString();
     switch (event.event) {
@@ -123,6 +147,133 @@ export function applyEvent(state, event) {
                 },
                 updatedAt,
             };
+        case 'controller-git-push-started':
+            return {
+                ...upsertGitPushState(state, {
+                    repoUrl: event.repoUrl,
+                    branch: event.branch,
+                    status: 'started',
+                    attempts: 0,
+                    message: null,
+                    phase: null,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: null,
+                    localHead: null,
+                    remoteBranchHead: null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-push-retry':
+            return {
+                ...upsertGitPushState(state, {
+                    repoUrl: event.repoUrl,
+                    branch: event.branch,
+                    status: 'retrying',
+                    attempts: event.attempts,
+                    message: event.message,
+                    phase: 'push',
+                    retryDelaySeconds: event.retryDelaySeconds,
+                    retryAfterSeconds: null,
+                    localHead: null,
+                    remoteBranchHead: null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-push-fetch-retry':
+            // Pre-push default-branch fetch retries are logged without surfacing a phantom push.
+            return { ...state, updatedAt };
+        case 'controller-git-push-succeeded':
+            return {
+                ...upsertGitPushState(state, {
+                    repoUrl: event.repoUrl,
+                    branch: event.branch,
+                    status: 'succeeded',
+                    attempts: event.attempts,
+                    message: null,
+                    phase: null,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: null,
+                    localHead: event.localHead ?? null,
+                    remoteBranchHead: event.remoteBranchHead ?? null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-push-failed':
+            return {
+                ...upsertGitPushState(state, {
+                    repoUrl: event.repoUrl,
+                    branch: event.branch,
+                    status: 'failed',
+                    attempts: event.attempts,
+                    message: event.message,
+                    phase: event.phase ?? null,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: event.retryAfterSeconds ?? null,
+                    localHead: null,
+                    remoteBranchHead: null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-pull-started':
+            return {
+                ...upsertGitPullState(state, {
+                    repoUrl: event.repoUrl,
+                    status: 'started',
+                    attempts: 0,
+                    message: null,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: null,
+                    defaultBranch: null,
+                    remoteDefaultHead: null,
+                    localDefaultHead: null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-pull-retry':
+            return {
+                ...upsertGitPullState(state, {
+                    repoUrl: event.repoUrl,
+                    status: 'retrying',
+                    attempts: event.attempts,
+                    message: event.message,
+                    retryDelaySeconds: event.retryDelaySeconds,
+                    retryAfterSeconds: null,
+                    defaultBranch: null,
+                    remoteDefaultHead: null,
+                    localDefaultHead: null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-pull-succeeded':
+            return {
+                ...upsertGitPullState(state, {
+                    repoUrl: event.repoUrl,
+                    status: 'succeeded',
+                    attempts: event.attempts,
+                    message: null,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: null,
+                    defaultBranch: event.defaultBranch,
+                    remoteDefaultHead: event.remoteDefaultHead ?? null,
+                    localDefaultHead: event.localDefaultHead ?? null,
+                }),
+                updatedAt,
+            };
+        case 'controller-git-pull-failed':
+            return {
+                ...upsertGitPullState(state, {
+                    repoUrl: event.repoUrl,
+                    status: 'failed',
+                    attempts: event.attempts,
+                    message: event.message,
+                    retryDelaySeconds: null,
+                    retryAfterSeconds: event.retryAfterSeconds ?? null,
+                    defaultBranch: null,
+                    remoteDefaultHead: null,
+                    localDefaultHead: null,
+                }),
+                updatedAt,
+            };
         case 'task-completed':
             return { ...state, status: 'completed', updatedAt };
         case 'task-failed':