@team-agent/installer 0.5.123 → 0.5.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -1
- package/crates/team-agent/src/cli/emit.rs +41 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +30 -54
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +59 -118
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +6 -5
- package/crates/team-agent/src/cli/models.rs +93 -128
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +21 -5
- package/crates/team-agent/src/compiler.rs +24 -1
- package/crates/team-agent/src/contract_runtime/backend.rs +30 -6
- package/crates/team-agent/src/contract_runtime/config.rs +34 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +79 -56
- package/crates/team-agent/src/contract_runtime/framework.rs +89 -34
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -24
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +0 -1
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +14 -1
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +19 -101
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +0 -28
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -20
- package/crates/team-agent/src/lifecycle/profile_launch.rs +11 -39
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +1 -63
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +43 -13
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +6 -2
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +1 -3
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +4 -16
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +1 -3
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +84 -53
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +19 -1
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +21 -0
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -137
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +186 -38
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +4 -4
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +66 -4
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +22 -6
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +1 -67
- package/crates/team-agent/src/provider/adapters/mod.rs +0 -1
- package/crates/team-agent/src/provider/adapters/pi.rs +4 -4
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +2 -73
- package/crates/team-agent/src/provider/session/capture.rs +1 -1
- package/crates/team-agent/src/provider/session/context_fork.rs +4 -4
- package/crates/team-agent/src/provider/session_scan/common.rs +1 -2
- package/crates/team-agent/src/provider/session_scan/pi.rs +32 -19
- package/crates/team-agent/src/provider/session_scan.rs +0 -4
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +5 -184
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -6
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +48 -8
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/npm/install.mjs +40 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +1 -1
- package/crates/team-agent/src/lifecycle/launch/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
|
@@ -20,9 +20,7 @@ fn request(session: PiSessionSelector<'static>) -> PiCommandRequest<'static> {
|
|
|
20
20
|
|
|
21
21
|
#[test]
|
|
22
22
|
fn pi_command_omits_unset_model_and_thinking_flags() {
|
|
23
|
-
let mut request = request(PiSessionSelector::Fresh
|
|
24
|
-
session_id: "a2320d4e-7b3a-44ae-b3b8-d5de57033b01",
|
|
25
|
-
});
|
|
23
|
+
let mut request = request(PiSessionSelector::Fresh);
|
|
26
24
|
request.model = None;
|
|
27
25
|
request.effort = None;
|
|
28
26
|
let argv = build_pi_command_argv(request).expect("Pi provider defaults");
|
|
@@ -38,9 +36,7 @@ fn leader_request() -> PiCommandRequest<'static> {
|
|
|
38
36
|
effort: None,
|
|
39
37
|
system_prompt: "frozen leader prompt",
|
|
40
38
|
session_dir: None,
|
|
41
|
-
session: PiSessionSelector::Fresh
|
|
42
|
-
session_id: "da8c3622-2378-4d05-a26c-e826a6ef6d63",
|
|
43
|
-
},
|
|
39
|
+
session: PiSessionSelector::Fresh,
|
|
44
40
|
agent_id: "leader",
|
|
45
41
|
}
|
|
46
42
|
}
|
|
@@ -57,8 +53,6 @@ fn pi_interactive_leader_argv_preserves_native_session_discovery() {
|
|
|
57
53
|
"/workspace/.team/runtime/pi/current/leader/team-mcp.ts",
|
|
58
54
|
"--append-system-prompt",
|
|
59
55
|
"frozen leader prompt",
|
|
60
|
-
"--session-id",
|
|
61
|
-
"da8c3622-2378-4d05-a26c-e826a6ef6d63",
|
|
62
56
|
"--name",
|
|
63
57
|
"leader",
|
|
64
58
|
]
|
|
@@ -98,9 +92,7 @@ fn pi_leader_session_scope_keeps_explicit_and_external_routes_isolated() {
|
|
|
98
92
|
|
|
99
93
|
#[test]
|
|
100
94
|
fn pi_command_preserves_direct_pi_defaults_with_only_team_runtime_additions() {
|
|
101
|
-
let fresh = build_pi_command_argv(request(PiSessionSelector::Fresh
|
|
102
|
-
session_id: "da8c3622-2378-4d05-a26c-e826a6ef6d63",
|
|
103
|
-
}))
|
|
95
|
+
let fresh = build_pi_command_argv(request(PiSessionSelector::Fresh))
|
|
104
96
|
.expect("fresh Pi command");
|
|
105
97
|
assert_eq!(
|
|
106
98
|
fresh,
|
|
@@ -116,8 +108,6 @@ fn pi_command_preserves_direct_pi_defaults_with_only_team_runtime_additions() {
|
|
|
116
108
|
"frozen worker prompt",
|
|
117
109
|
"--session-dir",
|
|
118
110
|
"/workspace/.team/runtime/pi/team-a/worker-a/sessions",
|
|
119
|
-
"--session-id",
|
|
120
|
-
"da8c3622-2378-4d05-a26c-e826a6ef6d63",
|
|
121
111
|
"--name",
|
|
122
112
|
"worker-a",
|
|
123
113
|
]
|
|
@@ -178,9 +168,7 @@ fn pi_command_preserves_direct_pi_defaults_with_only_team_runtime_additions() {
|
|
|
178
168
|
|
|
179
169
|
#[test]
|
|
180
170
|
fn pi_command_keeps_direct_plugins_skills_context_auth_and_tools() {
|
|
181
|
-
let argv = build_pi_command_argv(request(PiSessionSelector::Fresh
|
|
182
|
-
session_id: "76f682b1-ecc3-4586-850f-ab2e2bb04cb3",
|
|
183
|
-
}))
|
|
171
|
+
let argv = build_pi_command_argv(request(PiSessionSelector::Fresh))
|
|
184
172
|
.expect("fresh Pi command");
|
|
185
173
|
|
|
186
174
|
for forbidden in [
|
|
@@ -58,9 +58,7 @@ fn command(_tools: &[&str], effort: ProviderEffort, model: &str) -> Result<Vec<S
|
|
|
58
58
|
session_dir: Some(Path::new(
|
|
59
59
|
"/workspace/.team/runtime/pi/t1/pi-worker/sessions",
|
|
60
60
|
)),
|
|
61
|
-
session: PiSessionSelector::Fresh
|
|
62
|
-
session_id: "c5ddf218-24a5-4e74-960c-ab6606ea7e8c",
|
|
63
|
-
},
|
|
61
|
+
session: PiSessionSelector::Fresh,
|
|
64
62
|
agent_id: "pi-worker",
|
|
65
63
|
})
|
|
66
64
|
.map_err(|error| error.to_string())
|
|
@@ -4,7 +4,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
|
|
|
4
4
|
|
|
5
5
|
use crate::lifecycle::launch::launch_with_transport_in_workspace;
|
|
6
6
|
use crate::lifecycle::launch::pi_mcp::{
|
|
7
|
-
PiExecutableChain,
|
|
7
|
+
PiExecutableChain, PiMaterializeRequest, PiSessionScope,
|
|
8
8
|
PiWrapperRequest, materialize_pi_plan, materialize_pi_resume_plan,
|
|
9
9
|
parse_pi_list_models_table, pi_seat_paths, resolve_pi_executable_chain,
|
|
10
10
|
validate_pi_executable_chain, validate_pi_wrapper_source, write_pi_wrapper,
|
|
@@ -105,47 +105,35 @@ fn mcp_config(candidate: &Path, workspace: &Path, agent_id: &str) -> McpConfig {
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
#[test]
|
|
108
|
-
fn
|
|
108
|
+
fn pi_executable_chain_accepts_any_first_path_entry_and_freezes_catalog() {
|
|
109
109
|
let chain = PiExecutableChain {
|
|
110
110
|
path_entry: PathBuf::from("/Users/fixture/.local/bin/pi"),
|
|
111
|
-
path_entry_type: PiExecutableFileType::Wrapper,
|
|
112
|
-
launch_executable: PathBuf::from("/Users/fixture/.local/bin/pi"),
|
|
113
|
-
real_binary: PathBuf::from(
|
|
114
|
-
"/opt/homebrew/lib/node_modules/@earendil-works/pi-coding-agent/dist/bundle/cli.js",
|
|
115
|
-
),
|
|
116
111
|
pi_version: "0.84.3".to_string(),
|
|
117
112
|
catalog_sha256: CATALOG_DIGEST.to_string(),
|
|
118
113
|
};
|
|
119
|
-
validate_pi_executable_chain(&chain).expect("the
|
|
114
|
+
validate_pi_executable_chain(&chain).expect("the PATH wrapper entry is valid");
|
|
120
115
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
116
|
+
// A plain binary or compiled wrapper first on PATH is what bare `pi` runs.
|
|
117
|
+
let mut direct_binary = chain.clone();
|
|
118
|
+
direct_binary.path_entry = PathBuf::from("/opt/homebrew/bin/pi");
|
|
119
|
+
validate_pi_executable_chain(&direct_binary)
|
|
120
|
+
.expect("a direct binary first on PATH is the native launch entry");
|
|
125
121
|
|
|
126
|
-
let mut
|
|
127
|
-
|
|
128
|
-
validate_pi_executable_chain(&
|
|
122
|
+
let mut newer = chain.clone();
|
|
123
|
+
newer.pi_version = "0.84.4".to_string();
|
|
124
|
+
validate_pi_executable_chain(&newer)
|
|
129
125
|
.expect("an arbitrary newer Pi version with the same public protocol is valid");
|
|
130
126
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
127
|
+
for bad in ["", "pi", "/opt/homebrew/bin/pi-native"] {
|
|
128
|
+
let mut wrong = chain.clone();
|
|
129
|
+
wrong.path_entry = PathBuf::from(bad);
|
|
130
|
+
assert!(validate_pi_executable_chain(&wrong).is_err(), "{bad:?}");
|
|
131
|
+
}
|
|
134
132
|
|
|
135
133
|
let mut wrong_catalog = chain.clone();
|
|
136
134
|
wrong_catalog.catalog_sha256 = "00".repeat(32);
|
|
137
135
|
assert!(validate_pi_executable_chain(&wrong_catalog).is_err());
|
|
138
136
|
|
|
139
|
-
let mut direct_binary = chain.clone();
|
|
140
|
-
direct_binary.path_entry = PathBuf::from("/opt/homebrew/bin/pi");
|
|
141
|
-
direct_binary.path_entry_type = PiExecutableFileType::Binary;
|
|
142
|
-
direct_binary.launch_executable = direct_binary.path_entry.clone();
|
|
143
|
-
direct_binary.real_binary = direct_binary.path_entry.clone();
|
|
144
|
-
assert!(
|
|
145
|
-
validate_pi_executable_chain(&direct_binary).is_err(),
|
|
146
|
-
"a direct Homebrew binary must not replace the verified PATH wrapper launch entry"
|
|
147
|
-
);
|
|
148
|
-
|
|
149
137
|
assert!(parse_pi_list_models_table(b"provider model\nopenai-codex gpt-5.6-luna\n").is_ok());
|
|
150
138
|
assert!(parse_pi_list_models_table(b"provider model\n").is_err());
|
|
151
139
|
assert!(parse_pi_list_models_table(b"provider model\nmalformed\n").is_err());
|
|
@@ -178,14 +166,38 @@ fn pi_standard_npm_symlink_is_a_verified_launch_entry() {
|
|
|
178
166
|
|
|
179
167
|
let (chain, models) = resolve_pi_executable_chain()
|
|
180
168
|
.expect("the first PATH Pi entry must define direct Pi behavior");
|
|
181
|
-
assert_eq!(chain.path_entry, bin.join("pi"));
|
|
182
|
-
assert_eq!(
|
|
183
|
-
|
|
169
|
+
assert_eq!(chain.path_entry, bin.join("pi"), "the npm symlink is kept as found");
|
|
170
|
+
assert_eq!(models, ["team-agent/qwen3.8-27b"]);
|
|
171
|
+
|
|
172
|
+
// A user wrapper prepended to PATH is the entry, and every probe runs it.
|
|
173
|
+
let wrappers = root.join("wrappers");
|
|
174
|
+
std::fs::create_dir_all(&wrappers).expect("create wrapper dir");
|
|
175
|
+
let marker = root.join("wrapper-invocations");
|
|
176
|
+
std::fs::write(
|
|
177
|
+
wrappers.join("pi"),
|
|
178
|
+
format!(
|
|
179
|
+
"#!/bin/sh\nprintf '%s\\n' \"$*\" >> '{}'\nexec '{}' \"$@\"\n",
|
|
180
|
+
marker.display(),
|
|
181
|
+
bin.join("pi").display()
|
|
182
|
+
),
|
|
183
|
+
)
|
|
184
|
+
.expect("write user Pi wrapper");
|
|
185
|
+
std::fs::set_permissions(wrappers.join("pi"), std::fs::Permissions::from_mode(0o755))
|
|
186
|
+
.expect("make user Pi wrapper executable");
|
|
187
|
+
unsafe {
|
|
188
|
+
std::env::set_var(
|
|
189
|
+
"PATH",
|
|
190
|
+
std::env::join_paths([&wrappers, &bin, &later_bin]).expect("join wrapper PATH"),
|
|
191
|
+
);
|
|
192
|
+
}
|
|
193
|
+
let (chain, models) =
|
|
194
|
+
resolve_pi_executable_chain().expect("a user wrapper first on PATH is accepted");
|
|
195
|
+
assert_eq!(chain.path_entry, wrappers.join("pi"));
|
|
196
|
+
assert_eq!(models, ["team-agent/qwen3.8-27b"]);
|
|
184
197
|
assert_eq!(
|
|
185
|
-
|
|
186
|
-
|
|
198
|
+
std::fs::read_to_string(&marker).expect("the wrapper genuinely ran"),
|
|
199
|
+
"--version\n--list-models\n"
|
|
187
200
|
);
|
|
188
|
-
assert_eq!(models, ["team-agent/qwen3.8-27b"]);
|
|
189
201
|
std::fs::remove_dir_all(root).expect("remove symlink fixture");
|
|
190
202
|
});
|
|
191
203
|
}
|
|
@@ -678,13 +690,14 @@ fn pi_materializer_and_worker_routes_body(hermetic: &HermeticTestEnv) {
|
|
|
678
690
|
.any(|arg| arg.as_str() == other_candidate.to_string_lossy().as_ref())
|
|
679
691
|
);
|
|
680
692
|
|
|
681
|
-
|
|
682
|
-
.pending_session_id
|
|
683
|
-
|
|
684
|
-
|
|
693
|
+
assert!(
|
|
694
|
+
started_agent.pending_session_id.is_none(),
|
|
695
|
+
"fresh Pi assigns its own session id"
|
|
696
|
+
);
|
|
697
|
+
let foreign_session_id = format!("{worker}-foreign");
|
|
685
698
|
write_pi_session_header(
|
|
686
699
|
&home_candidate,
|
|
687
|
-
|
|
700
|
+
&foreign_session_id,
|
|
688
701
|
&worker_workspace,
|
|
689
702
|
"2099-01-01T00:00:00Z",
|
|
690
703
|
);
|
|
@@ -698,27 +711,45 @@ fn pi_materializer_and_worker_routes_body(hermetic: &HermeticTestEnv) {
|
|
|
698
711
|
.join("foreign.jsonl");
|
|
699
712
|
write_pi_session_header(
|
|
700
713
|
&cross_seat,
|
|
701
|
-
|
|
714
|
+
&foreign_session_id,
|
|
702
715
|
&worker_workspace,
|
|
703
716
|
"2099-01-01T00:00:00Z",
|
|
704
717
|
);
|
|
705
|
-
let
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
)
|
|
717
|
-
.expect("scan the recorded worker seat only");
|
|
718
|
+
let context = CaptureSessionContext {
|
|
719
|
+
agent_id: worker.to_string(),
|
|
720
|
+
spawn_cwd: worker_workspace.clone(),
|
|
721
|
+
pane_id: None,
|
|
722
|
+
pane_pid: None,
|
|
723
|
+
spawned_at: Some(started_agent.spawned_at.clone()),
|
|
724
|
+
expected_session_id: None,
|
|
725
|
+
provider_projects_root: Some(paths.sessions.clone()),
|
|
726
|
+
};
|
|
727
|
+
let candidates = scan_session_candidates_once(Provider::Pi, &context)
|
|
728
|
+
.expect("scan the recorded worker seat only");
|
|
718
729
|
assert!(
|
|
719
730
|
candidates.is_empty(),
|
|
720
731
|
"HOME and another worker seat must not become capture candidates: {candidates:?}"
|
|
721
732
|
);
|
|
733
|
+
// Positive control: Pi's own header inside the recorded seat is captured.
|
|
734
|
+
let own = paths.sessions.join("own.jsonl");
|
|
735
|
+
write_pi_session_header(
|
|
736
|
+
&own,
|
|
737
|
+
&format!("{worker}-own"),
|
|
738
|
+
&worker_workspace,
|
|
739
|
+
"2099-01-01T00:00:00Z",
|
|
740
|
+
);
|
|
741
|
+
let candidates = scan_session_candidates_once(Provider::Pi, &context)
|
|
742
|
+
.expect("scan the recorded worker seat only");
|
|
743
|
+
assert_eq!(candidates.len(), 1, "{candidates:?}");
|
|
744
|
+
assert_eq!(
|
|
745
|
+
candidates[0]
|
|
746
|
+
.captured
|
|
747
|
+
.session_id
|
|
748
|
+
.as_ref()
|
|
749
|
+
.map(SessionId::as_str),
|
|
750
|
+
Some(format!("{worker}-own").as_str())
|
|
751
|
+
);
|
|
752
|
+
std::fs::remove_file(&cross_seat).expect("clear foreign header from the other seat");
|
|
722
753
|
}
|
|
723
754
|
|
|
724
755
|
let restart_workspace = hermetic.workspace("worker-restart");
|
|
@@ -812,7 +812,25 @@ fn r05_bad_source_tuples_and_jsonl_fail_closed_without_a_fresh_target() {
|
|
|
812
812
|
}
|
|
813
813
|
_ => unreachable!(),
|
|
814
814
|
}
|
|
815
|
-
|
|
815
|
+
if case == "missing-tuple" {
|
|
816
|
+
// An ordinary save backfills the latest complete tuple (stale-writer
|
|
817
|
+
// protection), so only a capture-backfill-skipping writer can drop it.
|
|
818
|
+
team_agent::state::projection::save_team_scoped_state_with_lifecycle_topology_authority_and_capture_backfill_skip(
|
|
819
|
+
&fixture.run_workspace,
|
|
820
|
+
&state,
|
|
821
|
+
&fixture.team_key,
|
|
822
|
+
&[SOURCE],
|
|
823
|
+
&[],
|
|
824
|
+
)
|
|
825
|
+
.expect("persist the incomplete source tuple");
|
|
826
|
+
} else {
|
|
827
|
+
fixture.save_state(&state);
|
|
828
|
+
}
|
|
829
|
+
assert_eq!(
|
|
830
|
+
fixture.state()["agents"][SOURCE]["rollout_path"],
|
|
831
|
+
state["agents"][SOURCE]["rollout_path"],
|
|
832
|
+
"R05 ({case}): the adversarial source row must be what fork reads"
|
|
833
|
+
);
|
|
816
834
|
let transport = fixture.transport();
|
|
817
835
|
let result = fixture.fork(TARGET, None, &transport);
|
|
818
836
|
assert!(
|
|
@@ -133,6 +133,27 @@ fn pi_session_capture_requires_header_id_cwd_generation_and_unique_claim() {
|
|
|
133
133
|
std::fs::remove_dir_all(root).expect("remove session fixture");
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
+
#[test]
|
|
137
|
+
fn pi_fresh_capture_reads_the_header_id_pi_wrote() {
|
|
138
|
+
let root = temp_root("native-header");
|
|
139
|
+
let cwd = root.join("workspace");
|
|
140
|
+
let sessions = root.join("seat/sessions");
|
|
141
|
+
std::fs::create_dir_all(&cwd).expect("create cwd");
|
|
142
|
+
let native_id = "410271aa-2a95-46fe-a92e-41927688fb0c";
|
|
143
|
+
let path = sessions.join("pi-created.jsonl");
|
|
144
|
+
write_header(&path, native_id, &cwd, "2026-08-29T10:00:01Z");
|
|
145
|
+
let mut context = scan_context(&cwd, &sessions, "unused", "2026-08-29T10:00:00Z");
|
|
146
|
+
context.expected_session_id = None;
|
|
147
|
+
|
|
148
|
+
let candidates = scan_session_candidates_once(Provider::Pi, &context).expect("native header scan");
|
|
149
|
+
assert_eq!(candidates.len(), 1);
|
|
150
|
+
assert_eq!(
|
|
151
|
+
candidates[0].captured.session_id.as_ref().map(SessionId::as_str),
|
|
152
|
+
Some(native_id)
|
|
153
|
+
);
|
|
154
|
+
std::fs::remove_dir_all(root).expect("remove native header fixture");
|
|
155
|
+
}
|
|
156
|
+
|
|
136
157
|
#[test]
|
|
137
158
|
fn pi_restart_uses_exact_path_and_refuses_missing_backing() {
|
|
138
159
|
let root = temp_root("resume");
|
|
@@ -1067,7 +1067,6 @@ fn provider_name(provider: Provider) -> &'static str {
|
|
|
1067
1067
|
Provider::Copilot => "copilot",
|
|
1068
1068
|
Provider::GeminiCli => "gemini",
|
|
1069
1069
|
Provider::Grok => "grok",
|
|
1070
|
-
Provider::CursorAgent => "cursor_agent",
|
|
1071
1070
|
Provider::Pi => "pi",
|
|
1072
1071
|
Provider::Fake => "fake",
|
|
1073
1072
|
}
|
|
@@ -95,103 +95,6 @@ fn worker_spawn_inherits_parent_process_env_for_proxy_and_ca() {
|
|
|
95
95
|
);
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
#[test]
|
|
99
|
-
#[serial(env)]
|
|
100
|
-
fn cursor_subscription_proxy_profile_reaches_fresh_and_restart_transport_final_env() {
|
|
101
|
-
let _guard = EnvGuard::set([
|
|
102
|
-
("HTTPS_PROXY", "https://upper-https:1"),
|
|
103
|
-
("HTTP_PROXY", "http://upper-http:1"),
|
|
104
|
-
("ALL_PROXY", "socks5://upper-all:1"),
|
|
105
|
-
("https_proxy", "https://lower-https:1"),
|
|
106
|
-
("http_proxy", "http://lower-http:1"),
|
|
107
|
-
("all_proxy", "socks5://lower-all:1"),
|
|
108
|
-
("NO_PROXY", "localhost,127.0.0.1"),
|
|
109
|
-
("no_proxy", "localhost,127.0.0.1"),
|
|
110
|
-
("GLOBAL_AGENT_HTTPS_PROXY", "https://global-https:1"),
|
|
111
|
-
("GLOBAL_AGENT_HTTP_PROXY", "http://global-http:1"),
|
|
112
|
-
]);
|
|
113
|
-
|
|
114
|
-
let launch_direct = compiled_cursor_profile_team("cursor-direct-launch", "direct");
|
|
115
|
-
let launch_transport = RecordingTransport::new().with_session_present(false);
|
|
116
|
-
launch_with_transport(
|
|
117
|
-
&launch_direct.join("team.spec.yaml"),
|
|
118
|
-
false,
|
|
119
|
-
true,
|
|
120
|
-
true,
|
|
121
|
-
&launch_transport,
|
|
122
|
-
)
|
|
123
|
-
.expect("direct Cursor launch fixture should spawn");
|
|
124
|
-
assert_cursor_proxy_spawn(&launch_transport.single_spawn(), true);
|
|
125
|
-
|
|
126
|
-
let restart_direct = compiled_cursor_profile_team("cursor-direct-restart", "direct");
|
|
127
|
-
seed_restart_state_with_profile(&restart_direct, "worker_a", "cursor_proxy");
|
|
128
|
-
let restart_transport = RecordingTransport::new().with_session_present(false);
|
|
129
|
-
restart_with_transport(&restart_direct, true, None, &restart_transport)
|
|
130
|
-
.expect("direct Cursor restart fixture should spawn");
|
|
131
|
-
assert_cursor_proxy_spawn(&restart_transport.single_spawn(), true);
|
|
132
|
-
|
|
133
|
-
let launch_inherit = compiled_cursor_profile_team("cursor-inherit-launch", "inherit");
|
|
134
|
-
let inherit_transport = RecordingTransport::new().with_session_present(false);
|
|
135
|
-
launch_with_transport(
|
|
136
|
-
&launch_inherit.join("team.spec.yaml"),
|
|
137
|
-
false,
|
|
138
|
-
true,
|
|
139
|
-
true,
|
|
140
|
-
&inherit_transport,
|
|
141
|
-
)
|
|
142
|
-
.expect("inherit Cursor launch fixture should spawn");
|
|
143
|
-
assert_cursor_proxy_spawn(&inherit_transport.single_spawn(), false);
|
|
144
|
-
|
|
145
|
-
let restart_inherit = compiled_cursor_profile_team("cursor-inherit-restart", "inherit");
|
|
146
|
-
seed_restart_state_with_profile(&restart_inherit, "worker_a", "cursor_proxy");
|
|
147
|
-
let restart_inherit_transport = RecordingTransport::new().with_session_present(false);
|
|
148
|
-
restart_with_transport(
|
|
149
|
-
&restart_inherit,
|
|
150
|
-
true,
|
|
151
|
-
None,
|
|
152
|
-
&restart_inherit_transport,
|
|
153
|
-
)
|
|
154
|
-
.expect("inherit Cursor restart fixture should spawn");
|
|
155
|
-
assert_cursor_proxy_spawn(&restart_inherit_transport.single_spawn(), false);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
fn assert_cursor_proxy_spawn(spawn: &RecordedSpawn, direct: bool) {
|
|
159
|
-
let keys = [
|
|
160
|
-
"HTTPS_PROXY",
|
|
161
|
-
"HTTP_PROXY",
|
|
162
|
-
"ALL_PROXY",
|
|
163
|
-
"https_proxy",
|
|
164
|
-
"http_proxy",
|
|
165
|
-
"all_proxy",
|
|
166
|
-
"GLOBAL_AGENT_HTTPS_PROXY",
|
|
167
|
-
"GLOBAL_AGENT_HTTP_PROXY",
|
|
168
|
-
];
|
|
169
|
-
for key in keys {
|
|
170
|
-
if direct {
|
|
171
|
-
assert!(!spawn.env.contains_key(key), "direct env must omit {key}");
|
|
172
|
-
assert!(
|
|
173
|
-
spawn.env_unset.iter().any(|candidate| candidate == key),
|
|
174
|
-
"direct env_unset must contain {key}; got {:?}",
|
|
175
|
-
spawn.env_unset
|
|
176
|
-
);
|
|
177
|
-
} else {
|
|
178
|
-
assert!(spawn.env.contains_key(key), "inherit env must preserve {key}");
|
|
179
|
-
assert!(
|
|
180
|
-
spawn.env_unset.iter().all(|candidate| candidate != key),
|
|
181
|
-
"inherit env_unset must not contain {key}; got {:?}",
|
|
182
|
-
spawn.env_unset
|
|
183
|
-
);
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
for key in ["NO_PROXY", "no_proxy"] {
|
|
187
|
-
assert!(spawn.env.contains_key(key), "NO_PROXY bypass key must remain: {key}");
|
|
188
|
-
assert!(
|
|
189
|
-
spawn.env_unset.iter().all(|candidate| candidate != key),
|
|
190
|
-
"NO_PROXY bypass key must not be unset: {key}"
|
|
191
|
-
);
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
|
|
195
98
|
#[test]
|
|
196
99
|
fn tmux_control_filter_uses_env_keys_not_substring_in_inherited_values() {
|
|
197
100
|
let mut env = BTreeMap::from([
|
|
@@ -507,39 +410,6 @@ fn compiled_team_dir(label: &str, agents: &[(&str, &str)]) -> PathBuf {
|
|
|
507
410
|
compiled_team_dir_for_provider(label, agents, "codex")
|
|
508
411
|
}
|
|
509
412
|
|
|
510
|
-
fn compiled_cursor_profile_team(label: &str, proxy_mode: &str) -> PathBuf {
|
|
511
|
-
let team = tmp_dir(label).join("teamdir");
|
|
512
|
-
std::fs::create_dir_all(team.join("agents")).unwrap();
|
|
513
|
-
std::fs::write(
|
|
514
|
-
team.join("TEAM.md"),
|
|
515
|
-
"---\nname: envteam\nobjective: Cursor proxy environment contract.\nprovider: cursor_agent\n---\n\nTeam.\n",
|
|
516
|
-
)
|
|
517
|
-
.unwrap();
|
|
518
|
-
std::fs::write(
|
|
519
|
-
team.join("agents").join("worker_a.md"),
|
|
520
|
-
"---\nname: worker_a\nrole: Cursor Worker\nprovider: cursor_agent\nmodel: sonnet-4-thinking\nauth_mode: subscription\nprofile: cursor_proxy\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nCursor worker.\n",
|
|
521
|
-
)
|
|
522
|
-
.unwrap();
|
|
523
|
-
for directory in [
|
|
524
|
-
team.join("profiles"),
|
|
525
|
-
team.join(".team/current/profiles"),
|
|
526
|
-
] {
|
|
527
|
-
std::fs::create_dir_all(&directory).unwrap();
|
|
528
|
-
std::fs::write(
|
|
529
|
-
directory.join("cursor_proxy.env"),
|
|
530
|
-
format!("AUTH_MODE=subscription\nPROFILE_NAME=cursor_proxy\nPROXY_MODE={proxy_mode}\n"),
|
|
531
|
-
)
|
|
532
|
-
.unwrap();
|
|
533
|
-
}
|
|
534
|
-
let spec = team_agent::compiler::compile_team(&team).unwrap();
|
|
535
|
-
std::fs::write(
|
|
536
|
-
team.join("team.spec.yaml"),
|
|
537
|
-
team_agent::model::yaml::dumps(&spec),
|
|
538
|
-
)
|
|
539
|
-
.unwrap();
|
|
540
|
-
team
|
|
541
|
-
}
|
|
542
|
-
|
|
543
413
|
fn compiled_team_dir_for_provider(label: &str, agents: &[(&str, &str)], provider: &str) -> PathBuf {
|
|
544
414
|
let team = tmp_dir(label).join("teamdir");
|
|
545
415
|
std::fs::create_dir_all(team.join("agents")).unwrap();
|
|
@@ -580,13 +450,6 @@ fn seed_restart_state(team: &Path, agent_id: &str) {
|
|
|
580
450
|
seed_restart_state_as(team, agent_id, "codex");
|
|
581
451
|
}
|
|
582
452
|
|
|
583
|
-
fn seed_restart_state_with_profile(team: &Path, agent_id: &str, profile: &str) {
|
|
584
|
-
seed_restart_state_as(team, agent_id, "cursor_agent");
|
|
585
|
-
let mut state = team_agent::state::persist::load_runtime_state(team).unwrap();
|
|
586
|
-
state["agents"][agent_id]["profile"] = json!(profile);
|
|
587
|
-
team_agent::state::persist::save_runtime_state(team, &state).unwrap();
|
|
588
|
-
}
|
|
589
|
-
|
|
590
453
|
fn seed_restart_state_as(team: &Path, agent_id: &str, provider: &str) {
|
|
591
454
|
team_agent::state::persist::save_runtime_state(
|
|
592
455
|
team,
|
|
@@ -59,9 +59,6 @@ mod codex_weak_window_attribution_red;
|
|
|
59
59
|
mod communication_mode_runtime_contract_red;
|
|
60
60
|
mod copilot_provider_red;
|
|
61
61
|
mod core;
|
|
62
|
-
mod cursor_mcp_overlay;
|
|
63
|
-
mod cursor_require_explicit_model_red;
|
|
64
|
-
mod cursor_restart_resume_red;
|
|
65
62
|
mod f032_startup_prompt_best_effort_red;
|
|
66
63
|
mod grok_effort_argv_red;
|
|
67
64
|
mod grok_mcp_overlay_red;
|
|
@@ -226,10 +226,8 @@ fn mcp_tool_name(provider: Provider, server: &str, tool: &str) -> String {
|
|
|
226
226
|
Provider::Grok => format!("{server}__{tool}"),
|
|
227
227
|
// Pi's owned extension binds these logical operations to the observed MCP call surface.
|
|
228
228
|
Provider::Pi => tool.to_string(),
|
|
229
|
-
//
|
|
230
|
-
|
|
231
|
-
Provider::CursorAgent
|
|
232
|
-
| Provider::Codex
|
|
229
|
+
// Codex / Copilot / GeminiCli / Fake: 未验证,沿用现状点号。
|
|
230
|
+
Provider::Codex
|
|
233
231
|
| Provider::Copilot
|
|
234
232
|
| Provider::GeminiCli
|
|
235
233
|
| Provider::Fake => format!("{server}.{tool}"),
|