You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'main' into codex/session-title-fix (21ed173)
Adopt upstream's own fix for the adaptive-evidence footer assertion
(normalized separator comparison, supersedes our MAIN_SEPARATOR variant).
Budget re-based to measured 676495: +9 from the session-title regression
tests, the rest absorbs the pre-release repair batch 21ed173 which
landed without a budget update. Session-title tests still pass.
"{finished} background shell task(s) finished, but the turn cannot resume because the provider route is no longer valid: {err}. Their output stays available via /jobs."
1954
+
))))
1955
+
.await;
1956
+
return;
1957
+
}
1958
+
};
1926
1959
let _ = self
1927
1960
.tx_event
1928
1961
.send(Event::status(
1929
-
"Background shell work finished; continuing the active goal".to_string(),
1962
+
"Background shell work finished; resuming the turn".to_string(),
1930
1963
))
1931
1964
.await;
1932
-
self.schedule_goal_continuation(Vec::new());
1965
+
let _ = self
1966
+
.handle_send_message(
1967
+
"[runtime] A background shell task finished; its completion evidence follows."
1968
+
.to_string(),
1969
+
self.current_mode,
1970
+
route,
1971
+
self.config.compaction.clone(),
1972
+
self.config.goal_objective.clone(),
1973
+
self.config.goal_token_budget,
1974
+
self.config.goal_status,
1975
+
self.session.reasoning_effort.clone(),
1976
+
self.session.reasoning_effort_auto,
1977
+
self.session.auto_model,
1978
+
self.session.allow_shell,
1979
+
self.session.trust_mode,
1980
+
self.session.auto_approve,
1981
+
self.session.approval_mode,
1982
+
self.config.translation_enabled,
1983
+
self.config.allowed_tools.clone(),
1984
+
Vec::new(),
1985
+
self.config.hook_executor.clone(),
1986
+
self.config.verbosity.clone(),
1987
+
UserInputProvenance::Runtime,
1988
+
)
1989
+
.await;
1933
1990
}
1934
1991
1935
1992
/// Run the engine event loop
@@ -3544,7 +3601,7 @@ impl Engine {
3544
3601
Some(SubAgentForkContext{
3545
3602
messages:self.messages_with_turn_metadata(),
3546
3603
structured_state_block: state.to_system_block(),
3547
-
// Resolve at spawn time so a work update earlier in this turn
3604
+
// Resolve at spawn time so a todo_write earlier in this turn
3548
3605
// reaches the child rather than freezing turn-start state.
0 commit comments