mirrors/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-30 03:12:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

V5

Browse Source
This commit is contained in:
jif-oai
2025-10-14 11:46:27 +01:00
parent f72e9da7c5
commit cb99d71f57
7 changed files with 237 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

250
codex-rs/codex-infty/src/lib.rs
View File

@@ -23,8 +23,10 @@ use codex_core::cross_session::PostUserTurnRequest;
use codex_core::cross_session::RoleOrId;
use codex_core::cross_session::SessionEventStream;
use codex_core::protocol::AgentMessageEvent;
use codex_core::protocol::AskForApproval;
use codex_core::protocol::EventMsg;
use codex_core::protocol::Op;
use codex_core::protocol::SandboxPolicy;
use codex_core::protocol::SessionConfiguredEvent;
use codex_protocol::ConversationId;
use dirs::home_dir;
@@ -67,7 +69,9 @@ pub struct RoleConfig {
}
impl RoleConfig {
pub fn new(role: impl Into<String>, config: Config) -> Self {
pub fn new(role: impl Into<String>, mut config: Config) -> Self {
config.sandbox_policy = SandboxPolicy::DangerFullAccess;
config.approval_policy = AskForApproval::Never;
Self {
role: role.into(),
config,
@@ -101,7 +105,7 @@ pub struct ResumeParams {
const DEFAULT_DIRECTOR_TIMEOUT: Duration = Duration::from_secs(120);
const DEFAULT_VERIFIER_TIMEOUT: Duration = Duration::from_secs(180);
const FINALIZATION_PROMPT: &str = "Create deliverable/: include compiled artifacts or scripts, usage docs, and tests. Write deliverable/README.md with overview, manifest (paths and sizes), verification steps, and limitations. Remove scratch files. Reply with JSON: {\"type\":\"final_delivery\",\"deliverable_path\":\"<path>\",\"summary\":\"<summary>\"}.";
const FINALIZATION_PROMPT: &str = "Create deliverable/: include compiled artifacts or scripts, usage docs, and tests. Write deliverable/summary.txt capturing the final answer, evidence, and follow-up steps. Also provide deliverable/README.md with overview, manifest (paths and sizes), verification steps, and limitations. Remove scratch files. Reply with JSON: {\"type\":\"final_delivery\",\"deliverable_path\":\"deliverable/summary.txt\",\"summary\":\"<answer plus supporting context>\"}.";
#[derive(Clone)]
pub struct RunExecutionOptions {
@@ -140,15 +144,17 @@ pub struct RoleSession {
enum SolverSignal {
DirectionRequest {
#[serde(default)]
prompt: String,
prompt: Option<String>,
},
VerificationRequest {
claim_path: String,
#[serde(default)]
claim_path: Option<String>,
#[serde(default)]
notes: Option<String>,
},
FinalDelivery {
deliverable_path: String,
#[serde(default)]
deliverable_path: Option<String>,
#[serde(default)]
summary: Option<String>,
},
@@ -431,28 +437,29 @@ impl InftyOrchestrator {
options: &RunExecutionOptions,
) -> Result<RunOutcome> {
let mut solver_events = self.stream_events(sessions.solver.conversation_id)?;
let mut waiting_for_signal = false;
let mut pending_solver_turn_completion = false;
if let Some(objective) = &options.objective {
self.post_to_role(
&sessions.run_id,
&sessions.solver.role,
objective.as_str(),
None,
Some(solver_signal_schema()),
)
.await?;
sessions.store.touch()?;
waiting_for_signal = true;
if let Some(progress) = self.progress.as_ref() {
progress.objective_posted(objective);
progress.waiting_for_solver();
}
}
let mut task_complete_detected = false;
loop {
'event_loop: loop {
tokio::select! {
maybe_event = solver_events.next() => {
let Some(event) = maybe_event else {
break;
break 'event_loop;
};
if let Some(progress) = self.progress.as_ref() {
progress.solver_event(&event.event.msg);
@@ -463,18 +470,53 @@ impl InftyOrchestrator {
progress.solver_agent_message(agent_msg);
}
if let Some(signal) = parse_solver_signal(&agent_msg.message) {
waiting_for_signal = false;
match signal {
SolverSignal::DirectionRequest { prompt } => {
let prompt = prompt
.and_then(|p| {
let trimmed = p.trim();
if trimmed.is_empty() {
None
} else {
Some(trimmed.to_string())
}
})
.ok_or_else(|| {
anyhow!(
"solver direction_request missing prompt text"
)
})?;
if let Some(progress) = self.progress.as_ref() {
progress.direction_request(&prompt);
}
self.handle_direction_request(sessions, &prompt, options)
.await?;
self.handle_direction_request(
sessions,
&prompt,
options,
)
.await?;
sessions.store.touch()?;
pending_solver_turn_completion = true;
}
SolverSignal::VerificationRequest { claim_path, notes } => {
let claim_path = claim_path
.and_then(|p| {
let trimmed = p.trim();
if trimmed.is_empty() {
None
} else {
Some(trimmed.to_string())
}
})
.ok_or_else(|| {
anyhow!(
"solver verification_request missing claim_path"
)
})?;
if let Some(progress) = self.progress.as_ref() {
progress.verification_request(&claim_path, notes.as_deref());
progress
.verification_request(&claim_path, notes.as_deref());
}
let pass = self
.handle_verification_request(
@@ -485,6 +527,7 @@ impl InftyOrchestrator {
)
.await?;
sessions.store.touch()?;
pending_solver_turn_completion = true;
if pass {
self.post_to_role(
&sessions.run_id,
@@ -494,6 +537,7 @@ impl InftyOrchestrator {
)
.await?;
sessions.store.touch()?;
pending_solver_turn_completion = true;
}
}
SolverSignal::FinalDelivery {
@@ -501,17 +545,91 @@ impl InftyOrchestrator {
summary,
} => {
sessions.store.touch()?;
let deliverable_path = resolve_deliverable_path(
sessions.store.path(),
&candidate_path,
)
.with_context(|| {
format!(
"invalid deliverable path reported by solver: {candidate_path}"
let summary_clone = summary.clone();
let mut deliverable_path = match candidate_path
.and_then(|p| {
let trimmed = p.trim();
if trimmed.is_empty() {
None
} else {
Some(trimmed.to_string())
}
})
{
Some(candidate) => resolve_deliverable_path(
sessions.store.path(),
&candidate,
)
})?;
.with_context(|| {
format!(
"invalid deliverable path reported by solver: {candidate}"
)
})?,
None => {
let fallback_dir =
sessions.store.path().join("deliverable");
fs::create_dir_all(&fallback_dir).with_context(|| {
format!(
"failed to create fallback deliverable directory at {}",
fallback_dir.display()
)
})?;
fallback_dir.join("summary.txt")
}
};
let content = summary_clone
.clone()
.or_else(|| Some(agent_msg.message.clone()))
.unwrap_or_default();
if deliverable_path.exists() {
if deliverable_path.is_dir() {
let fallback_file =
deliverable_path.join("summary.txt");
fs::create_dir_all(
fallback_file.parent().unwrap_or(&deliverable_path),
)
.with_context(|| {
format!(
"failed to prepare fallback deliverable directory at {}",
deliverable_path.display()
)
})?;
fs::write(&fallback_file, &content).with_context(
|| {
format!(
"failed to write fallback deliverable at {}",
fallback_file.display()
)
},
)?;
deliverable_path = fallback_file;
}
} else {
if let Some(parent) = deliverable_path.parent() {
fs::create_dir_all(parent).with_context(|| {
format!(
"failed to create deliverable directory at {}",
parent.display()
)
})?;
}
fs::write(&deliverable_path, &content).with_context(
|| {
format!(
"failed to write deliverable file at {}",
deliverable_path.display()
)
},
)?;
}
if let Some(progress) = self.progress.as_ref() {
progress.final_delivery(&deliverable_path, summary.as_deref());
progress.final_delivery(
&deliverable_path,
summary.as_deref(),
);
}
return Ok(RunOutcome {
run_id: sessions.run_id.clone(),
@@ -524,10 +642,21 @@ impl InftyOrchestrator {
}
}
EventMsg::TaskComplete { .. } => {
task_complete_detected = true;
if pending_solver_turn_completion {
pending_solver_turn_completion = false;
waiting_for_signal = true;
continue;
}
if waiting_for_signal {
return Err(anyhow!(
"run {} ended without emitting a structured solver signal (direction_request / verification_request / final_delivery)",
sessions.run_id
));
}
break 'event_loop;
}
EventMsg::ShutdownComplete => {
break;
break 'event_loop;
}
_ => {}
}
@@ -544,17 +673,10 @@ impl InftyOrchestrator {
}
}
if task_complete_detected {
Err(anyhow!(
"run {} ended without emitting a structured solver signal (direction_request / verification_request / final_delivery)",
sessions.run_id
))
} else {
Err(anyhow!(
"run {} ended before emitting final_delivery message",
sessions.run_id
))
}
Err(anyhow!(
"run {} ended before emitting final_delivery message",
sessions.run_id
))
}
async fn handle_direction_request(
@@ -573,7 +695,7 @@ impl InftyOrchestrator {
&sessions.run_id,
&sessions.director.role,
request_text,
Some(director_schema()),
None,
)
.await?;
let directive = self
@@ -590,7 +712,7 @@ impl InftyOrchestrator {
&sessions.run_id,
&sessions.solver.role,
directive_text,
None,
Some(solver_signal_schema()),
)
.await?;
Ok(())
@@ -610,7 +732,12 @@ impl InftyOrchestrator {
}
let summary_text = serde_json::to_string_pretty(&summary)?;
let _ = self
.post_to_role(&sessions.run_id, &sessions.solver.role, summary_text, None)
.post_to_role(
&sessions.run_id,
&sessions.solver.role,
summary_text,
Some(solver_signal_schema()),
)
.await?;
return Ok(true);
}
@@ -622,14 +749,13 @@ impl InftyOrchestrator {
};
let request_text = serde_json::to_string_pretty(&request)?;
let mut collected = Vec::with_capacity(sessions.verifiers.len());
let schema = verifier_schema();
for verifier in &sessions.verifiers {
let handle = self
.post_to_role(
&sessions.run_id,
&verifier.role,
request_text.as_str(),
Some(schema.clone()),
None,
)
.await?;
let response = self
@@ -651,7 +777,12 @@ impl InftyOrchestrator {
}
let summary_text = serde_json::to_string_pretty(&summary)?;
let _ = self
.post_to_role(&sessions.run_id, &sessions.solver.role, summary_text, None)
.post_to_role(
&sessions.run_id,
&sessions.solver.role,
summary_text,
Some(solver_signal_schema()),
)
.await?;
Ok(summary.overall.is_pass())
}
@@ -971,27 +1102,28 @@ fn aggregate_verdicts(items: Vec<(String, VerifierVerdict)>) -> AggregatedVerifi
}
}
fn director_schema() -> Value {
fn solver_signal_schema() -> Value {
json!({
"type": "object",
"required": ["directive"],
"properties": {
"directive": { "type": "string" },
"rationale": { "type": "string" }
},
"additionalProperties": false
})
}
fn verifier_schema() -> Value {
json!({
"type": "object",
"required": ["verdict"],
"properties": {
"verdict": { "type": "string", "enum": ["pass", "fail"] },
"reasons": { "type": "array", "items": { "type": "string" } },
"suggestions": { "type": "array", "items": { "type": "string" } }
"type": {
"type": "string",
"enum": ["direction_request", "verification_request", "final_delivery"]
},
"prompt": { "type": ["string", "null"] },
"claim_path": { "type": ["string", "null"] },
"notes": { "type": ["string", "null"] },
"deliverable_path": { "type": ["string", "null"] },
"summary": { "type": ["string", "null"] }
},
"required": [
"type",
"prompt",
"claim_path",
"notes",
"deliverable_path",
"summary"
],
"additionalProperties": false
})
}
@@ -1003,7 +1135,7 @@ fn final_delivery_schema() -> Value {
"properties": {
"type": { "const": "final_delivery" },
"deliverable_path": { "type": "string" },
"summary": { "type": "string" }
"summary": { "type": ["string", "null"] }
},
"additionalProperties": false
})