The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix(runner): tolerate Codex account notifications during active turns (#13902)
Dottaa6448cd06093
diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/bin/fake-codex-app-server.rs b/packages/paperclip-runner/runner/crates/runner-core/src/bin/fake-codex-app-server.rsindex aeb637022e..bac103d0ff 100644--- a/packages/paperclip-runner/runner/crates/runner-core/src/bin/fake-codex-app-server.rs+++ b/packages/paperclip-runner/runner/crates/runner-core/src/bin/fake-codex-app-server.rs@@ -1471,6 +1471,14 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {"method": "turn/started","params": {"turn": {"id": provider_turn_id}}}))?;+ if args.iter().any(|value| value == "--account-notifications") {+ send(json!({"method":"account/updated", "params":{+ "authMode":"chatgpt", "planType":"pro"+ }}))?;+ send(json!({"method":"account/login/completed", "params":{+ "loginId":"fixture-login", "success":true, "error":null+ }}))?;+ }if args.iter().any(|value| value == "--helper-tool-requests") {if !args.iter().any(|value| value == "--foreign-helper-tool") {send(json!({"method":"item/completed", "params":{diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/codex_provider.rs b/packages/paperclip-runner/runner/crates/runner-core/src/codex_provider.rsindex bfa72a01c7..549b6d8890 100644--- a/packages/paperclip-runner/runner/crates/runner-core/src/codex_provider.rs+++ b/packages/paperclip-runner/runner/crates/runner-core/src/codex_provider.rs@@ -3383,8 +3383,18 @@ fn classify_notification_thread("Codex notification has malformed turn identity",));}- // This connection-level notification carries no task authority. Codex can- // emit it while loading skills during the first turn.+ // Account and skill updates describe the provider connection, not a task.+ // Codex can emit them during startup or credential refresh without thread+ // or turn IDs. Never let them acquire execution authority or expose their+ // account payload as task output.+ if matches!(method, "account/updated" | "account/login/completed") {+ if contains_provider_work_binding(params) {+ return Err(LocalRunnerError::invalid(+ "Codex account notification contains execution identity",+ ));+ }+ return Ok(NotificationThread::UnrelatedInformation);+ }if method == "skills/changed" && !contains_provider_work_binding(params) {return Ok(NotificationThread::UnrelatedInformation);}@@ -4986,6 +4996,38 @@ mod notification_identity_tests {}}+ #[test]+ fn account_notifications_are_connection_information_without_execution_authority() {+ for (method, params) in [+ (+ "account/updated",+ json!({"authMode":"chatgpt", "planType":"pro"}),+ ),+ (+ "account/login/completed",+ json!({"loginId":null, "success":true, "error":null}),+ ),+ ] {+ assert_eq!(+ classify_notification_thread(method, "root", &BTreeSet::new(), ¶ms).unwrap(),+ NotificationThread::UnrelatedInformation+ );+ for invalid in [+ json!({"threadId":"other"}),+ json!({"turnId":"unbound"}),+ json!({"itemId":"unbound"}),+ json!({"nested":{"request":{"id":"unbound"}}}),+ json!({"threadId":7}),+ json!({"threadId":"root", "thread":{"id":"other"}}),+ ] {+ assert!(+ classify_notification_thread(method, "root", &BTreeSet::new(), &invalid)+ .is_err()+ );+ }+ }+ }+#[test]fn child_mcp_startup_before_lineage_has_no_execution_authority() {let params =diff --git a/packages/paperclip-runner/runner/crates/runner-core/tests/codex_provider.rs b/packages/paperclip-runner/runner/crates/runner-core/tests/codex_provider.rsindex b32714c0cb..ff4edc2e33 100644--- a/packages/paperclip-runner/runner/crates/runner-core/tests/codex_provider.rs+++ b/packages/paperclip-runner/runner/crates/runner-core/tests/codex_provider.rs@@ -588,6 +588,54 @@ fn codex_transport_buffers_notifications_while_waiting_for_responses() {fs::remove_dir_all(directory).expect("remove Codex integration-test directory");}+#[test]+fn codex_account_updates_do_not_interrupt_turns_or_publish_account_details() {+ let directory = temporary_directory("account-notifications");+ let config = provider_config(&directory, &["--account-notifications"]);+ let mut provider = CodexProvider::start(&config, None).expect("start fake Codex provider");+ for _ in 0..2 {+ provider+ .start_turn("Are you there?", &config.cwd)+ .expect("start provider turn");+ let mut completed = false;+ let mut account_notices = 0;+ let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);+ while std::time::Instant::now() < deadline {+ match provider.poll().expect("poll provider event") {+ Some(CodexProviderEvent::ProtocolFailure { diagnostic }) => {+ panic!("account notification interrupted the turn: {diagnostic}");+ }+ Some(CodexProviderEvent::Notification { method, params }) => {+ if params["providerMethod"]+ .as_str()+ .is_some_and(|method| method.starts_with("account/"))+ {+ account_notices += 1;+ assert_eq!(method, "warning");+ assert_eq!(params["classification"], "unrelated_information");+ assert!(!params.to_string().contains("fixture-login"));+ assert!(params.get("authMode").is_none());+ assert!(params.get("planType").is_none());+ }+ if method == "turn/completed" {+ completed = true;+ break;+ }+ }+ _ => {}+ }+ std::thread::sleep(std::time::Duration::from_millis(1));+ }+ assert!(+ completed,+ "the real provider boundary must deliver the terminal"+ );+ assert_eq!(account_notices, 2);+ }+ provider.shutdown().expect("stop provider");+ fs::remove_dir_all(directory).expect("remove account notification test directory");+}+#[test]fn codex_goal_autostart_binds_the_provider_turn_authority() {let directory = temporary_directory("goal-autostart");diff --git a/server/src/services/native-runtime/native-session-executor.test.ts b/server/src/services/native-runtime/native-session-executor.test.tsindex 3be76308f4..4bd73dce89 100644--- a/server/src/services/native-runtime/native-session-executor.test.ts+++ b/server/src/services/native-runtime/native-session-executor.test.ts@@ -10396,7 +10396,7 @@ describe("runnerd provider runtime wiring", () => {});it.each([- ...["current", "stale", "missing", "retained", "retained-mismatch", "retained-error", "retained-timeout", "retained-explicit"]+ ...["current", "preinstalled-exact", "preinstalled-mismatch", "preinstalled-error", "preinstalled-timeout", "stale", "missing", "retained", "retained-mismatch", "retained-error", "retained-timeout", "retained-explicit"].map((image) => ({ image, version: "0.156.0", compatible: true })),...["0.149.0", "0.149.1", "0.153.4", "0.156.1"].map((version) => ({ image: "current", version, compatible: true })),@@ -10405,11 +10405,11 @@ describe("runnerd provider runtime wiring", () => {])("uses shared Codex and the server-owned replacement artifact (image=$image, Codex=$version)", async ({ image, version, compatible }) => {const retained = image.startsWith("retained");const exactRetained = image === "retained" || image === "retained-explicit";- const needsReplacement = image !== "current" && !exactRetained;+ const needsReplacement = image !== "current" && image !== "preinstalled-exact" && !exactRetained;// The mocked remote executes metadata probes; artifact staging only needs bytes.// Keep this regression independent of a locally compiled Rust runner binary.const controllerArtifact = join(isolatedStateDirectory, "paperclip-runnerd");- if (needsReplacement || retained) {+ if (needsReplacement || retained || image === "preinstalled-exact") {await writeFile(controllerArtifact, "fixture runner artifact");state.resolveRunnerBinary.mockReturnValueOnce(controllerArtifact);}@@ -10420,10 +10420,10 @@ describe("runnerd provider runtime wiring", () => {let stdout = "";const script = command.args?.[1] ?? "";if (script.includes('sha256sum "$1"')) {- if (image === "retained-error") throw new Error("checksum unavailable");+ if (image.endsWith("-error")) throw new Error("checksum unavailable");return {- exitCode: 0, signal: null, timedOut: image === "retained-timeout", stderr: "",- stdout: `${createHash("sha256").update(image === "retained-mismatch" ? "stale artifact" : "fixture runner artifact").digest("hex")} ${command.args?.[3]}\n`,+ exitCode: 0, signal: null, timedOut: image.endsWith("-timeout"), stderr: "",+ stdout: `${createHash("sha256").update(image.endsWith("-mismatch") ? "stale artifact" : "fixture runner artifact").digest("hex")} ${command.args?.[3]}\n`,};} else if (command.args?.[0] === "--build-metadata") {stdout = JSON.stringify({diff --git a/server/src/services/native-runtime/native-session-executor.ts b/server/src/services/native-runtime/native-session-executor.tsindex 48de155f83..e6ec883912 100644--- a/server/src/services/native-runtime/native-session-executor.ts+++ b/server/src/services/native-runtime/native-session-executor.ts@@ -10852,9 +10852,33 @@ async function createRunnerdBackendWithinSessionClaim(remotePrepared = true;return;}- // A resumed sandbox may already contain the exact controller-owned binary.- // Do not upload it every turn, but never treat compatible metadata alone as- // proof of artifact identity (especially for an explicit operator override).+ // Compatibility metadata does not prove artifact identity. Reuse only the+ // exact controller-owned bytes when the controller artifact is available.+ const matchesControllerRunnerArtifact = async (executable: string): Promise<boolean> => {+ const expected = createHash("sha256")+ .update(readFileSync(controllerRunnerBinary))+ .digest("hex");+ try {+ const probe = await remoteCommandRunner.execute({+ command: "sh",+ args: [+ "-c",+ 'test -x "$1" || exit 1; if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1"; else shasum -a 256 "$1"; fi',+ "paperclip-runner-artifact",+ executable,+ ],+ cwd: remoteTarget.remoteCwd,+ bypassSession: true,+ timeoutMs: 10_000,+ });+ return probe.exitCode === 0 && !probe.timedOut &&+ /^[a-f0-9]{64}\s/.test(probe.stdout) &&+ probe.stdout.trim().split(/\s+/)[0] === expected;+ } catch {+ // An unavailable checksum uses the verified staging path.+ return false;+ }+ };let runnerArtifactPrepared = false;if (sandboxLeaseAcquisition?.outcome === "resumed" &&@@ -10863,32 +10887,7 @@ async function createRunnerdBackendWithinSessionClaim(runnerArtifactPrepared = await measureNativeRunnerSpan(input.trace,"runner.artifact.verify_retained",- async () => {- const expected = createHash("sha256")- .update(readFileSync(controllerRunnerBinary))- .digest("hex");- try {- const probe = await remoteCommandRunner.execute({- command: "sh",- args: [- "-c",- 'test -x "$1" || exit 1; if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1"; else shasum -a 256 "$1"; fi',- "paperclip-runner-artifact",- remoteBinary,- ],- cwd: remoteTarget.remoteCwd,- bypassSession: true,- timeoutMs: 10_000,- });- return probe.exitCode === 0 && !probe.timedOut &&- /^[a-f0-9]{64}\s/.test(probe.stdout) &&- probe.stdout.trim().split(/\s+/)[0] === expected;- } catch {- // Missing binaries, checksum tools, or a failed probe use the- // ordinary verified staging path; none authorizes cached execution.- return false;- }- },+ () => matchesControllerRunnerArtifact(remoteBinary),);}const explicitRemoteBinary = input.runnerRemoteBinaryPath?.trim() || null;@@ -10905,6 +10904,10 @@ async function createRunnerdBackendWithinSessionClaim("runner.artifact.verify_preinstalled",() => verifyRemoteRunner(requiredMode, preinstalledRunner),);+ if (existsSync(controllerRunnerBinary) &&+ !await matchesControllerRunnerArtifact(preinstalledRunner)) {+ throw new Error("runner_remote_preinstalled_artifact_mismatch");+ }await measureNativeRunnerSpan(input.trace,"runner.artifact.link",