@team-agent/installer 0.5.125 → 0.5.127
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 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -137
- package/crates/team-agent/src/cli/emit.rs +13 -8
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +55 -10
- package/crates/team-agent/src/cli/mod.rs +35 -29
- package/crates/team-agent/src/cli/models.rs +33 -944
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +3 -3
- package/crates/team-agent/src/cli/tests/run_delegation.rs +8 -7
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +54 -12
- package/crates/team-agent/src/compiler.rs +7 -205
- package/crates/team-agent/src/contract_runtime/backend.rs +97 -38
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +12 -8
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -13
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +100 -60
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +54 -16
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -44
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +22 -200
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +5 -496
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -26
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +26 -51
- package/crates/team-agent/src/lifecycle/launch.rs +3 -34
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -373
- package/crates/team-agent/src/lifecycle/restart/common.rs +45 -463
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +38 -236
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +106 -186
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +19 -15
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +33 -58
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +162 -284
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +15 -14
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1478
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +39 -38
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +42 -97
- package/crates/team-agent/src/lifecycle/tests.rs +0 -7
- package/crates/team-agent/src/lifecycle/types.rs +2 -21
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +14 -195
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +68 -69
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
- package/crates/team-agent/src/messaging/tests/spine.rs +30 -32
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +71 -572
- package/crates/team-agent/src/provider/adapters/mod.rs +6 -8
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +11 -211
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -24
- package/crates/team-agent/src/provider/session/context_fork.rs +29 -240
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +27 -87
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +7 -23
- package/crates/team-agent/src/provider/tests/adapter.rs +66 -204
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -29
- package/crates/team-agent/src/provider/tests/idle.rs +0 -68
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +77 -23
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +8 -5
- package/skills/team-agent/command-coverage.json +29 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +7 -3
- package/skills/team-agent/references/team-agent-operator.md +7 -3
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -39,9 +39,9 @@ use hermetic::HermeticTestEnv;
|
|
|
39
39
|
const TEAM_MD: &str =
|
|
40
40
|
"---\nname: verify031\nobjective: Verify mixed provider windows.\nprovider: codex\n---\n\nTeam.\n";
|
|
41
41
|
|
|
42
|
-
const
|
|
42
|
+
const FAKE_ROLE: &str = "---\nname: faker\nrole: Fake Worker\nprovider: fake\nmodel: fake\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nFake worker.\n";
|
|
43
43
|
|
|
44
|
-
const
|
|
44
|
+
const COPILOT_ROLE: &str = "---\nname: copiloter\nrole: Copilot Worker\nprovider: copilot\nmodel: gpt-5.5\nauth_mode: subscription\ndangerously_skip_permissions: false\ntools:\n - mcp_team\n---\n\nCopilot worker.\n";
|
|
45
45
|
|
|
46
46
|
#[test]
|
|
47
47
|
#[serial(env)]
|
|
@@ -50,7 +50,7 @@ fn worker_mcp_owner_team_scope_must_match_runtime_team_key_not_spec_name() {
|
|
|
50
50
|
let team = mixed_provider_team_dir(&hermetic, "mcp-owner-scope");
|
|
51
51
|
super::launch_spawn::seed_healthy_coordinator(team.parent().unwrap());
|
|
52
52
|
let transport = RecordingTransport::new()
|
|
53
|
-
.with_windows(vec![WindowName::new("
|
|
53
|
+
.with_windows(vec![WindowName::new("copiloter"), WindowName::new("faker")]);
|
|
54
54
|
let launch = ready_launch(
|
|
55
55
|
quick_start_with_transport(&team, None, true, None, &transport)
|
|
56
56
|
.expect("quick-start should reach worker spawn path"),
|
|
@@ -108,7 +108,7 @@ fn quick_start_preserves_external_leader_receiver_when_worker_pane_id_collides_a
|
|
|
108
108
|
let _tmux = hermetic.with_env("TMUX", &format!("{caller_endpoint},123,0"));
|
|
109
109
|
let _pane = hermetic.with_env("TMUX_PANE", "%0");
|
|
110
110
|
let _provider = hermetic.with_env("TEAM_AGENT_LEADER_PROVIDER", "codex");
|
|
111
|
-
let team =
|
|
111
|
+
let team = fake_only_team_dir(&hermetic, "external-pane-collision");
|
|
112
112
|
let workspace = team.parent().expect("teamdir has parent workspace");
|
|
113
113
|
let caller = PaneInfo {
|
|
114
114
|
pane_id: PaneId::new("%0"),
|
|
@@ -124,7 +124,7 @@ fn quick_start_preserves_external_leader_receiver_when_worker_pane_id_collides_a
|
|
|
124
124
|
leader_env: Default::default(),
|
|
125
125
|
};
|
|
126
126
|
let transport = RecordingTransport::new()
|
|
127
|
-
.with_windows(vec![WindowName::new("
|
|
127
|
+
.with_windows(vec![WindowName::new("faker")])
|
|
128
128
|
.with_tmux_endpoint(caller_endpoint)
|
|
129
129
|
.with_targets(vec![caller.clone()]);
|
|
130
130
|
let live = crate::transport::test_support::OfflineTransport::default()
|
|
@@ -139,9 +139,9 @@ fn quick_start_preserves_external_leader_receiver_when_worker_pane_id_collides_a
|
|
|
139
139
|
let worker_pane = launch
|
|
140
140
|
.started
|
|
141
141
|
.iter()
|
|
142
|
-
.find(|agent| agent.agent_id.as_str() == "
|
|
142
|
+
.find(|agent| agent.agent_id.as_str() == "faker")
|
|
143
143
|
.map(|agent| agent.target.as_str())
|
|
144
|
-
.expect("fixture precondition:
|
|
144
|
+
.expect("fixture precondition: faker spawned");
|
|
145
145
|
assert_eq!(
|
|
146
146
|
worker_pane, "%0",
|
|
147
147
|
"fixture precondition: first worker in the product -L socket receives bare pane id %0"
|
|
@@ -194,10 +194,11 @@ fn running_worker_state_must_only_be_written_for_windows_that_exist_after_launch
|
|
|
194
194
|
let spec_path = team.join("team.spec.yaml");
|
|
195
195
|
std::fs::write(&spec_path, team_agent::model::yaml::dumps(&spec)).expect("write spec");
|
|
196
196
|
|
|
197
|
-
// Simulates the Mac mini final capture: the
|
|
197
|
+
// Simulates the Mac mini final capture: the first worker's window exists, the other worker's
|
|
198
|
+
// (originally Claude, here Copilot) window does not.
|
|
198
199
|
// launch_with_transport currently never verifies the post-spawn window set before persisting
|
|
199
200
|
// `status=running`, so this fixture pins the state/physical invariant directly.
|
|
200
|
-
let transport = RecordingTransport::new().with_windows(vec![WindowName::new("
|
|
201
|
+
let transport = RecordingTransport::new().with_windows(vec![WindowName::new("faker")]);
|
|
201
202
|
let launch = launch_with_transport(&spec_path, false, true, true, &transport)
|
|
202
203
|
.expect("launch should reach the real spawn/state path");
|
|
203
204
|
assert_eq!(
|
|
@@ -269,10 +270,10 @@ fn leader_bound_delivery_must_target_bound_leader_pane_not_missing_leader_window
|
|
|
269
270
|
},
|
|
270
271
|
"owner_epoch": 1,
|
|
271
272
|
"agents": {
|
|
272
|
-
"
|
|
273
|
+
"faker": {
|
|
273
274
|
"status": "running",
|
|
274
|
-
"provider": "
|
|
275
|
-
"window": "
|
|
275
|
+
"provider": "fake",
|
|
276
|
+
"window": "faker"
|
|
276
277
|
}
|
|
277
278
|
},
|
|
278
279
|
"teams": {
|
|
@@ -291,10 +292,10 @@ fn leader_bound_delivery_must_target_bound_leader_pane_not_missing_leader_window
|
|
|
291
292
|
"owner_epoch": 1
|
|
292
293
|
},
|
|
293
294
|
"agents": {
|
|
294
|
-
"
|
|
295
|
+
"faker": {
|
|
295
296
|
"status": "running",
|
|
296
|
-
"provider": "
|
|
297
|
-
"window": "
|
|
297
|
+
"provider": "fake",
|
|
298
|
+
"window": "faker"
|
|
298
299
|
}
|
|
299
300
|
}
|
|
300
301
|
}
|
|
@@ -307,7 +308,7 @@ fn leader_bound_delivery_must_target_bound_leader_pane_not_missing_leader_window
|
|
|
307
308
|
let message_id = store
|
|
308
309
|
.create_message(
|
|
309
310
|
None,
|
|
310
|
-
"
|
|
311
|
+
"faker",
|
|
311
312
|
"leader",
|
|
312
313
|
"BUG4 worker to leader canary",
|
|
313
314
|
None,
|
|
@@ -317,7 +318,7 @@ fn leader_bound_delivery_must_target_bound_leader_pane_not_missing_leader_window
|
|
|
317
318
|
.expect("create accepted leader-bound message");
|
|
318
319
|
let event_log = EventLog::new(&workspace);
|
|
319
320
|
let transport = RecordingTransport::new()
|
|
320
|
-
.with_windows(vec![WindowName::new("
|
|
321
|
+
.with_windows(vec![WindowName::new("faker")])
|
|
321
322
|
.with_targets(vec![pane_info("%0", "external-leader-socket", "leader")]);
|
|
322
323
|
|
|
323
324
|
let outcome = deliver_pending_message(
|
|
@@ -368,7 +369,7 @@ fn worker_to_leader_delivery_succeeds_when_attached_leader_pane_lives_on_default
|
|
|
368
369
|
pane_info(
|
|
369
370
|
product_worker_pane.as_str(),
|
|
370
371
|
product_session.as_str(),
|
|
371
|
-
"
|
|
372
|
+
"faker",
|
|
372
373
|
),
|
|
373
374
|
]);
|
|
374
375
|
|
|
@@ -394,10 +395,10 @@ fn worker_to_leader_delivery_succeeds_when_attached_leader_pane_lives_on_default
|
|
|
394
395
|
},
|
|
395
396
|
"owner_epoch": 1,
|
|
396
397
|
"agents": {
|
|
397
|
-
"
|
|
398
|
+
"faker": {
|
|
398
399
|
"status": "running",
|
|
399
|
-
"provider": "
|
|
400
|
-
"window": "
|
|
400
|
+
"provider": "fake",
|
|
401
|
+
"window": "faker",
|
|
401
402
|
"pane_id": product_worker_pane.as_str(),
|
|
402
403
|
"startup_prompts": "handled"
|
|
403
404
|
}
|
|
@@ -420,10 +421,10 @@ fn worker_to_leader_delivery_succeeds_when_attached_leader_pane_lives_on_default
|
|
|
420
421
|
"claimed_via": "quick-start"
|
|
421
422
|
},
|
|
422
423
|
"agents": {
|
|
423
|
-
"
|
|
424
|
+
"faker": {
|
|
424
425
|
"status": "running",
|
|
425
|
-
"provider": "
|
|
426
|
-
"window": "
|
|
426
|
+
"provider": "fake",
|
|
427
|
+
"window": "faker",
|
|
427
428
|
"pane_id": product_worker_pane.as_str(),
|
|
428
429
|
"startup_prompts": "handled"
|
|
429
430
|
}
|
|
@@ -439,7 +440,7 @@ fn worker_to_leader_delivery_succeeds_when_attached_leader_pane_lives_on_default
|
|
|
439
440
|
let message_id = store
|
|
440
441
|
.create_message(
|
|
441
442
|
None,
|
|
442
|
-
"
|
|
443
|
+
"faker",
|
|
443
444
|
"leader",
|
|
444
445
|
"BUG4 worker-to-leader default socket canary",
|
|
445
446
|
None,
|
|
@@ -503,10 +504,10 @@ fn assert_bound_reachable_leader_send_message_injects(
|
|
|
503
504
|
},
|
|
504
505
|
"owner_epoch": 7,
|
|
505
506
|
"agents": {
|
|
506
|
-
"
|
|
507
|
+
"faker": {
|
|
507
508
|
"status": "running",
|
|
508
|
-
"provider": "
|
|
509
|
-
"window": "
|
|
509
|
+
"provider": "fake",
|
|
510
|
+
"window": "faker",
|
|
510
511
|
"pane_id": worker_pane.as_str(),
|
|
511
512
|
"startup_prompts": "handled"
|
|
512
513
|
}
|
|
@@ -516,7 +517,7 @@ fn assert_bound_reachable_leader_send_message_injects(
|
|
|
516
517
|
let transport = RecordingTransport::new()
|
|
517
518
|
.with_targets(vec![
|
|
518
519
|
pane_info(leader_pane.as_str(), "external-leader-socket", "leader"),
|
|
519
|
-
pane_info(worker_pane.as_str(), "team-bug4-fresh", "
|
|
520
|
+
pane_info(worker_pane.as_str(), "team-bug4-fresh", "faker"),
|
|
520
521
|
])
|
|
521
522
|
.with_liveness(vec![
|
|
522
523
|
(leader_pane.as_str().to_string(), PaneLiveness::Live),
|
|
@@ -525,7 +526,7 @@ fn assert_bound_reachable_leader_send_message_injects(
|
|
|
525
526
|
let event_log = EventLog::new(&workspace);
|
|
526
527
|
|
|
527
528
|
let mut opts = SendOptions::default();
|
|
528
|
-
opts.sender = TrustedSender::from_runtime_identity(AgentId::new("
|
|
529
|
+
opts.sender = TrustedSender::from_runtime_identity(AgentId::new("faker"));
|
|
529
530
|
opts.requires_ack = false;
|
|
530
531
|
opts.route_task_id = false;
|
|
531
532
|
opts.team = Some(team_agent::model::ids::TeamKey::new("teamdir"));
|
|
@@ -603,7 +604,7 @@ fn unbound_or_unreachable_worker_to_leader_remains_rebind_required_without_autod
|
|
|
603
604
|
"session_name": "team-bug4-unbound",
|
|
604
605
|
"active_team_key": "teamdir",
|
|
605
606
|
"leader": {"id": "leader", "provider": "codex"},
|
|
606
|
-
"agents": {"
|
|
607
|
+
"agents": {"faker": {"status": "running", "provider": "fake", "window": "faker"}}
|
|
607
608
|
}),
|
|
608
609
|
RecordingTransport::new(),
|
|
609
610
|
),
|
|
@@ -621,7 +622,7 @@ fn unbound_or_unreachable_worker_to_leader_remains_rebind_required_without_autod
|
|
|
621
622
|
"owner_epoch": 1
|
|
622
623
|
},
|
|
623
624
|
"team_owner": {"pane_id": "%missing-leader", "provider": "codex", "owner_epoch": 1},
|
|
624
|
-
"agents": {"
|
|
625
|
+
"agents": {"faker": {"status": "running", "provider": "fake", "window": "faker"}}
|
|
625
626
|
}),
|
|
626
627
|
RecordingTransport::new()
|
|
627
628
|
.with_liveness(vec![("%missing-leader".to_string(), PaneLiveness::Dead)]),
|
|
@@ -634,7 +635,7 @@ fn unbound_or_unreachable_worker_to_leader_remains_rebind_required_without_autod
|
|
|
634
635
|
save_runtime_state(&workspace, &state).expect("seed runtime state");
|
|
635
636
|
let event_log = EventLog::new(&workspace);
|
|
636
637
|
let mut opts = SendOptions::default();
|
|
637
|
-
opts.sender = TrustedSender::from_runtime_identity(AgentId::new("
|
|
638
|
+
opts.sender = TrustedSender::from_runtime_identity(AgentId::new("faker"));
|
|
638
639
|
opts.requires_ack = false;
|
|
639
640
|
opts.route_task_id = false;
|
|
640
641
|
opts.team = Some(team_agent::model::ids::TeamKey::new("teamdir"));
|
|
@@ -742,9 +743,9 @@ fn mixed_provider_team_dir(hermetic: &HermeticTestEnv, tag: &str) -> PathBuf {
|
|
|
742
743
|
let team = hermetic.workspace(tag).join("teamdir");
|
|
743
744
|
std::fs::create_dir_all(team.join("agents")).expect("create agents dir");
|
|
744
745
|
std::fs::write(team.join("TEAM.md"), TEAM_MD).expect("write TEAM.md");
|
|
745
|
-
std::fs::write(team.join("agents").join("
|
|
746
|
-
.expect("write
|
|
747
|
-
std::fs::write(team.join("agents").join("
|
|
746
|
+
std::fs::write(team.join("agents").join("copiloter.md"), COPILOT_ROLE)
|
|
747
|
+
.expect("write copiloter role");
|
|
748
|
+
std::fs::write(team.join("agents").join("faker.md"), FAKE_ROLE).expect("write faker role");
|
|
748
749
|
team
|
|
749
750
|
}
|
|
750
751
|
|
|
@@ -963,11 +964,11 @@ impl Transport for RecordingTransport {
|
|
|
963
964
|
}
|
|
964
965
|
}
|
|
965
966
|
|
|
966
|
-
fn
|
|
967
|
+
fn fake_only_team_dir(hermetic: &HermeticTestEnv, tag: &str) -> PathBuf {
|
|
967
968
|
let team = hermetic.workspace(tag).join("teamdir");
|
|
968
969
|
std::fs::create_dir_all(team.join("agents")).expect("create agents dir");
|
|
969
970
|
std::fs::write(team.join("TEAM.md"), TEAM_MD).expect("write TEAM.md");
|
|
970
|
-
std::fs::write(team.join("agents").join("
|
|
971
|
+
std::fs::write(team.join("agents").join("faker.md"), FAKE_ROLE).expect("write fake role");
|
|
971
972
|
team
|
|
972
973
|
}
|
|
973
974
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
//! Worker provider spawn environment contracts.
|
|
2
2
|
//!
|
|
3
|
-
//! #229 B-layer root cause: spawned
|
|
4
|
-
//! process environment (proxy/CA/PATH/etc.) just like a user typing
|
|
5
|
-
//! then overlay the Team Agent identity env. The contract is
|
|
6
|
-
//!
|
|
3
|
+
//! #229 B-layer root cause: spawned legacy-runtime workers must inherit the parent `team-agent`
|
|
4
|
+
//! process environment (proxy/CA/PATH/etc.) just like a user typing the provider command (here
|
|
5
|
+
//! `copilot`) in the same terminal, then overlay the Team Agent identity env. The contract is
|
|
6
|
+
//! path-generic and covers the three worker spawn surfaces: quick-start/launch, restart, and add-agent.
|
|
7
7
|
|
|
8
8
|
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
|
|
9
9
|
|
|
@@ -21,7 +21,7 @@ use serde_json::json;
|
|
|
21
21
|
use serial_test::serial;
|
|
22
22
|
use team_agent::lifecycle::{
|
|
23
23
|
add_agent_with_transport, fork_agent_with_transport, launch_with_transport,
|
|
24
|
-
restart_with_transport,
|
|
24
|
+
restart_with_transport, LifecycleError,
|
|
25
25
|
};
|
|
26
26
|
use team_agent::model::ids::AgentId;
|
|
27
27
|
use team_agent::transport::{
|
|
@@ -119,7 +119,7 @@ fn tmux_control_filter_uses_env_keys_not_substring_in_inherited_values() {
|
|
|
119
119
|
),
|
|
120
120
|
]);
|
|
121
121
|
let spawn = RecordedSpawn {
|
|
122
|
-
argv: vec!["
|
|
122
|
+
argv: vec!["copilot".to_string()],
|
|
123
123
|
env: env.clone(),
|
|
124
124
|
env_unset: Vec::new(),
|
|
125
125
|
session: SessionName::new("s"),
|
|
@@ -167,8 +167,8 @@ fn worker_spawn_scrubs_cross_provider_process_identity_but_keeps_config_env() {
|
|
|
167
167
|
("NODE_EXTRA_CA_CERTS", "/canary/ca.pem"),
|
|
168
168
|
]);
|
|
169
169
|
|
|
170
|
-
|
|
171
|
-
|
|
170
|
+
// The identity scrub is provider-agnostic; a Copilot worker exercises every spawn surface.
|
|
171
|
+
let launch_team = compiled_team_dir("cross-launch", &[("worker_a", "Launch Worker")]);
|
|
172
172
|
let launch_transport = RecordingTransport::new().with_session_present(false);
|
|
173
173
|
launch_with_transport(
|
|
174
174
|
&launch_team.join("team.spec.yaml"),
|
|
@@ -179,25 +179,16 @@ fn worker_spawn_scrubs_cross_provider_process_identity_but_keeps_config_env() {
|
|
|
179
179
|
)
|
|
180
180
|
.expect("launch fixture should spawn worker");
|
|
181
181
|
|
|
182
|
-
let restart_team =
|
|
183
|
-
|
|
184
|
-
&[("worker_a", "Restart Worker")],
|
|
185
|
-
"claude",
|
|
186
|
-
);
|
|
187
|
-
seed_restart_state_as(&restart_team, "worker_a", "claude");
|
|
182
|
+
let restart_team = compiled_team_dir("cross-restart", &[("worker_a", "Restart Worker")]);
|
|
183
|
+
seed_restart_state(&restart_team, "worker_a");
|
|
188
184
|
let restart_transport = RecordingTransport::new().with_session_present(false);
|
|
189
185
|
restart_with_transport(&restart_team, true, None, &restart_transport)
|
|
190
186
|
.expect("restart fixture should spawn worker");
|
|
191
187
|
|
|
192
|
-
let add_team =
|
|
193
|
-
|
|
194
|
-
seed_running_add_agent_state_as(&add_team, "worker_a", "claude");
|
|
188
|
+
let add_team = compiled_team_dir("cross-add", &[("worker_a", "Existing Worker")]);
|
|
189
|
+
seed_running_add_agent_state(&add_team, "worker_a");
|
|
195
190
|
let role_file = add_team.parent().unwrap().join("worker_b.md");
|
|
196
|
-
std::fs::write(
|
|
197
|
-
&role_file,
|
|
198
|
-
role_doc_for_provider("worker_b", "Added Worker", "claude"),
|
|
199
|
-
)
|
|
200
|
-
.unwrap();
|
|
191
|
+
std::fs::write(&role_file, role_doc("worker_b", "Added Worker")).unwrap();
|
|
201
192
|
let add_transport = RecordingTransport::new().with_session_present(true);
|
|
202
193
|
add_agent_with_transport(
|
|
203
194
|
&add_team,
|
|
@@ -227,11 +218,11 @@ fn worker_spawn_scrubs_cross_provider_process_identity_but_keeps_config_env() {
|
|
|
227
218
|
|
|
228
219
|
#[test]
|
|
229
220
|
#[serial(env)]
|
|
230
|
-
fn
|
|
231
|
-
//
|
|
232
|
-
//
|
|
233
|
-
let _home = hermetic_guard::HermeticTestEnv::enter("
|
|
234
|
-
let team = compiled_team_dir("
|
|
221
|
+
fn worker_spawn_legacy_fork_reports_unverified_not_unsupported() {
|
|
222
|
+
// 已废除的行为:旧的 legacy fork 入口把 in-window fork 当成已验证能力(或报「不支持」),此断言证明它确实没了。
|
|
223
|
+
// 本轮裁定:即便是声明了 fork 能力的 copilot 源席,legacy 入口也必须明确报「未验证」,不是「不支持」,且不 spawn。
|
|
224
|
+
let _home = hermetic_guard::HermeticTestEnv::enter("legacy-fork-unverified");
|
|
225
|
+
let team = compiled_team_dir("legacy-fork-tombstone", &[("worker_a", "Fork Source")]);
|
|
235
226
|
seed_forkable_source_state(&team, "worker_a");
|
|
236
227
|
let transport = RecordingTransport::new().with_session_present(true);
|
|
237
228
|
let err = fork_agent_with_transport(
|
|
@@ -243,16 +234,23 @@ fn worker_spawn_codex_in_window_fork_reports_unverified_not_unsupported() {
|
|
|
243
234
|
None,
|
|
244
235
|
&transport,
|
|
245
236
|
)
|
|
246
|
-
.expect_err("
|
|
247
|
-
let text = err.to_string();
|
|
237
|
+
.expect_err("the legacy fork entry must refuse as unverified");
|
|
248
238
|
assert!(
|
|
249
|
-
|
|
250
|
-
|
|
239
|
+
matches!(
|
|
240
|
+
&err,
|
|
241
|
+
LifecycleError::Provider(message) if message == "copilot native session fork is unverified (未验证); no legacy fork or fresh replacement was performed"
|
|
242
|
+
),
|
|
243
|
+
"the legacy fork entry must report 未验证 for the copilot source; err={err}"
|
|
251
244
|
);
|
|
245
|
+
let text = err.to_string();
|
|
252
246
|
assert!(
|
|
253
247
|
!text.contains("不支持") && !text.contains("does not support"),
|
|
254
248
|
"the ruling is unverified, not unsupported; err={text}"
|
|
255
249
|
);
|
|
250
|
+
assert!(
|
|
251
|
+
transport.spawns.lock().unwrap().is_empty(),
|
|
252
|
+
"the refused legacy fork must not spawn a pane"
|
|
253
|
+
);
|
|
256
254
|
}
|
|
257
255
|
|
|
258
256
|
#[test]
|
|
@@ -340,14 +338,14 @@ fn spawn_env_contract_failures(
|
|
|
340
338
|
"{surface}: worker spawn must filter tmux control env from inherited parent env; present_keys={present:?}"
|
|
341
339
|
));
|
|
342
340
|
}
|
|
343
|
-
if !spawn.argv.iter().any(|part| part == "
|
|
341
|
+
if !spawn.argv.iter().any(|part| part == "copilot") {
|
|
344
342
|
failures.push(format!(
|
|
345
|
-
"{surface}: provider executable must remain the command name `
|
|
343
|
+
"{surface}: provider executable must remain the command name `copilot`"
|
|
346
344
|
));
|
|
347
345
|
}
|
|
348
|
-
if spawn.argv.iter().any(|part| part.ends_with("/
|
|
346
|
+
if spawn.argv.iter().any(|part| part.ends_with("/copilot")) {
|
|
349
347
|
failures.push(format!(
|
|
350
|
-
"{surface}: provider executable must not be hard-coded as an absolute
|
|
348
|
+
"{surface}: provider executable must not be hard-coded as an absolute copilot path"
|
|
351
349
|
));
|
|
352
350
|
}
|
|
353
351
|
failures
|
|
@@ -407,7 +405,7 @@ fn cross_provider_identity_failures(surface: &str, spawn: &RecordedSpawn) -> Vec
|
|
|
407
405
|
}
|
|
408
406
|
|
|
409
407
|
fn compiled_team_dir(label: &str, agents: &[(&str, &str)]) -> PathBuf {
|
|
410
|
-
compiled_team_dir_for_provider(label, agents, "
|
|
408
|
+
compiled_team_dir_for_provider(label, agents, "copilot")
|
|
411
409
|
}
|
|
412
410
|
|
|
413
411
|
fn compiled_team_dir_for_provider(label: &str, agents: &[(&str, &str)], provider: &str) -> PathBuf {
|
|
@@ -437,7 +435,7 @@ fn compiled_team_dir_for_provider(label: &str, agents: &[(&str, &str)], provider
|
|
|
437
435
|
}
|
|
438
436
|
|
|
439
437
|
fn role_doc(name: &str, role: &str) -> String {
|
|
440
|
-
role_doc_for_provider(name, role, "
|
|
438
|
+
role_doc_for_provider(name, role, "copilot")
|
|
441
439
|
}
|
|
442
440
|
|
|
443
441
|
fn role_doc_for_provider(name: &str, role: &str, provider: &str) -> String {
|
|
@@ -447,7 +445,7 @@ fn role_doc_for_provider(name: &str, role: &str, provider: &str) -> String {
|
|
|
447
445
|
}
|
|
448
446
|
|
|
449
447
|
fn seed_restart_state(team: &Path, agent_id: &str) {
|
|
450
|
-
seed_restart_state_as(team, agent_id, "
|
|
448
|
+
seed_restart_state_as(team, agent_id, "copilot");
|
|
451
449
|
}
|
|
452
450
|
|
|
453
451
|
fn seed_restart_state_as(team: &Path, agent_id: &str, provider: &str) {
|
|
@@ -477,7 +475,7 @@ fn seed_restart_state_as(team: &Path, agent_id: &str, provider: &str) {
|
|
|
477
475
|
}
|
|
478
476
|
|
|
479
477
|
fn seed_running_add_agent_state(team: &Path, agent_id: &str) {
|
|
480
|
-
seed_running_add_agent_state_as(team, agent_id, "
|
|
478
|
+
seed_running_add_agent_state_as(team, agent_id, "copilot");
|
|
481
479
|
}
|
|
482
480
|
|
|
483
481
|
fn seed_running_add_agent_state_as(team: &Path, agent_id: &str, provider: &str) {
|
|
@@ -507,28 +505,6 @@ fn seed_running_add_agent_state_as(team: &Path, agent_id: &str, provider: &str)
|
|
|
507
505
|
|
|
508
506
|
fn seed_forkable_source_state(team: &Path, agent_id: &str) {
|
|
509
507
|
let workspace = team_agent::model::paths::team_workspace(team).unwrap();
|
|
510
|
-
let rollout_root = PathBuf::from(std::env::var_os("HOME").expect("hermetic HOME"))
|
|
511
|
-
.join(".codex/sessions/worker-spawn-source");
|
|
512
|
-
std::fs::create_dir_all(&rollout_root).unwrap();
|
|
513
|
-
let rollout = rollout_root.join("rollout-sess-worker-a.jsonl");
|
|
514
|
-
std::fs::write(
|
|
515
|
-
&rollout,
|
|
516
|
-
format!(
|
|
517
|
-
"{}\n{}\n",
|
|
518
|
-
json!({
|
|
519
|
-
"type": "session_meta",
|
|
520
|
-
"payload": {"id": "sess-worker-a", "cwd": workspace}
|
|
521
|
-
}),
|
|
522
|
-
json!({
|
|
523
|
-
"type": "response_item",
|
|
524
|
-
"payload": {"content": [{
|
|
525
|
-
"type": "input_text",
|
|
526
|
-
"text": format!("You are Team Agent worker `{agent_id}` with role `fixture`.")
|
|
527
|
-
}]}
|
|
528
|
-
})
|
|
529
|
-
),
|
|
530
|
-
)
|
|
531
|
-
.unwrap();
|
|
532
508
|
team_agent::state::persist::save_runtime_state(
|
|
533
509
|
&workspace,
|
|
534
510
|
&json!({
|
|
@@ -539,13 +515,12 @@ fn seed_forkable_source_state(team: &Path, agent_id: &str) {
|
|
|
539
515
|
"agents": {
|
|
540
516
|
agent_id: {
|
|
541
517
|
"status": "running",
|
|
542
|
-
"provider": "
|
|
518
|
+
"provider": "copilot",
|
|
543
519
|
"auth_mode": "subscription",
|
|
544
520
|
"role": "Fork Source",
|
|
545
521
|
"window": agent_id,
|
|
546
522
|
"owner_team_id": RUNTIME_TEAM_KEY,
|
|
547
523
|
"session_id": "sess-worker-a",
|
|
548
|
-
"rollout_path": rollout.to_string_lossy().to_string(),
|
|
549
524
|
"captured_at": "2026-07-16T00:00:00+00:00",
|
|
550
525
|
"captured_via": "session.captured",
|
|
551
526
|
"tools": ["mcp_team"]
|
|
@@ -678,11 +653,10 @@ impl RecordingTransport {
|
|
|
678
653
|
session: &SessionName,
|
|
679
654
|
window: &WindowName,
|
|
680
655
|
argv: &[String],
|
|
681
|
-
|
|
656
|
+
_cwd: &Path,
|
|
682
657
|
env: &BTreeMap<String, String>,
|
|
683
658
|
env_unset: &[String],
|
|
684
659
|
) -> SpawnResult {
|
|
685
|
-
emit_codex_fork_backing(argv, cwd);
|
|
686
660
|
let mut spawns = self.spawns.lock().unwrap();
|
|
687
661
|
let pane_id = PaneId::new(format!("%{}", spawns.len() + 1));
|
|
688
662
|
spawns.push(RecordedSpawn {
|
|
@@ -702,36 +676,6 @@ impl RecordingTransport {
|
|
|
702
676
|
}
|
|
703
677
|
}
|
|
704
678
|
|
|
705
|
-
fn emit_codex_fork_backing(argv: &[String], cwd: &Path) {
|
|
706
|
-
if !argv
|
|
707
|
-
.windows(2)
|
|
708
|
-
.any(|pair| pair[0] == "codex" && pair[1] == "fork")
|
|
709
|
-
{
|
|
710
|
-
return;
|
|
711
|
-
}
|
|
712
|
-
static SESSION_SEQ: AtomicU64 = AtomicU64::new(0);
|
|
713
|
-
let session_id = format!(
|
|
714
|
-
"worker-spawn-fork-{}-{}",
|
|
715
|
-
std::process::id(),
|
|
716
|
-
SESSION_SEQ.fetch_add(1, Ordering::Relaxed)
|
|
717
|
-
);
|
|
718
|
-
let root = PathBuf::from(std::env::var_os("HOME").expect("hermetic HOME"))
|
|
719
|
-
.join(".codex/sessions/worker-spawn-env-fixture");
|
|
720
|
-
std::fs::create_dir_all(&root).unwrap();
|
|
721
|
-
let record = serde_json::json!({
|
|
722
|
-
"session_meta": {"payload": {
|
|
723
|
-
"id": session_id.clone(),
|
|
724
|
-
"cwd": cwd.to_string_lossy(),
|
|
725
|
-
"created_at": chrono::Utc::now().to_rfc3339(),
|
|
726
|
-
}}
|
|
727
|
-
});
|
|
728
|
-
std::fs::write(
|
|
729
|
-
root.join(format!("rollout-{session_id}.jsonl")),
|
|
730
|
-
format!("{record}\n"),
|
|
731
|
-
)
|
|
732
|
-
.unwrap();
|
|
733
|
-
}
|
|
734
|
-
|
|
735
679
|
impl Transport for RecordingTransport {
|
|
736
680
|
fn kind(&self) -> BackendKind {
|
|
737
681
|
BackendKind::Tmux
|
|
@@ -809,8 +753,9 @@ impl Transport for RecordingTransport {
|
|
|
809
753
|
_target: &Target,
|
|
810
754
|
range: CaptureRange,
|
|
811
755
|
) -> Result<CapturedText, TransportError> {
|
|
756
|
+
// The Copilot ready screen lets the startup-prompt handler return at once.
|
|
812
757
|
Ok(CapturedText {
|
|
813
|
-
text:
|
|
758
|
+
text: team_agent::provider::COPILOT_READY_MARKER.to_string(),
|
|
814
759
|
range,
|
|
815
760
|
})
|
|
816
761
|
}
|
|
@@ -842,7 +787,7 @@ impl Transport for RecordingTransport {
|
|
|
842
787
|
window_name: Some(spawn.window.clone()),
|
|
843
788
|
pane_index: None,
|
|
844
789
|
tty: None,
|
|
845
|
-
current_command: Some("
|
|
790
|
+
current_command: Some("copilot".to_string()),
|
|
846
791
|
current_path: None,
|
|
847
792
|
active: false,
|
|
848
793
|
pane_pid: None,
|
|
@@ -50,20 +50,15 @@ mod agent_ops;
|
|
|
50
50
|
mod b0_legacy_snapshot_nonauthority_contract;
|
|
51
51
|
mod b0_reader_hideone_audit_contract;
|
|
52
52
|
mod behavioral_diff_264_red;
|
|
53
|
-
mod claude_compatible_config_red;
|
|
54
53
|
mod claude_profile_launch_red;
|
|
55
54
|
mod cli_argv_routing_red;
|
|
56
55
|
mod clone_agent_preserves_source_tools;
|
|
57
56
|
mod clone_fork_copilot_perms_red;
|
|
58
|
-
mod codex_weak_window_attribution_red;
|
|
59
57
|
mod communication_mode_runtime_contract_red;
|
|
60
58
|
mod copilot_provider_red;
|
|
61
59
|
mod core;
|
|
62
60
|
mod f032_startup_prompt_best_effort_red;
|
|
63
|
-
mod grok_effort_argv_red;
|
|
64
|
-
mod grok_mcp_overlay_red;
|
|
65
61
|
mod grok_require_explicit_model_red;
|
|
66
|
-
mod grok_restart_resume_red;
|
|
67
62
|
mod harvest2_a_batch_red;
|
|
68
63
|
mod host_cotenant_death_p0_contract;
|
|
69
64
|
mod issue238_codex_effort_contract;
|
|
@@ -77,10 +72,8 @@ mod phase_b_contracts;
|
|
|
77
72
|
mod phase_golden;
|
|
78
73
|
mod pi_catalog_red;
|
|
79
74
|
mod pi_command_red;
|
|
80
|
-
mod pi_compiler_red;
|
|
81
75
|
mod pi_dual_entry_red;
|
|
82
76
|
mod pi_executable_mcp_red;
|
|
83
|
-
mod pi_fork_session_inheritance_red;
|
|
84
77
|
mod pi_lifecycle_doctor_red;
|
|
85
78
|
mod pi_native_mcp_capability_red;
|
|
86
79
|
mod pi_session_delivery_red;
|
|
@@ -61,9 +61,6 @@ pub mod event_names {
|
|
|
61
61
|
pub const DISPLAY_ADAPTIVE_BLOCKED: &str = "display.adaptive_blocked";
|
|
62
62
|
pub const DISPLAY_ADAPTIVE_REBUILT: &str = "display.adaptive_rebuilt";
|
|
63
63
|
pub const DISPLAY_ADAPTIVE_CLOSED: &str = "display.adaptive_closed";
|
|
64
|
-
/// Directory-scoped grok toml dropped leftover per-seat `TEAM_AGENT_*` keys.
|
|
65
|
-
/// Fields: `path` (file), `keys` (names only — never values).
|
|
66
|
-
pub const GROK_TOML_PER_SEAT_KEYS_CLEARED: &str = "lifecycle.grok_toml.per_seat_keys_cleared";
|
|
67
64
|
}
|
|
68
65
|
|
|
69
66
|
// ===========================================================================
|
|
@@ -396,14 +393,6 @@ pub enum LifecycleError {
|
|
|
396
393
|
/// 编译 spec / role doc 失败(`compile_team`/`compile_role_doc_agent`)。
|
|
397
394
|
#[error("spec compile failed: {0}")]
|
|
398
395
|
Compile(String),
|
|
399
|
-
/// Pi model/schema admission failed before lifecycle reservation or writes.
|
|
400
|
-
#[error("pi model preflight failed: {requested}")]
|
|
401
|
-
PiModelPreflight {
|
|
402
|
-
requested: String,
|
|
403
|
-
candidates: Vec<String>,
|
|
404
|
-
action: String,
|
|
405
|
-
not_ready: bool,
|
|
406
|
-
},
|
|
407
396
|
/// provider 命令构造 / resume 不可用(`ResumeUnavailable`)。
|
|
408
397
|
#[error("provider error: {0}")]
|
|
409
398
|
Provider(String),
|
|
@@ -618,8 +607,8 @@ pub struct AddAgentReport {
|
|
|
618
607
|
pub role_file: PathBuf,
|
|
619
608
|
}
|
|
620
609
|
|
|
621
|
-
/// `fork_agent(...)` 结果。
|
|
622
|
-
///
|
|
610
|
+
/// `fork_agent(...)` 结果。legacy 席位不再 fork;Claude Code / Codex / Grok /
|
|
611
|
+
/// Pi 的新席位 fork 由 contract 管道直接给出回执,不经过这里。
|
|
623
612
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
624
613
|
pub struct ForkAgentReport {
|
|
625
614
|
pub source_agent_id: AgentId,
|
|
@@ -627,14 +616,6 @@ pub struct ForkAgentReport {
|
|
|
627
616
|
pub env: AgentActionEnvelope,
|
|
628
617
|
pub session_id: Option<SessionId>,
|
|
629
618
|
pub backing_state: ForkBackingState,
|
|
630
|
-
pub pi_fork: Option<PiForkDetails>,
|
|
631
|
-
}
|
|
632
|
-
|
|
633
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
634
|
-
pub struct PiForkDetails {
|
|
635
|
-
pub source_session_id: SessionId,
|
|
636
|
-
pub session_id: SessionId,
|
|
637
|
-
pub backing_path: RolloutPath,
|
|
638
619
|
}
|
|
639
620
|
|
|
640
621
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
@@ -39,7 +39,7 @@ impl Case {
|
|
|
39
39
|
assert!(carrier > 1);
|
|
40
40
|
let started = Utc::now();
|
|
41
41
|
let state = json!({"agents": {"worker": {
|
|
42
|
-
"provider": "
|
|
42
|
+
"provider": "copilot", "mcp_config": config,
|
|
43
43
|
"spawned_at": (started - chrono::Duration::seconds(10)).to_rfc3339(),
|
|
44
44
|
"pane_id": "%1", "pane_pid": carrier
|
|
45
45
|
}}});
|
|
@@ -114,24 +114,22 @@ impl Drop for Case {
|
|
|
114
114
|
|
|
115
115
|
#[test]
|
|
116
116
|
fn issue345_missing_mcp_config_does_not_disable_eager_admission() {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
117
|
+
// The Case seat is Copilot, the surviving eager-handshake legacy worker.
|
|
118
|
+
let mut case = Case::new();
|
|
119
|
+
case.state["agents"]["worker"]
|
|
120
|
+
.as_object_mut()
|
|
121
|
+
.unwrap()
|
|
122
|
+
.remove("mcp_config");
|
|
123
|
+
assert!(
|
|
124
|
+
case.admission().is_err(),
|
|
125
|
+
"missing config cannot disable copilot admission"
|
|
126
|
+
);
|
|
127
|
+
for value in [Value::Null, json!(false), json!(""), json!(" ")] {
|
|
128
|
+
case.state["agents"]["worker"]["mcp_config"] = value;
|
|
124
129
|
assert!(
|
|
125
130
|
case.admission().is_err(),
|
|
126
|
-
"
|
|
131
|
+
"invalid config cannot disable copilot admission"
|
|
127
132
|
);
|
|
128
|
-
for value in [Value::Null, json!(false), json!(""), json!(" ")] {
|
|
129
|
-
case.state["agents"]["worker"]["mcp_config"] = value;
|
|
130
|
-
assert!(
|
|
131
|
-
case.admission().is_err(),
|
|
132
|
-
"invalid config cannot disable {provider} admission"
|
|
133
|
-
);
|
|
134
|
-
}
|
|
135
133
|
}
|
|
136
134
|
}
|
|
137
135
|
|
|
@@ -352,7 +350,7 @@ fn config_scope_and_authorized_executable_cannot_be_substituted() {
|
|
|
352
350
|
fn fake_and_pi_keep_their_existing_non_eager_or_runtime_registry_admission() {
|
|
353
351
|
assert!(!crate::provider::get_adapter(Provider::Fake).requires_worker_mcp_handshake());
|
|
354
352
|
assert!(!crate::provider::get_adapter(Provider::Pi).requires_worker_mcp_handshake());
|
|
355
|
-
assert!(crate::provider::get_adapter(Provider::
|
|
353
|
+
assert!(crate::provider::get_adapter(Provider::Copilot).requires_worker_mcp_handshake());
|
|
356
354
|
let case = Case::new();
|
|
357
355
|
for provider in ["fake", "pi"] {
|
|
358
356
|
let mut state = case.state.clone();
|