[AISOS-2159] Workflow continues to PR creation after container execution failure by ekuris-redhat · Pull Request #159 · forge-sdlc/forge

ekuris-redhat · 2026-07-16T06:50:12Z

Summary

This pull request resolves a critical issue in the Task Takeover workflow where a failure in the container execution environment (such as Podman being unavailable) or an absence of code changes would still erroneously proceed to pull request creation, resulting in 422 Unprocessable Entity errors from GitHub. By validating the active error state and checking that a valid commit was actually made on the branch when the qualitative review retry limit is reached, we ensure that empty or broken workflows gracefully escalate to blocked rather than attempting to open invalid pull requests.

Changes

Core Workflow Logic

src/forge/workflow/task_takeover/graph.py: Modified the _route_after_qualitative_review routing function to verify that state.last_error is empty and that a successful commit was recorded (state.commit_info.committed) before transitioning to PR creation. If an active error exists or no changes are committed when the retry limit is exhausted, the workflow now routes to escalate_blocked.

Documentation

docs/guide/task-workflow.md: Updated the "Qualitative Review" section to explicitly document this new fallback routing logic, ensuring engineering documentation matches the runtime execution rules.

Test Suite

tests/unit/workflow/task_takeover/test_graph.py: Added comprehensive unit tests to validate the updated routing behavior under multiple conditions:
- test_route_after_qualitative_review_no_changes_escalates (verifies escalation when no changes/commits exist)
- test_route_after_qualitative_review_with_last_error_escalates (verifies escalation when an active error is recorded)
- test_route_after_qualitative_review_with_changes_creates_pr (verifies PR creation when there is a successful commit and no active error)
tests/sandbox/test_task_execution.py: Updated GitOperations mocking to mock prepare_workspace instead of mocking GitOperations directly on task_takeover_execution to align with the workspace-path and git helper acquisition logic.

Implementation Notes

Pure State Routing: The graph routing logic remains a pure state-driven function. Instead of calling Git commands directly, it relies on checking the state object variables (state.last_error and state.commit_info), preserving clean architectural separation.
Fail-Safe Fallback: Reaching the maximum attempts threshold no longer unconditionally proceeds to PR creation. The check serves as an important safeguard against environmental failures (e.g., container runner failure paths that clear exceptions but produce no code).

Testing

Unit Testing: Executed the newly added test suite in tests/unit/workflow/task_takeover/test_graph.py to cover all boundary states of the qualitative review retry routing, and updated sandbox execution tests to reflect mock alignment.
Linter & Verification: Verified that code formatters and linters pass cleanly across all modified files.

Related Tickets

Generated by Forge SDLC Orchestrator

… in task takeover Detailed description: - Modified routing logic in graph.py to prevent proceeding to PR creation when the maximum retry count is reached but container execution failed or when no changes/commits exist on the branch. In these error cases, the workflow routes to escalate_blocked instead of proceeding to create_pr. - Added unit tests in test_task_takeover_graph.py to cover these new routing behaviors and ensure robustness. Closes: AISOS-2159

Detailed description: - Added comprehensive unit tests in tests/unit/workflow/task_takeover/test_graph.py to verify routing in the task takeover workflow's _route_after_qualitative_review function when retry limit is reached. - Confirmed that routing correctly escalates to 'escalate_blocked' if no changes were committed or if there is an active error, and successfully proceeds to 'create_pr' only if changes were successfully committed and no active error exists. Closes: AISOS-2159

…review routing Detailed description: - Updated the "Qualitative Review" section of the task-workflow guide to document the new routing conditions. - Specifically noted that when the retry limit is hit, the workflow only proceeds to PR creation if there is no active error and changes have been successfully committed. Otherwise, it escalates to blocked. Closes: AISOS-2159-docs

ekuris-redhat · 2026-07-16T09:04:51Z

Tested locally with Podman stopped (podman machine stop):

Ran full unit test suite, 1468 passed, no regressions (2 pre-existing failures in test_generate_prd.py unrelated to this PR)
Triggered a fresh task takeover workflow on AISOS-2205
Container execution failed with exit code 125 (Podman connection refused)
Qualitative review retried twice, then hit the new guard: "Qualitative review retry limit reached with active error or no committed changes. Escalating."
Workflow escalated to forge:blocked , no PR creation attempted

Before this fix, the same scenario would proceed to create_pr and fail with a 422 from GitHub.

eshulman2 · 2026-07-16T10:56:19Z

/forge rebase

ekuris-redhat · 2026-07-16T10:57:08Z

Rebase triggered by @eshulman2

Merging main into the PR branch and resolving any conflicts. This may take a few minutes.

Auto-committed by Forge container fallback.

ekuris-redhat · 2026-07-16T11:04:04Z

Merge conflicts resolved and pushed. The PR branch has been updated.

Resolved files: tests/workflow/test_task_takeover_graph.py

eshulman2

Review findings

eshulman2 · 2026-07-16T13:23:40Z

+            else getattr(commit_info, "committed", False)
+        )
+
+        if last_error or not committed:


commit_info.committed only describes the latest execution attempt. A previous attempt may already have created a valid commit, while a feedback retry that produces no additional changes overwrites this flag with false; reaching the review cap then escalates even though the branch contains PR-worthy changes. Please check the branch against its base (or preserve cumulative commit state) instead of relying on the latest attempt’s flag.

eshulman2 · 2026-07-16T13:23:40Z

+            else getattr(commit_info, "committed", False)
+        )
+
+        if last_error or not committed:


The earlier if last_error and not verdict branch still returns create_pr at the retry limit, bypassing this new active-error safeguard. run_qualitative_review exceptions produce exactly that state (last_error set and review_verdict=None), so this check is never reached. Please route that case to escalate_blocked as documented, and test the state shape produced by the review node.

ekuris-redhat · 2026-07-16T13:24:30Z

Forge is addressing PR review feedback now. This status update is informational.

…l code review Detailed description: - Fixed an outdated assertion in in to match the newly implemented routing behavior where active-error review infrastructure failures escalate to blocked instead of proceeding to PR creation. - Verified all tests and linting check out correctly. Closes: AISOS-2159-review-review-impl

Auto-committed by Forge container fallback.

eshulman2

The state-based guard is the right fix, but the Git fallback should be removed. It adds filesystem I/O to a routing function, relies on the private _run_git API, hard-codes origin/main, and can allow an active last_error to proceed to PR creation when an earlier commit exists.

Please make the following changes:

Remove the Git fallback block from _route_after_qualitative_review and drop the Path, GitOperations, and Workspace imports.
Keep the router pure and state-driven: an active last_error must always route to escalate_blocked; at the retry cap, proceed only when commit_info.committed is true.
Fix commit_info.committed at its source in task_takeover_execution.py. It currently describes only the latest execution attempt, so a no-op feedback retry can overwrite an earlier successful commit with false. Preserve the successful/cumulative committed state once the branch has a valid implementation commit.
Add a typed commit_info field (preferably backed by a dedicated TypedDict) to TaskTakeoverState and initialize it consistently if appropriate.
Update _route_after_qualitative_review’s docstring to describe the retry-cap, active-error, and committed-state behavior.
Add regression coverage for an earlier successful commit followed by a no-op feedback retry, plus the invariant that last_error always blocks PR creation.

Items 1 and 3 need to land together: simply removing the fallback while retaining the current per-attempt committed semantics would falsely block branches that already contain valid changes.

ekuris-redhat · 2026-07-16T14:53:06Z

Forge is addressing PR review feedback now. This status update is informational.

…ask takeover execution sandbox tests Detailed description: - Fixed test failures in tests/sandbox/test_task_execution.py where GitOperations was being mocked directly on task_takeover_execution. - Since execute_task_changes now uses prepare_workspace to obtain the workspace_path and git helper, the test mocks have been updated to mock prepare_workspace instead of GitOperations. Closes: AISOS-2159-review-review-impl

ekuris-redhat · 2026-07-17T06:30:15Z

/forge rebase

ekuris-redhat · 2026-07-17T06:30:17Z

Rebase triggered by @eshulman2

Merging main into the PR branch and resolving any conflicts. This may take a few minutes.

Auto-committed by Forge container fallback.

ekuris-redhat · 2026-07-17T06:36:06Z

Merge conflicts resolved and pushed. The PR branch has been updated.

Resolved files: src/forge/workflow/nodes/task_takeover_execution.py, src/forge/workflow/task_takeover/state.py

ekuris-redhat · 2026-07-17T06:36:12Z

Rebase triggered by @ekuris-redhat

Merging main into the PR branch and resolving any conflicts. This may take a few minutes.

ekuris-redhat added 3 commits July 16, 2026 06:14

ekuris-redhat added ready-for-review verified/tested labels Jul 16, 2026

ekuris-redhat mentioned this pull request Jul 16, 2026

Workflow continues to PR creation after container execution failure #147

Open

ekuris-redhat added do not merge ready-for-review verified/tested and removed ready-for-review verified/tested do not merge labels Jul 16, 2026

eshulman2 added bug Something isn't working area:workflow Workflow graphs, orchestration, state, routing, and gates area:execution Agent execution, containers, sandboxes, and runtime drivers labels Jul 16, 2026

[AISOS-2159-rebase] Resolve merge conflicts with main for AISOS-2159

d8411f0

Auto-committed by Forge container fallback.

eshulman2 reviewed Jul 16, 2026

View reviewed changes

ekuris-redhat added 4 commits July 16, 2026 13:56

[AISOS-2159] review: address PR feedback

0945c86

[AISOS-2159-review-review-impl] Post-review-impl code review

97d453a

Auto-committed by Forge container fallback.

Delete Pipfile

9df11a0

eshulman2 reviewed Jul 16, 2026

View reviewed changes

ekuris-redhat added 2 commits July 16, 2026 15:14

[AISOS-2159] review: address PR feedback

7600a1a

[AISOS-2159-rebase] Resolve merge conflicts with main for AISOS-2159

a40461b

Auto-committed by Forge container fallback.

Uh oh!

Conversation

ekuris-redhat commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Core Workflow Logic

Documentation

Test Suite

Implementation Notes

Testing

Related Tickets

Uh oh!

ekuris-redhat commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eshulman2 commented Jul 16, 2026

Uh oh!

ekuris-redhat commented Jul 16, 2026

Uh oh!

ekuris-redhat commented Jul 16, 2026

Uh oh!

eshulman2 left a comment

Choose a reason for hiding this comment

Uh oh!

eshulman2 Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

eshulman2 Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

ekuris-redhat commented Jul 16, 2026

Uh oh!

eshulman2 left a comment

Choose a reason for hiding this comment

Uh oh!

ekuris-redhat commented Jul 16, 2026

Uh oh!

ekuris-redhat commented Jul 17, 2026

Uh oh!

ekuris-redhat commented Jul 17, 2026

Uh oh!

ekuris-redhat commented Jul 17, 2026

Uh oh!

ekuris-redhat commented Jul 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ekuris-redhat commented Jul 16, 2026 •

edited

Loading

ekuris-redhat commented Jul 16, 2026 •

edited

Loading