Persist resolved multi-agent version per thread

This commit is contained in:
Ahmed Ibrahim
2026-05-29 13:12:44 -07:00
parent fb3905f59d
commit 91d87fcd09
47 changed files with 467 additions and 109 deletions
@@ -0,0 +1 @@
ALTER TABLE threads ADD COLUMN multi_agent_version TEXT;
+4
View File
@@ -54,6 +54,7 @@ fn apply_session_meta_from_item(metadata: &mut ThreadMetadata, meta_line: &Sessi
metadata.agent_nickname = meta_line.meta.agent_nickname.clone();
metadata.agent_role = meta_line.meta.agent_role.clone();
metadata.agent_path = meta_line.meta.agent_path.clone();
metadata.multi_agent_version = meta_line.meta.multi_agent_version;
if let Some(provider) = meta_line.meta.model_provider.as_deref() {
metadata.model_provider = provider.to_string();
}
@@ -330,6 +331,7 @@ mod tests {
agent_nickname: None,
agent_role: None,
model_provider: Some("openai".to_string()),
multi_agent_version: None,
base_instructions: None,
dynamic_tools: None,
memory_mode: None,
@@ -452,6 +454,7 @@ mod tests {
agent_nickname: None,
agent_role: None,
model_provider: Some("openai".to_string()),
multi_agent_version: None,
base_instructions: None,
dynamic_tools: None,
memory_mode: None,
@@ -481,6 +484,7 @@ mod tests {
model_provider: "openai".to_string(),
model: None,
reasoning_effort: None,
multi_agent_version: None,
cwd: PathBuf::from("/tmp"),
cli_version: "0.0.0".to_string(),
title: String::new(),
@@ -2,11 +2,13 @@ use anyhow::Result;
use chrono::DateTime;
use chrono::Utc;
use codex_protocol::ThreadId;
use codex_protocol::openai_models::MultiAgentVersion;
use codex_protocol::openai_models::ReasoningEffort;
use codex_protocol::protocol::AskForApproval;
use codex_protocol::protocol::SandboxPolicy;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::ThreadSource;
use serde_json::Value;
use sqlx::Row;
use sqlx::sqlite::SqliteRow;
use std::path::PathBuf;
@@ -83,6 +85,8 @@ pub struct ThreadMetadata {
pub model: Option<String>,
/// The latest observed reasoning effort for the thread.
pub reasoning_effort: Option<ReasoningEffort>,
/// Thread-scoped multi-agent runtime selector.
pub multi_agent_version: Option<MultiAgentVersion>,
/// The working directory for the thread.
pub cwd: PathBuf,
/// Version of the CLI that created the thread.
@@ -132,6 +136,8 @@ pub struct ThreadMetadataBuilder {
pub agent_path: Option<String>,
/// The model provider identifier, if known.
pub model_provider: Option<String>,
/// Thread-scoped multi-agent runtime selector.
pub multi_agent_version: Option<MultiAgentVersion>,
/// The working directory for the thread.
pub cwd: PathBuf,
/// Version of the CLI that created the thread.
@@ -169,6 +175,7 @@ impl ThreadMetadataBuilder {
agent_role: None,
agent_path: None,
model_provider: None,
multi_agent_version: None,
cwd: PathBuf::new(),
cli_version: None,
sandbox_policy: SandboxPolicy::new_read_only_policy(),
@@ -209,6 +216,7 @@ impl ThreadMetadataBuilder {
.unwrap_or_else(|| default_provider.to_string()),
model: None,
reasoning_effort: None,
multi_agent_version: self.multi_agent_version,
cwd: self.cwd.clone(),
cli_version: self.cli_version.clone().unwrap_or_default(),
title: String::new(),
@@ -275,6 +283,9 @@ impl ThreadMetadata {
if self.reasoning_effort != other.reasoning_effort {
diffs.push("reasoning_effort");
}
if self.multi_agent_version != other.multi_agent_version {
diffs.push("multi_agent_version");
}
if self.cwd != other.cwd {
diffs.push("cwd");
}
@@ -333,6 +344,7 @@ pub(crate) struct ThreadRow {
model_provider: String,
model: Option<String>,
reasoning_effort: Option<String>,
multi_agent_version: Option<String>,
cwd: String,
cli_version: String,
title: String,
@@ -362,6 +374,7 @@ impl ThreadRow {
model_provider: row.try_get("model_provider")?,
model: row.try_get("model")?,
reasoning_effort: row.try_get("reasoning_effort")?,
multi_agent_version: row.try_get("multi_agent_version")?,
cwd: row.try_get("cwd")?,
cli_version: row.try_get("cli_version")?,
title: row.try_get("title")?,
@@ -395,6 +408,7 @@ impl TryFrom<ThreadRow> for ThreadMetadata {
model_provider,
model,
reasoning_effort,
multi_agent_version,
cwd,
cli_version,
title,
@@ -426,6 +440,8 @@ impl TryFrom<ThreadRow> for ThreadMetadata {
model,
reasoning_effort: reasoning_effort
.and_then(|value| value.parse::<ReasoningEffort>().ok()),
multi_agent_version: multi_agent_version
.and_then(|value| serde_json::from_value(Value::String(value)).ok()),
cwd: PathBuf::from(cwd),
cli_version,
title,
@@ -512,6 +528,7 @@ mod tests {
model_provider: "openai".to_string(),
model: Some("gpt-5".to_string()),
reasoning_effort: reasoning_effort.map(str::to_string),
multi_agent_version: None,
cwd: "/tmp/workspace".to_string(),
cli_version: "0.0.0".to_string(),
title: String::new(),
@@ -542,6 +559,7 @@ mod tests {
model_provider: "openai".to_string(),
model: Some("gpt-5".to_string()),
reasoning_effort,
multi_agent_version: None,
cwd: PathBuf::from("/tmp/workspace"),
cli_version: "0.0.0".to_string(),
title: String::new(),
+2
View File
@@ -177,6 +177,7 @@ SELECT
threads.agent_nickname,
threads.agent_role,
threads.model_provider,
threads.multi_agent_version,
threads.model,
threads.reasoning_effort,
threads.cwd,
@@ -547,6 +548,7 @@ SELECT
threads.agent_role,
threads.agent_path,
threads.model_provider,
threads.multi_agent_version,
threads.model,
threads.reasoning_effort,
threads.cwd,
@@ -55,6 +55,7 @@ pub(super) fn test_thread_metadata(
model_provider: "test-provider".to_string(),
model: Some("gpt-5".to_string()),
reasoning_effort: Some(ReasoningEffort::Medium),
multi_agent_version: None,
cwd,
cli_version: "0.0.0".to_string(),
title: String::new(),
+21 -2
View File
@@ -18,6 +18,7 @@ SELECT
threads.agent_role,
threads.agent_path,
threads.model_provider,
threads.multi_agent_version,
threads.model,
threads.reasoning_effort,
threads.cwd,
@@ -491,6 +492,7 @@ INSERT INTO threads (
agent_role,
agent_path,
model_provider,
multi_agent_version,
model,
reasoning_effort,
cwd,
@@ -507,7 +509,7 @@ INSERT INTO threads (
git_branch,
git_origin_url,
memory_mode
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(id) DO NOTHING
"#,
)
@@ -527,6 +529,12 @@ ON CONFLICT(id) DO NOTHING
.bind(metadata.agent_role.as_deref())
.bind(metadata.agent_path.as_deref())
.bind(metadata.model_provider.as_str())
.bind(
metadata
.multi_agent_version
.as_ref()
.map(crate::extract::enum_to_string),
)
.bind(metadata.model.as_deref())
.bind(
metadata
@@ -697,6 +705,7 @@ INSERT INTO threads (
agent_role,
agent_path,
model_provider,
multi_agent_version,
model,
reasoning_effort,
cwd,
@@ -713,7 +722,7 @@ INSERT INTO threads (
git_branch,
git_origin_url,
memory_mode
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(id) DO UPDATE SET
rollout_path = excluded.rollout_path,
created_at = excluded.created_at,
@@ -726,6 +735,7 @@ ON CONFLICT(id) DO UPDATE SET
agent_role = excluded.agent_role,
agent_path = excluded.agent_path,
model_provider = excluded.model_provider,
multi_agent_version = excluded.multi_agent_version,
model = excluded.model,
reasoning_effort = excluded.reasoning_effort,
cwd = excluded.cwd,
@@ -759,6 +769,12 @@ ON CONFLICT(id) DO UPDATE SET
.bind(metadata.agent_role.as_deref())
.bind(metadata.agent_path.as_deref())
.bind(metadata.model_provider.as_str())
.bind(
metadata
.multi_agent_version
.as_ref()
.map(crate::extract::enum_to_string),
)
.bind(metadata.model.as_deref())
.bind(
metadata
@@ -929,6 +945,7 @@ SELECT
threads.agent_role,
threads.agent_path,
threads.model_provider,
threads.multi_agent_version,
threads.model,
threads.reasoning_effort,
threads.cwd,
@@ -1334,6 +1351,7 @@ mod tests {
agent_nickname: None,
agent_role: None,
model_provider: None,
multi_agent_version: None,
base_instructions: None,
dynamic_tools: None,
memory_mode: Some("polluted".to_string()),
@@ -1393,6 +1411,7 @@ mod tests {
agent_nickname: None,
agent_role: None,
model_provider: None,
multi_agent_version: None,
base_instructions: None,
dynamic_tools: None,
memory_mode: None,