diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/acpx_provider_backend.rs b/packages/paperclip-runner/runner/crates/runner-core/src/acpx_provider_backend.rs index 7aed75e7ff7..d29cd3ed265 100644 --- a/packages/paperclip-runner/runner/crates/runner-core/src/acpx_provider_backend.rs +++ b/packages/paperclip-runner/runner/crates/runner-core/src/acpx_provider_backend.rs @@ -3244,6 +3244,21 @@ impl CommandExecutor for AcpxCommandExecutor { self.retained_events() } + fn provider_poll_is_live(&self) -> bool { + self.restore_checked + && self.persistence_error.is_none() + && self + .session + .as_ref() + .is_some_and(|session| !session.awaits_next_turn()) + && self.state.as_ref().is_some_and(|state| { + matches!(state.lifecycle.as_str(), "turn_starting" | "turn_active") + && state.active_turn_id.is_some() + && !state.provider_exit_unconfirmed + && state.descriptor.run_id == self.context.run_id + }) + } + fn poll_disconnected_events(&mut self) -> Result, DurableRunnerError> { self.ensure_persistence_healthy()?; if self.session.is_none() diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/native_provider_backend.rs b/packages/paperclip-runner/runner/crates/runner-core/src/native_provider_backend.rs index 4dc83a4d7df..ce58aa81193 100644 --- a/packages/paperclip-runner/runner/crates/runner-core/src/native_provider_backend.rs +++ b/packages/paperclip-runner/runner/crates/runner-core/src/native_provider_backend.rs @@ -99,6 +99,7 @@ impl CommandExecutor for SelectedExecutor { fn provider_poll_is_live(&self) -> bool { match self { Self::LocalFacade(executor) => executor.provider_poll_is_live(), + Self::Acpx(executor) => executor.provider_poll_is_live(), _ => false, } } diff --git a/packages/paperclip-runner/runner/crates/runner-core/tests/acpx_warm_attachment.rs b/packages/paperclip-runner/runner/crates/runner-core/tests/acpx_warm_attachment.rs index 05167e91492..ced2ac6e4d7 100644 --- a/packages/paperclip-runner/runner/crates/runner-core/tests/acpx_warm_attachment.rs +++ b/packages/paperclip-runner/runner/crates/runner-core/tests/acpx_warm_attachment.rs @@ -9,6 +9,7 @@ use paperclip_runner_core::acpx_provider_backend::AcpxCommandExecutor; use paperclip_runner_core::durable::{ AcpxLaunchProfile, Command, CommandExecutor, DurableRunnerConfig, QualifiedLaunchArtifact, }; +use paperclip_runner_core::native_provider_backend::NativeProviderCommandExecutor; use serde_json::{json, Value}; use sha2::{Digest, Sha256}; @@ -309,6 +310,91 @@ fn reopens_the_conversation_for_a_turn_after_a_suspension_stop() { original.shutdown().unwrap(); } +#[test] +fn only_a_restored_session_with_an_active_turn_polls_as_live() { + let fixture = + Fixture(std::env::temp_dir().join(format!("acpx-live-poll-{}", uuid::Uuid::new_v4()))); + fs::create_dir_all(&fixture.0).unwrap(); + fs::set_permissions(&fixture.0, fs::Permissions::from_mode(0o700)).unwrap(); + let sidecar = fixture.0.join("sidecar"); + fs::copy(env!("CARGO_BIN_EXE_fake-acpx-sidecar"), &sidecar).unwrap(); + fs::set_permissions(&sidecar, fs::Permissions::from_mode(0o700)).unwrap(); + let ports = unused_fence_ports(); + let args = vec![ + "--mode".to_owned(), + "suspend".to_owned(), + "--profile-digest".to_owned(), + PROFILE_DIGEST.to_owned(), + "--lifetime-fence-ports".to_owned(), + format!("{},{},{}", ports[0], ports[1], ports[2]), + ]; + let config = DurableRunnerConfig { + connect_url: "ws://127.0.0.1/runner".to_owned(), + ca_bundle_path: None, + state_dir: fixture.0.clone(), + runner_instance_id: "runner-1".to_owned(), + environment_lease_id: "lease-1".to_owned(), + run_id: "run-1".to_owned(), + normalized_session_id: "session-1".to_owned(), + turn_id: "turn-1".to_owned(), + item_id: "item-1".to_owned(), + runner_version: "0.0.0".to_owned(), + runner_digest: format!("sha256:{}", "a".repeat(64)), + acpx_launch_profile: Some(AcpxLaunchProfile { + candidate_admission: None, + authority_digest: format!("sha256:{}", "d".repeat(64)), + command: sidecar.clone(), + args: args.clone(), + artifacts: vec![QualifiedLaunchArtifact { + path: sidecar.clone(), + sha256: format!("sha256:{:x}", Sha256::digest(fs::read(&sidecar).unwrap())), + }], + }), + opencode_launch_profile: None, + cursor_cloud_launch_profile: None, + max_outbox_bytes: 1024 * 1024, + p0_reserve_bytes: 64 * 1024, + max_frame_bytes: 1024 * 1024, + reconnect_delay: Duration::from_millis(1), + reconnect_grace: None, + max_runtime: Duration::from_secs(30), + turn_scoped: false, + }; + let descriptor = json!({ + "kind": "acpx", "provider": "acpx", "driver": "acpx_runtime", + "providerVersion": "0.22.0", "agent": "codex", "model": "gpt-5.6-sol", + "acpxVersion": "0.22.0", "agentServerPackage": "@agentclientprotocol/codex-acp", + "agentServerVersion": "1.6.2", "agentRuntimePackage": "@openai/codex", + "agentRuntimeVersion": "0.160.0", "commandDigest": PROFILE_DIGEST, + "sidecarCommand": sidecar, "sidecarArgs": args, "runtimeDirectory": fixture.0, + "normalizedSessionId": "session-1", "runId": "run-1", "cwd": fixture.0, + "instructions": "Complete the supplied work.", + "permissionMode": "approve-all", "permissionModePinned": true, + }); + let mut executor = NativeProviderCommandExecutor::with_runner_config(&fixture.0, &config); + assert!(!executor.provider_poll_is_live()); + executor + .execute(&command(1, "run.prepare", json!({"provider": descriptor}))) + .unwrap(); + executor + .execute(&command(2, "session.open", json!({}))) + .unwrap(); + assert!(!executor.provider_poll_is_live()); + let started = executor + .execute(&command( + 3, + "turn.start", + json!({"turnId": "provider-turn-1", "text": "Do the work."}), + )) + .unwrap(); + assert_eq!(started.result["status"], "accepted"); + assert!(executor.provider_poll_is_live()); + drop(executor); + + let restored = NativeProviderCommandExecutor::with_runner_config(&fixture.0, &config); + assert!(!restored.provider_poll_is_live()); +} + #[test] fn restores_the_conversation_after_losing_an_active_turn_to_a_runner_restart() { let fixture =