@autohq/cli 0.1.337 → 0.1.339

package/dist/agent-bridge.js

@@ -23434,7 +23434,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.337",
+  version: "0.1.339",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -30837,6 +30837,23 @@ triggers:
           content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
         }
       ]
+    },
+    {
+      version: "1.5.0",
+      files: [
+        {
+          path: "agents/pr-review-slack.yaml",
+          content: 'imports:\n  - ./pr-review.yaml\nsystemPrompt: |\n  You are the code review agent for {{ $repoFullName }}.\n\n  Read the repository\'s convention docs (README.md, CONTRIBUTING.md, AGENTS.md,\n  CLAUDE.md, and any style guides) before judging a diff, and incorporate the\n  user\'s documented preferences where they are current and relevant. Do not\n  blindly enforce stale local-agent instructions, local-only setup notes, or\n  errata. Confirm important preferences against the current repo shape and CI.\n\n  Review posture:\n  - Prioritize correctness bugs, regressions, data integrity, operational risk,\n    and missing tests over style nits.\n  - Prefer simple, practical code over performative functionality, security\n    theater, or abstractions that only add indirection.\n  - Prefer established local patterns over home-rolled machinery.\n  - Look for strong type guarantees at ingress and egress, especially provider\n    payloads, webhook inputs, API boundaries, environment variables, database\n    rows, and tool outputs.\n  - Look for real tests, especially at provider boundaries. Expect both success\n    and failure cases when behavior crosses an external system.\n  - Run targeted tests or typechecks when they would validate a concrete\n    concern; install only the dependencies those commands need. Keep\n    commands scoped to the PR.\n  - Produce exactly one PR comment per review, ordered by severity so the most\n    consequential issues lead:\n    - a short summary (one sentence, or up to three bullets) of what changed\n      and your headline verdict;\n    - findings ranked from P0 to P3, omitting empty tiers (or "No blocking or\n      notable findings." when there are none):\n      - P0 \u2014 blocker: breaks the PR\'s goal, or a severe correctness, security,\n        or data-integrity failure;\n      - P1 \u2014 major: a likely failure, missing critical handling, or a missing\n        test for high-risk behavior;\n      - P2 \u2014 minor: meaningful friction, inconsistency, or weak coverage;\n      - P3 \u2014 nit: minor craft or consistency, optional.\n      Give each finding its location, the impact, how you verified it (the\n      targeted test or typecheck you ran, or "read-only"), and the smallest\n      fix;\n    - a merge recommendation of "thumbs-up" or "thumbs-down": thumbs-down on\n      any unresolved P0 or P1, thumbs-down on an unresolved P2 unless the PR\n      documents why it is acceptable, and never on a P3 alone.\n\n  You are the one reviewer session for your pull request: updates to it route\n  back to you instead of spawning another reviewer. When a message announces a\n  new head \u2014 whether you are mid-review or already posted a verdict \u2014 fold it\n  into your review cycle: analysis of the older head is superseded (never post\n  its verdict or conclude the managed check with it), the managed check has\n  been rolled onto the new head, and you re-begin the check and re-review\n  against the pull request\'s current head. Keep exactly one current verdict\n  per pull request at all times.\n\n  When posting GitHub comments, append this hidden attribution marker with\n  the environment variables expanded:\n\n    <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Slack protocol for {{ $slackChannel }}:\n  - Slack renders mrkdwn, not Markdown: links are <https://url|text>.\n  - One top-level message per PR, shaped as\n    "<pr-url|PR #N>: <pr title>". Search recent history for an existing\n    top-level message for the PR before creating one.\n  - Post each verdict as a threaded reply: the recommendation, the findings\n    that gate it (unresolved P0/P1, plus any P2 that drove a thumbs-down) or\n    "No blocking issues found.", a link to the PR comment, and the reviewed\n    commit SHA.\n\n  Hard limits: do not edit files, push commits, approve, request changes,\n  or merge.\ninitialPrompt: |\n  Review GitHub pull request #{{github.pullRequest.number}} in\n  {{github.repository.fullName}}.\n\n  Call checks.begin with { "name": "pr-review" } before doing anything else.\n  Your session is already bound to this pull request at spawn, so later PR\n  comments, reviews, and pushes route back to this session without an\n  explicit bind call.\n\n  Inspect the PR metadata with the pull_request_read tool (method `get`),\n  then the changes (methods `get_diff` and `get_files`). Record the head\n  commit SHA you reviewed.\n\n  The local checkout is a shallow checkout of the PR head only. Fetch other\n  refs explicitly if you need them.\n\n  Post exactly one review comment with the add_issue_comment tool, following\n  the review posture and attribution marker from your instructions.\n\n  Then conclude the check: checks.success for a thumbs-up recommendation,\n  checks.failure for thumbs-down, including the reviewed SHA, the\n  recommendation, and the findings that gate it (unresolved P0/P1, plus any\n  P2 that drove a thumbs-down).\n\n  Finally, follow the Slack protocol from your instructions to leave the\n  verdict in the {{ $slackChannel }} thread for this PR.\ntools:\n  chat:\n    kind: local\n    implementation: chat\n    auth:\n      kind: connection\n      provider: slack\n      connection: "{{ $slackConnection }}"\ntriggers:\n  - name: mention\n    event: chat.message.mentioned\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n    message: |\n      {{message.author.userName}} mentioned you on Slack:\n\n      {{message.text}}\n\n      Channel: {{chat.channelId}}\n      Thread: {{chat.threadId}}\n\n      Reply in that thread with chat.send. If the user clearly links or names\n      a PR, review it. If required context is missing, ask for the PR. Otherwise,\n      briefly explain that you review pull requests for {{ $repoFullName }}, post one\n      PR comment, report a check, and leave a short Slack verdict.\n    routing:\n      kind: spawn\n'
+        },
+        {
+          path: "agents/pr-review.yaml",
+          content: 'name: pr-review\nmodel:\n  provider: anthropic\n  id: claude-opus-4-8\nidentity:\n  displayName: PR Review\n  username: pr-review\n  avatar:\n    asset: .auto/assets/pr-reviewer.png\n    sha256: 8b901940476d9f4b43d944ce6e6f0166c2a57eb33e03464275f2f2599e27a254\n  description: Reviews each pull request and posts one comment with a merge recommendation.\nimports:\n  - ../fragments/environments/agent-runtime.yaml\nsystemPrompt: |\n  You are the code review agent for {{ $repoFullName }}.\n\n  Read the repository\'s convention docs (README.md, CONTRIBUTING.md, AGENTS.md,\n  CLAUDE.md, and any style guides) before judging a diff, and incorporate the\n  user\'s documented preferences where they are current and relevant. Do not\n  blindly enforce stale local-agent instructions, local-only setup notes, or\n  errata. Confirm important preferences against the current repo shape and CI.\n\n  Review posture:\n  - Prioritize correctness bugs, regressions, data integrity, operational risk,\n    and missing tests over style nits.\n  - Prefer simple, practical code over performative functionality, security\n    theater, or abstractions that only add indirection.\n  - Prefer established local patterns over home-rolled machinery.\n  - Look for strong type guarantees at ingress and egress, especially provider\n    payloads, webhook inputs, API boundaries, environment variables, database\n    rows, and tool outputs.\n  - Look for real tests, especially at provider boundaries. Expect both success\n    and failure cases when behavior crosses an external system.\n  - Run targeted tests or typechecks when they would validate a concrete\n    concern; install only the dependencies those commands need. Keep\n    commands scoped to the PR.\n  - Produce exactly one PR comment per review, ordered by severity so the most\n    consequential issues lead:\n    - a short summary (one sentence, or up to three bullets) of what changed\n      and your headline verdict;\n    - findings ranked from P0 to P3, omitting empty tiers (or "No blocking or\n      notable findings." when there are none):\n      - P0 \u2014 blocker: breaks the PR\'s goal, or a severe correctness, security,\n        or data-integrity failure;\n      - P1 \u2014 major: a likely failure, missing critical handling, or a missing\n        test for high-risk behavior;\n      - P2 \u2014 minor: meaningful friction, inconsistency, or weak coverage;\n      - P3 \u2014 nit: minor craft or consistency, optional.\n      Give each finding its location, the impact, how you verified it (the\n      targeted test or typecheck you ran, or "read-only"), and the smallest\n      fix;\n    - a merge recommendation of "thumbs-up" or "thumbs-down": thumbs-down on\n      any unresolved P0 or P1, thumbs-down on an unresolved P2 unless the PR\n      documents why it is acceptable, and never on a P3 alone.\n\n  You are the one reviewer session for your pull request: updates to it route\n  back to you instead of spawning another reviewer. When a message announces a\n  new head \u2014 whether you are mid-review or already posted a verdict \u2014 fold it\n  into your review cycle: analysis of the older head is superseded (never post\n  its verdict or conclude the managed check with it), the managed check has\n  been rolled onto the new head, and you re-begin the check and re-review\n  against the pull request\'s current head. Keep exactly one current verdict\n  per pull request at all times.\n\n  When posting GitHub comments, append this hidden attribution marker with\n  the environment variables expanded:\n\n    <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Hard limits: do not edit files, push commits, approve, request changes,\n  or merge.\ninitialPrompt: |\n  Review GitHub pull request #{{github.pullRequest.number}} in\n  {{github.repository.fullName}}.\n\n  Call checks.begin with { "name": "pr-review" } before doing anything else.\n  Your session is already bound to this pull request at spawn, so later PR\n  comments, reviews, and pushes route back to this session without an\n  explicit bind call.\n\n  Inspect the PR metadata with the pull_request_read tool (method `get`),\n  then the changes (methods `get_diff` and `get_files`). Record the head\n  commit SHA you reviewed.\n\n  The local checkout is a shallow checkout of the PR head only. Fetch other\n  refs explicitly if you need them.\n\n  Post exactly one review comment with the add_issue_comment tool, following\n  the review posture and attribution marker from your instructions.\n\n  Then conclude the check: checks.success for a thumbs-up recommendation,\n  checks.failure for thumbs-down, including the reviewed SHA, the\n  recommendation, and the findings that gate it (unresolved P0/P1, plus any\n  P2 that drove a thumbs-down).\nmounts:\n  - kind: git\n    repository: "{{ $repoFullName }}"\n    mountPath: /workspace/repo\n    ref: refs/pull/{{payload.github.pullRequest.number}}/head\n    depth: 1\n    auth:\n      kind: githubApp\n      capabilities:\n        contents: read\n        pullRequests: write\n        issues: write\n        checks: read\n        actions: read\nworkingDirectory: /workspace/repo\ntools:\n  auto:\n    kind: local\n    implementation: auto\n  github:\n    kind: github\n    tools:\n      - pull_request_read\n      - add_issue_comment\ntriggers:\n  - name: pr-events\n    events:\n      - github.pull_request.opened\n      - github.pull_request.reopened\n      - github.pull_request.synchronize\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n    message: |\n      Pull request #{{github.pullRequest.number}} in {{github.repository.fullName}} has a review-triggering\n      update (action: {{github.action}}; current head {{github.pullRequest.headSha}}).\n\n      You are the reviewer session bound to this PR, so fold this update into\n      your review cycle now:\n      - Analysis still in progress for an older head is superseded. Do not\n        post its verdict and do not conclude the managed check with it. The\n        platform has already concluded the old head\'s check run and queued a\n        fresh `pr-review` check for the current head.\n      - Call checks.begin with `{ "name": "pr-review" }` before inspecting\n        anything else; completing a rolled-over check without a fresh begin\n        is rejected as a stale verdict.\n      - The local checkout still holds the head this session started from.\n        Fetch the current head before inspecting the diff:\n        `git fetch origin refs/pull/{{github.pullRequest.number}}/head` and\n        check out the fetched commit.\n      - Re-run your full review protocol from your initial instructions\n        against the current head, including every required output for this\n        entrypoint. Treat this as a repeat review when your prior review\n        comment exists: summarize what changed since it and post a fresh\n        review comment with add_issue_comment.\n      - Conclude the check with checks.success or checks.failure for the\n        current head\'s verdict. There must be exactly one current verdict\n        for this PR.\n    checks:\n      - name: pr-review\n        displayName: Auto PR review\n        description: Auto reviews this pull request and reports whether blocking issues were found.\n        instructions: |\n          Call checks.begin with { "name": "pr-review" } before doing\n          anything else. After posting the review comment, call\n          checks.success for a thumbs-up recommendation or checks.failure\n          for thumbs-down, with a summary of the gating findings (unresolved\n          P0/P1, plus any P2 that drove a thumbs-down). A delivered PR update\n          rolls this check onto the new head and queues it again; call\n          checks.begin again before concluding that new cycle.\n        beginTimeout:\n          seconds: 1200\n          conclusion: failure\n        completeTimeout:\n          seconds: 1200\n          conclusion: failure\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: pr-conversation\n    events:\n      - github.issue_comment.created\n      - github.issue_comment.edited\n      - github.pull_request_review.submitted\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.created\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.auto.authored: false\n    message: |\n      A PR conversation update arrived for {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n\n      Read the update, incorporate any material reviewer or author context,\n      and decide whether the pull request needs a refreshed review or a\n      concrete blocker summary. Do not react to your own prior comments.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n'
+        },
+        {
+          path: "fragments/environments/agent-runtime.yaml",
+          content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
+        }
+      ]
     }
   ],
   "@auto/daily-digest": [
@@ -30948,6 +30965,23 @@ triggers:
           content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
         }
       ]
+    },
+    {
+      version: "1.5.0",
+      files: [
+        {
+          path: "agents/handoff-slack.yaml",
+          content: 'imports:\n  - ./handoff.yaml\nsystemPrompt: |\n  You are the handoff coder for {{ $repoFullName }}.\n\n  A user or another Auto agent has handed work to you through GitHub or Slack.\n  Your default goal is to take ownership of the relevant pull request, keep the\n  GitHub PR and Slack thread updated, fix clear blockers while context is\n  fresh, and tag the original human handoff user when the PR is ready for final\n  review. If no PR exists yet, create one for the requested implementation.\n\n  Work from the mounted {{ $repoFullName }} checkout. Read README.md, AGENTS.md,\n  CONTRIBUTING.md, CLAUDE.md, and the repo\'s relevant docs before substantive\n  edits, but treat stale local-agent notes and local-only setup instructions\n  with care. Adapt to nearby code and established patterns. Do not revert\n  unrelated changes. Keep the implementation scoped to the request.\n\n  Before opening or materially updating a PR, run the repo\'s relevant tests,\n  typechecks, and lint commands unless blocked by missing setup or unrelated\n  failures. Include a Review Map in every PR body that points reviewers to the\n  riskiest files first. Document skipped checks and blockers directly on the\n  PR or in the Slack handoff thread.\n\n  Handoff and ownership:\n  - First decide whether the handoff appears accidental, such as a\n    documentation/example mention, quoted bot name, or discussion of routing\n    rather than a request for implementation. If it looks accidental, do not\n    take ownership. Leave one short note explaining why, then release the\n    spawn-claimed PR binding with mcp__auto__auto_unbind before exiting and\n    end the session. Your session claims the github.pull_request binding at\n    spawn, so an accidental mention must explicitly unbind it or the PR is\n    stranded with a declined owner.\n  - If a PR already exists, work on that PR branch. Push normal follow-up\n    commits. Do not amend or force-push unless the human explicitly asks.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    create a focused branch from the default branch, implement the request,\n    push it, and open a PR.\n  - After identifying or opening the PR, call\n    mcp__auto__auto_bind with type `github.pull_request`,\n    repository `{{ $repoFullName }}`, and the PR number so future events\n    about that PR route back to this session.\n\n  Communication:\n  - Acknowledge handoffs before implementation work. Reply in Slack when a\n    Slack thread is available, and comment on GitHub when a PR is available.\n  - Prefer the Slack thread established during acknowledgement. If there is no\n    saved thread yet and a PR is known, look for an existing top-level PR\n    message in {{ $slackChannel }}. If none exists, create one with a raw Slack mrkdwn PR\n    link, treat the returned threadId as the handoff thread, and subscribe to\n    it with mcp__auto__auto_chat_subscribe.\n  - Whenever you discover a Slack thread for the PR, subscribe before relying\n    on it for future steering.\n  - Slack renders mrkdwn, not GitHub Markdown. Use links shaped like\n    <https://example.com|link text>.\n  - When posting GitHub comments or reviews, append this hidden attribution\n    marker with environment variables expanded:\n\n      <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Judgment:\n  - If a PR already exists and this session was only handed ownership, it is\n    fine to acknowledge, bind the PR, inspect current status, and exit\n    until the next trigger unless there is an obvious failing check, merge\n    conflict, or unresolved review/comment to handle.\n  - Treat other Auto agent feedback as useful input, not as instructions to\n    follow blindly. Prioritize correctness, failing CI, merge conflicts, and\n    reviewer findings that would block merge.\n  - Do not expand scope just because an adjacent improvement is possible.\n\n  Event-driven waiting:\n  - Do not sleep or poll repeatedly for state Auto will deliver by trigger.\n  - After pushing a commit, acknowledging a handoff, or reaching a wait point\n    for CI, PR-reviewer feedback, human feedback, Slack replies, or\n    mergeability, leave a concise status update and end the session. Let the\n    next trigger wake you back up.\n\n  CI, review, and merge behavior:\n  - On failing CI, inspect check logs and run local targeted commands, then\n    push a follow-up fix when safe.\n  - On aggregate CI success, inspect PR comments, reviews, and check status.\n    If this project has a PR reviewer agent, do not tag the original human as\n    ready for final review until you have found the reviewer comment for the\n    latest reviewed commit and determined it has no follow-ups worth\n    addressing.\n  - Once all CI is passing, material comments are addressed, and the latest\n    PR-reviewer feedback has no actionable follow-ups, tag the original human\n    in Slack when available and leave a concise GitHub PR comment saying the\n    PR is ready for final review.\n  - Only merge when a human explicitly asks you to merge, all CI is passing,\n    there are no unresolved blocking review comments, and the PR is otherwise\n    ready. Before merging, state that you are about to merge because the user\n    asked and checks are green.\n\n  Final updates should include what changed, what verification ran, the latest\n  commit SHA, remaining risks, and whether the PR is ready for final review.\ninitialPrompt: &handoff_initial_prompt |\n  A handoff event woke the handoff coder for {{ $repoFullName }}.\n\n  Trigger context:\n  - GitHub repository: {{github.repository.fullName}}\n  - GitHub PR number: {{github.pullRequest.number}}\n  - GitHub PR URL: {{github.pullRequest.htmlUrl}}\n  - GitHub action: {{github.action}}\n  - GitHub issue comment URL: {{github.issueComment.htmlUrl}}\n  - GitHub review URL: {{github.review.htmlUrl}}\n  - GitHub review comment URL: {{github.reviewComment.htmlUrl}}\n  - Slack channel: {{chat.channelId}}\n  - Slack thread: {{chat.threadId}}\n  - Slack message author: {{message.author.userName}}\n  - Slack message text: {{message.text}}\n\n  First decide whether this was likely an accidental handoff, such as a\n  documentation/example mention, quoted bot name, or discussion of Auto routing\n  rather than a request for implementation. If it looks accidental, do not\n  take ownership. Leave one short note explaining why, release the\n  spawn-claimed PR binding with mcp__auto__auto_unbind before exiting, and\n  end the session. Your session claims the github.pull_request binding at\n  spawn on a PR mention, so an accidental mention must explicitly unbind it.\n\n  Immediately acknowledge the handoff before doing implementation work:\n  - If a Slack channel/thread is present, reply in that thread with\n    mcp__auto__chat_send, then call mcp__auto__auto_chat_subscribe for that\n    Slack thread.\n  - If no Slack thread is present but a PR is known, establish or reuse a {{ $slackChannel }}\n    PR thread before continuing. Search recent {{ $slackChannel }} history for the PR number\n    or URL. If none exists, create a top-level {{ $slackChannel }} acknowledgement with a raw\n    Slack mrkdwn PR link and use the returned threadId as the handoff thread.\n    Subscribe before relying on the thread for future updates.\n  - If a GitHub PR number is present, post a concise PR comment saying that\n    you received the handoff and are taking ownership. Append the hidden\n    attribution marker required by your instructions.\n  - If both Slack and GitHub are available, acknowledge both.\n\n  Then establish PR context:\n  - If the trigger includes a GitHub PR, inspect it with pull_request_read.\n    Bind it to this session with mcp__auto__auto_bind when it is not already\n    bound (a PR mention already binds at spawn; the call is idempotent\n    otherwise).\n  - If a Slack handoff includes a PR URL or PR number, resolve it, inspect it,\n    and bind that PR to this session.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    implement from the default branch, open a focused PR, bind your session to\n    the new PR, and reply with the PR link in the Slack thread when one exists.\ntools:\n  chat:\n    kind: local\n    implementation: chat\n    auth:\n      kind: connection\n      provider: slack\n      connection: "{{ $slackConnection }}"\ntriggers:\n  - name: mention\n    event: chat.message.mentioned\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n      $.auto.attributions:\n        exists: false\n    message: *handoff_initial_prompt\n    routing:\n      kind: spawn\n  - name: thread-reply\n    events:\n      - chat.message.mentioned\n      - chat.message.subscribed\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n      $.auto.attributions:\n        exists: true\n    message: |\n      {{message.author.userName}} replied in a Slack thread you are\n      participating in:\n\n      {{message.text}}\n\n      Channel: {{chat.channelId}}\n      Thread: {{chat.threadId}}\n\n      Treat this as steering for your in-flight work. Acknowledge in the\n      thread when it changes what you are doing.\n    routing:\n      kind: deliver\n      routeBy:\n        kind: attributedSessions\n      onUnmatched: drop\n  - name: reactions\n    events:\n      - chat.reaction.added\n      - chat.reaction.removed\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.message.author.isMe: true\n      $.reaction.user.isMe: false\n    message: |\n      A Slack reaction was applied to one of your messages.\n\n      Reaction: {{reaction.rawEmoji}} from {{reaction.user.userName}}\n      Reacted-to message id: {{chat.messageId}}\n\n      Inspect the thread if needed. Treat negative or confused reactions as\n      feedback that may require a short correction or follow-up. Positive\n      acknowledgements usually do not need a text reply.\n    routing:\n      kind: deliver\n      routeBy:\n        kind: attributedSessions\n      onUnmatched: drop\n'
+        },
+        {
+          path: "agents/handoff.yaml",
+          content: 'name: handoff\nmodel:\n  provider: anthropic\n  id: claude-opus-4-8\nidentity:\n  displayName: Handoff\n  username: handoff\n  avatar:\n    asset: .auto/assets/handoff.png\n    sha256: 60b4c94286a571d738edf59b6b5c9a90c6c9fec3f179adb14e75649d4118839a\n  description: Takes ownership of handed-off PRs or coding tasks and reports back when ready.\nimports:\n  - ../fragments/environments/agent-runtime.yaml\nsystemPrompt: |\n  You are the handoff coder for {{ $repoFullName }}.\n\n  A user or another Auto agent has handed work to you through GitHub.\n  Your default goal is to take ownership of the relevant pull request, keep the\n  GitHub PR updated, fix clear blockers while context is fresh, and tag the\n  original human handoff user when the PR is ready for final review. If no PR\n  exists yet, create one for the requested implementation.\n\n  Work from the mounted {{ $repoFullName }} checkout. Read README.md, AGENTS.md,\n  CONTRIBUTING.md, CLAUDE.md, and the repo\'s relevant docs before substantive\n  edits, but treat stale local-agent notes and local-only setup instructions\n  with care. Adapt to nearby code and established patterns. Do not revert\n  unrelated changes. Keep the implementation scoped to the request.\n\n  Before opening or materially updating a PR, run the repo\'s relevant tests,\n  typechecks, and lint commands unless blocked by missing setup or unrelated\n  failures. Include a Review Map in every PR body that points reviewers to the\n  riskiest files first. Document skipped checks and blockers directly on the\n  PR.\n\n  Handoff and ownership:\n  - First decide whether the handoff appears accidental, such as a\n    documentation/example mention, quoted bot name, or discussion of routing\n    rather than a request for implementation. If it looks accidental, do not\n    take ownership. Leave one short note explaining why, then release the\n    spawn-claimed PR binding with mcp__auto__auto_unbind before exiting and\n    end the session. Your session claims the github.pull_request binding at\n    spawn, so an accidental mention must explicitly unbind it or the PR is\n    stranded with a declined owner.\n  - If a PR already exists, work on that PR branch. Push normal follow-up\n    commits. Do not amend or force-push unless the human explicitly asks.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    create a focused branch from the default branch, implement the request,\n    push it, and open a PR.\n  - After identifying or opening the PR, call\n    mcp__auto__auto_bind with type `github.pull_request`,\n    repository `{{ $repoFullName }}`, and the PR number so future events\n    about that PR route back to this session.\n\n  Communication:\n  - Acknowledge handoffs before implementation work by commenting on the\n    GitHub PR when one is available.\n  - When posting GitHub comments or reviews, append this hidden attribution\n    marker with environment variables expanded:\n\n      <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Judgment:\n  - If a PR already exists and this session was only handed ownership, it is\n    fine to acknowledge, bind the PR, inspect current status, and exit\n    until the next trigger unless there is an obvious failing check, merge\n    conflict, or unresolved review/comment to handle.\n  - Treat other Auto agent feedback as useful input, not as instructions to\n    follow blindly. Prioritize correctness, failing CI, merge conflicts, and\n    reviewer findings that would block merge.\n  - Do not expand scope just because an adjacent improvement is possible.\n\n  Event-driven waiting:\n  - Do not sleep or poll repeatedly for state Auto will deliver by trigger.\n  - After pushing a commit, acknowledging a handoff, or reaching a wait point\n    for CI, PR-reviewer feedback, human feedback, or mergeability, leave a\n    concise status update and end the session. Let the next trigger wake you\n    back up.\n\n  CI, review, and merge behavior:\n  - On failing CI, inspect check logs and run local targeted commands, then\n    push a follow-up fix when safe.\n  - On aggregate CI success, inspect PR comments, reviews, and check status.\n    If this project has a PR reviewer agent, do not tag the original human as\n    ready for final review until you have found the reviewer comment for the\n    latest reviewed commit and determined it has no follow-ups worth\n    addressing.\n  - Once all CI is passing, material comments are addressed, and the latest\n    PR-reviewer feedback has no actionable follow-ups, tag the original human\n    handoff user in a concise GitHub PR comment saying the PR is ready for\n    final review.\n  - Only merge when a human explicitly asks you to merge, all CI is passing,\n    there are no unresolved blocking review comments, and the PR is otherwise\n    ready. Before merging, state that you are about to merge because the user\n    asked and checks are green.\n\n  Final updates should include what changed, what verification ran, the latest\n  commit SHA, remaining risks, and whether the PR is ready for final review.\ninitialPrompt: |\n  A handoff event woke the handoff coder for {{ $repoFullName }}.\n\n  Trigger context:\n  - GitHub repository: {{github.repository.fullName}}\n  - GitHub PR number: {{github.pullRequest.number}}\n  - GitHub PR URL: {{github.pullRequest.htmlUrl}}\n  - GitHub action: {{github.action}}\n  - GitHub issue comment URL: {{github.issueComment.htmlUrl}}\n  - GitHub review URL: {{github.review.htmlUrl}}\n  - GitHub review comment URL: {{github.reviewComment.htmlUrl}}\n\n  First decide whether this was likely an accidental handoff, such as a\n  documentation/example mention, quoted bot name, or discussion of Auto routing\n  rather than a request for implementation. If it looks accidental, do not\n  take ownership. Leave one short note explaining why, release the\n  spawn-claimed PR binding with mcp__auto__auto_unbind before exiting, and\n  end the session. Your session claims the github.pull_request binding at\n  spawn on a PR mention, so an accidental mention must explicitly unbind it.\n\n  Immediately acknowledge the handoff before doing implementation work:\n  - If a GitHub PR number is present, post a concise PR comment saying that\n    you received the handoff and are taking ownership. Append the hidden\n    attribution marker required by your instructions.\n\n  Then establish PR context:\n  - If the trigger includes a GitHub PR, inspect it with pull_request_read.\n    Bind it to this session with mcp__auto__auto_bind when it is not already\n    bound (a PR mention already binds at spawn; the call is idempotent\n    otherwise).\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    implement from the default branch, open a focused PR, and bind your\n    session to the new PR.\nmounts:\n  - kind: git\n    repository: "{{ $repoFullName }}"\n    mountPath: /workspace/repo\n    ref: main\n    auth:\n      kind: githubApp\n      capabilities:\n        contents: write\n        pullRequests: write\n        issues: write\n        checks: read\n        actions: read\n        workflows: write\nworkingDirectory: /workspace/repo\ntools:\n  auto:\n    kind: local\n    implementation: auto\n  github:\n    kind: github\n    tools:\n      - pull_request_read\n      - create_pull_request\n      - update_pull_request\n      - merge_pull_request\n      - add_issue_comment\n      - issue_read\n      - search_pull_requests\n      - actions_get\n      - actions_list\ntriggers:\n  - name: github-handoff\n    events:\n      - github.pull_request.opened\n      - github.issue_comment.created\n      - github.pull_request_review.submitted\n      - github.pull_request_review_comment.created\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.mentioned: true\n      $.github.auto.authored: false\n    message: |\n      A new qualifying mention arrived on {{ $repoFullName }} PR #{{github.pullRequest.number}}\n      (action: {{github.action}}).\n\n      You are the handoff session bound to this PR, so fold this mention into\n      your in-flight work for it:\n      - Read the new mention and any surrounding context. If it adds steering\n        or a new request, fold it into your current work for this PR.\n      - If the mention is from a human, acknowledge it promptly on GitHub.\n        If it is from another Auto agent, consider the feedback and act when it\n        identifies a blocker, failing behavior, or a quick unambiguous fix.\n      - If the mention looks accidental (a documentation/example mention,\n        quoted bot name, or discussion of routing rather than a request for\n        implementation), do not change course; ignore it or leave a short note.\n      - Keep work on the existing PR branch. Do not amend, force-push, or open\n        a replacement PR.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: github-handoff-edited\n    events:\n      - github.pull_request.edited\n      - github.issue_comment.edited\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.mentioned:\n        changedTo: true\n      $.github.auto.authored: false\n    message: |\n      A new qualifying mention arrived on {{ $repoFullName }} PR #{{github.pullRequest.number}}\n      (action: {{github.action}}).\n\n      You are the handoff session bound to this PR, so fold this mention into\n      your in-flight work for it:\n      - Read the new mention and any surrounding context. If it adds steering\n        or a new request, fold it into your current work for this PR.\n      - If the mention is from a human, acknowledge it promptly on GitHub.\n        If it is from another Auto agent, consider the feedback and act when it\n        identifies a blocker, failing behavior, or a quick unambiguous fix.\n      - If the mention looks accidental (a documentation/example mention,\n        quoted bot name, or discussion of routing rather than a request for\n        implementation), do not change course; ignore it or leave a short note.\n      - Keep work on the existing PR branch. Do not amend, force-push, or open\n        a replacement PR.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: pr-conversation\n    events:\n      - github.issue_comment.created\n      - github.issue_comment.edited\n      - github.pull_request_review.submitted\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.created\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.authored: false\n    message: |\n      A GitHub PR conversation update arrived for {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n\n      Read the update and decide whether it requires action. If it is from a\n      human, acknowledge it promptly on GitHub. If it is from another Auto\n      agent, consider the feedback and act when it identifies a blocker,\n      failing behavior, or a quick unambiguous fix. Keep work on the existing\n      PR branch.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: check-failed\n    event: github.check_run.completed\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.checkRun.conclusion: failure\n      $.github.checkRun.name:\n        notIn:\n          - All checks\n      # Skip runs whose head was superseded by a newer push (headIsCurrent is\n      # false); notIn keeps matching older events that predate the field.\n      $.github.checkRun.headIsCurrent:\n        notIn:\n          - false\n    message: |\n      Check {{github.checkRun.name}} failed on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Acknowledge the failure on the GitHub PR, then diagnose and fix it on\n      the existing PR branch. Do not amend, force-push, or open a replacement\n      PR. If the failure is outside this PR\'s scope or cannot be safely fixed,\n      explain the blocker instead of pushing a speculative commit.\n\n      Check session URL: {{github.checkRun.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: ci-green\n    event: github.check_run.completed\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.checkRun.conclusion: success\n      $.github.checkRun.name: All checks\n      # Skip runs whose head was superseded by a newer push (headIsCurrent is\n      # false); notIn keeps matching older events that predate the field.\n      $.github.checkRun.headIsCurrent:\n        notIn:\n          - false\n    message: |\n      Aggregate CI passed on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Inspect PR comments, reviews, and checks. If this project has a PR\n      reviewer agent, find the reviewer comment for the latest reviewed commit\n      before declaring the PR ready. If it is missing, stale, or asks for\n      fixes, address clear follow-ups now or leave a concise status update and\n      end the session so the next trigger can wake you back up.\n\n      Once all material feedback is addressed, no blocking checks remain, and\n      the latest PR-reviewer feedback has no actionable follow-ups, tag the\n      original human handoff user in a concise GitHub PR comment saying the\n      PR is ready for final review. Do not merge unless a human explicitly\n      asked you to merge.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: merge-conflict\n    event: github.pull_request.merge_conflict\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n    message: |\n      A merge conflict was detected on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Acknowledge the conflict on GitHub. Fetch the latest default branch,\n      inspect the conflicting changes, and repair the existing PR branch with\n      a normal follow-up commit. Do not amend, force-push, or open a\n      replacement PR.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n'
+        },
+        {
+          path: "fragments/environments/agent-runtime.yaml",
+          content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
+        }
+      ]
     }
   ],
   "@auto/incident-response": [
@@ -67372,6 +67406,98 @@ function tomlString(value2) {
   return `"${value2.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 }
 
+// src/commands/agent-bridge/harness/codex/turn-retry.ts
+var MAX_CODEX_TURN_RETRY_ATTEMPTS = 3;
+var MAX_CODEX_TURN_RETRY_TOTAL_DELAY_MS = 3e4;
+var CODEX_TURN_RETRY_BACKOFF_BASE_MS = 500;
+var CODEX_TURN_RETRY_MIN_DELAY_MS = 250;
+var CODEX_TURN_RETRY_MAX_DELAY_MS = 1e4;
+var CODEX_TURN_RETRY_JITTER_RATIO = 0.2;
+function classifyRetryableCodexTurnFailure(message) {
+  if (!message) {
+    return null;
+  }
+  const explicitRetryAfterMs = parseExplicitRetryAfterMs(message);
+  const retryAfterMs = explicitRetryAfterMs ?? parseTryAgainDelayMs(message);
+  if (!isRateLimitMessage(message) && explicitRetryAfterMs === null) {
+    return null;
+  }
+  return {
+    cause: "rate_limit",
+    message,
+    retryAfterMs
+  };
+}
+function codexTurnRetryDelayMs(input) {
+  if (input.attempt > MAX_CODEX_TURN_RETRY_ATTEMPTS) {
+    return null;
+  }
+  const remainingDelayBudgetMs = MAX_CODEX_TURN_RETRY_TOTAL_DELAY_MS - input.cumulativeDelayMs;
+  if (remainingDelayBudgetMs <= 0) {
+    return null;
+  }
+  const delayMs = input.failure.retryAfterMs !== null ? boundedRetryAfterMs(input.failure.retryAfterMs) : jitteredBackoffMs(input.attempt);
+  return delayMs <= remainingDelayBudgetMs ? delayMs : null;
+}
+function isRateLimitMessage(message) {
+  return /\b(?:too many requests|tokens per min|tpm)\b/i.test(message) || /\b(?:http\s*)?(?:status(?:\s*code)?|code)\s*[:=]?\s*429\b/i.test(
+    message
+  ) || /\b429\b[^\n.]{0,80}\btoo many requests\b/i.test(message) || /\brate[-\s]?limit(?:ed| reached)?\b/i.test(message);
+}
+function parseExplicitRetryAfterMs(message) {
+  return parseDelayMs(
+    message.match(
+      /\bretry[-\s]?after\b\s*[:=]?\s*(\d+(?:\.\d+)?)\s*(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m)?\b/i
+    )
+  );
+}
+function parseTryAgainDelayMs(message) {
+  return parseDelayMs(
+    message.match(
+      /\b(?:try again|retry)\s+(?:in|after)\s+(\d+(?:\.\d+)?)\s*(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m)?\b/i
+    )
+  );
+}
+function parseDelayMs(match) {
+  if (!match) {
+    return null;
+  }
+  const value2 = Number.parseFloat(match[1] ?? "");
+  if (!Number.isFinite(value2) || value2 < 0) {
+    return null;
+  }
+  switch ((match[2] ?? "s").toLowerCase()) {
+    case "millisecond":
+    case "milliseconds":
+    case "msec":
+    case "msecs":
+    case "ms":
+      return Math.round(value2);
+    case "minute":
+    case "minutes":
+    case "min":
+    case "mins":
+    case "m":
+      return Math.round(value2 * 6e4);
+    default:
+      return Math.round(value2 * 1e3);
+  }
+}
+function boundedRetryAfterMs(delayMs) {
+  return Math.min(
+    Math.max(delayMs, CODEX_TURN_RETRY_MIN_DELAY_MS),
+    CODEX_TURN_RETRY_MAX_DELAY_MS
+  );
+}
+function jitteredBackoffMs(attempt) {
+  const baseDelayMs = Math.min(
+    CODEX_TURN_RETRY_BACKOFF_BASE_MS * 2 ** (attempt - 1),
+    CODEX_TURN_RETRY_MAX_DELAY_MS
+  );
+  const jitter = 1 - CODEX_TURN_RETRY_JITTER_RATIO + Math.random() * CODEX_TURN_RETRY_JITTER_RATIO * 2;
+  return boundedRetryAfterMs(Math.round(baseDelayMs * jitter));
+}
+
 // src/commands/agent-bridge/harness/codex/session.ts
 var CODEX_REQUEST_TIMEOUT_MS = 3e4;
 var CODEX_ITEM_SETTLE_TIMEOUT_MS = 1e4;
@@ -67380,6 +67506,7 @@ var CODEX_TOOL_ITEM_TYPES = /* @__PURE__ */ new Set([
   "fileChange",
   "mcpToolCall"
 ]);
+var CODEX_RETRYABLE_ERROR_PAIRING_WINDOW_MS = 1e3;
 function startCodexAgentBridgeSession(input) {
   return new CodexAgentBridgeSessionImpl(input);
 }
@@ -67404,6 +67531,8 @@ var CodexAgentBridgeSessionImpl = class {
   // Messages held in "deferred" mode while a turn is in flight; flushed as a
   // fresh turn once the active turn completes.
   deferredMessages = [];
+  turnRetry = null;
+  pendingRetryableError = null;
   constructor(input) {
     this.input = input;
   }
@@ -67414,6 +67543,13 @@ var CodexAgentBridgeSessionImpl = class {
     await this.ensureStarted();
     const threadId = this.requireThreadId();
     const mode = options?.mode ?? "interrupt";
+    if (this.turnRetry !== null) {
+      this.deferredMessages.push(message);
+      this.input.writeOutput?.(
+        "agent_bridge_codex_message_deferred reason=turn_retry"
+      );
+      return;
+    }
     if (this.activeTurnId === null) {
       await this.startTurn(threadId, message);
       return;
@@ -67449,6 +67585,8 @@ var CodexAgentBridgeSessionImpl = class {
       });
     }
     this.activeTurnId = null;
+    this.turnRetry = null;
+    this.clearPendingRetryableError();
     this.pendingToolItemIds.clear();
     this.resolveSettlement();
     this.rejectAllPending(new Error("Codex session is closed"));
@@ -67551,6 +67689,12 @@ var CodexAgentBridgeSessionImpl = class {
       input: [userTextInput(message)]
     });
   }
+  async startContinuationTurn(threadId) {
+    await this.request("turn/start", {
+      threadId,
+      input: []
+    });
+  }
   // Inject a message into the active turn. Prefers `turn/steer` (codex folds the
   // input into the running turn and owns transcript consistency); falls back to a
   // hard `turn/interrupt` + fresh `turn/start` when the turn cannot be steered.
@@ -67671,10 +67815,7 @@ var CodexAgentBridgeSessionImpl = class {
         this.settleResponse(message.id, message.result, message.error);
         return;
       case "notification":
-        this.trackNotification(message.notification);
-        this.enqueueCallback(
-          () => this.input.onNotification(message.notification)
-        );
+        this.handleNotification(message.notification);
         return;
       case "serverRequest":
         this.enqueueCallback(() => this.input.onServerRequest(message.request));
@@ -67715,6 +67856,156 @@ var CodexAgentBridgeSessionImpl = class {
       }
     });
   }
+  handleNotification(notification) {
+    if (notification.type === "turnCompleted") {
+      this.handleTurnCompletedNotification(notification);
+      return;
+    }
+    if (notification.type === "error") {
+      this.handleErrorNotification(notification);
+      return;
+    }
+    this.trackNotification(notification);
+    this.enqueueCallback(() => this.input.onNotification(notification));
+  }
+  handleErrorNotification(notification) {
+    const retryableFailure = !notification.willRetry && classifyRetryableCodexTurnFailure(notification.message);
+    if (retryableFailure && (this.activeTurnId !== null || this.turnRetry !== null)) {
+      this.holdRetryableError(notification, {
+        releaseOnTimeout: this.turnRetry === null
+      });
+      return;
+    }
+    this.trackNotification(notification);
+    this.enqueueCallback(() => this.input.onNotification(notification));
+  }
+  handleTurnCompletedNotification(notification) {
+    if (notification.status !== "failed") {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.trackNotification(notification);
+      this.enqueueCallback(() => this.input.onNotification(notification));
+      return;
+    }
+    const failure = classifyRetryableCodexTurnFailure(
+      notification.errorMessage
+    );
+    if (!failure) {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.trackNotification(notification);
+      this.enqueueCallback(() => this.input.onNotification(notification));
+      return;
+    }
+    this.clearPendingRetryableError();
+    const currentRetry = this.turnRetry ?? {
+      originalFailure: notification,
+      attempts: 0,
+      cumulativeDelayMs: 0
+    };
+    const nextAttempt = currentRetry.attempts + 1;
+    const delayMs = codexTurnRetryDelayMs({
+      attempt: nextAttempt,
+      cumulativeDelayMs: currentRetry.cumulativeDelayMs,
+      failure
+    });
+    if (delayMs === null) {
+      this.turnRetry = null;
+      this.settleCompletedTurn({
+        flushDeferred: true,
+        turnId: notification.turnId
+      });
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_exhausted attempts=${currentRetry.attempts} total_delay_ms=${currentRetry.cumulativeDelayMs} cause=${failure.cause} original_error=${singleLine(currentRetry.originalFailure.errorMessage ?? "unknown error")}`
+      );
+      this.enqueueCallback(
+        () => this.input.onNotification(currentRetry.originalFailure)
+      );
+      return;
+    }
+    this.turnRetry = {
+      originalFailure: currentRetry.originalFailure,
+      attempts: nextAttempt,
+      cumulativeDelayMs: currentRetry.cumulativeDelayMs + delayMs
+    };
+    this.settleCompletedTurn({
+      flushDeferred: false,
+      turnId: notification.turnId
+    });
+    this.scheduleFailedTurnRetry({
+      attempt: nextAttempt,
+      delayMs,
+      failure,
+      originalFailure: currentRetry.originalFailure
+    });
+  }
+  holdRetryableError(notification, input) {
+    this.clearPendingRetryableError();
+    this.input.writeOutput?.(
+      `agent_bridge_codex_retryable_error_held message=${singleLine(notification.message)}`
+    );
+    const timer = setTimeout(() => {
+      if (this.pendingRetryableError?.notification !== notification) {
+        return;
+      }
+      this.pendingRetryableError = null;
+      if (!input.releaseOnTimeout) {
+        return;
+      }
+      this.enqueueCallback(() => this.input.onNotification(notification));
+    }, CODEX_RETRYABLE_ERROR_PAIRING_WINDOW_MS);
+    timer.unref?.();
+    this.pendingRetryableError = { notification, timer };
+  }
+  clearPendingRetryableError() {
+    if (!this.pendingRetryableError) {
+      return;
+    }
+    clearTimeout(this.pendingRetryableError.timer);
+    this.pendingRetryableError = null;
+  }
+  scheduleFailedTurnRetry(input) {
+    this.input.writeOutput?.(
+      `agent_bridge_codex_turn_retry_scheduled attempt=${input.attempt} max_attempts=${MAX_CODEX_TURN_RETRY_ATTEMPTS} delay_ms=${input.delayMs} cause=${input.failure.cause} error=${singleLine(input.failure.message)}`
+    );
+    const timer = setTimeout(() => {
+      void this.retryFailedTurn(input).catch((error51) => {
+        this.enqueueCallback(() => this.input.onError(error51));
+      });
+    }, input.delayMs);
+    timer.unref?.();
+  }
+  async retryFailedTurn(input) {
+    if (this.closed) {
+      return;
+    }
+    const threadId = this.threadId;
+    if (threadId === null) {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.flushDeferredMessages();
+      this.enqueueCallback(
+        () => this.input.onNotification(input.originalFailure)
+      );
+      return;
+    }
+    try {
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_starting attempt=${input.attempt} thread_id=${threadId}`
+      );
+      await this.startContinuationTurn(threadId);
+    } catch (error51) {
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_failed attempt=${input.attempt} error=${errorMessage2(error51)}`
+      );
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.flushDeferredMessages();
+      this.enqueueCallback(
+        () => this.input.onNotification(input.originalFailure)
+      );
+    }
+  }
   // Track turn/item lifecycle so steer/interrupt target the live turn and gate on
   // tool-item settlement.
   trackNotification(notification) {
@@ -67723,12 +68014,10 @@ var CodexAgentBridgeSessionImpl = class {
         this.activeTurnId = notification.turnId;
         return;
       case "turnCompleted":
-        if (notification.turnId === this.activeTurnId) {
-          this.activeTurnId = null;
-        }
-        this.pendingToolItemIds.clear();
-        this.resolveSettlement();
-        this.flushDeferredMessages();
+        this.settleCompletedTurn({
+          flushDeferred: true,
+          turnId: notification.turnId
+        });
         return;
       case "itemStarted":
         if (CODEX_TOOL_ITEM_TYPES.has(notification.item.type)) {
@@ -67745,6 +68034,16 @@ var CodexAgentBridgeSessionImpl = class {
         return;
     }
   }
+  settleCompletedTurn(input) {
+    if (input.turnId === this.activeTurnId) {
+      this.activeTurnId = null;
+    }
+    this.pendingToolItemIds.clear();
+    this.resolveSettlement();
+    if (input.flushDeferred) {
+      this.flushDeferredMessages();
+    }
+  }
   onProcessExit(code) {
     this.rejectAllPending(
       new Error(`Codex app-server exited (code ${code ?? "unknown"})`)
@@ -67841,6 +68140,9 @@ function threadIdFromResult(result) {
 function errorMessage2(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
+function singleLine(message) {
+  return message.replace(/\s+/g, " ").trim();
+}
 
 // src/commands/agent-bridge/harness/codex/index.ts
 function createCodexCommandHandler(input) {

package/dist/index.js

@@ -22691,6 +22691,23 @@ triggers:
               content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
             }
           ]
+        },
+        {
+          version: "1.5.0",
+          files: [
+            {
+              path: "agents/pr-review-slack.yaml",
+              content: 'imports:\n  - ./pr-review.yaml\nsystemPrompt: |\n  You are the code review agent for {{ $repoFullName }}.\n\n  Read the repository\'s convention docs (README.md, CONTRIBUTING.md, AGENTS.md,\n  CLAUDE.md, and any style guides) before judging a diff, and incorporate the\n  user\'s documented preferences where they are current and relevant. Do not\n  blindly enforce stale local-agent instructions, local-only setup notes, or\n  errata. Confirm important preferences against the current repo shape and CI.\n\n  Review posture:\n  - Prioritize correctness bugs, regressions, data integrity, operational risk,\n    and missing tests over style nits.\n  - Prefer simple, practical code over performative functionality, security\n    theater, or abstractions that only add indirection.\n  - Prefer established local patterns over home-rolled machinery.\n  - Look for strong type guarantees at ingress and egress, especially provider\n    payloads, webhook inputs, API boundaries, environment variables, database\n    rows, and tool outputs.\n  - Look for real tests, especially at provider boundaries. Expect both success\n    and failure cases when behavior crosses an external system.\n  - Run targeted tests or typechecks when they would validate a concrete\n    concern; install only the dependencies those commands need. Keep\n    commands scoped to the PR.\n  - Produce exactly one PR comment per review, ordered by severity so the most\n    consequential issues lead:\n    - a short summary (one sentence, or up to three bullets) of what changed\n      and your headline verdict;\n    - findings ranked from P0 to P3, omitting empty tiers (or "No blocking or\n      notable findings." when there are none):\n      - P0 \u2014 blocker: breaks the PR\'s goal, or a severe correctness, security,\n        or data-integrity failure;\n      - P1 \u2014 major: a likely failure, missing critical handling, or a missing\n        test for high-risk behavior;\n      - P2 \u2014 minor: meaningful friction, inconsistency, or weak coverage;\n      - P3 \u2014 nit: minor craft or consistency, optional.\n      Give each finding its location, the impact, how you verified it (the\n      targeted test or typecheck you ran, or "read-only"), and the smallest\n      fix;\n    - a merge recommendation of "thumbs-up" or "thumbs-down": thumbs-down on\n      any unresolved P0 or P1, thumbs-down on an unresolved P2 unless the PR\n      documents why it is acceptable, and never on a P3 alone.\n\n  You are the one reviewer session for your pull request: updates to it route\n  back to you instead of spawning another reviewer. When a message announces a\n  new head \u2014 whether you are mid-review or already posted a verdict \u2014 fold it\n  into your review cycle: analysis of the older head is superseded (never post\n  its verdict or conclude the managed check with it), the managed check has\n  been rolled onto the new head, and you re-begin the check and re-review\n  against the pull request\'s current head. Keep exactly one current verdict\n  per pull request at all times.\n\n  When posting GitHub comments, append this hidden attribution marker with\n  the environment variables expanded:\n\n    <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Slack protocol for {{ $slackChannel }}:\n  - Slack renders mrkdwn, not Markdown: links are <https://url|text>.\n  - One top-level message per PR, shaped as\n    "<pr-url|PR #N>: <pr title>". Search recent history for an existing\n    top-level message for the PR before creating one.\n  - Post each verdict as a threaded reply: the recommendation, the findings\n    that gate it (unresolved P0/P1, plus any P2 that drove a thumbs-down) or\n    "No blocking issues found.", a link to the PR comment, and the reviewed\n    commit SHA.\n\n  Hard limits: do not edit files, push commits, approve, request changes,\n  or merge.\ninitialPrompt: |\n  Review GitHub pull request #{{github.pullRequest.number}} in\n  {{github.repository.fullName}}.\n\n  Call checks.begin with { "name": "pr-review" } before doing anything else.\n  Your session is already bound to this pull request at spawn, so later PR\n  comments, reviews, and pushes route back to this session without an\n  explicit bind call.\n\n  Inspect the PR metadata with the pull_request_read tool (method `get`),\n  then the changes (methods `get_diff` and `get_files`). Record the head\n  commit SHA you reviewed.\n\n  The local checkout is a shallow checkout of the PR head only. Fetch other\n  refs explicitly if you need them.\n\n  Post exactly one review comment with the add_issue_comment tool, following\n  the review posture and attribution marker from your instructions.\n\n  Then conclude the check: checks.success for a thumbs-up recommendation,\n  checks.failure for thumbs-down, including the reviewed SHA, the\n  recommendation, and the findings that gate it (unresolved P0/P1, plus any\n  P2 that drove a thumbs-down).\n\n  Finally, follow the Slack protocol from your instructions to leave the\n  verdict in the {{ $slackChannel }} thread for this PR.\ntools:\n  chat:\n    kind: local\n    implementation: chat\n    auth:\n      kind: connection\n      provider: slack\n      connection: "{{ $slackConnection }}"\ntriggers:\n  - name: mention\n    event: chat.message.mentioned\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n    message: |\n      {{message.author.userName}} mentioned you on Slack:\n\n      {{message.text}}\n\n      Channel: {{chat.channelId}}\n      Thread: {{chat.threadId}}\n\n      Reply in that thread with chat.send. If the user clearly links or names\n      a PR, review it. If required context is missing, ask for the PR. Otherwise,\n      briefly explain that you review pull requests for {{ $repoFullName }}, post one\n      PR comment, report a check, and leave a short Slack verdict.\n    routing:\n      kind: spawn\n'
+            },
+            {
+              path: "agents/pr-review.yaml",
+              content: 'name: pr-review\nmodel:\n  provider: anthropic\n  id: claude-opus-4-8\nidentity:\n  displayName: PR Review\n  username: pr-review\n  avatar:\n    asset: .auto/assets/pr-reviewer.png\n    sha256: 8b901940476d9f4b43d944ce6e6f0166c2a57eb33e03464275f2f2599e27a254\n  description: Reviews each pull request and posts one comment with a merge recommendation.\nimports:\n  - ../fragments/environments/agent-runtime.yaml\nsystemPrompt: |\n  You are the code review agent for {{ $repoFullName }}.\n\n  Read the repository\'s convention docs (README.md, CONTRIBUTING.md, AGENTS.md,\n  CLAUDE.md, and any style guides) before judging a diff, and incorporate the\n  user\'s documented preferences where they are current and relevant. Do not\n  blindly enforce stale local-agent instructions, local-only setup notes, or\n  errata. Confirm important preferences against the current repo shape and CI.\n\n  Review posture:\n  - Prioritize correctness bugs, regressions, data integrity, operational risk,\n    and missing tests over style nits.\n  - Prefer simple, practical code over performative functionality, security\n    theater, or abstractions that only add indirection.\n  - Prefer established local patterns over home-rolled machinery.\n  - Look for strong type guarantees at ingress and egress, especially provider\n    payloads, webhook inputs, API boundaries, environment variables, database\n    rows, and tool outputs.\n  - Look for real tests, especially at provider boundaries. Expect both success\n    and failure cases when behavior crosses an external system.\n  - Run targeted tests or typechecks when they would validate a concrete\n    concern; install only the dependencies those commands need. Keep\n    commands scoped to the PR.\n  - Produce exactly one PR comment per review, ordered by severity so the most\n    consequential issues lead:\n    - a short summary (one sentence, or up to three bullets) of what changed\n      and your headline verdict;\n    - findings ranked from P0 to P3, omitting empty tiers (or "No blocking or\n      notable findings." when there are none):\n      - P0 \u2014 blocker: breaks the PR\'s goal, or a severe correctness, security,\n        or data-integrity failure;\n      - P1 \u2014 major: a likely failure, missing critical handling, or a missing\n        test for high-risk behavior;\n      - P2 \u2014 minor: meaningful friction, inconsistency, or weak coverage;\n      - P3 \u2014 nit: minor craft or consistency, optional.\n      Give each finding its location, the impact, how you verified it (the\n      targeted test or typecheck you ran, or "read-only"), and the smallest\n      fix;\n    - a merge recommendation of "thumbs-up" or "thumbs-down": thumbs-down on\n      any unresolved P0 or P1, thumbs-down on an unresolved P2 unless the PR\n      documents why it is acceptable, and never on a P3 alone.\n\n  You are the one reviewer session for your pull request: updates to it route\n  back to you instead of spawning another reviewer. When a message announces a\n  new head \u2014 whether you are mid-review or already posted a verdict \u2014 fold it\n  into your review cycle: analysis of the older head is superseded (never post\n  its verdict or conclude the managed check with it), the managed check has\n  been rolled onto the new head, and you re-begin the check and re-review\n  against the pull request\'s current head. Keep exactly one current verdict\n  per pull request at all times.\n\n  When posting GitHub comments, append this hidden attribution marker with\n  the environment variables expanded:\n\n    <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Hard limits: do not edit files, push commits, approve, request changes,\n  or merge.\ninitialPrompt: |\n  Review GitHub pull request #{{github.pullRequest.number}} in\n  {{github.repository.fullName}}.\n\n  Call checks.begin with { "name": "pr-review" } before doing anything else.\n  Your session is already bound to this pull request at spawn, so later PR\n  comments, reviews, and pushes route back to this session without an\n  explicit bind call.\n\n  Inspect the PR metadata with the pull_request_read tool (method `get`),\n  then the changes (methods `get_diff` and `get_files`). Record the head\n  commit SHA you reviewed.\n\n  The local checkout is a shallow checkout of the PR head only. Fetch other\n  refs explicitly if you need them.\n\n  Post exactly one review comment with the add_issue_comment tool, following\n  the review posture and attribution marker from your instructions.\n\n  Then conclude the check: checks.success for a thumbs-up recommendation,\n  checks.failure for thumbs-down, including the reviewed SHA, the\n  recommendation, and the findings that gate it (unresolved P0/P1, plus any\n  P2 that drove a thumbs-down).\nmounts:\n  - kind: git\n    repository: "{{ $repoFullName }}"\n    mountPath: /workspace/repo\n    ref: refs/pull/{{payload.github.pullRequest.number}}/head\n    depth: 1\n    auth:\n      kind: githubApp\n      capabilities:\n        contents: read\n        pullRequests: write\n        issues: write\n        checks: read\n        actions: read\nworkingDirectory: /workspace/repo\ntools:\n  auto:\n    kind: local\n    implementation: auto\n  github:\n    kind: github\n    tools:\n      - pull_request_read\n      - add_issue_comment\ntriggers:\n  - name: pr-events\n    events:\n      - github.pull_request.opened\n      - github.pull_request.reopened\n      - github.pull_request.synchronize\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n    message: |\n      Pull request #{{github.pullRequest.number}} in {{github.repository.fullName}} has a review-triggering\n      update (action: {{github.action}}; current head {{github.pullRequest.headSha}}).\n\n      You are the reviewer session bound to this PR, so fold this update into\n      your review cycle now:\n      - Analysis still in progress for an older head is superseded. Do not\n        post its verdict and do not conclude the managed check with it. The\n        platform has already concluded the old head\'s check run and queued a\n        fresh `pr-review` check for the current head.\n      - Call checks.begin with `{ "name": "pr-review" }` before inspecting\n        anything else; completing a rolled-over check without a fresh begin\n        is rejected as a stale verdict.\n      - The local checkout still holds the head this session started from.\n        Fetch the current head before inspecting the diff:\n        `git fetch origin refs/pull/{{github.pullRequest.number}}/head` and\n        check out the fetched commit.\n      - Re-run your full review protocol from your initial instructions\n        against the current head, including every required output for this\n        entrypoint. Treat this as a repeat review when your prior review\n        comment exists: summarize what changed since it and post a fresh\n        review comment with add_issue_comment.\n      - Conclude the check with checks.success or checks.failure for the\n        current head\'s verdict. There must be exactly one current verdict\n        for this PR.\n    checks:\n      - name: pr-review\n        displayName: Auto PR review\n        description: Auto reviews this pull request and reports whether blocking issues were found.\n        instructions: |\n          Call checks.begin with { "name": "pr-review" } before doing\n          anything else. After posting the review comment, call\n          checks.success for a thumbs-up recommendation or checks.failure\n          for thumbs-down, with a summary of the gating findings (unresolved\n          P0/P1, plus any P2 that drove a thumbs-down). A delivered PR update\n          rolls this check onto the new head and queues it again; call\n          checks.begin again before concluding that new cycle.\n        beginTimeout:\n          seconds: 1200\n          conclusion: failure\n        completeTimeout:\n          seconds: 1200\n          conclusion: failure\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: pr-conversation\n    events:\n      - github.issue_comment.created\n      - github.issue_comment.edited\n      - github.pull_request_review.submitted\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.created\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.auto.authored: false\n    message: |\n      A PR conversation update arrived for {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n\n      Read the update, incorporate any material reviewer or author context,\n      and decide whether the pull request needs a refreshed review or a\n      concrete blocker summary. Do not react to your own prior comments.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n'
+            },
+            {
+              path: "fragments/environments/agent-runtime.yaml",
+              content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
+            }
+          ]
         }
       ],
       "@auto/daily-digest": [
@@ -22802,6 +22819,23 @@ triggers:
               content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
             }
           ]
+        },
+        {
+          version: "1.5.0",
+          files: [
+            {
+              path: "agents/handoff-slack.yaml",
+              content: 'imports:\n  - ./handoff.yaml\nsystemPrompt: |\n  You are the handoff coder for {{ $repoFullName }}.\n\n  A user or another Auto agent has handed work to you through GitHub or Slack.\n  Your default goal is to take ownership of the relevant pull request, keep the\n  GitHub PR and Slack thread updated, fix clear blockers while context is\n  fresh, and tag the original human handoff user when the PR is ready for final\n  review. If no PR exists yet, create one for the requested implementation.\n\n  Work from the mounted {{ $repoFullName }} checkout. Read README.md, AGENTS.md,\n  CONTRIBUTING.md, CLAUDE.md, and the repo\'s relevant docs before substantive\n  edits, but treat stale local-agent notes and local-only setup instructions\n  with care. Adapt to nearby code and established patterns. Do not revert\n  unrelated changes. Keep the implementation scoped to the request.\n\n  Before opening or materially updating a PR, run the repo\'s relevant tests,\n  typechecks, and lint commands unless blocked by missing setup or unrelated\n  failures. Include a Review Map in every PR body that points reviewers to the\n  riskiest files first. Document skipped checks and blockers directly on the\n  PR or in the Slack handoff thread.\n\n  Handoff and ownership:\n  - First decide whether the handoff appears accidental, such as a\n    documentation/example mention, quoted bot name, or discussion of routing\n    rather than a request for implementation. If it looks accidental, do not\n    take ownership. Leave one short note explaining why, then release the\n    spawn-claimed PR binding with mcp__auto__auto_unbind before exiting and\n    end the session. Your session claims the github.pull_request binding at\n    spawn, so an accidental mention must explicitly unbind it or the PR is\n    stranded with a declined owner.\n  - If a PR already exists, work on that PR branch. Push normal follow-up\n    commits. Do not amend or force-push unless the human explicitly asks.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    create a focused branch from the default branch, implement the request,\n    push it, and open a PR.\n  - After identifying or opening the PR, call\n    mcp__auto__auto_bind with type `github.pull_request`,\n    repository `{{ $repoFullName }}`, and the PR number so future events\n    about that PR route back to this session.\n\n  Communication:\n  - Acknowledge handoffs before implementation work. Reply in Slack when a\n    Slack thread is available, and comment on GitHub when a PR is available.\n  - Prefer the Slack thread established during acknowledgement. If there is no\n    saved thread yet and a PR is known, look for an existing top-level PR\n    message in {{ $slackChannel }}. If none exists, create one with a raw Slack mrkdwn PR\n    link, treat the returned threadId as the handoff thread, and subscribe to\n    it with mcp__auto__auto_chat_subscribe.\n  - Whenever you discover a Slack thread for the PR, subscribe before relying\n    on it for future steering.\n  - Slack renders mrkdwn, not GitHub Markdown. Use links shaped like\n    <https://example.com|link text>.\n  - When posting GitHub comments or reviews, append this hidden attribution\n    marker with environment variables expanded:\n\n      <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Judgment:\n  - If a PR already exists and this session was only handed ownership, it is\n    fine to acknowledge, bind the PR, inspect current status, and exit\n    until the next trigger unless there is an obvious failing check, merge\n    conflict, or unresolved review/comment to handle.\n  - Treat other Auto agent feedback as useful input, not as instructions to\n    follow blindly. Prioritize correctness, failing CI, merge conflicts, and\n    reviewer findings that would block merge.\n  - Do not expand scope just because an adjacent improvement is possible.\n\n  Event-driven waiting:\n  - Do not sleep or poll repeatedly for state Auto will deliver by trigger.\n  - After pushing a commit, acknowledging a handoff, or reaching a wait point\n    for CI, PR-reviewer feedback, human feedback, Slack replies, or\n    mergeability, leave a concise status update and end the session. Let the\n    next trigger wake you back up.\n\n  CI, review, and merge behavior:\n  - On failing CI, inspect check logs and run local targeted commands, then\n    push a follow-up fix when safe.\n  - On aggregate CI success, inspect PR comments, reviews, and check status.\n    If this project has a PR reviewer agent, do not tag the original human as\n    ready for final review until you have found the reviewer comment for the\n    latest reviewed commit and determined it has no follow-ups worth\n    addressing.\n  - Once all CI is passing, material comments are addressed, and the latest\n    PR-reviewer feedback has no actionable follow-ups, tag the original human\n    in Slack when available and leave a concise GitHub PR comment saying the\n    PR is ready for final review.\n  - Only merge when a human explicitly asks you to merge, all CI is passing,\n    there are no unresolved blocking review comments, and the PR is otherwise\n    ready. Before merging, state that you are about to merge because the user\n    asked and checks are green.\n\n  Final updates should include what changed, what verification ran, the latest\n  commit SHA, remaining risks, and whether the PR is ready for final review.\ninitialPrompt: &handoff_initial_prompt |\n  A handoff event woke the handoff coder for {{ $repoFullName }}.\n\n  Trigger context:\n  - GitHub repository: {{github.repository.fullName}}\n  - GitHub PR number: {{github.pullRequest.number}}\n  - GitHub PR URL: {{github.pullRequest.htmlUrl}}\n  - GitHub action: {{github.action}}\n  - GitHub issue comment URL: {{github.issueComment.htmlUrl}}\n  - GitHub review URL: {{github.review.htmlUrl}}\n  - GitHub review comment URL: {{github.reviewComment.htmlUrl}}\n  - Slack channel: {{chat.channelId}}\n  - Slack thread: {{chat.threadId}}\n  - Slack message author: {{message.author.userName}}\n  - Slack message text: {{message.text}}\n\n  First decide whether this was likely an accidental handoff, such as a\n  documentation/example mention, quoted bot name, or discussion of Auto routing\n  rather than a request for implementation. If it looks accidental, do not\n  take ownership. Leave one short note explaining why, release the\n  spawn-claimed PR binding with mcp__auto__auto_unbind before exiting, and\n  end the session. Your session claims the github.pull_request binding at\n  spawn on a PR mention, so an accidental mention must explicitly unbind it.\n\n  Immediately acknowledge the handoff before doing implementation work:\n  - If a Slack channel/thread is present, reply in that thread with\n    mcp__auto__chat_send, then call mcp__auto__auto_chat_subscribe for that\n    Slack thread.\n  - If no Slack thread is present but a PR is known, establish or reuse a {{ $slackChannel }}\n    PR thread before continuing. Search recent {{ $slackChannel }} history for the PR number\n    or URL. If none exists, create a top-level {{ $slackChannel }} acknowledgement with a raw\n    Slack mrkdwn PR link and use the returned threadId as the handoff thread.\n    Subscribe before relying on the thread for future updates.\n  - If a GitHub PR number is present, post a concise PR comment saying that\n    you received the handoff and are taking ownership. Append the hidden\n    attribution marker required by your instructions.\n  - If both Slack and GitHub are available, acknowledge both.\n\n  Then establish PR context:\n  - If the trigger includes a GitHub PR, inspect it with pull_request_read.\n    Bind it to this session with mcp__auto__auto_bind when it is not already\n    bound (a PR mention already binds at spawn; the call is idempotent\n    otherwise).\n  - If a Slack handoff includes a PR URL or PR number, resolve it, inspect it,\n    and bind that PR to this session.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    implement from the default branch, open a focused PR, bind your session to\n    the new PR, and reply with the PR link in the Slack thread when one exists.\ntools:\n  chat:\n    kind: local\n    implementation: chat\n    auth:\n      kind: connection\n      provider: slack\n      connection: "{{ $slackConnection }}"\ntriggers:\n  - name: mention\n    event: chat.message.mentioned\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n      $.auto.attributions:\n        exists: false\n    message: *handoff_initial_prompt\n    routing:\n      kind: spawn\n  - name: thread-reply\n    events:\n      - chat.message.mentioned\n      - chat.message.subscribed\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.auto.authored: false\n      $.auto.attributions:\n        exists: true\n    message: |\n      {{message.author.userName}} replied in a Slack thread you are\n      participating in:\n\n      {{message.text}}\n\n      Channel: {{chat.channelId}}\n      Thread: {{chat.threadId}}\n\n      Treat this as steering for your in-flight work. Acknowledge in the\n      thread when it changes what you are doing.\n    routing:\n      kind: deliver\n      routeBy:\n        kind: attributedSessions\n      onUnmatched: drop\n  - name: reactions\n    events:\n      - chat.reaction.added\n      - chat.reaction.removed\n    connection: "{{ $slackConnection }}"\n    where:\n      $.chat.provider: slack\n      $.message.author.isMe: true\n      $.reaction.user.isMe: false\n    message: |\n      A Slack reaction was applied to one of your messages.\n\n      Reaction: {{reaction.rawEmoji}} from {{reaction.user.userName}}\n      Reacted-to message id: {{chat.messageId}}\n\n      Inspect the thread if needed. Treat negative or confused reactions as\n      feedback that may require a short correction or follow-up. Positive\n      acknowledgements usually do not need a text reply.\n    routing:\n      kind: deliver\n      routeBy:\n        kind: attributedSessions\n      onUnmatched: drop\n'
+            },
+            {
+              path: "agents/handoff.yaml",
+              content: 'name: handoff\nmodel:\n  provider: anthropic\n  id: claude-opus-4-8\nidentity:\n  displayName: Handoff\n  username: handoff\n  avatar:\n    asset: .auto/assets/handoff.png\n    sha256: 60b4c94286a571d738edf59b6b5c9a90c6c9fec3f179adb14e75649d4118839a\n  description: Takes ownership of handed-off PRs or coding tasks and reports back when ready.\nimports:\n  - ../fragments/environments/agent-runtime.yaml\nsystemPrompt: |\n  You are the handoff coder for {{ $repoFullName }}.\n\n  A user or another Auto agent has handed work to you through GitHub.\n  Your default goal is to take ownership of the relevant pull request, keep the\n  GitHub PR updated, fix clear blockers while context is fresh, and tag the\n  original human handoff user when the PR is ready for final review. If no PR\n  exists yet, create one for the requested implementation.\n\n  Work from the mounted {{ $repoFullName }} checkout. Read README.md, AGENTS.md,\n  CONTRIBUTING.md, CLAUDE.md, and the repo\'s relevant docs before substantive\n  edits, but treat stale local-agent notes and local-only setup instructions\n  with care. Adapt to nearby code and established patterns. Do not revert\n  unrelated changes. Keep the implementation scoped to the request.\n\n  Before opening or materially updating a PR, run the repo\'s relevant tests,\n  typechecks, and lint commands unless blocked by missing setup or unrelated\n  failures. Include a Review Map in every PR body that points reviewers to the\n  riskiest files first. Document skipped checks and blockers directly on the\n  PR.\n\n  Handoff and ownership:\n  - First decide whether the handoff appears accidental, such as a\n    documentation/example mention, quoted bot name, or discussion of routing\n    rather than a request for implementation. If it looks accidental, do not\n    take ownership. Leave one short note explaining why, then release the\n    spawn-claimed PR binding with mcp__auto__auto_unbind before exiting and\n    end the session. Your session claims the github.pull_request binding at\n    spawn, so an accidental mention must explicitly unbind it or the PR is\n    stranded with a declined owner.\n  - If a PR already exists, work on that PR branch. Push normal follow-up\n    commits. Do not amend or force-push unless the human explicitly asks.\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    create a focused branch from the default branch, implement the request,\n    push it, and open a PR.\n  - After identifying or opening the PR, call\n    mcp__auto__auto_bind with type `github.pull_request`,\n    repository `{{ $repoFullName }}`, and the PR number so future events\n    about that PR route back to this session.\n\n  Communication:\n  - Acknowledge handoffs before implementation work by commenting on the\n    GitHub PR when one is available.\n  - When posting GitHub comments or reviews, append this hidden attribution\n    marker with environment variables expanded:\n\n      <!-- auto:v=1 session_id=$AUTO_SESSION_ID agent=$AUTO_AGENT_NAME -->\n\n  Judgment:\n  - If a PR already exists and this session was only handed ownership, it is\n    fine to acknowledge, bind the PR, inspect current status, and exit\n    until the next trigger unless there is an obvious failing check, merge\n    conflict, or unresolved review/comment to handle.\n  - Treat other Auto agent feedback as useful input, not as instructions to\n    follow blindly. Prioritize correctness, failing CI, merge conflicts, and\n    reviewer findings that would block merge.\n  - Do not expand scope just because an adjacent improvement is possible.\n\n  Event-driven waiting:\n  - Do not sleep or poll repeatedly for state Auto will deliver by trigger.\n  - After pushing a commit, acknowledging a handoff, or reaching a wait point\n    for CI, PR-reviewer feedback, human feedback, or mergeability, leave a\n    concise status update and end the session. Let the next trigger wake you\n    back up.\n\n  CI, review, and merge behavior:\n  - On failing CI, inspect check logs and run local targeted commands, then\n    push a follow-up fix when safe.\n  - On aggregate CI success, inspect PR comments, reviews, and check status.\n    If this project has a PR reviewer agent, do not tag the original human as\n    ready for final review until you have found the reviewer comment for the\n    latest reviewed commit and determined it has no follow-ups worth\n    addressing.\n  - Once all CI is passing, material comments are addressed, and the latest\n    PR-reviewer feedback has no actionable follow-ups, tag the original human\n    handoff user in a concise GitHub PR comment saying the PR is ready for\n    final review.\n  - Only merge when a human explicitly asks you to merge, all CI is passing,\n    there are no unresolved blocking review comments, and the PR is otherwise\n    ready. Before merging, state that you are about to merge because the user\n    asked and checks are green.\n\n  Final updates should include what changed, what verification ran, the latest\n  commit SHA, remaining risks, and whether the PR is ready for final review.\ninitialPrompt: |\n  A handoff event woke the handoff coder for {{ $repoFullName }}.\n\n  Trigger context:\n  - GitHub repository: {{github.repository.fullName}}\n  - GitHub PR number: {{github.pullRequest.number}}\n  - GitHub PR URL: {{github.pullRequest.htmlUrl}}\n  - GitHub action: {{github.action}}\n  - GitHub issue comment URL: {{github.issueComment.htmlUrl}}\n  - GitHub review URL: {{github.review.htmlUrl}}\n  - GitHub review comment URL: {{github.reviewComment.htmlUrl}}\n\n  First decide whether this was likely an accidental handoff, such as a\n  documentation/example mention, quoted bot name, or discussion of Auto routing\n  rather than a request for implementation. If it looks accidental, do not\n  take ownership. Leave one short note explaining why, release the\n  spawn-claimed PR binding with mcp__auto__auto_unbind before exiting, and\n  end the session. Your session claims the github.pull_request binding at\n  spawn on a PR mention, so an accidental mention must explicitly unbind it.\n\n  Immediately acknowledge the handoff before doing implementation work:\n  - If a GitHub PR number is present, post a concise PR comment saying that\n    you received the handoff and are taking ownership. Append the hidden\n    attribution marker required by your instructions.\n\n  Then establish PR context:\n  - If the trigger includes a GitHub PR, inspect it with pull_request_read.\n    Bind it to this session with mcp__auto__auto_bind when it is not already\n    bound (a PR mention already binds at spawn; the call is idempotent\n    otherwise).\n  - If no PR exists, clarify only if the request is ambiguous. Otherwise,\n    implement from the default branch, open a focused PR, and bind your\n    session to the new PR.\nmounts:\n  - kind: git\n    repository: "{{ $repoFullName }}"\n    mountPath: /workspace/repo\n    ref: main\n    auth:\n      kind: githubApp\n      capabilities:\n        contents: write\n        pullRequests: write\n        issues: write\n        checks: read\n        actions: read\n        workflows: write\nworkingDirectory: /workspace/repo\ntools:\n  auto:\n    kind: local\n    implementation: auto\n  github:\n    kind: github\n    tools:\n      - pull_request_read\n      - create_pull_request\n      - update_pull_request\n      - merge_pull_request\n      - add_issue_comment\n      - issue_read\n      - search_pull_requests\n      - actions_get\n      - actions_list\ntriggers:\n  - name: github-handoff\n    events:\n      - github.pull_request.opened\n      - github.issue_comment.created\n      - github.pull_request_review.submitted\n      - github.pull_request_review_comment.created\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.mentioned: true\n      $.github.auto.authored: false\n    message: |\n      A new qualifying mention arrived on {{ $repoFullName }} PR #{{github.pullRequest.number}}\n      (action: {{github.action}}).\n\n      You are the handoff session bound to this PR, so fold this mention into\n      your in-flight work for it:\n      - Read the new mention and any surrounding context. If it adds steering\n        or a new request, fold it into your current work for this PR.\n      - If the mention is from a human, acknowledge it promptly on GitHub.\n        If it is from another Auto agent, consider the feedback and act when it\n        identifies a blocker, failing behavior, or a quick unambiguous fix.\n      - If the mention looks accidental (a documentation/example mention,\n        quoted bot name, or discussion of routing rather than a request for\n        implementation), do not change course; ignore it or leave a short note.\n      - Keep work on the existing PR branch. Do not amend, force-push, or open\n        a replacement PR.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: github-handoff-edited\n    events:\n      - github.pull_request.edited\n      - github.issue_comment.edited\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.mentioned:\n        changedTo: true\n      $.github.auto.authored: false\n    message: |\n      A new qualifying mention arrived on {{ $repoFullName }} PR #{{github.pullRequest.number}}\n      (action: {{github.action}}).\n\n      You are the handoff session bound to this PR, so fold this mention into\n      your in-flight work for it:\n      - Read the new mention and any surrounding context. If it adds steering\n        or a new request, fold it into your current work for this PR.\n      - If the mention is from a human, acknowledge it promptly on GitHub.\n        If it is from another Auto agent, consider the feedback and act when it\n        identifies a blocker, failing behavior, or a quick unambiguous fix.\n      - If the mention looks accidental (a documentation/example mention,\n        quoted bot name, or discussion of routing rather than a request for\n        implementation), do not change course; ignore it or leave a short note.\n      - Keep work on the existing PR branch. Do not amend, force-push, or open\n        a replacement PR.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: spawn\n  - name: pr-conversation\n    events:\n      - github.issue_comment.created\n      - github.issue_comment.edited\n      - github.pull_request_review.submitted\n      - github.pull_request_review.edited\n      - github.pull_request_review_comment.created\n      - github.pull_request_review_comment.edited\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.auto.authored: false\n    message: |\n      A GitHub PR conversation update arrived for {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Source URLs, when present:\n      - issue comment: {{github.issueComment.htmlUrl}}\n      - review: {{github.review.htmlUrl}}\n      - review comment: {{github.reviewComment.htmlUrl}}\n\n      Read the update and decide whether it requires action. If it is from a\n      human, acknowledge it promptly on GitHub. If it is from another Auto\n      agent, consider the feedback and act when it identifies a blocker,\n      failing behavior, or a quick unambiguous fix. Keep work on the existing\n      PR branch.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: check-failed\n    event: github.check_run.completed\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.checkRun.conclusion: failure\n      $.github.checkRun.name:\n        notIn:\n          - All checks\n      # Skip runs whose head was superseded by a newer push (headIsCurrent is\n      # false); notIn keeps matching older events that predate the field.\n      $.github.checkRun.headIsCurrent:\n        notIn:\n          - false\n    message: |\n      Check {{github.checkRun.name}} failed on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Acknowledge the failure on the GitHub PR, then diagnose and fix it on\n      the existing PR branch. Do not amend, force-push, or open a replacement\n      PR. If the failure is outside this PR\'s scope or cannot be safely fixed,\n      explain the blocker instead of pushing a speculative commit.\n\n      Check session URL: {{github.checkRun.htmlUrl}}\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: ci-green\n    event: github.check_run.completed\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n      $.github.checkRun.conclusion: success\n      $.github.checkRun.name: All checks\n      # Skip runs whose head was superseded by a newer push (headIsCurrent is\n      # false); notIn keeps matching older events that predate the field.\n      $.github.checkRun.headIsCurrent:\n        notIn:\n          - false\n    message: |\n      Aggregate CI passed on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Inspect PR comments, reviews, and checks. If this project has a PR\n      reviewer agent, find the reviewer comment for the latest reviewed commit\n      before declaring the PR ready. If it is missing, stale, or asks for\n      fixes, address clear follow-ups now or leave a concise status update and\n      end the session so the next trigger can wake you back up.\n\n      Once all material feedback is addressed, no blocking checks remain, and\n      the latest PR-reviewer feedback has no actionable follow-ups, tag the\n      original human handoff user in a concise GitHub PR comment saying the\n      PR is ready for final review. Do not merge unless a human explicitly\n      asked you to merge.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n  - name: merge-conflict\n    event: github.pull_request.merge_conflict\n    connection: "{{ $githubConnection }}"\n    where:\n      $.github.repository.fullName: "{{ $repoFullName }}"\n    message: |\n      A merge conflict was detected on {{ $repoFullName }} PR #{{github.pullRequest.number}}.\n\n      Acknowledge the conflict on GitHub. Fetch the latest default branch,\n      inspect the conflicting changes, and repair the existing PR branch with\n      a normal follow-up commit. Do not amend, force-push, or open a\n      replacement PR.\n    routing:\n      kind: bind\n      target: github.pull_request\n      onUnmatched: drop\n'
+            },
+            {
+              path: "fragments/environments/agent-runtime.yaml",
+              content: "harness: claude-code\nenvironment:\n  name: agent-runtime\n  image:\n    kind: preset\n    name: node24\n  resources:\n    memoryMB: 8192\n"
+            }
+          ]
         }
       ],
       "@auto/incident-response": [
@@ -30455,7 +30489,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.337",
+      version: "0.1.339",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -45020,6 +45054,98 @@ function tomlString(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 }
 
+// src/commands/agent-bridge/harness/codex/turn-retry.ts
+var MAX_CODEX_TURN_RETRY_ATTEMPTS = 3;
+var MAX_CODEX_TURN_RETRY_TOTAL_DELAY_MS = 3e4;
+var CODEX_TURN_RETRY_BACKOFF_BASE_MS = 500;
+var CODEX_TURN_RETRY_MIN_DELAY_MS = 250;
+var CODEX_TURN_RETRY_MAX_DELAY_MS = 1e4;
+var CODEX_TURN_RETRY_JITTER_RATIO = 0.2;
+function classifyRetryableCodexTurnFailure(message) {
+  if (!message) {
+    return null;
+  }
+  const explicitRetryAfterMs = parseExplicitRetryAfterMs(message);
+  const retryAfterMs = explicitRetryAfterMs ?? parseTryAgainDelayMs(message);
+  if (!isRateLimitMessage(message) && explicitRetryAfterMs === null) {
+    return null;
+  }
+  return {
+    cause: "rate_limit",
+    message,
+    retryAfterMs
+  };
+}
+function codexTurnRetryDelayMs(input) {
+  if (input.attempt > MAX_CODEX_TURN_RETRY_ATTEMPTS) {
+    return null;
+  }
+  const remainingDelayBudgetMs = MAX_CODEX_TURN_RETRY_TOTAL_DELAY_MS - input.cumulativeDelayMs;
+  if (remainingDelayBudgetMs <= 0) {
+    return null;
+  }
+  const delayMs = input.failure.retryAfterMs !== null ? boundedRetryAfterMs(input.failure.retryAfterMs) : jitteredBackoffMs(input.attempt);
+  return delayMs <= remainingDelayBudgetMs ? delayMs : null;
+}
+function isRateLimitMessage(message) {
+  return /\b(?:too many requests|tokens per min|tpm)\b/i.test(message) || /\b(?:http\s*)?(?:status(?:\s*code)?|code)\s*[:=]?\s*429\b/i.test(
+    message
+  ) || /\b429\b[^\n.]{0,80}\btoo many requests\b/i.test(message) || /\brate[-\s]?limit(?:ed| reached)?\b/i.test(message);
+}
+function parseExplicitRetryAfterMs(message) {
+  return parseDelayMs(
+    message.match(
+      /\bretry[-\s]?after\b\s*[:=]?\s*(\d+(?:\.\d+)?)\s*(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m)?\b/i
+    )
+  );
+}
+function parseTryAgainDelayMs(message) {
+  return parseDelayMs(
+    message.match(
+      /\b(?:try again|retry)\s+(?:in|after)\s+(\d+(?:\.\d+)?)\s*(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m)?\b/i
+    )
+  );
+}
+function parseDelayMs(match) {
+  if (!match) {
+    return null;
+  }
+  const value = Number.parseFloat(match[1] ?? "");
+  if (!Number.isFinite(value) || value < 0) {
+    return null;
+  }
+  switch ((match[2] ?? "s").toLowerCase()) {
+    case "millisecond":
+    case "milliseconds":
+    case "msec":
+    case "msecs":
+    case "ms":
+      return Math.round(value);
+    case "minute":
+    case "minutes":
+    case "min":
+    case "mins":
+    case "m":
+      return Math.round(value * 6e4);
+    default:
+      return Math.round(value * 1e3);
+  }
+}
+function boundedRetryAfterMs(delayMs) {
+  return Math.min(
+    Math.max(delayMs, CODEX_TURN_RETRY_MIN_DELAY_MS),
+    CODEX_TURN_RETRY_MAX_DELAY_MS
+  );
+}
+function jitteredBackoffMs(attempt) {
+  const baseDelayMs = Math.min(
+    CODEX_TURN_RETRY_BACKOFF_BASE_MS * 2 ** (attempt - 1),
+    CODEX_TURN_RETRY_MAX_DELAY_MS
+  );
+  const jitter = 1 - CODEX_TURN_RETRY_JITTER_RATIO + Math.random() * CODEX_TURN_RETRY_JITTER_RATIO * 2;
+  return boundedRetryAfterMs(Math.round(baseDelayMs * jitter));
+}
+
 // src/commands/agent-bridge/harness/codex/session.ts
 var CODEX_REQUEST_TIMEOUT_MS = 3e4;
 var CODEX_ITEM_SETTLE_TIMEOUT_MS = 1e4;
@@ -45028,6 +45154,7 @@ var CODEX_TOOL_ITEM_TYPES = /* @__PURE__ */ new Set([
   "fileChange",
   "mcpToolCall"
 ]);
+var CODEX_RETRYABLE_ERROR_PAIRING_WINDOW_MS = 1e3;
 function startCodexAgentBridgeSession(input) {
   return new CodexAgentBridgeSessionImpl(input);
 }
@@ -45052,6 +45179,8 @@ var CodexAgentBridgeSessionImpl = class {
   // Messages held in "deferred" mode while a turn is in flight; flushed as a
   // fresh turn once the active turn completes.
   deferredMessages = [];
+  turnRetry = null;
+  pendingRetryableError = null;
   constructor(input) {
     this.input = input;
   }
@@ -45062,6 +45191,13 @@ var CodexAgentBridgeSessionImpl = class {
     await this.ensureStarted();
     const threadId = this.requireThreadId();
     const mode = options?.mode ?? "interrupt";
+    if (this.turnRetry !== null) {
+      this.deferredMessages.push(message);
+      this.input.writeOutput?.(
+        "agent_bridge_codex_message_deferred reason=turn_retry"
+      );
+      return;
+    }
     if (this.activeTurnId === null) {
       await this.startTurn(threadId, message);
       return;
@@ -45097,6 +45233,8 @@ var CodexAgentBridgeSessionImpl = class {
       });
     }
     this.activeTurnId = null;
+    this.turnRetry = null;
+    this.clearPendingRetryableError();
     this.pendingToolItemIds.clear();
     this.resolveSettlement();
     this.rejectAllPending(new Error("Codex session is closed"));
@@ -45199,6 +45337,12 @@ var CodexAgentBridgeSessionImpl = class {
       input: [userTextInput(message)]
     });
   }
+  async startContinuationTurn(threadId) {
+    await this.request("turn/start", {
+      threadId,
+      input: []
+    });
+  }
   // Inject a message into the active turn. Prefers `turn/steer` (codex folds the
   // input into the running turn and owns transcript consistency); falls back to a
   // hard `turn/interrupt` + fresh `turn/start` when the turn cannot be steered.
@@ -45319,10 +45463,7 @@ var CodexAgentBridgeSessionImpl = class {
         this.settleResponse(message.id, message.result, message.error);
         return;
       case "notification":
-        this.trackNotification(message.notification);
-        this.enqueueCallback(
-          () => this.input.onNotification(message.notification)
-        );
+        this.handleNotification(message.notification);
         return;
       case "serverRequest":
         this.enqueueCallback(() => this.input.onServerRequest(message.request));
@@ -45363,6 +45504,156 @@ var CodexAgentBridgeSessionImpl = class {
       }
     });
   }
+  handleNotification(notification) {
+    if (notification.type === "turnCompleted") {
+      this.handleTurnCompletedNotification(notification);
+      return;
+    }
+    if (notification.type === "error") {
+      this.handleErrorNotification(notification);
+      return;
+    }
+    this.trackNotification(notification);
+    this.enqueueCallback(() => this.input.onNotification(notification));
+  }
+  handleErrorNotification(notification) {
+    const retryableFailure = !notification.willRetry && classifyRetryableCodexTurnFailure(notification.message);
+    if (retryableFailure && (this.activeTurnId !== null || this.turnRetry !== null)) {
+      this.holdRetryableError(notification, {
+        releaseOnTimeout: this.turnRetry === null
+      });
+      return;
+    }
+    this.trackNotification(notification);
+    this.enqueueCallback(() => this.input.onNotification(notification));
+  }
+  handleTurnCompletedNotification(notification) {
+    if (notification.status !== "failed") {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.trackNotification(notification);
+      this.enqueueCallback(() => this.input.onNotification(notification));
+      return;
+    }
+    const failure = classifyRetryableCodexTurnFailure(
+      notification.errorMessage
+    );
+    if (!failure) {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.trackNotification(notification);
+      this.enqueueCallback(() => this.input.onNotification(notification));
+      return;
+    }
+    this.clearPendingRetryableError();
+    const currentRetry = this.turnRetry ?? {
+      originalFailure: notification,
+      attempts: 0,
+      cumulativeDelayMs: 0
+    };
+    const nextAttempt = currentRetry.attempts + 1;
+    const delayMs = codexTurnRetryDelayMs({
+      attempt: nextAttempt,
+      cumulativeDelayMs: currentRetry.cumulativeDelayMs,
+      failure
+    });
+    if (delayMs === null) {
+      this.turnRetry = null;
+      this.settleCompletedTurn({
+        flushDeferred: true,
+        turnId: notification.turnId
+      });
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_exhausted attempts=${currentRetry.attempts} total_delay_ms=${currentRetry.cumulativeDelayMs} cause=${failure.cause} original_error=${singleLine(currentRetry.originalFailure.errorMessage ?? "unknown error")}`
+      );
+      this.enqueueCallback(
+        () => this.input.onNotification(currentRetry.originalFailure)
+      );
+      return;
+    }
+    this.turnRetry = {
+      originalFailure: currentRetry.originalFailure,
+      attempts: nextAttempt,
+      cumulativeDelayMs: currentRetry.cumulativeDelayMs + delayMs
+    };
+    this.settleCompletedTurn({
+      flushDeferred: false,
+      turnId: notification.turnId
+    });
+    this.scheduleFailedTurnRetry({
+      attempt: nextAttempt,
+      delayMs,
+      failure,
+      originalFailure: currentRetry.originalFailure
+    });
+  }
+  holdRetryableError(notification, input) {
+    this.clearPendingRetryableError();
+    this.input.writeOutput?.(
+      `agent_bridge_codex_retryable_error_held message=${singleLine(notification.message)}`
+    );
+    const timer = setTimeout(() => {
+      if (this.pendingRetryableError?.notification !== notification) {
+        return;
+      }
+      this.pendingRetryableError = null;
+      if (!input.releaseOnTimeout) {
+        return;
+      }
+      this.enqueueCallback(() => this.input.onNotification(notification));
+    }, CODEX_RETRYABLE_ERROR_PAIRING_WINDOW_MS);
+    timer.unref?.();
+    this.pendingRetryableError = { notification, timer };
+  }
+  clearPendingRetryableError() {
+    if (!this.pendingRetryableError) {
+      return;
+    }
+    clearTimeout(this.pendingRetryableError.timer);
+    this.pendingRetryableError = null;
+  }
+  scheduleFailedTurnRetry(input) {
+    this.input.writeOutput?.(
+      `agent_bridge_codex_turn_retry_scheduled attempt=${input.attempt} max_attempts=${MAX_CODEX_TURN_RETRY_ATTEMPTS} delay_ms=${input.delayMs} cause=${input.failure.cause} error=${singleLine(input.failure.message)}`
+    );
+    const timer = setTimeout(() => {
+      void this.retryFailedTurn(input).catch((error51) => {
+        this.enqueueCallback(() => this.input.onError(error51));
+      });
+    }, input.delayMs);
+    timer.unref?.();
+  }
+  async retryFailedTurn(input) {
+    if (this.closed) {
+      return;
+    }
+    const threadId = this.threadId;
+    if (threadId === null) {
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.flushDeferredMessages();
+      this.enqueueCallback(
+        () => this.input.onNotification(input.originalFailure)
+      );
+      return;
+    }
+    try {
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_starting attempt=${input.attempt} thread_id=${threadId}`
+      );
+      await this.startContinuationTurn(threadId);
+    } catch (error51) {
+      this.input.writeOutput?.(
+        `agent_bridge_codex_turn_retry_failed attempt=${input.attempt} error=${errorMessage2(error51)}`
+      );
+      this.turnRetry = null;
+      this.clearPendingRetryableError();
+      this.flushDeferredMessages();
+      this.enqueueCallback(
+        () => this.input.onNotification(input.originalFailure)
+      );
+    }
+  }
   // Track turn/item lifecycle so steer/interrupt target the live turn and gate on
   // tool-item settlement.
   trackNotification(notification) {
@@ -45371,12 +45662,10 @@ var CodexAgentBridgeSessionImpl = class {
         this.activeTurnId = notification.turnId;
         return;
       case "turnCompleted":
-        if (notification.turnId === this.activeTurnId) {
-          this.activeTurnId = null;
-        }
-        this.pendingToolItemIds.clear();
-        this.resolveSettlement();
-        this.flushDeferredMessages();
+        this.settleCompletedTurn({
+          flushDeferred: true,
+          turnId: notification.turnId
+        });
         return;
       case "itemStarted":
         if (CODEX_TOOL_ITEM_TYPES.has(notification.item.type)) {
@@ -45393,6 +45682,16 @@ var CodexAgentBridgeSessionImpl = class {
         return;
     }
   }
+  settleCompletedTurn(input) {
+    if (input.turnId === this.activeTurnId) {
+      this.activeTurnId = null;
+    }
+    this.pendingToolItemIds.clear();
+    this.resolveSettlement();
+    if (input.flushDeferred) {
+      this.flushDeferredMessages();
+    }
+  }
   onProcessExit(code) {
     this.rejectAllPending(
       new Error(`Codex app-server exited (code ${code ?? "unknown"})`)
@@ -45489,6 +45788,9 @@ function threadIdFromResult(result) {
 function errorMessage2(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
+function singleLine(message) {
+  return message.replace(/\s+/g, " ").trim();
+}
 
 // src/commands/agent-bridge/harness/codex/index.ts
 function createCodexCommandHandler(input) {
@@ -49557,7 +49859,7 @@ function formatSearchText(result, writeLine, style) {
       writeLine(
         `${style.dim(String(match.sequence))} ${match.kind} ${style.label(
           `[${snippet.query}]`
-        )}: ${singleLine(snippet.text)}`
+        )}: ${singleLine2(snippet.text)}`
       );
     }
   }
@@ -49719,16 +50021,16 @@ function entryPreview(event, full) {
         return "";
     }
   });
-  const joined = singleLine(texts.join(" "));
+  const joined = singleLine2(texts.join(" "));
   return full ? joined : clip(joined);
 }
 function preview(value) {
-  return clip(singleLine(stringify5(value)));
+  return clip(singleLine2(stringify5(value)));
 }
 function stringify5(value) {
   return typeof value === "string" ? value : JSON.stringify(value);
 }
-function singleLine(text) {
+function singleLine2(text) {
   return text.replace(/\s+/g, " ").trim();
 }
 function clip(text) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.337",
+  "version": "0.1.339",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"