@team-agent/installer 0.5.127 → 0.6.0
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/README.md +15 -4
- package/README.zh.md +1 -1
- package/package.json +4 -8
- package/skills/team-agent/SKILL.md +41 -26
- package/skills/team-agent/command-coverage.json +170 -184
- package/skills/team-agent/docs/reference/team-agent-operator.md +66 -32
- package/skills/team-agent/references/recovery-runbook.md +1 -1
- package/skills/team-agent/references/team-agent-operator.md +66 -32
- package/templates/team_state.md +1 -1
- package/Cargo.lock +0 -1063
- package/Cargo.toml +0 -36
- package/crates/team-agent/Cargo.toml +0 -69
- package/crates/team-agent/src/app_server_test_support.rs +0 -258
- package/crates/team-agent/src/cli/adapters.rs +0 -1298
- package/crates/team-agent/src/cli/arguments.rs +0 -401
- package/crates/team-agent/src/cli/attach_app_server_leader.rs +0 -98
- package/crates/team-agent/src/cli/diagnose.rs +0 -1675
- package/crates/team-agent/src/cli/emit.rs +0 -2898
- package/crates/team-agent/src/cli/grok_slot.rs +0 -384
- package/crates/team-agent/src/cli/helpers.rs +0 -91
- package/crates/team-agent/src/cli/intent/runtime.rs +0 -1189
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +0 -821
- package/crates/team-agent/src/cli/intent/tests.rs +0 -691
- package/crates/team-agent/src/cli/intent.rs +0 -664
- package/crates/team-agent/src/cli/leader.rs +0 -300
- package/crates/team-agent/src/cli/leader_prompt.rs +0 -261
- package/crates/team-agent/src/cli/leaders.rs +0 -418
- package/crates/team-agent/src/cli/mod.rs +0 -6528
- package/crates/team-agent/src/cli/models.rs +0 -449
- package/crates/team-agent/src/cli/named_address.rs +0 -1651
- package/crates/team-agent/src/cli/profile.rs +0 -342
- package/crates/team-agent/src/cli/route.rs +0 -212
- package/crates/team-agent/src/cli/send/coordinator.rs +0 -164
- package/crates/team-agent/src/cli/send/mailbox.rs +0 -145
- package/crates/team-agent/src/cli/send/persist.rs +0 -192
- package/crates/team-agent/src/cli/send/presentation.rs +0 -370
- package/crates/team-agent/src/cli/send/resolve.rs +0 -573
- package/crates/team-agent/src/cli/send.rs +0 -201
- package/crates/team-agent/src/cli/shutdown_socket.rs +0 -288
- package/crates/team-agent/src/cli/spec.rs +0 -159
- package/crates/team-agent/src/cli/status.rs +0 -280
- package/crates/team-agent/src/cli/status_port/agents.rs +0 -358
- package/crates/team-agent/src/cli/status_port/approvals.rs +0 -79
- package/crates/team-agent/src/cli/status_port/brief.rs +0 -2043
- package/crates/team-agent/src/cli/status_port/compact.rs +0 -240
- package/crates/team-agent/src/cli/status_port/format.rs +0 -146
- package/crates/team-agent/src/cli/status_port/inbox.rs +0 -62
- package/crates/team-agent/src/cli/status_port/runtime.rs +0 -197
- package/crates/team-agent/src/cli/status_port/snapshot.rs +0 -208
- package/crates/team-agent/src/cli/status_port/store.rs +0 -416
- package/crates/team-agent/src/cli/status_port/tests.rs +0 -90
- package/crates/team-agent/src/cli/status_port.rs +0 -92
- package/crates/team-agent/src/cli/tests/base.rs +0 -885
- package/crates/team-agent/src/cli/tests/divergence.rs +0 -518
- package/crates/team-agent/src/cli/tests/lane_c.rs +0 -453
- package/crates/team-agent/src/cli/tests/leader_watch.rs +0 -372
- package/crates/team-agent/src/cli/tests/main_preserved.rs +0 -430
- package/crates/team-agent/src/cli/tests/missing_subcommands.rs +0 -336
- package/crates/team-agent/src/cli/tests/mod.rs +0 -137
- package/crates/team-agent/src/cli/tests/named_address.rs +0 -760
- package/crates/team-agent/src/cli/tests/parser_safety.rs +0 -383
- package/crates/team-agent/src/cli/tests/run_delegation.rs +0 -481
- package/crates/team-agent/src/cli/tests/shutdown_kill_plan.rs +0 -2179
- package/crates/team-agent/src/cli/tests/status_brief.rs +0 -1514
- package/crates/team-agent/src/cli/tests/status_send.rs +0 -1091
- package/crates/team-agent/src/cli/tests/verb_install_skill.rs +0 -93
- package/crates/team-agent/src/cli/tests/verb_profile.rs +0 -392
- package/crates/team-agent/src/cli/triage.rs +0 -234
- package/crates/team-agent/src/cli/types.rs +0 -591
- package/crates/team-agent/src/codex_app_server.rs +0 -546
- package/crates/team-agent/src/communication_mode/mod.rs +0 -56
- package/crates/team-agent/src/compiler/tests.rs +0 -842
- package/crates/team-agent/src/compiler.rs +0 -691
- package/crates/team-agent/src/conpty/backend.rs +0 -829
- package/crates/team-agent/src/conpty/mod.rs +0 -33
- package/crates/team-agent/src/contract_runtime/backend.rs +0 -1610
- package/crates/team-agent/src/contract_runtime/commands.rs +0 -671
- package/crates/team-agent/src/contract_runtime/config.rs +0 -354
- package/crates/team-agent/src/contract_runtime/config_tests.rs +0 -56
- package/crates/team-agent/src/contract_runtime/discovery.rs +0 -438
- package/crates/team-agent/src/contract_runtime/fork.rs +0 -368
- package/crates/team-agent/src/contract_runtime/forward.rs +0 -288
- package/crates/team-agent/src/contract_runtime/framework.rs +0 -350
- package/crates/team-agent/src/contract_runtime/mcp.rs +0 -399
- package/crates/team-agent/src/contract_runtime/mod.rs +0 -17
- package/crates/team-agent/src/contract_runtime/prompt.rs +0 -216
- package/crates/team-agent/src/contract_runtime/pump.rs +0 -271
- package/crates/team-agent/src/contract_runtime/registry.rs +0 -589
- package/crates/team-agent/src/contract_runtime/workspace.rs +0 -228
- package/crates/team-agent/src/coordinator/backoff.rs +0 -741
- package/crates/team-agent/src/coordinator/conpty_shim.rs +0 -805
- package/crates/team-agent/src/coordinator/health.rs +0 -1185
- package/crates/team-agent/src/coordinator/mod.rs +0 -119
- package/crates/team-agent/src/coordinator/orphan.rs +0 -110
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -798
- package/crates/team-agent/src/coordinator/runtime_observation.rs +0 -84
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +0 -2309
- package/crates/team-agent/src/coordinator/steps/delivery.rs +0 -15
- package/crates/team-agent/src/coordinator/steps/health_sync.rs +0 -15
- package/crates/team-agent/src/coordinator/steps/mod.rs +0 -126
- package/crates/team-agent/src/coordinator/steps/persist.rs +0 -15
- package/crates/team-agent/src/coordinator/steps/runtime_prompts.rs +0 -15
- package/crates/team-agent/src/coordinator/steps/session_gate.rs +0 -16
- package/crates/team-agent/src/coordinator/tests/a0_lostupdate.rs +0 -158
- package/crates/team-agent/src/coordinator/tests/abnormal.rs +0 -312
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +0 -338
- package/crates/team-agent/src/coordinator/tests/basics.rs +0 -211
- package/crates/team-agent/src/coordinator/tests/daemon.rs +0 -514
- package/crates/team-agent/src/coordinator/tests/energy.rs +0 -549
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -461
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +0 -186
- package/crates/team-agent/src/coordinator/tests/mod.rs +0 -295
- package/crates/team-agent/src/coordinator/tests/s3_bounded.rs +0 -207
- package/crates/team-agent/src/coordinator/tests/spine.rs +0 -308
- package/crates/team-agent/src/coordinator/tests/takeover.rs +0 -286
- package/crates/team-agent/src/coordinator/tests/tick_core.rs +0 -237
- package/crates/team-agent/src/coordinator/tick.rs +0 -3112
- package/crates/team-agent/src/coordinator/types.rs +0 -540
- package/crates/team-agent/src/db/agent_health_capture.rs +0 -126
- package/crates/team-agent/src/db/message_store.rs +0 -1585
- package/crates/team-agent/src/db/migration.rs +0 -984
- package/crates/team-agent/src/db/mod.rs +0 -26
- package/crates/team-agent/src/db/schema.rs +0 -663
- package/crates/team-agent/src/diagnose/comms.rs +0 -242
- package/crates/team-agent/src/diagnose/mod.rs +0 -44
- package/crates/team-agent/src/diagnose/orphans.rs +0 -889
- package/crates/team-agent/src/event_log.rs +0 -502
- package/crates/team-agent/src/fake_worker.rs +0 -303
- package/crates/team-agent/src/kill_audit.rs +0 -106
- package/crates/team-agent/src/layout/manager.rs +0 -248
- package/crates/team-agent/src/layout/mod.rs +0 -36
- package/crates/team-agent/src/layout/overlay.rs +0 -134
- package/crates/team-agent/src/layout/placement.rs +0 -52
- package/crates/team-agent/src/layout/recovery.rs +0 -106
- package/crates/team-agent/src/layout/runtime_sessions.rs +0 -317
- package/crates/team-agent/src/layout/sessions.rs +0 -294
- package/crates/team-agent/src/layout/tmux_endpoint.rs +0 -165
- package/crates/team-agent/src/layout/worker_env.rs +0 -721
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -37
- package/crates/team-agent/src/leader/helpers.rs +0 -178
- package/crates/team-agent/src/leader/incident.rs +0 -6
- package/crates/team-agent/src/leader/lease.rs +0 -3356
- package/crates/team-agent/src/leader/mod.rs +0 -104
- package/crates/team-agent/src/leader/owner_bind.rs +0 -400
- package/crates/team-agent/src/leader/prompt.rs +0 -905
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -247
- package/crates/team-agent/src/leader/rediscover/tests.rs +0 -689
- package/crates/team-agent/src/leader/rediscover.rs +0 -1192
- package/crates/team-agent/src/leader/registry.rs +0 -883
- package/crates/team-agent/src/leader/start.rs +0 -4500
- package/crates/team-agent/src/leader/takeover.rs +0 -65
- package/crates/team-agent/src/leader/tests/basics.rs +0 -337
- package/crates/team-agent/src/leader/tests/byte_findings.rs +0 -355
- package/crates/team-agent/src/leader/tests/claim_leader_mailbox_flush_contract.rs +0 -544
- package/crates/team-agent/src/leader/tests/historical_inventory_upgrade_gate_red.rs +0 -624
- package/crates/team-agent/src/leader/tests/identity.rs +0 -465
- package/crates/team-agent/src/leader/tests/identity_session_names.rs +0 -42
- package/crates/team-agent/src/leader/tests/idle.rs +0 -113
- package/crates/team-agent/src/leader/tests/lease_api.rs +0 -520
- package/crates/team-agent/src/leader/tests/lease_claim.rs +0 -629
- package/crates/team-agent/src/leader/tests/mod.rs +0 -106
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +0 -267
- package/crates/team-agent/src/leader/tests/rediscover.rs +0 -403
- package/crates/team-agent/src/leader/tests/rehomed_env.rs +0 -83
- package/crates/team-agent/src/leader/tests/team_in_team_state_scope_red.rs +0 -1273
- package/crates/team-agent/src/leader/tests/terminal_and_replay_vs_rerender_invariants_red.rs +0 -417
- package/crates/team-agent/src/leader/tests/wake_start_owner.rs +0 -168
- package/crates/team-agent/src/leader/types.rs +0 -534
- package/crates/team-agent/src/lib.rs +0 -145
- package/crates/team-agent/src/lifecycle/helpers.rs +0 -212
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +0 -848
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +0 -393
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -332
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +0 -178
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -82
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +0 -63
- package/crates/team-agent/src/lifecycle/launch/identity.rs +0 -674
- package/crates/team-agent/src/lifecycle/launch/layout.rs +0 -350
- package/crates/team-agent/src/lifecycle/launch/leader_context.rs +0 -589
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +0 -152
- package/crates/team-agent/src/lifecycle/launch/ownership.rs +0 -105
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +0 -629
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +0 -226
- package/crates/team-agent/src/lifecycle/launch/plan.rs +0 -269
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -5176
- package/crates/team-agent/src/lifecycle/launch/quick_start_transport.rs +0 -368
- package/crates/team-agent/src/lifecycle/launch/readiness.rs +0 -519
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +0 -287
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +0 -450
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -801
- package/crates/team-agent/src/lifecycle/launch/state_projection.rs +0 -624
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -558
- package/crates/team-agent/src/lifecycle/launch.rs +0 -534
- package/crates/team-agent/src/lifecycle/lock.rs +0 -350
- package/crates/team-agent/src/lifecycle/mod.rs +0 -79
- package/crates/team-agent/src/lifecycle/pane_input_lock.rs +0 -239
- package/crates/team-agent/src/lifecycle/profile_launch.rs +0 -757
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +0 -557
- package/crates/team-agent/src/lifecycle/restart/agent.rs +0 -2198
- package/crates/team-agent/src/lifecycle/restart/common.rs +0 -2052
- package/crates/team-agent/src/lifecycle/restart/orchestrator.rs +0 -65
- package/crates/team-agent/src/lifecycle/restart/preflight.rs +0 -113
- package/crates/team-agent/src/lifecycle/restart/rebuild.rs +0 -5135
- package/crates/team-agent/src/lifecycle/restart/remove.rs +0 -1504
- package/crates/team-agent/src/lifecycle/restart/selection.rs +0 -559
- package/crates/team-agent/src/lifecycle/restart/team_state.rs +0 -329
- package/crates/team-agent/src/lifecycle/restart.rs +0 -223
- package/crates/team-agent/src/lifecycle/role_config.rs +0 -1205
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +0 -1021
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +0 -1205
- package/crates/team-agent/src/lifecycle/tests/b0_legacy_snapshot_nonauthority_contract.rs +0 -265
- package/crates/team-agent/src/lifecycle/tests/b0_reader_hideone_audit_contract.rs +0 -490
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +0 -656
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +0 -135
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +0 -1415
- package/crates/team-agent/src/lifecycle/tests/clone_agent_preserves_source_tools.rs +0 -427
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +0 -396
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +0 -418
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +0 -2039
- package/crates/team-agent/src/lifecycle/tests/core.rs +0 -1298
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +0 -315
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_list_models_g0.stdout.txt +0 -222
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_list_models_spaced_ids.stdout.txt +0 -9
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +0 -71
- package/crates/team-agent/src/lifecycle/tests/gate_fixtures.rs +0 -562
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +0 -110
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +0 -472
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +0 -921
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +0 -68
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +0 -1851
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +0 -3981
- package/crates/team-agent/src/lifecycle/tests/lifecycle_lock.rs +0 -339
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +0 -596
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +0 -513
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +0 -69
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +0 -824
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +0 -723
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +0 -152
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +0 -182
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +0 -374
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +0 -546
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +0 -31
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +0 -528
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +0 -134
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +0 -333
- package/crates/team-agent/src/lifecycle/tests/realmachine_clusters_1_6_red.rs +0 -786
- package/crates/team-agent/src/lifecycle/tests/realmachine_residual_g1_g4_red.rs +0 -648
- package/crates/team-agent/src/lifecycle/tests/restart.rs +0 -185
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +0 -1053
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +0 -679
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1126
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +0 -153
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +0 -427
- package/crates/team-agent/src/lifecycle/tests/stale_team_saveconflict_contract.rs +0 -431
- package/crates/team-agent/src/lifecycle/tests/startup_latency_contract.rs +0 -1066
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +0 -876
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +0 -1026
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +0 -90
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +0 -543
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +0 -1103
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +0 -1276
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_roster_red.rs +0 -145
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +0 -603
- package/crates/team-agent/src/lifecycle/tests/test_isolation_escape_contract.rs +0 -936
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +0 -970
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +0 -996
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -827
- package/crates/team-agent/src/lifecycle/tests.rs +0 -102
- package/crates/team-agent/src/lifecycle/types.rs +0 -861
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +0 -370
- package/crates/team-agent/src/main.rs +0 -52
- package/crates/team-agent/src/mcp_server/helpers.rs +0 -510
- package/crates/team-agent/src/mcp_server/lifecycle_tools/mod.rs +0 -6
- package/crates/team-agent/src/mcp_server/lifecycle_tools/state_status.rs +0 -43
- package/crates/team-agent/src/mcp_server/mod.rs +0 -119
- package/crates/team-agent/src/mcp_server/normalize.rs +0 -485
- package/crates/team-agent/src/mcp_server/readiness.rs +0 -546
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +0 -369
- package/crates/team-agent/src/mcp_server/tests/golden.rs +0 -285
- package/crates/team-agent/src/mcp_server/tests/normalize.rs +0 -247
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +0 -168
- package/crates/team-agent/src/mcp_server/tests/send.rs +0 -388
- package/crates/team-agent/src/mcp_server/tests/tools.rs +0 -343
- package/crates/team-agent/src/mcp_server/tests/wire.rs +0 -254
- package/crates/team-agent/src/mcp_server/tests.rs +0 -43
- package/crates/team-agent/src/mcp_server/tools.rs +0 -1015
- package/crates/team-agent/src/mcp_server/types.rs +0 -396
- package/crates/team-agent/src/mcp_server/wire.rs +0 -867
- package/crates/team-agent/src/messaging/activity.rs +0 -461
- package/crates/team-agent/src/messaging/address.rs +0 -87
- package/crates/team-agent/src/messaging/delivery.rs +0 -3785
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +0 -234
- package/crates/team-agent/src/messaging/enter_rescue.rs +0 -362
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +0 -633
- package/crates/team-agent/src/messaging/helpers.rs +0 -354
- package/crates/team-agent/src/messaging/leader_channel.rs +0 -287
- package/crates/team-agent/src/messaging/leader_receiver.rs +0 -786
- package/crates/team-agent/src/messaging/mod.rs +0 -166
- package/crates/team-agent/src/messaging/persist.rs +0 -377
- package/crates/team-agent/src/messaging/presentation.rs +0 -417
- package/crates/team-agent/src/messaging/results/collection_tests.rs +0 -719
- package/crates/team-agent/src/messaging/results.rs +0 -1415
- package/crates/team-agent/src/messaging/scheduler.rs +0 -217
- package/crates/team-agent/src/messaging/selftest.rs +0 -315
- package/crates/team-agent/src/messaging/send.rs +0 -981
- package/crates/team-agent/src/messaging/tests/basic.rs +0 -346
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +0 -551
- package/crates/team-agent/src/messaging/tests/e23.rs +0 -49
- package/crates/team-agent/src/messaging/tests/leader_channel.rs +0 -169
- package/crates/team-agent/src/messaging/tests/leader_inject_acceptance.rs +0 -817
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +0 -85
- package/crates/team-agent/src/messaging/tests/mod.rs +0 -306
- package/crates/team-agent/src/messaging/tests/runtime.rs +0 -3655
- package/crates/team-agent/src/messaging/tests/spine.rs +0 -837
- package/crates/team-agent/src/messaging/tests/wave2.rs +0 -381
- package/crates/team-agent/src/messaging/trust.rs +0 -215
- package/crates/team-agent/src/messaging/types.rs +0 -471
- package/crates/team-agent/src/messaging/wait.rs +0 -366
- package/crates/team-agent/src/messaging/watchers.rs +0 -916
- package/crates/team-agent/src/model/enums.rs +0 -356
- package/crates/team-agent/src/model/errors.rs +0 -18
- package/crates/team-agent/src/model/ids.rs +0 -165
- package/crates/team-agent/src/model/mod.rs +0 -29
- package/crates/team-agent/src/model/name_similarity.rs +0 -252
- package/crates/team-agent/src/model/pane_authority_refusal.rs +0 -359
- package/crates/team-agent/src/model/paths.rs +0 -257
- package/crates/team-agent/src/model/routing.rs +0 -387
- package/crates/team-agent/src/model/spec.rs +0 -1184
- package/crates/team-agent/src/model/task_graph.rs +0 -321
- package/crates/team-agent/src/model/testdata/fuzz.golden.yaml +0 -43
- package/crates/team-agent/src/model/testdata/fuzz.yaml +0 -43
- package/crates/team-agent/src/model/testdata/spec_invalid_a.yaml +0 -209
- package/crates/team-agent/src/model/testdata/team.spec.golden.yaml +0 -208
- package/crates/team-agent/src/model/testdata/team.spec.yaml +0 -208
- package/crates/team-agent/src/model/yaml/tests.rs +0 -188
- package/crates/team-agent/src/model/yaml.rs +0 -802
- package/crates/team-agent/src/os_probe.rs +0 -280
- package/crates/team-agent/src/packaging/install.rs +0 -219
- package/crates/team-agent/src/packaging/migrate.rs +0 -38
- package/crates/team-agent/src/packaging/mod.rs +0 -91
- package/crates/team-agent/src/packaging/repair.rs +0 -33
- package/crates/team-agent/src/packaging/tests.rs +0 -822
- package/crates/team-agent/src/packaging/types.rs +0 -417
- package/crates/team-agent/src/platform/argv.rs +0 -331
- package/crates/team-agent/src/platform/errors.rs +0 -104
- package/crates/team-agent/src/platform/file_lock.rs +0 -279
- package/crates/team-agent/src/platform/mod.rs +0 -5
- package/crates/team-agent/src/platform/process.rs +0 -545
- package/crates/team-agent/src/provider/adapter.rs +0 -898
- package/crates/team-agent/src/provider/adapters/copilot.rs +0 -75
- package/crates/team-agent/src/provider/adapters/copilot_fork.rs +0 -307
- package/crates/team-agent/src/provider/adapters/fake.rs +0 -18
- package/crates/team-agent/src/provider/adapters/mod.rs +0 -28
- package/crates/team-agent/src/provider/approvals/mod.rs +0 -3
- package/crates/team-agent/src/provider/approvals/parsing.rs +0 -586
- package/crates/team-agent/src/provider/approvals/runtime_prompts.rs +0 -205
- package/crates/team-agent/src/provider/argv_route.rs +0 -405
- package/crates/team-agent/src/provider/bypass_flags.rs +0 -116
- package/crates/team-agent/src/provider/classify.rs +0 -773
- package/crates/team-agent/src/provider/command_helpers.rs +0 -45
- package/crates/team-agent/src/provider/faults.rs +0 -165
- package/crates/team-agent/src/provider/helpers.rs +0 -52
- package/crates/team-agent/src/provider/mod.rs +0 -78
- package/crates/team-agent/src/provider/model_catalog.rs +0 -722
- package/crates/team-agent/src/provider/session/capture.rs +0 -2631
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -168
- package/crates/team-agent/src/provider/session/context_fork.rs +0 -264
- package/crates/team-agent/src/provider/session/mod.rs +0 -36
- package/crates/team-agent/src/provider/session/resume.rs +0 -269
- package/crates/team-agent/src/provider/session_scan/common/tests.rs +0 -316
- package/crates/team-agent/src/provider/session_scan/common.rs +0 -618
- package/crates/team-agent/src/provider/session_scan/copilot.rs +0 -280
- package/crates/team-agent/src/provider/session_scan/pi.rs +0 -152
- package/crates/team-agent/src/provider/session_scan.rs +0 -61
- package/crates/team-agent/src/provider/startup_prompt.rs +0 -757
- package/crates/team-agent/src/provider/submit_now.rs +0 -71
- package/crates/team-agent/src/provider/testdata/copilot-ready-marker.txt +0 -5
- package/crates/team-agent/src/provider/testdata/copilot-trust-prompt.txt +0 -19
- package/crates/team-agent/src/provider/testdata/grok-models-authenticated.stdout +0 -9
- package/crates/team-agent/src/provider/testdata/grok-models-unauthenticated.stdout +0 -7
- package/crates/team-agent/src/provider/tests/adapter.rs +0 -354
- package/crates/team-agent/src/provider/tests/classify.rs +0 -201
- package/crates/team-agent/src/provider/tests/command_helpers.rs +0 -26
- package/crates/team-agent/src/provider/tests/copilot_fork.rs +0 -191
- package/crates/team-agent/src/provider/tests/faults.rs +0 -200
- package/crates/team-agent/src/provider/tests/idle.rs +0 -140
- package/crates/team-agent/src/provider/tests/wire.rs +0 -213
- package/crates/team-agent/src/provider/tests.rs +0 -32
- package/crates/team-agent/src/provider/types.rs +0 -529
- package/crates/team-agent/src/provider/wire.rs +0 -406
- package/crates/team-agent/src/redaction.rs +0 -259
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +0 -248
- package/crates/team-agent/src/state/abnormal_watch.rs +0 -144
- package/crates/team-agent/src/state/identity.rs +0 -914
- package/crates/team-agent/src/state/identity_keys.rs +0 -132
- package/crates/team-agent/src/state/mod.rs +0 -74
- package/crates/team-agent/src/state/owner_gate.rs +0 -482
- package/crates/team-agent/src/state/ownership.rs +0 -563
- package/crates/team-agent/src/state/paths.rs +0 -395
- package/crates/team-agent/src/state/persist.rs +0 -3811
- package/crates/team-agent/src/state/projection.rs +0 -1508
- package/crates/team-agent/src/state/repository/intent.rs +0 -14
- package/crates/team-agent/src/state/repository/tests.rs +0 -184
- package/crates/team-agent/src/state/repository.rs +0 -866
- package/crates/team-agent/src/state/selector.rs +0 -160
- package/crates/team-agent/src/state/testdata/state-rich.canonical.json +0 -133
- package/crates/team-agent/src/tmux_backend/enter_rescue.rs +0 -325
- package/crates/team-agent/src/tmux_backend/enter_rescue_tests.rs +0 -432
- package/crates/team-agent/src/tmux_backend/native_input.rs +0 -513
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +0 -742
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -4254
- package/crates/team-agent/src/tmux_backend.rs +0 -4527
- package/crates/team-agent/src/topology.rs +0 -537
- package/crates/team-agent/src/transport/enter_rescue.rs +0 -166
- package/crates/team-agent/src/transport/native_input.rs +0 -491
- package/crates/team-agent/src/transport/test_support.rs +0 -743
- package/crates/team-agent/src/transport/tests/behavior.rs +0 -326
- package/crates/team-agent/src/transport/tests/mod.rs +0 -194
- package/crates/team-agent/src/transport/tests/wire.rs +0 -574
- package/crates/team-agent/src/transport.rs +0 -1655
- package/crates/team-agent/src/transport_factory.rs +0 -819
|
@@ -1,4500 +0,0 @@
|
|
|
1
|
-
//!
|
|
2
|
-
//! leader::start — leader_start_plan / leader_session_name(派生 tmux session 名)。
|
|
3
|
-
//! Managed launch windows: first leader keeps provider_wire; later live
|
|
4
|
-
//! leaders in the same A-22 session get a unique suffix so attach targets
|
|
5
|
-
//! SESSION:WINDOW without claude_code collisions. state.json records every
|
|
6
|
-
//! live pane in leader_receiver.bound_panes and does not overwrite the first
|
|
7
|
-
//! pane_id.
|
|
8
|
-
|
|
9
|
-
use std::collections::BTreeMap;
|
|
10
|
-
use std::io::{IsTerminal, Read, Write};
|
|
11
|
-
use std::path::{Path, PathBuf};
|
|
12
|
-
use std::process::{Command, Stdio};
|
|
13
|
-
use std::sync::atomic::{AtomicBool, Ordering};
|
|
14
|
-
use std::time::Duration;
|
|
15
|
-
|
|
16
|
-
#[cfg(target_os = "linux")]
|
|
17
|
-
use std::os::fd::AsRawFd;
|
|
18
|
-
#[cfg(unix)]
|
|
19
|
-
use std::os::unix::fs::{FileTypeExt, MetadataExt, OpenOptionsExt};
|
|
20
|
-
|
|
21
|
-
use crate::model::pane_authority_refusal as pane_refusal;
|
|
22
|
-
use crate::provider::{get_adapter, Provider};
|
|
23
|
-
use crate::tmux_backend::TmuxBackend;
|
|
24
|
-
use crate::transport::{
|
|
25
|
-
CaptureRange, PaneId, PaneInfo, PaneLiveness, SessionName, SpawnResult, Target, Transport,
|
|
26
|
-
TransportError, WindowName,
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
use super::helpers::{
|
|
30
|
-
provider_wire, resolve_workspace_for_hash, sanitize_session_folder, sha1_hex_prefix,
|
|
31
|
-
};
|
|
32
|
-
use super::owner_bind::leader_identity_context;
|
|
33
|
-
use super::{
|
|
34
|
-
LeaderError, LeaderIdentity, LeaderLaunchOutcome, LeaderLaunchSocket, LeaderLaunchStatus,
|
|
35
|
-
LeaderStartMode, LeaderStartPlan,
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
// ── leader::start — leader_start_plan / session 名 ──
|
|
39
|
-
|
|
40
|
-
pub(crate) struct PreparedLeaderStart {
|
|
41
|
-
plan: LeaderStartPlan,
|
|
42
|
-
ambient_authority: Option<VerifiedAmbientPaneAuthority>,
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
#[derive(Clone, Copy)]
|
|
46
|
-
enum ManagedClientAttachMode {
|
|
47
|
-
AttachSession,
|
|
48
|
-
SwitchClient,
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
impl PreparedLeaderStart {
|
|
52
|
-
pub(crate) fn plan(&self) -> &LeaderStartPlan {
|
|
53
|
-
&self.plan
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
pub(crate) enum PrepareLeaderStartError {
|
|
58
|
-
PaneAuthorityRefused(pane_refusal::PaneAuthorityRefusal),
|
|
59
|
-
Leader(LeaderError),
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
impl PrepareLeaderStartError {
|
|
63
|
-
fn into_leader_error(self) -> LeaderError {
|
|
64
|
-
match self {
|
|
65
|
-
Self::PaneAuthorityRefused(refusal) => LeaderError::Validation(format!(
|
|
66
|
-
"{}; open a new terminal outside the current tmux/pane or run \
|
|
67
|
-
`team-agent attach-leader` from the intended workspace pane",
|
|
68
|
-
refusal.reason().as_str()
|
|
69
|
-
)),
|
|
70
|
-
Self::Leader(error) => error,
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
impl From<LeaderError> for PrepareLeaderStartError {
|
|
76
|
-
fn from(error: LeaderError) -> Self {
|
|
77
|
-
Self::Leader(error)
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
/// `leader_start_plan`(card §46;`__init__.py:82`)。计算 leader 启动计划
|
|
82
|
-
/// (exec in-TMUX / new tmux session / attach existing)。provider 未安装 → `Err(Start)`。
|
|
83
|
-
pub(crate) fn leader_start_plan(
|
|
84
|
-
provider: Provider,
|
|
85
|
-
provider_args: &[String],
|
|
86
|
-
workspace: &Path,
|
|
87
|
-
attach_existing: bool,
|
|
88
|
-
confirm_attach: bool,
|
|
89
|
-
attach_session: Option<&SessionName>,
|
|
90
|
-
external_leader: bool,
|
|
91
|
-
) -> Result<LeaderStartPlan, LeaderError> {
|
|
92
|
-
prepare_leader_start(
|
|
93
|
-
provider,
|
|
94
|
-
provider_args,
|
|
95
|
-
workspace,
|
|
96
|
-
attach_existing,
|
|
97
|
-
confirm_attach,
|
|
98
|
-
attach_session,
|
|
99
|
-
external_leader,
|
|
100
|
-
)
|
|
101
|
-
.map(|prepared| prepared.plan)
|
|
102
|
-
.map_err(PrepareLeaderStartError::into_leader_error)
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
pub(crate) fn prepare_leader_start(
|
|
106
|
-
provider: Provider,
|
|
107
|
-
provider_args: &[String],
|
|
108
|
-
workspace: &Path,
|
|
109
|
-
attach_existing: bool,
|
|
110
|
-
confirm_attach: bool,
|
|
111
|
-
attach_session: Option<&SessionName>,
|
|
112
|
-
external_leader: bool,
|
|
113
|
-
) -> Result<PreparedLeaderStart, PrepareLeaderStartError> {
|
|
114
|
-
prepare_leader_start_with_nested_attach(
|
|
115
|
-
provider,
|
|
116
|
-
provider_args,
|
|
117
|
-
workspace,
|
|
118
|
-
attach_existing,
|
|
119
|
-
confirm_attach,
|
|
120
|
-
attach_session,
|
|
121
|
-
external_leader,
|
|
122
|
-
false,
|
|
123
|
-
)
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
pub(crate) fn prepare_leader_start_with_nested_attach(
|
|
127
|
-
provider: Provider,
|
|
128
|
-
provider_args: &[String],
|
|
129
|
-
workspace: &Path,
|
|
130
|
-
attach_existing: bool,
|
|
131
|
-
confirm_attach: bool,
|
|
132
|
-
attach_session: Option<&SessionName>,
|
|
133
|
-
external_leader: bool,
|
|
134
|
-
allow_nested_attach: bool,
|
|
135
|
-
) -> Result<PreparedLeaderStart, PrepareLeaderStartError> {
|
|
136
|
-
let explicit_external_path = external_leader || attach_existing || attach_session.is_some();
|
|
137
|
-
let state_external_path = workspace_state_uses_external_leader(workspace);
|
|
138
|
-
let (ambient_authority, managed_client_attach_mode, managed_exec_provider) =
|
|
139
|
-
if explicit_external_path || state_external_path {
|
|
140
|
-
(ambient_pane_authority_preflight(workspace)?, None, false)
|
|
141
|
-
} else {
|
|
142
|
-
managed_launcher_ambient_route(
|
|
143
|
-
provider,
|
|
144
|
-
provider_args,
|
|
145
|
-
workspace,
|
|
146
|
-
allow_nested_attach,
|
|
147
|
-
)?
|
|
148
|
-
};
|
|
149
|
-
let plan = leader_start_plan_with_ambient_authority(
|
|
150
|
-
provider,
|
|
151
|
-
provider_args,
|
|
152
|
-
workspace,
|
|
153
|
-
attach_existing,
|
|
154
|
-
confirm_attach,
|
|
155
|
-
attach_session,
|
|
156
|
-
external_leader,
|
|
157
|
-
ambient_authority.is_some(),
|
|
158
|
-
managed_client_attach_mode,
|
|
159
|
-
managed_exec_provider,
|
|
160
|
-
allow_nested_attach,
|
|
161
|
-
)?;
|
|
162
|
-
Ok(PreparedLeaderStart {
|
|
163
|
-
plan,
|
|
164
|
-
ambient_authority,
|
|
165
|
-
})
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
pub(crate) fn leader_start_plan_after_ambient_authority_check(
|
|
169
|
-
provider: Provider,
|
|
170
|
-
provider_args: &[String],
|
|
171
|
-
workspace: &Path,
|
|
172
|
-
attach_existing: bool,
|
|
173
|
-
confirm_attach: bool,
|
|
174
|
-
attach_session: Option<&SessionName>,
|
|
175
|
-
external_leader: bool,
|
|
176
|
-
) -> Result<LeaderStartPlan, LeaderError> {
|
|
177
|
-
let in_tmux = std::env::var_os("TMUX").is_some();
|
|
178
|
-
let explicit_external_path = external_leader || attach_existing || attach_session.is_some();
|
|
179
|
-
let managed_client_attach_mode = (!explicit_external_path).then_some(if in_tmux {
|
|
180
|
-
ManagedClientAttachMode::SwitchClient
|
|
181
|
-
} else {
|
|
182
|
-
ManagedClientAttachMode::AttachSession
|
|
183
|
-
});
|
|
184
|
-
leader_start_plan_with_ambient_authority(
|
|
185
|
-
provider,
|
|
186
|
-
provider_args,
|
|
187
|
-
workspace,
|
|
188
|
-
attach_existing,
|
|
189
|
-
confirm_attach,
|
|
190
|
-
attach_session,
|
|
191
|
-
external_leader,
|
|
192
|
-
in_tmux,
|
|
193
|
-
managed_client_attach_mode,
|
|
194
|
-
false,
|
|
195
|
-
false,
|
|
196
|
-
)
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
fn leader_start_plan_with_ambient_authority(
|
|
200
|
-
provider: Provider,
|
|
201
|
-
provider_args: &[String],
|
|
202
|
-
workspace: &Path,
|
|
203
|
-
attach_existing: bool,
|
|
204
|
-
confirm_attach: bool,
|
|
205
|
-
attach_session: Option<&SessionName>,
|
|
206
|
-
external_leader: bool,
|
|
207
|
-
in_tmux: bool,
|
|
208
|
-
managed_client_attach_mode: Option<ManagedClientAttachMode>,
|
|
209
|
-
managed_exec_provider: bool,
|
|
210
|
-
allow_nested_attach: bool,
|
|
211
|
-
) -> Result<LeaderStartPlan, LeaderError> {
|
|
212
|
-
if attach_session.is_some() && !confirm_attach {
|
|
213
|
-
return Err(LeaderError::Start(
|
|
214
|
-
"--attach-session requires --confirm".to_string(),
|
|
215
|
-
));
|
|
216
|
-
}
|
|
217
|
-
if attach_existing && !confirm_attach {
|
|
218
|
-
return Err(LeaderError::Start(
|
|
219
|
-
"attach existing leader session requires confirm".to_string(),
|
|
220
|
-
));
|
|
221
|
-
}
|
|
222
|
-
let adapter = get_adapter(provider);
|
|
223
|
-
if !adapter.is_installed() {
|
|
224
|
-
let command_name = provider_command_name(provider);
|
|
225
|
-
return Err(LeaderError::Start(format!(
|
|
226
|
-
"Provider {} command '{}' not found",
|
|
227
|
-
provider_wire(provider),
|
|
228
|
-
command_name
|
|
229
|
-
)));
|
|
230
|
-
}
|
|
231
|
-
let state = crate::state::persist::load_runtime_state(workspace).ok();
|
|
232
|
-
let identity = leader_identity_context(workspace, None, state.as_ref())?;
|
|
233
|
-
let external_path = external_leader
|
|
234
|
-
|| attach_existing
|
|
235
|
-
|| attach_session.is_some()
|
|
236
|
-
|| state
|
|
237
|
-
.as_ref()
|
|
238
|
-
.is_some_and(crate::state::projection::state_is_external_leader);
|
|
239
|
-
// 0.3.28 Step 2: managed mode now uses the SAME dedicated leader session
|
|
240
|
-
// as the external path (`team-agent-leader-<provider>-<folder>-<sha1[:8]>`)
|
|
241
|
-
// — Python parity. Pre-0.3.28 the managed branch used
|
|
242
|
-
// `managed_team_session_name(identity) = team-<team_id>` which is the
|
|
243
|
-
// worker session — that co-location is the structural root of
|
|
244
|
-
// E49/E51/E53/E57-3/E60.
|
|
245
|
-
// A-22: managed mode reuses a live provider leader session by prefix;
|
|
246
|
-
// when no candidate exists, it falls back to a per-launch nonce. The
|
|
247
|
-
// external/attach paths keep the stable workspace-keyed name because a
|
|
248
|
-
// nonce would break `--attach-session` reattach.
|
|
249
|
-
let session_name = if external_path {
|
|
250
|
-
attach_session
|
|
251
|
-
.cloned()
|
|
252
|
-
.or_else(|| Some(leader_session_name(provider, workspace)))
|
|
253
|
-
} else {
|
|
254
|
-
Some(managed_leader_session_for_launch(provider, workspace))
|
|
255
|
-
};
|
|
256
|
-
if !in_tmux {
|
|
257
|
-
ensure_tmux_installed()?;
|
|
258
|
-
}
|
|
259
|
-
let existing_session =
|
|
260
|
-
if external_path && !in_tmux && !attach_existing && attach_session.is_none() {
|
|
261
|
-
match session_name.as_ref() {
|
|
262
|
-
Some(session) => tmux_session_exists(workspace, session)?,
|
|
263
|
-
None => false,
|
|
264
|
-
}
|
|
265
|
-
} else {
|
|
266
|
-
false
|
|
267
|
-
};
|
|
268
|
-
let mode = if managed_exec_provider {
|
|
269
|
-
LeaderStartMode::ExecProvider
|
|
270
|
-
} else if !external_path {
|
|
271
|
-
LeaderStartMode::ManagedTmuxClient
|
|
272
|
-
} else if in_tmux {
|
|
273
|
-
LeaderStartMode::ExecProvider
|
|
274
|
-
} else if attach_existing || attach_session.is_some() || existing_session {
|
|
275
|
-
LeaderStartMode::AttachExisting
|
|
276
|
-
} else {
|
|
277
|
-
LeaderStartMode::NewTmuxSession
|
|
278
|
-
};
|
|
279
|
-
let leader_env = leader_env_for_identity(provider, &identity);
|
|
280
|
-
// First managed leader keeps `provider_wire` (`claude_code`). A second
|
|
281
|
-
// live leader in the same A-22 session gets a nonce suffix so attach
|
|
282
|
-
// targets a unique `SESSION:WINDOW` instead of colliding.
|
|
283
|
-
let managed_window = match (mode, session_name.as_ref()) {
|
|
284
|
-
(LeaderStartMode::ManagedTmuxClient, Some(session)) => Some(
|
|
285
|
-
managed_leader_window_for_launch(provider, workspace, session),
|
|
286
|
-
),
|
|
287
|
-
_ => None,
|
|
288
|
-
};
|
|
289
|
-
let configured_prompt = if mode == LeaderStartMode::AttachExisting {
|
|
290
|
-
None
|
|
291
|
-
} else {
|
|
292
|
-
super::prompt::load().map_err(|error| error.for_provider(provider))?
|
|
293
|
-
};
|
|
294
|
-
let mut pi_routed_argv = None;
|
|
295
|
-
let mut session_capture = None;
|
|
296
|
-
let mut provider_argv = if provider == Provider::Pi && mode != LeaderStartMode::AttachExisting {
|
|
297
|
-
let parsed = crate::lifecycle::launch::pi_mcp::parse_pi_leader_args(provider_args)
|
|
298
|
-
.map_err(|error| LeaderError::Start(error.to_string()))?;
|
|
299
|
-
let mcp_config = adapter
|
|
300
|
-
.mcp_config(crate::model::enums::AuthMode::Subscription)
|
|
301
|
-
.map_err(|error| LeaderError::Start(error.to_string()))?;
|
|
302
|
-
let mcp_config = crate::lifecycle::launch::resolve_mcp_config(
|
|
303
|
-
mcp_config,
|
|
304
|
-
workspace,
|
|
305
|
-
"leader",
|
|
306
|
-
identity.team_id.as_str(),
|
|
307
|
-
);
|
|
308
|
-
let contract = crate::lifecycle::worker_command_context::compile_pi_leader_system_prompt();
|
|
309
|
-
let prompt = if let Some(stored) = configured_prompt.as_ref() {
|
|
310
|
-
// Read route once and validate conflicts before creating any Pi MCP artifacts.
|
|
311
|
-
let mut routed = vec!["pi".to_string()];
|
|
312
|
-
crate::provider::argv_route::apply(provider, &mut routed)
|
|
313
|
-
.map_err(|error| LeaderError::Start(error.to_string()))?;
|
|
314
|
-
let combined = super::prompt::compose_pi_contract(
|
|
315
|
-
&contract, &routed, &stored.text, &stored.path,
|
|
316
|
-
)?;
|
|
317
|
-
pi_routed_argv = Some(routed);
|
|
318
|
-
combined
|
|
319
|
-
} else {
|
|
320
|
-
contract
|
|
321
|
-
};
|
|
322
|
-
let team_mcp_tools = ["send_message", "report_result", "get_team_status"];
|
|
323
|
-
let spawned_at = chrono::Utc::now().to_rfc3339();
|
|
324
|
-
let command = crate::lifecycle::launch::pi_mcp::materialize_pi_plan(
|
|
325
|
-
crate::lifecycle::launch::pi_mcp::PiMaterializeRequest {
|
|
326
|
-
workspace,
|
|
327
|
-
team_id: identity.team_id.as_str(),
|
|
328
|
-
agent_id: "leader",
|
|
329
|
-
model: parsed.model.as_deref(),
|
|
330
|
-
effort: parsed.effort,
|
|
331
|
-
system_prompt: &prompt,
|
|
332
|
-
team_mcp_tools: &team_mcp_tools,
|
|
333
|
-
mcp_config: &mcp_config,
|
|
334
|
-
session_scope: crate::lifecycle::launch::pi_mcp::pi_leader_session_scope(
|
|
335
|
-
provider_args,
|
|
336
|
-
external_path,
|
|
337
|
-
allow_nested_attach,
|
|
338
|
-
),
|
|
339
|
-
},
|
|
340
|
-
)
|
|
341
|
-
.map_err(|error| LeaderError::Start(error.to_string()))?;
|
|
342
|
-
session_capture = Some(crate::provider::CaptureSessionContext {
|
|
343
|
-
agent_id: "leader".into(),
|
|
344
|
-
spawn_cwd: resolve_workspace_for_hash(workspace),
|
|
345
|
-
pane_id: None,
|
|
346
|
-
pane_pid: None,
|
|
347
|
-
spawned_at: Some(spawned_at),
|
|
348
|
-
expected_session_id: command.expected_session_id,
|
|
349
|
-
provider_projects_root: command.provider_projects_root,
|
|
350
|
-
});
|
|
351
|
-
command.argv
|
|
352
|
-
} else if provider == Provider::Pi {
|
|
353
|
-
Vec::new()
|
|
354
|
-
} else {
|
|
355
|
-
provider_command_argv(provider, provider_args)
|
|
356
|
-
};
|
|
357
|
-
if mode != LeaderStartMode::AttachExisting {
|
|
358
|
-
if let Some(routed) = pi_routed_argv {
|
|
359
|
-
provider_argv.splice(1..1, routed.into_iter().skip(1));
|
|
360
|
-
} else {
|
|
361
|
-
crate::provider::argv_route::apply(provider, &mut provider_argv)
|
|
362
|
-
.map_err(|error| LeaderError::Start(error.to_string()))?;
|
|
363
|
-
if let Some(stored) = configured_prompt.as_ref() {
|
|
364
|
-
super::prompt::inject(provider, &mut provider_argv, &stored.text, &stored.path)?;
|
|
365
|
-
}
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
let argv = start_argv(
|
|
369
|
-
mode,
|
|
370
|
-
provider,
|
|
371
|
-
&provider_argv,
|
|
372
|
-
workspace,
|
|
373
|
-
session_name.as_ref(),
|
|
374
|
-
managed_window.as_ref(),
|
|
375
|
-
&leader_env,
|
|
376
|
-
managed_client_attach_mode,
|
|
377
|
-
)?;
|
|
378
|
-
let plan_session_name = if mode == LeaderStartMode::ExecProvider && !external_path {
|
|
379
|
-
None
|
|
380
|
-
} else {
|
|
381
|
-
session_name
|
|
382
|
-
};
|
|
383
|
-
let plan_env = if mode == LeaderStartMode::ExecProvider {
|
|
384
|
-
merged_exec_env(&leader_env)
|
|
385
|
-
} else {
|
|
386
|
-
leader_env.clone()
|
|
387
|
-
};
|
|
388
|
-
Ok(LeaderStartPlan {
|
|
389
|
-
mode,
|
|
390
|
-
provider,
|
|
391
|
-
workspace: resolve_workspace_for_hash(workspace),
|
|
392
|
-
socket: LeaderLaunchSocket::Workspace,
|
|
393
|
-
session_name: plan_session_name,
|
|
394
|
-
argv,
|
|
395
|
-
provider_argv,
|
|
396
|
-
leader_prompt: configured_prompt
|
|
397
|
-
.as_ref()
|
|
398
|
-
.map(|stored| stored.metadata(provider)),
|
|
399
|
-
session_capture,
|
|
400
|
-
// 0.3.28 Step 2: leader window inside the dedicated leader session is
|
|
401
|
-
// named after the provider wire (e.g. `claude_code`), never the
|
|
402
|
-
// literal string `leader`. Occupied names get a per-launch suffix.
|
|
403
|
-
leader_window: managed_window,
|
|
404
|
-
is_external_leader: external_path,
|
|
405
|
-
leader_env: plan_env,
|
|
406
|
-
identity: Some(identity),
|
|
407
|
-
detached: false,
|
|
408
|
-
})
|
|
409
|
-
}
|
|
410
|
-
|
|
411
|
-
pub(crate) fn leader_env_for_identity(
|
|
412
|
-
provider: Provider,
|
|
413
|
-
identity: &LeaderIdentity,
|
|
414
|
-
) -> BTreeMap<String, String> {
|
|
415
|
-
let mut leader_env = BTreeMap::new();
|
|
416
|
-
leader_env.insert(
|
|
417
|
-
"TEAM_AGENT_LEADER_PROVIDER".to_string(),
|
|
418
|
-
provider_wire(provider).to_string(),
|
|
419
|
-
);
|
|
420
|
-
leader_env.insert(
|
|
421
|
-
"TEAM_AGENT_LEADER_SESSION_UUID".to_string(),
|
|
422
|
-
identity.leader_session_uuid.as_str().to_string(),
|
|
423
|
-
);
|
|
424
|
-
leader_env.insert(
|
|
425
|
-
"TEAM_AGENT_MACHINE_FINGERPRINT".to_string(),
|
|
426
|
-
identity.machine_fingerprint.clone(),
|
|
427
|
-
);
|
|
428
|
-
leader_env.insert(
|
|
429
|
-
"TEAM_AGENT_WORKSPACE".to_string(),
|
|
430
|
-
identity.workspace_abspath.to_string_lossy().into_owned(),
|
|
431
|
-
);
|
|
432
|
-
leader_env.insert(
|
|
433
|
-
"TEAM_AGENT_TEAM_ID".to_string(),
|
|
434
|
-
identity.team_id.as_str().to_string(),
|
|
435
|
-
);
|
|
436
|
-
if provider == Provider::Copilot {
|
|
437
|
-
leader_env.insert(
|
|
438
|
-
"COPILOT_DISABLE_TERMINAL_TITLE".to_string(),
|
|
439
|
-
"1".to_string(),
|
|
440
|
-
);
|
|
441
|
-
}
|
|
442
|
-
// Managed providers run after `sh -lc`; restore the launcher's native
|
|
443
|
-
// executable lookup path at invocation, not just in the tmux client env.
|
|
444
|
-
if let Some(path) = std::env::var_os("PATH").and_then(|path| path.into_string().ok()) {
|
|
445
|
-
leader_env.insert("PATH".to_string(), path);
|
|
446
|
-
}
|
|
447
|
-
leader_env
|
|
448
|
-
}
|
|
449
|
-
|
|
450
|
-
pub(crate) fn execute_prepared_leader_start(
|
|
451
|
-
prepared: &PreparedLeaderStart,
|
|
452
|
-
workspace: &Path,
|
|
453
|
-
) -> Result<LeaderLaunchOutcome, LeaderError> {
|
|
454
|
-
execute_leader_plan_after_ambient_authority(
|
|
455
|
-
&prepared.plan,
|
|
456
|
-
workspace,
|
|
457
|
-
prepared.ambient_authority.as_ref(),
|
|
458
|
-
)
|
|
459
|
-
}
|
|
460
|
-
|
|
461
|
-
fn execute_leader_plan_after_ambient_authority(
|
|
462
|
-
plan: &LeaderStartPlan,
|
|
463
|
-
workspace: &Path,
|
|
464
|
-
ambient_authority: Option<&VerifiedAmbientPaneAuthority>,
|
|
465
|
-
) -> Result<LeaderLaunchOutcome, LeaderError> {
|
|
466
|
-
if plan.mode == LeaderStartMode::ManagedTmuxClient {
|
|
467
|
-
return execute_managed_leader_plan(plan, workspace);
|
|
468
|
-
}
|
|
469
|
-
let mut argv = plan.argv.clone();
|
|
470
|
-
let detached = plan.mode == LeaderStartMode::NewTmuxSession
|
|
471
|
-
&& !std::io::stdin().is_terminal()
|
|
472
|
-
&& insert_detach_flag(&mut argv);
|
|
473
|
-
let bind_verified_ambient = plan.mode == LeaderStartMode::ExecProvider
|
|
474
|
-
&& (!plan.is_external_leader || workspace_state_uses_external_leader(workspace));
|
|
475
|
-
if bind_verified_ambient {
|
|
476
|
-
let authority = ambient_authority.ok_or_else(|| {
|
|
477
|
-
LeaderError::Validation("exec provider ambient pane authority missing".to_string())
|
|
478
|
-
})?;
|
|
479
|
-
// 0.5.35 (`.team/artifacts/managed-leader-provider-reentry-locate.md`
|
|
480
|
-
// §5/§6): three-way classify BEFORE persist. Same physical pane =
|
|
481
|
-
// provider process replacement (refresh only). Different pane with
|
|
482
|
-
// an existing canonical binding = no canonical rewrite (claim /
|
|
483
|
-
// takeover is the recovery path, §7). Unbound = first-time write.
|
|
484
|
-
match classify_exec_provider_binding(workspace, plan, authority)? {
|
|
485
|
-
ExecProviderBinding::ManagedReentry => {
|
|
486
|
-
refresh_managed_leader_provider_binding(plan, workspace, authority)?;
|
|
487
|
-
}
|
|
488
|
-
ExecProviderBinding::DifferentPaneAlreadyBound => {
|
|
489
|
-
// No canonical state write. Provider still runs below.
|
|
490
|
-
}
|
|
491
|
-
ExecProviderBinding::Unbound => {
|
|
492
|
-
persist_exec_provider_leader_binding(
|
|
493
|
-
plan,
|
|
494
|
-
workspace,
|
|
495
|
-
authority,
|
|
496
|
-
plan.is_external_leader,
|
|
497
|
-
)?;
|
|
498
|
-
}
|
|
499
|
-
}
|
|
500
|
-
} else if plan.is_external_leader {
|
|
501
|
-
persist_external_leader_topology_marker(plan, workspace)?;
|
|
502
|
-
}
|
|
503
|
-
let process = run_leader_argv(&argv, &plan.leader_env, plan, workspace, None)?;
|
|
504
|
-
let code = process.status.code();
|
|
505
|
-
if !process.status.success() {
|
|
506
|
-
return Err(LeaderError::Start(leader_launcher_failure(&process)));
|
|
507
|
-
}
|
|
508
|
-
if detached {
|
|
509
|
-
Ok(LeaderLaunchOutcome {
|
|
510
|
-
status: LeaderLaunchStatus::Detached,
|
|
511
|
-
exit_code: code,
|
|
512
|
-
session_name: plan.session_name.clone(),
|
|
513
|
-
reason: None,
|
|
514
|
-
})
|
|
515
|
-
} else {
|
|
516
|
-
let _ = workspace;
|
|
517
|
-
Ok(LeaderLaunchOutcome {
|
|
518
|
-
status: LeaderLaunchStatus::Exited,
|
|
519
|
-
exit_code: code,
|
|
520
|
-
session_name: plan.session_name.clone(),
|
|
521
|
-
reason: None,
|
|
522
|
-
})
|
|
523
|
-
}
|
|
524
|
-
}
|
|
525
|
-
|
|
526
|
-
struct VerifiedAmbientPaneAuthority {
|
|
527
|
-
pane_id: PaneId,
|
|
528
|
-
observed: PaneInfo,
|
|
529
|
-
endpoint: String,
|
|
530
|
-
tmux: String,
|
|
531
|
-
}
|
|
532
|
-
|
|
533
|
-
fn workspace_state_uses_external_leader(workspace: &Path) -> bool {
|
|
534
|
-
crate::state::persist::load_runtime_state_without_migrations(workspace)
|
|
535
|
-
.ok()
|
|
536
|
-
.as_ref()
|
|
537
|
-
.is_some_and(crate::state::projection::state_is_external_leader)
|
|
538
|
-
}
|
|
539
|
-
|
|
540
|
-
fn workspace_state_is_managed_provider_reentry(workspace: &Path) -> bool {
|
|
541
|
-
let Ok(state) = crate::state::persist::load_runtime_state_without_migrations(workspace) else {
|
|
542
|
-
return false;
|
|
543
|
-
};
|
|
544
|
-
if crate::state::projection::state_is_external_leader(&state) {
|
|
545
|
-
return false;
|
|
546
|
-
}
|
|
547
|
-
let Some(team_key) = state
|
|
548
|
-
.get("active_team_key")
|
|
549
|
-
.and_then(serde_json::Value::as_str)
|
|
550
|
-
else {
|
|
551
|
-
return false;
|
|
552
|
-
};
|
|
553
|
-
let Some(receiver) = state
|
|
554
|
-
.get("teams")
|
|
555
|
-
.and_then(serde_json::Value::as_object)
|
|
556
|
-
.and_then(|teams| teams.get(team_key))
|
|
557
|
-
.and_then(|team| team.get("leader_receiver"))
|
|
558
|
-
else {
|
|
559
|
-
return false;
|
|
560
|
-
};
|
|
561
|
-
let Some(pane) = std::env::var_os("TMUX_PANE") else {
|
|
562
|
-
return false;
|
|
563
|
-
};
|
|
564
|
-
let Some(tmux) = std::env::var_os("TMUX") else {
|
|
565
|
-
return false;
|
|
566
|
-
};
|
|
567
|
-
let tmux = tmux.to_string_lossy();
|
|
568
|
-
let endpoint = tmux.split(',').next().unwrap_or("").trim();
|
|
569
|
-
receiver.get("status").and_then(serde_json::Value::as_str) == Some("attached")
|
|
570
|
-
&& receiver.get("pane_id").and_then(serde_json::Value::as_str) == pane.to_str()
|
|
571
|
-
&& receiver
|
|
572
|
-
.get("tmux_socket")
|
|
573
|
-
.and_then(serde_json::Value::as_str)
|
|
574
|
-
== Some(endpoint)
|
|
575
|
-
&& receiver
|
|
576
|
-
.get("session_name")
|
|
577
|
-
.and_then(serde_json::Value::as_str)
|
|
578
|
-
.is_some_and(|session| session.starts_with(LEADER_SESSION_PREFIX))
|
|
579
|
-
}
|
|
580
|
-
|
|
581
|
-
fn ambient_pane_authority_preflight(
|
|
582
|
-
workspace: &Path,
|
|
583
|
-
) -> Result<Option<VerifiedAmbientPaneAuthority>, PrepareLeaderStartError> {
|
|
584
|
-
let Some(tmux) = std::env::var_os("TMUX") else {
|
|
585
|
-
return Ok(None);
|
|
586
|
-
};
|
|
587
|
-
let tmux = tmux.into_string().map_err(|_| {
|
|
588
|
-
PrepareLeaderStartError::PaneAuthorityRefused(ambient_tmux_endpoint_refusal(
|
|
589
|
-
workspace,
|
|
590
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::TmuxValueNotUnicode,
|
|
591
|
-
))
|
|
592
|
-
})?;
|
|
593
|
-
verified_ambient_pane_authority(workspace, &tmux)
|
|
594
|
-
.map(Some)
|
|
595
|
-
.map_err(PrepareLeaderStartError::PaneAuthorityRefused)
|
|
596
|
-
}
|
|
597
|
-
|
|
598
|
-
fn managed_launcher_ambient_route(
|
|
599
|
-
provider: Provider,
|
|
600
|
-
provider_args: &[String],
|
|
601
|
-
workspace: &Path,
|
|
602
|
-
allow_nested_attach: bool,
|
|
603
|
-
) -> Result<
|
|
604
|
-
(
|
|
605
|
-
Option<VerifiedAmbientPaneAuthority>,
|
|
606
|
-
Option<ManagedClientAttachMode>,
|
|
607
|
-
bool,
|
|
608
|
-
),
|
|
609
|
-
PrepareLeaderStartError,
|
|
610
|
-
> {
|
|
611
|
-
let isolated = || (None, Some(ManagedClientAttachMode::AttachSession), false);
|
|
612
|
-
let authority = match ambient_pane_authority_preflight(workspace) {
|
|
613
|
-
Ok(Some(authority)) => authority,
|
|
614
|
-
Ok(None) => return Ok(isolated()),
|
|
615
|
-
Err(PrepareLeaderStartError::PaneAuthorityRefused(_)) if !allow_nested_attach => {
|
|
616
|
-
// An inherited tuple cannot authorize adoption, but an ordinary
|
|
617
|
-
// managed launch can still create its own workspace pane. Keep
|
|
618
|
-
// explicit external/attach and nested-attach intent fail-closed.
|
|
619
|
-
return Ok(isolated());
|
|
620
|
-
}
|
|
621
|
-
Err(error) => return Err(error),
|
|
622
|
-
};
|
|
623
|
-
if workspace_state_is_managed_provider_reentry(workspace)
|
|
624
|
-
|| (provider == Provider::Pi && provider_args.is_empty() && !allow_nested_attach)
|
|
625
|
-
{
|
|
626
|
-
// Only verified current-pane authority permits replacing the caller.
|
|
627
|
-
return Ok((Some(authority), None, true));
|
|
628
|
-
}
|
|
629
|
-
let target_endpoint = crate::tmux_backend::socket_path_for_workspace(workspace);
|
|
630
|
-
let same_server = target_endpoint.as_ref().is_some_and(|target| {
|
|
631
|
-
let observed = Path::new(&authority.endpoint)
|
|
632
|
-
.canonicalize()
|
|
633
|
-
.unwrap_or_else(|_| PathBuf::from(&authority.endpoint));
|
|
634
|
-
let target = target.canonicalize().unwrap_or_else(|_| target.clone());
|
|
635
|
-
observed == target
|
|
636
|
-
});
|
|
637
|
-
if same_server {
|
|
638
|
-
return Ok((
|
|
639
|
-
Some(authority),
|
|
640
|
-
Some(ManagedClientAttachMode::SwitchClient),
|
|
641
|
-
false,
|
|
642
|
-
));
|
|
643
|
-
}
|
|
644
|
-
if allow_nested_attach {
|
|
645
|
-
return Ok((
|
|
646
|
-
Some(authority),
|
|
647
|
-
Some(ManagedClientAttachMode::AttachSession),
|
|
648
|
-
false,
|
|
649
|
-
));
|
|
650
|
-
}
|
|
651
|
-
// Do not switch/adopt the unrelated server. The existing managed attach
|
|
652
|
-
// child clears TMUX/TMUX_PANE without changing the caller's environment.
|
|
653
|
-
Ok(isolated())
|
|
654
|
-
}
|
|
655
|
-
|
|
656
|
-
fn validated_ambient_tmux_endpoint(
|
|
657
|
-
workspace: &Path,
|
|
658
|
-
tmux: &str,
|
|
659
|
-
) -> Result<String, pane_refusal::PaneAuthorityRefusal> {
|
|
660
|
-
let tuple = tmux.split(',').map(str::trim).collect::<Vec<_>>();
|
|
661
|
-
let [endpoint, server_pid, session_index] = tuple.as_slice() else {
|
|
662
|
-
return Err(ambient_tmux_endpoint_refusal(
|
|
663
|
-
workspace,
|
|
664
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::TmuxTupleFieldCountInvalid,
|
|
665
|
-
));
|
|
666
|
-
};
|
|
667
|
-
if endpoint.is_empty() {
|
|
668
|
-
return Err(ambient_tmux_endpoint_refusal(
|
|
669
|
-
workspace,
|
|
670
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::EndpointMissing,
|
|
671
|
-
));
|
|
672
|
-
}
|
|
673
|
-
if !Path::new(endpoint).is_absolute() {
|
|
674
|
-
return Err(ambient_tmux_endpoint_refusal(
|
|
675
|
-
workspace,
|
|
676
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::EndpointNotAbsolute,
|
|
677
|
-
));
|
|
678
|
-
}
|
|
679
|
-
if server_pid.parse::<u32>().is_err() {
|
|
680
|
-
return Err(ambient_tmux_endpoint_refusal(
|
|
681
|
-
workspace,
|
|
682
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::ServerPidInvalid,
|
|
683
|
-
));
|
|
684
|
-
}
|
|
685
|
-
if session_index.parse::<u32>().is_err() {
|
|
686
|
-
return Err(ambient_tmux_endpoint_refusal(
|
|
687
|
-
workspace,
|
|
688
|
-
pane_refusal::AmbientTmuxEndpointUnavailableCause::SessionIndexInvalid,
|
|
689
|
-
));
|
|
690
|
-
}
|
|
691
|
-
Ok((*endpoint).to_string())
|
|
692
|
-
}
|
|
693
|
-
|
|
694
|
-
fn verified_ambient_pane_authority(
|
|
695
|
-
workspace: &Path,
|
|
696
|
-
tmux: &str,
|
|
697
|
-
) -> Result<VerifiedAmbientPaneAuthority, pane_refusal::PaneAuthorityRefusal> {
|
|
698
|
-
let requested_workspace = resolve_workspace_for_hash(workspace);
|
|
699
|
-
let endpoint = validated_ambient_tmux_endpoint(workspace, tmux)?;
|
|
700
|
-
let pane_id = match std::env::var_os("TMUX_PANE") {
|
|
701
|
-
None => {
|
|
702
|
-
return Err(pane_refusal::PaneAuthorityRefusal::new(
|
|
703
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientPaneIdUnavailable(
|
|
704
|
-
pane_refusal::AmbientPaneIdUnavailableFacts {
|
|
705
|
-
requested_workspace,
|
|
706
|
-
observed_pane_id: pane_refusal::UnavailablePaneAuthorityFact::new(
|
|
707
|
-
pane_refusal::AmbientPaneIdUnavailableCause::EnvironmentValueMissing,
|
|
708
|
-
),
|
|
709
|
-
endpoint,
|
|
710
|
-
},
|
|
711
|
-
),
|
|
712
|
-
));
|
|
713
|
-
}
|
|
714
|
-
Some(value) => match value.into_string() {
|
|
715
|
-
Ok(value) if value.trim().is_empty() => {
|
|
716
|
-
return Err(pane_refusal::PaneAuthorityRefusal::new(
|
|
717
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientPaneIdUnavailable(
|
|
718
|
-
pane_refusal::AmbientPaneIdUnavailableFacts {
|
|
719
|
-
requested_workspace,
|
|
720
|
-
observed_pane_id: pane_refusal::UnavailablePaneAuthorityFact::new(
|
|
721
|
-
pane_refusal::AmbientPaneIdUnavailableCause::EnvironmentValueEmpty,
|
|
722
|
-
),
|
|
723
|
-
endpoint,
|
|
724
|
-
},
|
|
725
|
-
),
|
|
726
|
-
));
|
|
727
|
-
}
|
|
728
|
-
Ok(value) => PaneId::new(value.trim().to_string()),
|
|
729
|
-
Err(_) => {
|
|
730
|
-
return Err(pane_refusal::PaneAuthorityRefusal::new(
|
|
731
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientPaneIdUnavailable(
|
|
732
|
-
pane_refusal::AmbientPaneIdUnavailableFacts {
|
|
733
|
-
requested_workspace,
|
|
734
|
-
observed_pane_id: pane_refusal::UnavailablePaneAuthorityFact::new(
|
|
735
|
-
pane_refusal::AmbientPaneIdUnavailableCause::EnvironmentValueNotUnicode,
|
|
736
|
-
),
|
|
737
|
-
endpoint,
|
|
738
|
-
},
|
|
739
|
-
),
|
|
740
|
-
));
|
|
741
|
-
}
|
|
742
|
-
},
|
|
743
|
-
};
|
|
744
|
-
let observed = current_tmux_pane_info(&pane_id, &endpoint).map_err(|error| {
|
|
745
|
-
let cause = match error {
|
|
746
|
-
CurrentTmuxPaneInfoError::QueryFailed => {
|
|
747
|
-
pane_refusal::AmbientPaneWorkspaceUnavailableCause::PaneQueryFailed
|
|
748
|
-
}
|
|
749
|
-
CurrentTmuxPaneInfoError::PaneNotFound => {
|
|
750
|
-
pane_refusal::AmbientPaneWorkspaceUnavailableCause::PaneNotFound
|
|
751
|
-
}
|
|
752
|
-
};
|
|
753
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
754
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientPaneWorkspaceUnavailable(
|
|
755
|
-
pane_refusal::AmbientPaneWorkspaceUnavailableFacts {
|
|
756
|
-
requested_workspace: requested_workspace.clone(),
|
|
757
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
758
|
-
observed_pane_workspace: pane_refusal::UnavailablePaneAuthorityFact::new(cause),
|
|
759
|
-
endpoint: endpoint.clone(),
|
|
760
|
-
},
|
|
761
|
-
),
|
|
762
|
-
)
|
|
763
|
-
})?;
|
|
764
|
-
let pane_workspace = observed.current_path.clone().ok_or_else(|| {
|
|
765
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
766
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientPaneWorkspaceUnavailable(
|
|
767
|
-
pane_refusal::AmbientPaneWorkspaceUnavailableFacts {
|
|
768
|
-
requested_workspace: requested_workspace.clone(),
|
|
769
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
770
|
-
observed_pane_workspace: pane_refusal::UnavailablePaneAuthorityFact::new(
|
|
771
|
-
pane_refusal::AmbientPaneWorkspaceUnavailableCause::CurrentPathMissing,
|
|
772
|
-
),
|
|
773
|
-
endpoint: endpoint.clone(),
|
|
774
|
-
},
|
|
775
|
-
),
|
|
776
|
-
)
|
|
777
|
-
})?;
|
|
778
|
-
let caller_tty = caller_controlling_tty().map_err(|cause| {
|
|
779
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
780
|
-
pane_refusal::PaneAuthorityRefusalFacts::CallerControllingTtyUnavailable(
|
|
781
|
-
pane_refusal::CallerControllingTtyUnavailableFacts {
|
|
782
|
-
requested_workspace: requested_workspace.clone(),
|
|
783
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
784
|
-
endpoint: endpoint.clone(),
|
|
785
|
-
caller_controlling_tty: pane_refusal::UnavailablePaneAuthorityFact::new(cause),
|
|
786
|
-
},
|
|
787
|
-
),
|
|
788
|
-
)
|
|
789
|
-
})?;
|
|
790
|
-
let pane_tty_path = observed.tty.as_deref().ok_or_else(|| {
|
|
791
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
792
|
-
pane_refusal::PaneAuthorityRefusalFacts::ObservedPaneTtyUnavailable(
|
|
793
|
-
pane_refusal::ObservedPaneTtyUnavailableFacts {
|
|
794
|
-
requested_workspace: requested_workspace.clone(),
|
|
795
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
796
|
-
endpoint: endpoint.clone(),
|
|
797
|
-
observed_pane_tty: pane_refusal::UnavailablePaneAuthorityFact::new(
|
|
798
|
-
pane_refusal::ObservedPaneTtyUnavailableCause::PaneTtyMissing,
|
|
799
|
-
),
|
|
800
|
-
},
|
|
801
|
-
),
|
|
802
|
-
)
|
|
803
|
-
})?;
|
|
804
|
-
let pane_tty = pane_tty_device(pane_tty_path).map_err(|cause| {
|
|
805
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
806
|
-
pane_refusal::PaneAuthorityRefusalFacts::ObservedPaneTtyUnavailable(
|
|
807
|
-
pane_refusal::ObservedPaneTtyUnavailableFacts {
|
|
808
|
-
requested_workspace: requested_workspace.clone(),
|
|
809
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
810
|
-
endpoint: endpoint.clone(),
|
|
811
|
-
observed_pane_tty: pane_refusal::UnavailablePaneAuthorityFact::new(cause),
|
|
812
|
-
},
|
|
813
|
-
),
|
|
814
|
-
)
|
|
815
|
-
})?;
|
|
816
|
-
if caller_tty != pane_tty {
|
|
817
|
-
return Err(pane_refusal::PaneAuthorityRefusal::new(
|
|
818
|
-
pane_refusal::PaneAuthorityRefusalFacts::PaneTtyMismatch(
|
|
819
|
-
pane_refusal::PaneTtyMismatchFacts {
|
|
820
|
-
requested_workspace,
|
|
821
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
822
|
-
endpoint,
|
|
823
|
-
caller_controlling_tty: caller_tty,
|
|
824
|
-
observed_pane_tty: pane_tty,
|
|
825
|
-
},
|
|
826
|
-
),
|
|
827
|
-
));
|
|
828
|
-
}
|
|
829
|
-
if !crate::messaging::leader_channel::path_is_in_workspace(&pane_workspace, workspace) {
|
|
830
|
-
return Err(pane_refusal::PaneAuthorityRefusal::new(
|
|
831
|
-
pane_refusal::PaneAuthorityRefusalFacts::PaneWorkspaceMismatch(
|
|
832
|
-
pane_refusal::PaneWorkspaceMismatchFacts {
|
|
833
|
-
requested_workspace,
|
|
834
|
-
observed_pane_id: pane_id.as_str().to_string(),
|
|
835
|
-
observed_pane_workspace: pane_workspace,
|
|
836
|
-
endpoint,
|
|
837
|
-
},
|
|
838
|
-
),
|
|
839
|
-
));
|
|
840
|
-
}
|
|
841
|
-
Ok(VerifiedAmbientPaneAuthority {
|
|
842
|
-
pane_id,
|
|
843
|
-
observed,
|
|
844
|
-
endpoint,
|
|
845
|
-
tmux: tmux.to_string(),
|
|
846
|
-
})
|
|
847
|
-
}
|
|
848
|
-
|
|
849
|
-
fn ambient_tmux_endpoint_refusal(
|
|
850
|
-
workspace: &Path,
|
|
851
|
-
cause: pane_refusal::AmbientTmuxEndpointUnavailableCause,
|
|
852
|
-
) -> pane_refusal::PaneAuthorityRefusal {
|
|
853
|
-
pane_refusal::PaneAuthorityRefusal::new(
|
|
854
|
-
pane_refusal::PaneAuthorityRefusalFacts::AmbientTmuxEndpointUnavailable(
|
|
855
|
-
pane_refusal::AmbientTmuxEndpointUnavailableFacts {
|
|
856
|
-
requested_workspace: resolve_workspace_for_hash(workspace),
|
|
857
|
-
endpoint: pane_refusal::UnavailablePaneAuthorityFact::new(cause),
|
|
858
|
-
},
|
|
859
|
-
),
|
|
860
|
-
)
|
|
861
|
-
}
|
|
862
|
-
|
|
863
|
-
#[cfg(target_os = "macos")]
|
|
864
|
-
fn caller_controlling_tty() -> Result<u64, pane_refusal::CallerControllingTtyUnavailableCause> {
|
|
865
|
-
// `/dev/tty` proves that this process has a controlling terminal, but its
|
|
866
|
-
// own path and rdev remain the generic alias. Query the process table for
|
|
867
|
-
// the actual controlling device identity.
|
|
868
|
-
let _controlling_tty = std::fs::File::open("/dev/tty")
|
|
869
|
-
.map_err(|_| pane_refusal::CallerControllingTtyUnavailableCause::NoControllingTty)?;
|
|
870
|
-
let mut info = std::mem::MaybeUninit::<libc::proc_bsdinfo>::zeroed();
|
|
871
|
-
let info_size = std::mem::size_of::<libc::proc_bsdinfo>();
|
|
872
|
-
let read = unsafe {
|
|
873
|
-
libc::proc_pidinfo(
|
|
874
|
-
libc::getpid(),
|
|
875
|
-
libc::PROC_PIDTBSDINFO,
|
|
876
|
-
0,
|
|
877
|
-
info.as_mut_ptr().cast(),
|
|
878
|
-
info_size as libc::c_int,
|
|
879
|
-
)
|
|
880
|
-
};
|
|
881
|
-
if read != info_size as libc::c_int {
|
|
882
|
-
return Err(pane_refusal::CallerControllingTtyUnavailableCause::DeviceIdentityUnresolvable);
|
|
883
|
-
}
|
|
884
|
-
Ok(u64::from(unsafe { info.assume_init() }.e_tdev))
|
|
885
|
-
}
|
|
886
|
-
|
|
887
|
-
#[cfg(target_os = "linux")]
|
|
888
|
-
fn caller_controlling_tty() -> Result<u64, pane_refusal::CallerControllingTtyUnavailableCause> {
|
|
889
|
-
let controlling_tty = std::fs::OpenOptions::new()
|
|
890
|
-
.read(true)
|
|
891
|
-
.custom_flags(libc::O_NOCTTY | libc::O_CLOEXEC)
|
|
892
|
-
.open("/dev/tty")
|
|
893
|
-
.map_err(|_| pane_refusal::CallerControllingTtyUnavailableCause::NoControllingTty)?;
|
|
894
|
-
let mut device = 0 as libc::c_uint;
|
|
895
|
-
let result = unsafe { libc::ioctl(controlling_tty.as_raw_fd(), libc::TIOCGDEV, &mut device) };
|
|
896
|
-
if result != 0 {
|
|
897
|
-
return Err(pane_refusal::CallerControllingTtyUnavailableCause::DeviceIdentityUnresolvable);
|
|
898
|
-
}
|
|
899
|
-
Ok(u64::from(device))
|
|
900
|
-
}
|
|
901
|
-
|
|
902
|
-
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
|
|
903
|
-
fn caller_controlling_tty() -> Result<u64, pane_refusal::CallerControllingTtyUnavailableCause> {
|
|
904
|
-
Err(pane_refusal::CallerControllingTtyUnavailableCause::PlatformUnsupported)
|
|
905
|
-
}
|
|
906
|
-
|
|
907
|
-
#[cfg(unix)]
|
|
908
|
-
fn pane_tty_device(path: &str) -> Result<u64, pane_refusal::ObservedPaneTtyUnavailableCause> {
|
|
909
|
-
let pane_tty = std::fs::OpenOptions::new()
|
|
910
|
-
.read(true)
|
|
911
|
-
.custom_flags(libc::O_NOCTTY | libc::O_CLOEXEC)
|
|
912
|
-
.open(path)
|
|
913
|
-
.map_err(|_| pane_refusal::ObservedPaneTtyUnavailableCause::PaneTtyUnresolvable)?;
|
|
914
|
-
let metadata = pane_tty
|
|
915
|
-
.metadata()
|
|
916
|
-
.map_err(|_| pane_refusal::ObservedPaneTtyUnavailableCause::PaneTtyUnresolvable)?;
|
|
917
|
-
if !metadata.file_type().is_char_device() {
|
|
918
|
-
return Err(pane_refusal::ObservedPaneTtyUnavailableCause::PaneTtyNotCharacterDevice);
|
|
919
|
-
}
|
|
920
|
-
Ok(metadata.rdev())
|
|
921
|
-
}
|
|
922
|
-
|
|
923
|
-
#[cfg(not(unix))]
|
|
924
|
-
fn pane_tty_device(_path: &str) -> Result<u64, pane_refusal::ObservedPaneTtyUnavailableCause> {
|
|
925
|
-
Err(pane_refusal::ObservedPaneTtyUnavailableCause::PaneTtyUnresolvable)
|
|
926
|
-
}
|
|
927
|
-
|
|
928
|
-
/// B5: the deterministic leader-session naming prefix IS the ownership truth source —
|
|
929
|
-
/// shutdown's socket teardown spares sessions carrying it (no separate registry).
|
|
930
|
-
pub const LEADER_SESSION_PREFIX: &str = "team-agent-leader-";
|
|
931
|
-
|
|
932
|
-
/// `leader_session_name`(card §48;`__init__.py:186`)。确定派生 tmux session 名
|
|
933
|
-
/// `team-agent-leader-<provider>-<folder>-<sha1[:8]>`(workspace.resolve() 的 sha1 前 8 hex)。
|
|
934
|
-
pub fn leader_session_name(provider: Provider, workspace: &Path) -> SessionName {
|
|
935
|
-
let resolved = resolve_workspace_for_hash(workspace);
|
|
936
|
-
let folder_raw = resolved
|
|
937
|
-
.file_name()
|
|
938
|
-
.and_then(|n| n.to_str())
|
|
939
|
-
.unwrap_or("workspace");
|
|
940
|
-
let folder = sanitize_session_folder(folder_raw);
|
|
941
|
-
let hash = sha1_hex_prefix(resolved.to_string_lossy().as_bytes(), 8);
|
|
942
|
-
SessionName::new(format!(
|
|
943
|
-
"{LEADER_SESSION_PREFIX}{}-{folder}-{hash}",
|
|
944
|
-
provider_wire(provider)
|
|
945
|
-
))
|
|
946
|
-
}
|
|
947
|
-
|
|
948
|
-
/// 0.4.10+ mirror-session fix v2: managed-mode session name with a
|
|
949
|
-
/// per-launch nonce.
|
|
950
|
-
///
|
|
951
|
-
/// Format: `team-agent-leader-<provider>-<folder>-<hash>-<nonce>`.
|
|
952
|
-
/// `nonce` = `<pid_hex>-<epoch_nanos_hex>`. The pid distinguishes
|
|
953
|
-
/// concurrent launches; the epoch_nanos distinguishes sequential ones.
|
|
954
|
-
///
|
|
955
|
-
/// Each `team-agent <provider>` entry in the managed (non-tmux) path gets
|
|
956
|
-
/// its OWN session, matching the user expectation that `tmux new-session
|
|
957
|
-
/// + claude` is independent every time. The workspace-keyed prefix is
|
|
958
|
-
/// preserved so existing leader-session-anchored protections
|
|
959
|
-
/// (`LEADER_SESSION_PREFIX` matchers in shutdown/cli/mod.rs) still
|
|
960
|
-
/// classify these sessions as leader sessions.
|
|
961
|
-
///
|
|
962
|
-
/// External / attach paths keep the stable `leader_session_name` —
|
|
963
|
-
/// per-launch nonce would break `--attach-session <name>` reattach
|
|
964
|
-
/// semantics.
|
|
965
|
-
fn managed_leader_session_name(provider: Provider, workspace: &Path) -> SessionName {
|
|
966
|
-
let resolved = resolve_workspace_for_hash(workspace);
|
|
967
|
-
let folder_raw = resolved
|
|
968
|
-
.file_name()
|
|
969
|
-
.and_then(|n| n.to_str())
|
|
970
|
-
.unwrap_or("workspace");
|
|
971
|
-
let folder = sanitize_session_folder(folder_raw);
|
|
972
|
-
let hash = sha1_hex_prefix(resolved.to_string_lossy().as_bytes(), 8);
|
|
973
|
-
let pid = std::process::id();
|
|
974
|
-
let epoch_nanos = std::time::SystemTime::now()
|
|
975
|
-
.duration_since(std::time::UNIX_EPOCH)
|
|
976
|
-
.map(|d| d.as_nanos())
|
|
977
|
-
.unwrap_or(0);
|
|
978
|
-
SessionName::new(format!(
|
|
979
|
-
"{LEADER_SESSION_PREFIX}{}-{folder}-{hash}-{pid:x}-{epoch_nanos:x}",
|
|
980
|
-
provider_wire(provider)
|
|
981
|
-
))
|
|
982
|
-
}
|
|
983
|
-
|
|
984
|
-
fn managed_leader_session_for_launch(provider: Provider, workspace: &Path) -> SessionName {
|
|
985
|
-
let candidates = crate::transport_factory::tmux_workspace_transport(workspace)
|
|
986
|
-
.list_targets()
|
|
987
|
-
.unwrap_or_default()
|
|
988
|
-
.into_iter()
|
|
989
|
-
.map(|target| target.session.as_str().to_string());
|
|
990
|
-
managed_leader_session_from_candidates(provider, workspace, candidates)
|
|
991
|
-
}
|
|
992
|
-
|
|
993
|
-
fn managed_leader_session_from_candidates(
|
|
994
|
-
provider: Provider,
|
|
995
|
-
workspace: &Path,
|
|
996
|
-
candidates: impl IntoIterator<Item = String>,
|
|
997
|
-
) -> SessionName {
|
|
998
|
-
let prefix = format!("{LEADER_SESSION_PREFIX}{}-", provider_wire(provider));
|
|
999
|
-
let existing = candidates
|
|
1000
|
-
.into_iter()
|
|
1001
|
-
.filter(|name| name.starts_with(&prefix))
|
|
1002
|
-
.collect::<std::collections::BTreeSet<_>>();
|
|
1003
|
-
existing
|
|
1004
|
-
.into_iter()
|
|
1005
|
-
.next()
|
|
1006
|
-
.map(SessionName::new)
|
|
1007
|
-
.unwrap_or_else(|| managed_leader_session_name(provider, workspace))
|
|
1008
|
-
}
|
|
1009
|
-
|
|
1010
|
-
/// Base window is `provider_wire` (`claude_code`). A second live leader in
|
|
1011
|
-
/// the same session cannot reuse that name: tmux then fails
|
|
1012
|
-
/// `attach-session -t SESSION:claude_code` with `can't find window`.
|
|
1013
|
-
fn managed_leader_window_from_occupied(
|
|
1014
|
-
base: &str,
|
|
1015
|
-
occupied: impl IntoIterator<Item = String>,
|
|
1016
|
-
nonce: &str,
|
|
1017
|
-
) -> WindowName {
|
|
1018
|
-
let occupied = occupied
|
|
1019
|
-
.into_iter()
|
|
1020
|
-
.collect::<std::collections::BTreeSet<_>>();
|
|
1021
|
-
if !occupied.contains(base) {
|
|
1022
|
-
return WindowName::new(base);
|
|
1023
|
-
}
|
|
1024
|
-
let mut candidate = format!("{base}-{nonce}");
|
|
1025
|
-
let mut n = 2u32;
|
|
1026
|
-
while occupied.contains(&candidate) {
|
|
1027
|
-
candidate = format!("{base}-{nonce}-{n}");
|
|
1028
|
-
n = n.saturating_add(1);
|
|
1029
|
-
if n > 32 {
|
|
1030
|
-
break;
|
|
1031
|
-
}
|
|
1032
|
-
}
|
|
1033
|
-
WindowName::new(candidate)
|
|
1034
|
-
}
|
|
1035
|
-
|
|
1036
|
-
fn managed_leader_window_for_launch(
|
|
1037
|
-
provider: Provider,
|
|
1038
|
-
workspace: &Path,
|
|
1039
|
-
session: &SessionName,
|
|
1040
|
-
) -> WindowName {
|
|
1041
|
-
let base = provider_wire(provider);
|
|
1042
|
-
let transport = crate::transport_factory::tmux_workspace_transport(workspace);
|
|
1043
|
-
let session_exists = transport.has_session(session).unwrap_or(false);
|
|
1044
|
-
if !session_exists {
|
|
1045
|
-
return WindowName::new(base);
|
|
1046
|
-
}
|
|
1047
|
-
let occupied = match transport.list_windows(session) {
|
|
1048
|
-
Ok(windows) => windows
|
|
1049
|
-
.into_iter()
|
|
1050
|
-
.map(|window| window.as_str().to_string())
|
|
1051
|
-
.collect::<Vec<_>>(),
|
|
1052
|
-
// Cannot prove the base name is free: suffix rather than collide.
|
|
1053
|
-
Err(_) => vec![base.to_string()],
|
|
1054
|
-
};
|
|
1055
|
-
let pid = std::process::id();
|
|
1056
|
-
let epoch_nanos = std::time::SystemTime::now()
|
|
1057
|
-
.duration_since(std::time::UNIX_EPOCH)
|
|
1058
|
-
.map(|d| d.as_nanos())
|
|
1059
|
-
.unwrap_or(0);
|
|
1060
|
-
let nonce = format!("{pid:x}-{epoch_nanos:x}");
|
|
1061
|
-
managed_leader_window_from_occupied(base, occupied, &nonce)
|
|
1062
|
-
}
|
|
1063
|
-
|
|
1064
|
-
fn start_argv(
|
|
1065
|
-
mode: LeaderStartMode,
|
|
1066
|
-
provider: Provider,
|
|
1067
|
-
provider_argv: &[String],
|
|
1068
|
-
workspace: &Path,
|
|
1069
|
-
session_name: Option<&SessionName>,
|
|
1070
|
-
leader_window: Option<&WindowName>,
|
|
1071
|
-
leader_env: &BTreeMap<String, String>,
|
|
1072
|
-
managed_client_attach_mode: Option<ManagedClientAttachMode>,
|
|
1073
|
-
) -> Result<Vec<String>, LeaderError> {
|
|
1074
|
-
match mode {
|
|
1075
|
-
LeaderStartMode::ExecProvider => Ok(provider_argv.to_vec()),
|
|
1076
|
-
LeaderStartMode::ManagedTmuxClient => {
|
|
1077
|
-
let Some(session) = session_name else {
|
|
1078
|
-
return Err(LeaderError::Start(
|
|
1079
|
-
"managed leader session missing".to_string(),
|
|
1080
|
-
));
|
|
1081
|
-
};
|
|
1082
|
-
let Some(window) = leader_window else {
|
|
1083
|
-
return Err(LeaderError::Start(
|
|
1084
|
-
"managed leader window missing".to_string(),
|
|
1085
|
-
));
|
|
1086
|
-
};
|
|
1087
|
-
let attach_mode = managed_client_attach_mode.ok_or_else(|| {
|
|
1088
|
-
LeaderError::Start("managed client attach mode missing".to_string())
|
|
1089
|
-
})?;
|
|
1090
|
-
managed_client_argv(workspace, session, window, attach_mode)
|
|
1091
|
-
}
|
|
1092
|
-
LeaderStartMode::AttachExisting => {
|
|
1093
|
-
let Some(session) = session_name else {
|
|
1094
|
-
return Err(LeaderError::Start("attach session missing".to_string()));
|
|
1095
|
-
};
|
|
1096
|
-
let argv = vec![
|
|
1097
|
-
"tmux".to_string(),
|
|
1098
|
-
"attach-session".to_string(),
|
|
1099
|
-
"-t".to_string(),
|
|
1100
|
-
session.as_str().to_string(),
|
|
1101
|
-
];
|
|
1102
|
-
Ok(TmuxBackend::argv_for_workspace(workspace, &argv))
|
|
1103
|
-
}
|
|
1104
|
-
LeaderStartMode::NewTmuxSession => {
|
|
1105
|
-
let Some(session) = session_name else {
|
|
1106
|
-
return Err(LeaderError::Start("leader session missing".to_string()));
|
|
1107
|
-
};
|
|
1108
|
-
let resolved_workspace = resolve_workspace_for_hash(workspace);
|
|
1109
|
-
let mut exports = leader_export_assignments(leader_env);
|
|
1110
|
-
if let Some(path) = std::env::var_os("PATH").and_then(|p| p.into_string().ok()) {
|
|
1111
|
-
exports.push(shlex_quote(&format!("PATH={path}")));
|
|
1112
|
-
}
|
|
1113
|
-
let shell = format!(
|
|
1114
|
-
"cd {} && export {} && exec {}",
|
|
1115
|
-
shlex_quote(&resolved_workspace.to_string_lossy()),
|
|
1116
|
-
exports.join(" "),
|
|
1117
|
-
shell_join(provider_argv)
|
|
1118
|
-
);
|
|
1119
|
-
let argv = vec![
|
|
1120
|
-
"tmux".to_string(),
|
|
1121
|
-
"new-session".to_string(),
|
|
1122
|
-
"-s".to_string(),
|
|
1123
|
-
session.as_str().to_string(),
|
|
1124
|
-
"-n".to_string(),
|
|
1125
|
-
provider_wire(provider).to_string(),
|
|
1126
|
-
"-c".to_string(),
|
|
1127
|
-
resolved_workspace.to_string_lossy().into_owned(),
|
|
1128
|
-
"sh".to_string(),
|
|
1129
|
-
"-lc".to_string(),
|
|
1130
|
-
shell,
|
|
1131
|
-
];
|
|
1132
|
-
Ok(TmuxBackend::argv_for_workspace(workspace, &argv))
|
|
1133
|
-
}
|
|
1134
|
-
}
|
|
1135
|
-
}
|
|
1136
|
-
|
|
1137
|
-
fn provider_command_argv(provider: Provider, provider_args: &[String]) -> Vec<String> {
|
|
1138
|
-
let mut argv = vec![provider_command_name(provider).to_string()];
|
|
1139
|
-
argv.extend(normalized_provider_args(provider_args));
|
|
1140
|
-
argv
|
|
1141
|
-
}
|
|
1142
|
-
|
|
1143
|
-
fn normalized_provider_args(provider_args: &[String]) -> impl Iterator<Item = String> + '_ {
|
|
1144
|
-
provider_args
|
|
1145
|
-
.iter()
|
|
1146
|
-
.skip(usize::from(
|
|
1147
|
-
provider_args.first().is_some_and(|arg| arg == "--"),
|
|
1148
|
-
))
|
|
1149
|
-
.cloned()
|
|
1150
|
-
}
|
|
1151
|
-
|
|
1152
|
-
// 0.3.28 Step 2: `managed_team_session_name` deleted. Both paths use the
|
|
1153
|
-
// dedicated leader-session namespace; managed launches select a live prefix
|
|
1154
|
-
// candidate before falling back to the nonce helper, while external/attach
|
|
1155
|
-
// launches use the stable `leader_session_name`.
|
|
1156
|
-
|
|
1157
|
-
fn managed_client_argv(
|
|
1158
|
-
workspace: &Path,
|
|
1159
|
-
session: &SessionName,
|
|
1160
|
-
window: &WindowName,
|
|
1161
|
-
attach_mode: ManagedClientAttachMode,
|
|
1162
|
-
) -> Result<Vec<String>, LeaderError> {
|
|
1163
|
-
// Attach to the launch's actual window (base `provider_wire` or a unique
|
|
1164
|
-
// suffix). Targeting only `provider_wire` collides when two live leaders
|
|
1165
|
-
// share the A-22 session (`can't find window: claude_code`).
|
|
1166
|
-
let target = format!("{}:{}", session.as_str(), window.as_str());
|
|
1167
|
-
let argv = match attach_mode {
|
|
1168
|
-
ManagedClientAttachMode::SwitchClient => vec![
|
|
1169
|
-
"tmux".to_string(),
|
|
1170
|
-
"switch-client".to_string(),
|
|
1171
|
-
"-t".to_string(),
|
|
1172
|
-
target,
|
|
1173
|
-
],
|
|
1174
|
-
ManagedClientAttachMode::AttachSession => vec![
|
|
1175
|
-
"tmux".to_string(),
|
|
1176
|
-
"attach-session".to_string(),
|
|
1177
|
-
"-t".to_string(),
|
|
1178
|
-
target,
|
|
1179
|
-
],
|
|
1180
|
-
};
|
|
1181
|
-
Ok(TmuxBackend::argv_for_workspace(workspace, &argv))
|
|
1182
|
-
}
|
|
1183
|
-
|
|
1184
|
-
fn execute_managed_leader_plan(
|
|
1185
|
-
plan: &LeaderStartPlan,
|
|
1186
|
-
workspace: &Path,
|
|
1187
|
-
) -> Result<LeaderLaunchOutcome, LeaderError> {
|
|
1188
|
-
execute_managed_leader_plan_attempt(plan, workspace, true)
|
|
1189
|
-
}
|
|
1190
|
-
|
|
1191
|
-
fn execute_managed_leader_plan_attempt(
|
|
1192
|
-
plan: &LeaderStartPlan,
|
|
1193
|
-
workspace: &Path,
|
|
1194
|
-
allow_attach_recovery: bool,
|
|
1195
|
-
) -> Result<LeaderLaunchOutcome, LeaderError> {
|
|
1196
|
-
let Some(session) = plan.session_name.as_ref() else {
|
|
1197
|
-
return Err(LeaderError::Start(
|
|
1198
|
-
"managed leader session missing".to_string(),
|
|
1199
|
-
));
|
|
1200
|
-
};
|
|
1201
|
-
let Some(window) = plan.leader_window.as_ref() else {
|
|
1202
|
-
return Err(LeaderError::Start(
|
|
1203
|
-
"managed leader window missing".to_string(),
|
|
1204
|
-
));
|
|
1205
|
-
};
|
|
1206
|
-
// 0.5.x Phase 1d Batch 6: use the factory tmux channel helper
|
|
1207
|
-
// (thin wrapper over `TmuxBackend::for_workspace`) for
|
|
1208
|
-
// grep-visibility of every intentional tmux-only leader-launcher
|
|
1209
|
-
// site. Semantics unchanged; managed leader hosting stays
|
|
1210
|
-
// tmux-only per design §Batch 6.
|
|
1211
|
-
let transport = crate::transport_factory::tmux_workspace_transport(workspace);
|
|
1212
|
-
let session_existed_before = transport.has_session(session).map_err(|error| {
|
|
1213
|
-
LeaderError::Start(format!("managed leader session probe failed: {error}"))
|
|
1214
|
-
})?;
|
|
1215
|
-
let spawned = ensure_managed_leader_pane(
|
|
1216
|
-
&transport,
|
|
1217
|
-
session,
|
|
1218
|
-
window,
|
|
1219
|
-
plan,
|
|
1220
|
-
workspace,
|
|
1221
|
-
session_existed_before,
|
|
1222
|
-
)?;
|
|
1223
|
-
// A-55 (window rename race): tmux defaults `allow-rename` + `automatic-rename`
|
|
1224
|
-
// ON, so the pane's shell wrapper can print an OSC title-set escape during
|
|
1225
|
-
// init (zshrc/starship/PROMPT_COMMAND) and rename the window away from WINDOW
|
|
1226
|
-
// between spawn-poll and attach — making `attach-session -t SESSION:WINDOW`
|
|
1227
|
-
// fail with "can't find window: WINDOW". Lock both off right after spawn,
|
|
1228
|
-
// before run_leader_argv. Best-effort: a failure must NOT abort the launcher
|
|
1229
|
-
// (old tmux may lack the option), but it is audited below.
|
|
1230
|
-
let (rename_result, rename_stderr) =
|
|
1231
|
-
lock_down_window_rename(&transport, session, &spawned.window);
|
|
1232
|
-
write_window_rename_lockdown_event(workspace, &rename_result, &rename_stderr);
|
|
1233
|
-
if let Err(error) = persist_managed_leader_binding(plan, workspace, &spawned) {
|
|
1234
|
-
cleanup_managed_leader_resources(
|
|
1235
|
-
&transport,
|
|
1236
|
-
session,
|
|
1237
|
-
&spawned,
|
|
1238
|
-
session_existed_before,
|
|
1239
|
-
workspace,
|
|
1240
|
-
"binding_persist_failed",
|
|
1241
|
-
);
|
|
1242
|
-
return Err(error);
|
|
1243
|
-
}
|
|
1244
|
-
spawn_managed_provider_startup_prompt_handler(
|
|
1245
|
-
plan.provider,
|
|
1246
|
-
workspace.to_path_buf(),
|
|
1247
|
-
spawned.pane_id.as_str().to_string(),
|
|
1248
|
-
);
|
|
1249
|
-
let process = match run_leader_argv(
|
|
1250
|
-
&plan.argv,
|
|
1251
|
-
&BTreeMap::new(),
|
|
1252
|
-
plan,
|
|
1253
|
-
workspace,
|
|
1254
|
-
Some(ManagedAttachWatch {
|
|
1255
|
-
transport: &transport,
|
|
1256
|
-
spawned: &spawned,
|
|
1257
|
-
session,
|
|
1258
|
-
session_existed_before,
|
|
1259
|
-
workspace,
|
|
1260
|
-
provider_label: provider_command_name(plan.provider),
|
|
1261
|
-
}),
|
|
1262
|
-
) {
|
|
1263
|
-
Ok(process) => process,
|
|
1264
|
-
Err(error) => {
|
|
1265
|
-
cleanup_managed_leader_resources(
|
|
1266
|
-
&transport,
|
|
1267
|
-
session,
|
|
1268
|
-
&spawned,
|
|
1269
|
-
session_existed_before,
|
|
1270
|
-
workspace,
|
|
1271
|
-
"launcher_spawn_failed",
|
|
1272
|
-
);
|
|
1273
|
-
return Err(error);
|
|
1274
|
-
}
|
|
1275
|
-
};
|
|
1276
|
-
if process.intentional_teardown {
|
|
1277
|
-
return Ok(LeaderLaunchOutcome {
|
|
1278
|
-
status: LeaderLaunchStatus::Exited,
|
|
1279
|
-
exit_code: Some(0),
|
|
1280
|
-
session_name: plan.session_name.clone(),
|
|
1281
|
-
reason: None,
|
|
1282
|
-
});
|
|
1283
|
-
}
|
|
1284
|
-
let code = process.status.code();
|
|
1285
|
-
if !process.status.success() {
|
|
1286
|
-
cleanup_managed_leader_resources(
|
|
1287
|
-
&transport,
|
|
1288
|
-
session,
|
|
1289
|
-
&spawned,
|
|
1290
|
-
session_existed_before,
|
|
1291
|
-
workspace,
|
|
1292
|
-
"launcher_exit_failed",
|
|
1293
|
-
);
|
|
1294
|
-
let failure = LeaderError::Start(leader_launcher_failure(&process));
|
|
1295
|
-
if allow_attach_recovery {
|
|
1296
|
-
if let Ok(retry_plan) = managed_leader_attach_recovery_plan(plan, workspace) {
|
|
1297
|
-
return execute_managed_leader_plan_attempt(&retry_plan, workspace, false);
|
|
1298
|
-
}
|
|
1299
|
-
}
|
|
1300
|
-
return Err(failure);
|
|
1301
|
-
}
|
|
1302
|
-
if let Err(error) = ensure_managed_provider_live_after_attach(&transport, &spawned) {
|
|
1303
|
-
cleanup_managed_leader_resources(
|
|
1304
|
-
&transport,
|
|
1305
|
-
session,
|
|
1306
|
-
&spawned,
|
|
1307
|
-
session_existed_before,
|
|
1308
|
-
workspace,
|
|
1309
|
-
"provider_not_live_after_attach",
|
|
1310
|
-
);
|
|
1311
|
-
return Err(error);
|
|
1312
|
-
}
|
|
1313
|
-
Ok(LeaderLaunchOutcome {
|
|
1314
|
-
status: LeaderLaunchStatus::Exited,
|
|
1315
|
-
exit_code: code,
|
|
1316
|
-
session_name: plan.session_name.clone(),
|
|
1317
|
-
reason: None,
|
|
1318
|
-
})
|
|
1319
|
-
}
|
|
1320
|
-
|
|
1321
|
-
fn managed_leader_attach_recovery_plan(
|
|
1322
|
-
plan: &LeaderStartPlan,
|
|
1323
|
-
workspace: &Path,
|
|
1324
|
-
) -> Result<LeaderStartPlan, LeaderError> {
|
|
1325
|
-
let session = managed_leader_session_for_launch(plan.provider, workspace);
|
|
1326
|
-
let window = managed_leader_window_for_launch(plan.provider, workspace, &session);
|
|
1327
|
-
let attach_mode = if plan.argv.iter().any(|arg| arg == "switch-client") {
|
|
1328
|
-
ManagedClientAttachMode::SwitchClient
|
|
1329
|
-
} else {
|
|
1330
|
-
ManagedClientAttachMode::AttachSession
|
|
1331
|
-
};
|
|
1332
|
-
let argv = managed_client_argv(workspace, &session, &window, attach_mode)?;
|
|
1333
|
-
let mut retry_plan = plan.clone();
|
|
1334
|
-
retry_plan.session_name = Some(session);
|
|
1335
|
-
retry_plan.leader_window = Some(window);
|
|
1336
|
-
retry_plan.argv = argv;
|
|
1337
|
-
Ok(retry_plan)
|
|
1338
|
-
}
|
|
1339
|
-
|
|
1340
|
-
fn ensure_managed_leader_pane(
|
|
1341
|
-
transport: &dyn Transport,
|
|
1342
|
-
session: &SessionName,
|
|
1343
|
-
window: &WindowName,
|
|
1344
|
-
plan: &LeaderStartPlan,
|
|
1345
|
-
workspace: &Path,
|
|
1346
|
-
session_existed_before: bool,
|
|
1347
|
-
) -> Result<SpawnResult, LeaderError> {
|
|
1348
|
-
// A-22: a managed launch may reuse an existing provider leader session;
|
|
1349
|
-
// only a newly selected nonce session is absent before this probe.
|
|
1350
|
-
// Reusing the existing session adds one pane; a new session uses the
|
|
1351
|
-
// first-spawn path.
|
|
1352
|
-
if session_existed_before {
|
|
1353
|
-
// 0.4.x (CR C-1 + C-2): leader env_unset reuses the worker
|
|
1354
|
-
// provider_env_unsets (single source of truth) + spawn through the
|
|
1355
|
-
// leader shell wrapper so provider exit returns to a shell, not
|
|
1356
|
-
// `[exited]`.
|
|
1357
|
-
let env_unset = leader_env_unset_for_provider(plan.provider);
|
|
1358
|
-
let provider_label = provider_command_name(plan.provider);
|
|
1359
|
-
transport
|
|
1360
|
-
.spawn_into_with_leader_shell_wrapper(
|
|
1361
|
-
session,
|
|
1362
|
-
window,
|
|
1363
|
-
&plan.provider_argv,
|
|
1364
|
-
workspace,
|
|
1365
|
-
&plan.leader_env,
|
|
1366
|
-
&env_unset,
|
|
1367
|
-
provider_label,
|
|
1368
|
-
)
|
|
1369
|
-
.map_err(|error| prompt_aware_spawn_error(plan, error))
|
|
1370
|
-
} else {
|
|
1371
|
-
let env_unset = leader_env_unset_for_provider(plan.provider);
|
|
1372
|
-
let provider_label = provider_command_name(plan.provider);
|
|
1373
|
-
transport
|
|
1374
|
-
.spawn_first_with_leader_shell_wrapper(
|
|
1375
|
-
session,
|
|
1376
|
-
window,
|
|
1377
|
-
&plan.provider_argv,
|
|
1378
|
-
workspace,
|
|
1379
|
-
&plan.leader_env,
|
|
1380
|
-
&env_unset,
|
|
1381
|
-
provider_label,
|
|
1382
|
-
)
|
|
1383
|
-
.map_err(|error| prompt_aware_spawn_error(plan, error))
|
|
1384
|
-
}
|
|
1385
|
-
}
|
|
1386
|
-
|
|
1387
|
-
fn prompt_aware_spawn_error(plan: &LeaderStartPlan, error: TransportError) -> LeaderError {
|
|
1388
|
-
let Some(metadata) = plan.leader_prompt.as_ref() else {
|
|
1389
|
-
return LeaderError::Start(error.to_string());
|
|
1390
|
-
};
|
|
1391
|
-
// Transport subprocess errors contain the full tmux shell argv. Preserve
|
|
1392
|
-
// real exit/I/O evidence without exposing the process-level prompt payload.
|
|
1393
|
-
let mut safe = super::prompt::PromptError::new(
|
|
1394
|
-
"leader_prompt_carrier_failed",
|
|
1395
|
-
"Leader prompt-bearing transport spawn failed; argv and stderr withheld",
|
|
1396
|
-
Some(&metadata.config_path),
|
|
1397
|
-
)
|
|
1398
|
-
.for_provider(plan.provider);
|
|
1399
|
-
match error {
|
|
1400
|
-
TransportError::Subprocess { code, .. } => safe.exit_code = code,
|
|
1401
|
-
TransportError::Spawn { source, .. } | TransportError::Inject { source, .. }
|
|
1402
|
-
| TransportError::Capture { source } | TransportError::Io(source) => {
|
|
1403
|
-
safe.io_kind = Some(format!("{:?}", source.kind()));
|
|
1404
|
-
}
|
|
1405
|
-
oversized @ TransportError::CommandTooLong { .. } => {
|
|
1406
|
-
safe.error = oversized.to_string();
|
|
1407
|
-
}
|
|
1408
|
-
_ => {}
|
|
1409
|
-
}
|
|
1410
|
-
safe.action = "Inspect the owned launcher and transport metadata; do not repeat or change carriers to bypass the failure";
|
|
1411
|
-
LeaderError::Prompt(safe)
|
|
1412
|
-
}
|
|
1413
|
-
|
|
1414
|
-
struct ManagedAttachWatch<'a> {
|
|
1415
|
-
transport: &'a dyn Transport,
|
|
1416
|
-
spawned: &'a SpawnResult,
|
|
1417
|
-
session: &'a SessionName,
|
|
1418
|
-
session_existed_before: bool,
|
|
1419
|
-
workspace: &'a Path,
|
|
1420
|
-
provider_label: &'a str,
|
|
1421
|
-
}
|
|
1422
|
-
|
|
1423
|
-
#[cfg(unix)]
|
|
1424
|
-
static MANAGED_ATTACH_TEARDOWN: AtomicBool = AtomicBool::new(false);
|
|
1425
|
-
|
|
1426
|
-
#[cfg(unix)]
|
|
1427
|
-
struct ManagedTermGuard {
|
|
1428
|
-
old: libc::sighandler_t,
|
|
1429
|
-
}
|
|
1430
|
-
|
|
1431
|
-
#[cfg(unix)]
|
|
1432
|
-
impl ManagedTermGuard {
|
|
1433
|
-
fn install() -> Self {
|
|
1434
|
-
MANAGED_ATTACH_TEARDOWN.store(false, Ordering::SeqCst);
|
|
1435
|
-
let handler = managed_term_handler as *const () as libc::sighandler_t;
|
|
1436
|
-
let old = unsafe { libc::signal(libc::SIGTERM, handler) };
|
|
1437
|
-
Self { old }
|
|
1438
|
-
}
|
|
1439
|
-
}
|
|
1440
|
-
|
|
1441
|
-
#[cfg(unix)]
|
|
1442
|
-
impl Drop for ManagedTermGuard {
|
|
1443
|
-
fn drop(&mut self) {
|
|
1444
|
-
unsafe {
|
|
1445
|
-
libc::signal(libc::SIGTERM, self.old);
|
|
1446
|
-
}
|
|
1447
|
-
MANAGED_ATTACH_TEARDOWN.store(false, Ordering::SeqCst);
|
|
1448
|
-
}
|
|
1449
|
-
}
|
|
1450
|
-
|
|
1451
|
-
#[cfg(unix)]
|
|
1452
|
-
extern "C" fn managed_term_handler(_: libc::c_int) {
|
|
1453
|
-
MANAGED_ATTACH_TEARDOWN.store(true, Ordering::SeqCst);
|
|
1454
|
-
}
|
|
1455
|
-
|
|
1456
|
-
fn managed_attach_should_teardown(watch: &ManagedAttachWatch<'_>) -> bool {
|
|
1457
|
-
matches!(
|
|
1458
|
-
leader_provider_health(
|
|
1459
|
-
watch.transport,
|
|
1460
|
-
&watch.spawned.pane_id,
|
|
1461
|
-
watch.provider_label
|
|
1462
|
-
),
|
|
1463
|
-
LeaderProviderHealth::ProviderExited | LeaderProviderHealth::Unreachable
|
|
1464
|
-
)
|
|
1465
|
-
}
|
|
1466
|
-
|
|
1467
|
-
fn bound_pane_snapshot(
|
|
1468
|
-
pane_id: &str,
|
|
1469
|
-
session_name: &serde_json::Value,
|
|
1470
|
-
window_name: &serde_json::Value,
|
|
1471
|
-
tmux_socket: &serde_json::Value,
|
|
1472
|
-
) -> serde_json::Value {
|
|
1473
|
-
serde_json::json!({
|
|
1474
|
-
"pane_id": pane_id,
|
|
1475
|
-
"session_name": session_name,
|
|
1476
|
-
"window_name": window_name,
|
|
1477
|
-
"tmux_socket": tmux_socket,
|
|
1478
|
-
})
|
|
1479
|
-
}
|
|
1480
|
-
|
|
1481
|
-
fn merge_bound_panes(
|
|
1482
|
-
existing: Option<&serde_json::Value>,
|
|
1483
|
-
new_pane: serde_json::Value,
|
|
1484
|
-
) -> Vec<serde_json::Value> {
|
|
1485
|
-
let new_id = new_pane
|
|
1486
|
-
.get("pane_id")
|
|
1487
|
-
.and_then(serde_json::Value::as_str)
|
|
1488
|
-
.unwrap_or("")
|
|
1489
|
-
.to_string();
|
|
1490
|
-
let mut panes = Vec::new();
|
|
1491
|
-
if let Some(existing) = existing {
|
|
1492
|
-
if let Some(arr) = existing
|
|
1493
|
-
.get("bound_panes")
|
|
1494
|
-
.and_then(serde_json::Value::as_array)
|
|
1495
|
-
{
|
|
1496
|
-
panes.extend(arr.iter().cloned());
|
|
1497
|
-
} else if let Some(old_pane) = existing.get("pane_id").and_then(serde_json::Value::as_str) {
|
|
1498
|
-
panes.push(bound_pane_snapshot(
|
|
1499
|
-
old_pane,
|
|
1500
|
-
existing
|
|
1501
|
-
.get("session_name")
|
|
1502
|
-
.unwrap_or(&serde_json::Value::Null),
|
|
1503
|
-
existing
|
|
1504
|
-
.get("window_name")
|
|
1505
|
-
.unwrap_or(&serde_json::Value::Null),
|
|
1506
|
-
existing
|
|
1507
|
-
.get("tmux_socket")
|
|
1508
|
-
.unwrap_or(&serde_json::Value::Null),
|
|
1509
|
-
));
|
|
1510
|
-
}
|
|
1511
|
-
}
|
|
1512
|
-
if !new_id.is_empty()
|
|
1513
|
-
&& !panes.iter().any(|pane| {
|
|
1514
|
-
pane.get("pane_id").and_then(serde_json::Value::as_str) == Some(new_id.as_str())
|
|
1515
|
-
})
|
|
1516
|
-
{
|
|
1517
|
-
panes.push(new_pane);
|
|
1518
|
-
}
|
|
1519
|
-
panes
|
|
1520
|
-
}
|
|
1521
|
-
|
|
1522
|
-
fn apply_clear_to_leader_receiver(
|
|
1523
|
-
recv: &mut serde_json::Map<String, serde_json::Value>,
|
|
1524
|
-
pane_id: &str,
|
|
1525
|
-
) -> bool {
|
|
1526
|
-
let mut changed = false;
|
|
1527
|
-
if let Some(arr) = recv
|
|
1528
|
-
.get_mut("bound_panes")
|
|
1529
|
-
.and_then(serde_json::Value::as_array_mut)
|
|
1530
|
-
{
|
|
1531
|
-
let before = arr.len();
|
|
1532
|
-
arr.retain(|pane| pane.get("pane_id").and_then(serde_json::Value::as_str) != Some(pane_id));
|
|
1533
|
-
if arr.len() != before {
|
|
1534
|
-
changed = true;
|
|
1535
|
-
}
|
|
1536
|
-
}
|
|
1537
|
-
let scalar_match = recv.get("pane_id").and_then(serde_json::Value::as_str) == Some(pane_id);
|
|
1538
|
-
if scalar_match {
|
|
1539
|
-
let promoted = recv
|
|
1540
|
-
.get("bound_panes")
|
|
1541
|
-
.and_then(serde_json::Value::as_array)
|
|
1542
|
-
.and_then(|arr| arr.first())
|
|
1543
|
-
.cloned();
|
|
1544
|
-
if let Some(next) = promoted {
|
|
1545
|
-
recv.insert("status".to_string(), serde_json::json!("attached"));
|
|
1546
|
-
recv.insert(
|
|
1547
|
-
"pane_id".to_string(),
|
|
1548
|
-
next.get("pane_id")
|
|
1549
|
-
.cloned()
|
|
1550
|
-
.unwrap_or(serde_json::Value::Null),
|
|
1551
|
-
);
|
|
1552
|
-
recv.insert(
|
|
1553
|
-
"pane".to_string(),
|
|
1554
|
-
next.get("pane_id")
|
|
1555
|
-
.cloned()
|
|
1556
|
-
.unwrap_or(serde_json::Value::Null),
|
|
1557
|
-
);
|
|
1558
|
-
if let Some(session) = next.get("session_name") {
|
|
1559
|
-
recv.insert("session_name".to_string(), session.clone());
|
|
1560
|
-
}
|
|
1561
|
-
if let Some(window) = next.get("window_name") {
|
|
1562
|
-
recv.insert("window_name".to_string(), window.clone());
|
|
1563
|
-
}
|
|
1564
|
-
} else {
|
|
1565
|
-
recv.insert("status".to_string(), serde_json::json!("exited"));
|
|
1566
|
-
recv.remove("pane_id");
|
|
1567
|
-
recv.remove("pane");
|
|
1568
|
-
}
|
|
1569
|
-
changed = true;
|
|
1570
|
-
}
|
|
1571
|
-
changed
|
|
1572
|
-
}
|
|
1573
|
-
|
|
1574
|
-
fn clear_managed_leader_receiver_pane(workspace: &Path, pane_id: &str) {
|
|
1575
|
-
let Ok(mut state) = crate::state::persist::load_runtime_state(workspace) else {
|
|
1576
|
-
return;
|
|
1577
|
-
};
|
|
1578
|
-
let mut changed = false;
|
|
1579
|
-
if let Some(teams) = state
|
|
1580
|
-
.get_mut("teams")
|
|
1581
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
1582
|
-
{
|
|
1583
|
-
for (_key, team) in teams.iter_mut() {
|
|
1584
|
-
let Some(team_obj) = team.as_object_mut() else {
|
|
1585
|
-
continue;
|
|
1586
|
-
};
|
|
1587
|
-
if let Some(recv) = team_obj
|
|
1588
|
-
.get_mut("leader_receiver")
|
|
1589
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
1590
|
-
{
|
|
1591
|
-
if apply_clear_to_leader_receiver(recv, pane_id) {
|
|
1592
|
-
changed = true;
|
|
1593
|
-
}
|
|
1594
|
-
}
|
|
1595
|
-
if let Some(owner) = team_obj
|
|
1596
|
-
.get_mut("team_owner")
|
|
1597
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
1598
|
-
{
|
|
1599
|
-
if owner.get("pane_id").and_then(serde_json::Value::as_str) == Some(pane_id) {
|
|
1600
|
-
owner.remove("pane_id");
|
|
1601
|
-
changed = true;
|
|
1602
|
-
}
|
|
1603
|
-
}
|
|
1604
|
-
}
|
|
1605
|
-
}
|
|
1606
|
-
if !changed {
|
|
1607
|
-
return;
|
|
1608
|
-
}
|
|
1609
|
-
let team_key = state
|
|
1610
|
-
.get("active_team_key")
|
|
1611
|
-
.and_then(serde_json::Value::as_str)
|
|
1612
|
-
.unwrap_or("current")
|
|
1613
|
-
.to_string();
|
|
1614
|
-
let _ = crate::state::repository::StateRepository::new(workspace).save(
|
|
1615
|
-
crate::state::repository::StateWriteIntent::LeaderStartBinding {
|
|
1616
|
-
team_key: &team_key,
|
|
1617
|
-
transport_kind: "managed",
|
|
1618
|
-
},
|
|
1619
|
-
&state,
|
|
1620
|
-
);
|
|
1621
|
-
}
|
|
1622
|
-
|
|
1623
|
-
fn cleanup_managed_leader_resources(
|
|
1624
|
-
transport: &dyn Transport,
|
|
1625
|
-
session: &SessionName,
|
|
1626
|
-
spawned: &SpawnResult,
|
|
1627
|
-
session_existed_before: bool,
|
|
1628
|
-
workspace: &Path,
|
|
1629
|
-
reason: &str,
|
|
1630
|
-
) {
|
|
1631
|
-
// Own window only — never kill-server (same socket may host other teams).
|
|
1632
|
-
// Last window in the session lets tmux destroy the session itself.
|
|
1633
|
-
let window_target = Target::SessionWindow {
|
|
1634
|
-
session: spawned.session.clone(),
|
|
1635
|
-
window: spawned.window.clone(),
|
|
1636
|
-
};
|
|
1637
|
-
let window_result = transport
|
|
1638
|
-
.kill_window(&window_target)
|
|
1639
|
-
.map(|_| "ok".to_string())
|
|
1640
|
-
.unwrap_or_else(|error| error.to_string());
|
|
1641
|
-
let mut action = "kill_window".to_string();
|
|
1642
|
-
let mut result = window_result;
|
|
1643
|
-
if !session_existed_before {
|
|
1644
|
-
match transport.list_windows(session) {
|
|
1645
|
-
Ok(windows) if windows.is_empty() => {
|
|
1646
|
-
let session_result = transport
|
|
1647
|
-
.kill_session(session)
|
|
1648
|
-
.map(|_| "ok".to_string())
|
|
1649
|
-
.unwrap_or_else(|error| error.to_string());
|
|
1650
|
-
action = "kill_window+kill_session".to_string();
|
|
1651
|
-
result = format!("{result};kill_session={session_result}");
|
|
1652
|
-
}
|
|
1653
|
-
Ok(_) => {}
|
|
1654
|
-
Err(error) => {
|
|
1655
|
-
action = "kill_window+list_windows_err".to_string();
|
|
1656
|
-
result = format!("{result};list_windows={error}");
|
|
1657
|
-
}
|
|
1658
|
-
}
|
|
1659
|
-
}
|
|
1660
|
-
clear_managed_leader_receiver_pane(workspace, spawned.pane_id.as_str());
|
|
1661
|
-
write_leader_startup_prompt_event(
|
|
1662
|
-
workspace,
|
|
1663
|
-
"leader.launcher.rollback",
|
|
1664
|
-
serde_json::json!({
|
|
1665
|
-
"reason": reason,
|
|
1666
|
-
"session": session.as_str(),
|
|
1667
|
-
"pane_id": spawned.pane_id.as_str(),
|
|
1668
|
-
"session_preexisted": session_existed_before,
|
|
1669
|
-
"action": action,
|
|
1670
|
-
"result": result,
|
|
1671
|
-
}),
|
|
1672
|
-
);
|
|
1673
|
-
}
|
|
1674
|
-
|
|
1675
|
-
/// 0.4.x (CR C-1): leader provider env-unset list — SINGLE SOURCE OF TRUTH
|
|
1676
|
-
/// reused from worker spawn (`profile_launch::provider_env_unsets`).
|
|
1677
|
-
/// Audit grep guard: this function MUST be the only place in
|
|
1678
|
-
/// `crates/team-agent/src/leader/` that constructs a Claude/Codex/Copilot
|
|
1679
|
-
/// env-unset list. Any new code path that needs it must call this function
|
|
1680
|
-
/// or the underlying `provider_env_unsets`. Use `AuthMode::Subscription` —
|
|
1681
|
-
/// the leader is the user's interactive provider, never CompatibleApi/
|
|
1682
|
-
/// OfficialApi which are worker-only auth modes today.
|
|
1683
|
-
fn leader_env_unset_for_provider(provider: Provider) -> Vec<String> {
|
|
1684
|
-
crate::lifecycle::profile_launch::provider_env_unsets(
|
|
1685
|
-
provider,
|
|
1686
|
-
crate::model::enums::AuthMode::Subscription,
|
|
1687
|
-
)
|
|
1688
|
-
.into_iter()
|
|
1689
|
-
.collect()
|
|
1690
|
-
}
|
|
1691
|
-
|
|
1692
|
-
fn ensure_managed_provider_live_after_attach(
|
|
1693
|
-
transport: &dyn Transport,
|
|
1694
|
-
spawned: &SpawnResult,
|
|
1695
|
-
) -> Result<(), LeaderError> {
|
|
1696
|
-
let live = match transport.liveness(&spawned.pane_id) {
|
|
1697
|
-
Ok(PaneLiveness::Live) => true,
|
|
1698
|
-
Ok(PaneLiveness::Dead) => false,
|
|
1699
|
-
Ok(PaneLiveness::Unknown) | Err(_) => managed_spawned_pane_in_targets(transport, spawned),
|
|
1700
|
-
};
|
|
1701
|
-
if live {
|
|
1702
|
-
return Ok(());
|
|
1703
|
-
}
|
|
1704
|
-
Err(LeaderError::Start(format!(
|
|
1705
|
-
"managed leader provider pane is not running after tmux client returned: {} {}:{}",
|
|
1706
|
-
spawned.pane_id.as_str(),
|
|
1707
|
-
spawned.session.as_str(),
|
|
1708
|
-
spawned.window.as_str()
|
|
1709
|
-
)))
|
|
1710
|
-
}
|
|
1711
|
-
|
|
1712
|
-
/// Reconcile real pane liveness with the supervising wrapper's exit receipt.
|
|
1713
|
-
/// Restored provider output may contain any exit-marker text; it is not process
|
|
1714
|
-
/// state and must never authorize destructive managed-window cleanup.
|
|
1715
|
-
pub fn leader_provider_health(
|
|
1716
|
-
transport: &dyn Transport,
|
|
1717
|
-
pane_id: &PaneId,
|
|
1718
|
-
_expected_provider_label: &str,
|
|
1719
|
-
) -> LeaderProviderHealth {
|
|
1720
|
-
if matches!(transport.liveness(pane_id), Ok(PaneLiveness::Dead)) {
|
|
1721
|
-
return LeaderProviderHealth::Unreachable;
|
|
1722
|
-
}
|
|
1723
|
-
if matches!(transport.provider_exit_status(pane_id), Ok(Some(_))) {
|
|
1724
|
-
return LeaderProviderHealth::ProviderExited;
|
|
1725
|
-
}
|
|
1726
|
-
// Missing/unsupported receipts (including old wrappers) are not proof of exit.
|
|
1727
|
-
LeaderProviderHealth::Alive
|
|
1728
|
-
}
|
|
1729
|
-
|
|
1730
|
-
/// Health status reported by [`leader_provider_health`].
|
|
1731
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
1732
|
-
pub enum LeaderProviderHealth {
|
|
1733
|
-
/// Provider process appears to be the pane's current command.
|
|
1734
|
-
Alive,
|
|
1735
|
-
/// Pane has fallen back to a shell with the exit marker present —
|
|
1736
|
-
/// provider has exited.
|
|
1737
|
-
ProviderExited,
|
|
1738
|
-
/// Pane is dead / unaddressable.
|
|
1739
|
-
Unreachable,
|
|
1740
|
-
}
|
|
1741
|
-
|
|
1742
|
-
/// 0.4.x (CR R6 + R3): single-source shell-tail detection.
|
|
1743
|
-
/// Used by:
|
|
1744
|
-
/// - shutdown logic to recognise a leader pane in shell-tail mode
|
|
1745
|
-
/// as still owned by the leader (not stray).
|
|
1746
|
-
///
|
|
1747
|
-
/// Matches by basename (case-insensitive) — `pane_current_command` returns
|
|
1748
|
-
/// the basename of the running binary. Conservative whitelist of POSIX +
|
|
1749
|
-
/// common shell processes; missing entries here are false negatives
|
|
1750
|
-
/// (shell tail looks like provider absent → health says Alive) which is the
|
|
1751
|
-
/// safe default per the CR R6 conservative-Alive rule.
|
|
1752
|
-
fn is_interactive_shell_basename(name: &str) -> bool {
|
|
1753
|
-
let trimmed = name.trim().to_ascii_lowercase();
|
|
1754
|
-
let basename = std::path::Path::new(&trimmed)
|
|
1755
|
-
.file_name()
|
|
1756
|
-
.and_then(|s| s.to_str())
|
|
1757
|
-
.unwrap_or(&trimmed);
|
|
1758
|
-
matches!(
|
|
1759
|
-
basename,
|
|
1760
|
-
"zsh"
|
|
1761
|
-
| "bash"
|
|
1762
|
-
| "sh"
|
|
1763
|
-
| "fish"
|
|
1764
|
-
| "dash"
|
|
1765
|
-
| "ksh"
|
|
1766
|
-
| "tcsh"
|
|
1767
|
-
| "csh"
|
|
1768
|
-
| "ash"
|
|
1769
|
-
| "mksh"
|
|
1770
|
-
| "yash"
|
|
1771
|
-
| "elvish"
|
|
1772
|
-
| "nu"
|
|
1773
|
-
| "nushell"
|
|
1774
|
-
| "xonsh"
|
|
1775
|
-
)
|
|
1776
|
-
}
|
|
1777
|
-
|
|
1778
|
-
fn managed_spawned_pane_in_targets(transport: &dyn Transport, spawned: &SpawnResult) -> bool {
|
|
1779
|
-
transport
|
|
1780
|
-
.list_targets()
|
|
1781
|
-
.unwrap_or_default()
|
|
1782
|
-
.iter()
|
|
1783
|
-
.any(|pane| {
|
|
1784
|
-
pane.pane_id.as_str() == spawned.pane_id.as_str()
|
|
1785
|
-
&& pane.session.as_str() == spawned.session.as_str()
|
|
1786
|
-
&& pane.window_name.as_ref().map(WindowName::as_str)
|
|
1787
|
-
== Some(spawned.window.as_str())
|
|
1788
|
-
})
|
|
1789
|
-
}
|
|
1790
|
-
|
|
1791
|
-
/// Keep the launcher's native identity with the canonical pane. The backing
|
|
1792
|
-
/// JSONL may not exist until Pi's first turn; receipt observation resolves it by
|
|
1793
|
-
/// exact header, never by filename/mtime or the Team Agent owner UUID.
|
|
1794
|
-
fn bind_plan_session(receiver: &mut serde_json::Value, plan: &LeaderStartPlan) {
|
|
1795
|
-
if let Some(capture) = &plan.session_capture {
|
|
1796
|
-
let native = serde_json::json!({
|
|
1797
|
-
"expected_session_id": capture.expected_session_id,
|
|
1798
|
-
"provider_projects_root": capture.provider_projects_root,
|
|
1799
|
-
"spawn_cwd": capture.spawn_cwd,
|
|
1800
|
-
"spawned_at": capture.spawned_at,
|
|
1801
|
-
"pane_id": receiver.get("pane_id"),
|
|
1802
|
-
"tmux_socket": receiver.get("tmux_socket"),
|
|
1803
|
-
"leader_session_uuid": receiver.get("leader_session_uuid"),
|
|
1804
|
-
"owner_epoch": receiver.get("owner_epoch"),
|
|
1805
|
-
});
|
|
1806
|
-
receiver["native_session"] = native;
|
|
1807
|
-
}
|
|
1808
|
-
}
|
|
1809
|
-
|
|
1810
|
-
fn persist_managed_leader_binding(
|
|
1811
|
-
plan: &LeaderStartPlan,
|
|
1812
|
-
workspace: &Path,
|
|
1813
|
-
spawned: &SpawnResult,
|
|
1814
|
-
) -> Result<(), LeaderError> {
|
|
1815
|
-
let identity = plan
|
|
1816
|
-
.identity
|
|
1817
|
-
.as_ref()
|
|
1818
|
-
.ok_or_else(|| LeaderError::Start("managed leader identity missing".to_string()))?;
|
|
1819
|
-
let mut state = crate::state::persist::load_runtime_state(workspace)
|
|
1820
|
-
.unwrap_or_else(|_| serde_json::json!({}));
|
|
1821
|
-
let team_key = identity.team_id.as_str().to_string();
|
|
1822
|
-
let existing_recv = state
|
|
1823
|
-
.get("teams")
|
|
1824
|
-
.and_then(|teams| teams.get(&team_key))
|
|
1825
|
-
.and_then(|team| team.get("leader_receiver"))
|
|
1826
|
-
.cloned();
|
|
1827
|
-
let now = chrono::Utc::now().to_rfc3339();
|
|
1828
|
-
let socket = crate::tmux_backend::socket_path_for_workspace(workspace)
|
|
1829
|
-
.map(|path| path.to_string_lossy().to_string())
|
|
1830
|
-
.unwrap_or_else(|| crate::tmux_backend::socket_name_for_workspace(workspace));
|
|
1831
|
-
let provider = serde_json::to_value(plan.provider)?;
|
|
1832
|
-
let session = spawned.session.as_str().to_string();
|
|
1833
|
-
let window = spawned.window.as_str().to_string();
|
|
1834
|
-
let pane = spawned.pane_id.as_str().to_string();
|
|
1835
|
-
let keep_existing_scalar = existing_recv
|
|
1836
|
-
.as_ref()
|
|
1837
|
-
.and_then(|recv| recv.get("pane_id"))
|
|
1838
|
-
.and_then(serde_json::Value::as_str)
|
|
1839
|
-
.is_some_and(|old| old != pane);
|
|
1840
|
-
let current_epoch = state
|
|
1841
|
-
.get("owner_epoch")
|
|
1842
|
-
.and_then(serde_json::Value::as_u64)
|
|
1843
|
-
.or_else(|| {
|
|
1844
|
-
state
|
|
1845
|
-
.get("team_owner")
|
|
1846
|
-
.and_then(|owner| owner.get("owner_epoch"))
|
|
1847
|
-
.and_then(serde_json::Value::as_u64)
|
|
1848
|
-
})
|
|
1849
|
-
.unwrap_or(0);
|
|
1850
|
-
let owner_epoch = if keep_existing_scalar {
|
|
1851
|
-
existing_recv
|
|
1852
|
-
.as_ref()
|
|
1853
|
-
.and_then(|recv| recv.get("owner_epoch"))
|
|
1854
|
-
.and_then(serde_json::Value::as_u64)
|
|
1855
|
-
.unwrap_or(current_epoch)
|
|
1856
|
-
} else {
|
|
1857
|
-
current_epoch.saturating_add(1)
|
|
1858
|
-
};
|
|
1859
|
-
let attach_mode = if plan.argv.iter().any(|arg| arg == "switch-client") {
|
|
1860
|
-
"switch-client"
|
|
1861
|
-
} else {
|
|
1862
|
-
"attach-session"
|
|
1863
|
-
};
|
|
1864
|
-
let new_binding = bound_pane_snapshot(
|
|
1865
|
-
&pane,
|
|
1866
|
-
&serde_json::json!(session),
|
|
1867
|
-
&serde_json::json!(window),
|
|
1868
|
-
&serde_json::json!(socket),
|
|
1869
|
-
);
|
|
1870
|
-
let bound_panes = merge_bound_panes(existing_recv.as_ref(), new_binding);
|
|
1871
|
-
let existing_owner = state
|
|
1872
|
-
.get("teams")
|
|
1873
|
-
.and_then(|teams| teams.get(&team_key))
|
|
1874
|
-
.and_then(|team| team.get("team_owner"))
|
|
1875
|
-
.cloned();
|
|
1876
|
-
let keep_field = |existing: Option<&serde_json::Value>, key: &str, fallback: serde_json::Value| {
|
|
1877
|
-
existing
|
|
1878
|
-
.and_then(|value| value.get(key))
|
|
1879
|
-
.cloned()
|
|
1880
|
-
.unwrap_or(fallback)
|
|
1881
|
-
};
|
|
1882
|
-
let (scalar_pane, scalar_session, scalar_window, scalar_attached_at) =
|
|
1883
|
-
match existing_recv.as_ref() {
|
|
1884
|
-
Some(recv) if keep_existing_scalar => (
|
|
1885
|
-
recv.get("pane_id")
|
|
1886
|
-
.and_then(serde_json::Value::as_str)
|
|
1887
|
-
.unwrap_or(pane.as_str())
|
|
1888
|
-
.to_string(),
|
|
1889
|
-
recv.get("session_name")
|
|
1890
|
-
.cloned()
|
|
1891
|
-
.unwrap_or_else(|| serde_json::json!(session)),
|
|
1892
|
-
recv.get("window_name")
|
|
1893
|
-
.cloned()
|
|
1894
|
-
.unwrap_or_else(|| serde_json::json!(window)),
|
|
1895
|
-
recv.get("attached_at")
|
|
1896
|
-
.and_then(serde_json::Value::as_str)
|
|
1897
|
-
.unwrap_or(now.as_str())
|
|
1898
|
-
.to_string(),
|
|
1899
|
-
),
|
|
1900
|
-
_ => (
|
|
1901
|
-
pane.clone(),
|
|
1902
|
-
serde_json::json!(session),
|
|
1903
|
-
serde_json::json!(window),
|
|
1904
|
-
now.clone(),
|
|
1905
|
-
),
|
|
1906
|
-
};
|
|
1907
|
-
let leader_session_uuid = if keep_existing_scalar {
|
|
1908
|
-
keep_field(
|
|
1909
|
-
existing_recv.as_ref(),
|
|
1910
|
-
"leader_session_uuid",
|
|
1911
|
-
serde_json::json!(identity.leader_session_uuid),
|
|
1912
|
-
)
|
|
1913
|
-
} else {
|
|
1914
|
-
serde_json::json!(identity.leader_session_uuid)
|
|
1915
|
-
};
|
|
1916
|
-
let discovery = if keep_existing_scalar {
|
|
1917
|
-
keep_field(
|
|
1918
|
-
existing_recv.as_ref(),
|
|
1919
|
-
"discovery",
|
|
1920
|
-
serde_json::json!("managed_launcher"),
|
|
1921
|
-
)
|
|
1922
|
-
} else {
|
|
1923
|
-
serde_json::json!("managed_launcher")
|
|
1924
|
-
};
|
|
1925
|
-
let mut receiver = serde_json::json!({
|
|
1926
|
-
"mode": "direct_tmux",
|
|
1927
|
-
"status": "attached",
|
|
1928
|
-
"provider": provider.clone(),
|
|
1929
|
-
"pane_id": scalar_pane,
|
|
1930
|
-
"pane": scalar_pane,
|
|
1931
|
-
"session_name": scalar_session,
|
|
1932
|
-
"window_name": scalar_window,
|
|
1933
|
-
"tmux_socket": socket,
|
|
1934
|
-
"leader_session_uuid": leader_session_uuid.clone(),
|
|
1935
|
-
"owner_epoch": owner_epoch,
|
|
1936
|
-
"attached_at": scalar_attached_at,
|
|
1937
|
-
"discovery": discovery,
|
|
1938
|
-
"bound_panes": bound_panes,
|
|
1939
|
-
});
|
|
1940
|
-
if keep_existing_scalar {
|
|
1941
|
-
for key in ["native_session", "rollout_path"] {
|
|
1942
|
-
if let Some(value) = existing_recv.as_ref().and_then(|old| old.get(key)) {
|
|
1943
|
-
receiver[key] = value.clone();
|
|
1944
|
-
}
|
|
1945
|
-
}
|
|
1946
|
-
} else {
|
|
1947
|
-
bind_plan_session(&mut receiver, plan);
|
|
1948
|
-
}
|
|
1949
|
-
let owner_uuid = if keep_existing_scalar {
|
|
1950
|
-
keep_field(
|
|
1951
|
-
existing_owner.as_ref(),
|
|
1952
|
-
"leader_session_uuid",
|
|
1953
|
-
leader_session_uuid.clone(),
|
|
1954
|
-
)
|
|
1955
|
-
} else {
|
|
1956
|
-
leader_session_uuid.clone()
|
|
1957
|
-
};
|
|
1958
|
-
let claimed_via = if keep_existing_scalar {
|
|
1959
|
-
keep_field(
|
|
1960
|
-
existing_owner.as_ref(),
|
|
1961
|
-
"claimed_via",
|
|
1962
|
-
serde_json::json!("claim-leader"),
|
|
1963
|
-
)
|
|
1964
|
-
} else {
|
|
1965
|
-
serde_json::json!("claim-leader")
|
|
1966
|
-
};
|
|
1967
|
-
let claimed_at = if keep_existing_scalar {
|
|
1968
|
-
keep_field(existing_owner.as_ref(), "claimed_at", serde_json::json!(now))
|
|
1969
|
-
} else {
|
|
1970
|
-
serde_json::json!(now)
|
|
1971
|
-
};
|
|
1972
|
-
let owner = serde_json::json!({
|
|
1973
|
-
"pane_id": scalar_pane,
|
|
1974
|
-
"provider": provider.clone(),
|
|
1975
|
-
"machine_fingerprint": identity.machine_fingerprint,
|
|
1976
|
-
"leader_session_uuid": owner_uuid,
|
|
1977
|
-
"owner_epoch": owner_epoch,
|
|
1978
|
-
"claimed_at": claimed_at,
|
|
1979
|
-
"claimed_via": claimed_via,
|
|
1980
|
-
"os_user": identity.os_user,
|
|
1981
|
-
});
|
|
1982
|
-
if let Some(obj) = state.as_object_mut() {
|
|
1983
|
-
// unit-4 (Stage 1) ROOT CAUSE FIX of 0.3.39 leader mis-kill:
|
|
1984
|
-
//
|
|
1985
|
-
// BEFORE: `obj.insert("session_name", json!(session));` wrote the
|
|
1986
|
-
// leader launcher session (always `team-agent-leader-*`) into the
|
|
1987
|
-
// top-level worker-session-name field, hijacking the identity used
|
|
1988
|
-
// by restart/shutdown when they decided what tmux session to kill.
|
|
1989
|
-
//
|
|
1990
|
-
// AFTER: the launcher session is recorded ONLY in
|
|
1991
|
-
// `leader_receiver.session_name` (the `receiver` block above) and
|
|
1992
|
-
// `team_owner.pane_id`. The top-level `state.session_name` keeps
|
|
1993
|
-
// whatever value the worker quick-start put there (the real worker
|
|
1994
|
-
// session). If the workspace has never been quick-started yet
|
|
1995
|
-
// (no `session_name` field at all), we leave the field absent —
|
|
1996
|
-
// restart and shutdown have safe default branches for that case.
|
|
1997
|
-
//
|
|
1998
|
-
// unit-3's preflight is the belt-and-suspenders backstop: even if a
|
|
1999
|
-
// future regression reintroduces this overwrite, restart now refuses
|
|
2000
|
-
// before killing a leader-prefixed session_name.
|
|
2001
|
-
if !crate::layout::sessions::LEADER_SESSION_PREFIX.is_empty()
|
|
2002
|
-
&& session.starts_with(crate::layout::sessions::LEADER_SESSION_PREFIX)
|
|
2003
|
-
{
|
|
2004
|
-
// Explicit: skip the overwrite for leader-prefixed launcher
|
|
2005
|
-
// sessions. The receiver block records the launcher session in
|
|
2006
|
-
// its proper home (`leader_receiver.session_name`).
|
|
2007
|
-
} else {
|
|
2008
|
-
obj.insert("session_name".to_string(), serde_json::json!(session));
|
|
2009
|
-
}
|
|
2010
|
-
obj.insert(
|
|
2011
|
-
"active_team_key".to_string(),
|
|
2012
|
-
serde_json::json!(identity.team_id.as_str()),
|
|
2013
|
-
);
|
|
2014
|
-
obj.insert("tmux_socket".to_string(), serde_json::json!(socket));
|
|
2015
|
-
obj.insert("is_external_leader".to_string(), serde_json::json!(false));
|
|
2016
|
-
obj.insert(
|
|
2017
|
-
"leader_client".to_string(),
|
|
2018
|
-
serde_json::json!({
|
|
2019
|
-
"diagnostic_only": true,
|
|
2020
|
-
"attach_mode": attach_mode,
|
|
2021
|
-
"tmux": std::env::var("TMUX").ok(),
|
|
2022
|
-
}),
|
|
2023
|
-
);
|
|
2024
|
-
}
|
|
2025
|
-
// Stage 3a/d (identity-boundary unified plan, architect direction
|
|
2026
|
-
// 2026-06-23): build the teams.<key> entry from the non-owner fields
|
|
2027
|
-
// of state (compact_team_state strips the `teams` key), then publish
|
|
2028
|
-
// the canonical owner record AFTER teams.insert so write_owner's
|
|
2029
|
-
// teams.<key>.{team_owner,leader_receiver,owner_epoch} is the final
|
|
2030
|
-
// word and doesn't get overwritten by the compacted entry.
|
|
2031
|
-
let entry = crate::state::projection::compact_team_state(&state);
|
|
2032
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2033
|
-
let teams = obj
|
|
2034
|
-
.entry("teams".to_string())
|
|
2035
|
-
.or_insert_with(|| serde_json::json!({}));
|
|
2036
|
-
if let Some(teams) = teams.as_object_mut() {
|
|
2037
|
-
teams.insert(identity.team_id.as_str().to_string(), entry);
|
|
2038
|
-
}
|
|
2039
|
-
}
|
|
2040
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
2041
|
-
.with_leader_receiver(receiver)
|
|
2042
|
-
.with_team_owner(owner)
|
|
2043
|
-
.with_owner_epoch(owner_epoch);
|
|
2044
|
-
crate::state::ownership::write_owner(&mut state, identity.team_id.as_str(), record);
|
|
2045
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2046
|
-
crate::state::repository::StateWriteIntent::LeaderStartBinding {
|
|
2047
|
-
team_key: identity.team_id.as_str(),
|
|
2048
|
-
transport_kind: "managed",
|
|
2049
|
-
},
|
|
2050
|
-
&state,
|
|
2051
|
-
)?;
|
|
2052
|
-
Ok(())
|
|
2053
|
-
}
|
|
2054
|
-
|
|
2055
|
-
fn persist_exec_provider_leader_binding(
|
|
2056
|
-
plan: &LeaderStartPlan,
|
|
2057
|
-
workspace: &Path,
|
|
2058
|
-
authority: &VerifiedAmbientPaneAuthority,
|
|
2059
|
-
is_external_leader: bool,
|
|
2060
|
-
) -> Result<(), LeaderError> {
|
|
2061
|
-
let identity = plan
|
|
2062
|
-
.identity
|
|
2063
|
-
.as_ref()
|
|
2064
|
-
.ok_or_else(|| LeaderError::Start("exec provider leader identity missing".to_string()))?;
|
|
2065
|
-
let pane = authority.pane_id.as_str();
|
|
2066
|
-
let target = &authority.observed;
|
|
2067
|
-
let mut state = crate::state::persist::load_runtime_state(workspace)
|
|
2068
|
-
.unwrap_or_else(|_| serde_json::json!({}));
|
|
2069
|
-
let owner_epoch = state
|
|
2070
|
-
.get("owner_epoch")
|
|
2071
|
-
.and_then(serde_json::Value::as_u64)
|
|
2072
|
-
.or_else(|| {
|
|
2073
|
-
state
|
|
2074
|
-
.get("team_owner")
|
|
2075
|
-
.and_then(|owner| owner.get("owner_epoch"))
|
|
2076
|
-
.and_then(serde_json::Value::as_u64)
|
|
2077
|
-
})
|
|
2078
|
-
.unwrap_or(0)
|
|
2079
|
-
.saturating_add(1);
|
|
2080
|
-
let now = chrono::Utc::now().to_rfc3339();
|
|
2081
|
-
let socket = authority.endpoint.as_str();
|
|
2082
|
-
let provider = serde_json::to_value(plan.provider)?;
|
|
2083
|
-
let mut receiver = serde_json::json!({
|
|
2084
|
-
"mode": "direct_tmux",
|
|
2085
|
-
"status": "attached",
|
|
2086
|
-
"provider": provider.clone(),
|
|
2087
|
-
"pane_id": pane,
|
|
2088
|
-
"pane": pane,
|
|
2089
|
-
"leader_session_uuid": identity.leader_session_uuid,
|
|
2090
|
-
"owner_epoch": owner_epoch,
|
|
2091
|
-
"attached_at": now,
|
|
2092
|
-
"discovery": "current_pane",
|
|
2093
|
-
});
|
|
2094
|
-
if let Some(obj) = receiver.as_object_mut() {
|
|
2095
|
-
obj.insert(
|
|
2096
|
-
"session_name".to_string(),
|
|
2097
|
-
serde_json::json!(target.session.as_str()),
|
|
2098
|
-
);
|
|
2099
|
-
if let Some(window_name) = target.window_name.as_ref() {
|
|
2100
|
-
obj.insert(
|
|
2101
|
-
"window_name".to_string(),
|
|
2102
|
-
serde_json::json!(window_name.as_str()),
|
|
2103
|
-
);
|
|
2104
|
-
}
|
|
2105
|
-
obj.insert("tmux_socket".to_string(), serde_json::json!(socket));
|
|
2106
|
-
}
|
|
2107
|
-
bind_plan_session(&mut receiver, plan);
|
|
2108
|
-
let owner = serde_json::json!({
|
|
2109
|
-
"pane_id": pane,
|
|
2110
|
-
"provider": provider.clone(),
|
|
2111
|
-
"machine_fingerprint": identity.machine_fingerprint,
|
|
2112
|
-
"leader_session_uuid": identity.leader_session_uuid,
|
|
2113
|
-
"owner_epoch": owner_epoch,
|
|
2114
|
-
"claimed_at": now,
|
|
2115
|
-
"claimed_via": "claim-leader",
|
|
2116
|
-
"os_user": identity.os_user,
|
|
2117
|
-
});
|
|
2118
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2119
|
-
obj.insert(
|
|
2120
|
-
"active_team_key".to_string(),
|
|
2121
|
-
serde_json::json!(identity.team_id.as_str()),
|
|
2122
|
-
);
|
|
2123
|
-
// The ambient session identifies the leader receiver, not workers.
|
|
2124
|
-
// Leave any existing worker session untouched, including unknown state.
|
|
2125
|
-
obj.insert("tmux_endpoint".to_string(), serde_json::json!(socket));
|
|
2126
|
-
obj.insert("tmux_socket".to_string(), serde_json::json!(socket));
|
|
2127
|
-
obj.insert(
|
|
2128
|
-
"is_external_leader".to_string(),
|
|
2129
|
-
serde_json::json!(is_external_leader),
|
|
2130
|
-
);
|
|
2131
|
-
obj.insert(
|
|
2132
|
-
"leader_client".to_string(),
|
|
2133
|
-
serde_json::json!({
|
|
2134
|
-
"diagnostic_only": true,
|
|
2135
|
-
"attach_mode": "exec-provider",
|
|
2136
|
-
"tmux": authority.tmux.as_str(),
|
|
2137
|
-
}),
|
|
2138
|
-
);
|
|
2139
|
-
}
|
|
2140
|
-
// Stage 3a/d (identity-boundary unified plan, architect direction
|
|
2141
|
-
// 2026-06-23): compact-then-write-owner ordering as in
|
|
2142
|
-
// persist_managed_leader_binding above. write_owner must be the final
|
|
2143
|
-
// write so the canonical teams.<key> owner record survives.
|
|
2144
|
-
let entry = crate::state::projection::compact_team_state(&state);
|
|
2145
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2146
|
-
let teams = obj
|
|
2147
|
-
.entry("teams".to_string())
|
|
2148
|
-
.or_insert_with(|| serde_json::json!({}));
|
|
2149
|
-
if let Some(teams) = teams.as_object_mut() {
|
|
2150
|
-
teams.insert(identity.team_id.as_str().to_string(), entry);
|
|
2151
|
-
}
|
|
2152
|
-
}
|
|
2153
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
2154
|
-
.with_leader_receiver(receiver)
|
|
2155
|
-
.with_team_owner(owner)
|
|
2156
|
-
.with_owner_epoch(owner_epoch);
|
|
2157
|
-
crate::state::ownership::write_owner(&mut state, identity.team_id.as_str(), record);
|
|
2158
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2159
|
-
crate::state::repository::StateWriteIntent::LeaderStartBinding {
|
|
2160
|
-
team_key: identity.team_id.as_str(),
|
|
2161
|
-
transport_kind: "exec_provider",
|
|
2162
|
-
},
|
|
2163
|
-
&state,
|
|
2164
|
-
)?;
|
|
2165
|
-
Ok(())
|
|
2166
|
-
}
|
|
2167
|
-
|
|
2168
|
-
/// 0.5.35 (`.team/artifacts/managed-leader-provider-reentry-locate.md` §5/§6):
|
|
2169
|
-
/// three-way classification of an in-tmux ExecProvider invocation. Physical-
|
|
2170
|
-
/// channel-first — never consults `pane_current_command` or gates on
|
|
2171
|
-
/// `leader_session_uuid` equality (§6 forbids uuid-mismatch hard refusal).
|
|
2172
|
-
enum ExecProviderBinding {
|
|
2173
|
-
ManagedReentry,
|
|
2174
|
-
DifferentPaneAlreadyBound,
|
|
2175
|
-
Unbound,
|
|
2176
|
-
}
|
|
2177
|
-
|
|
2178
|
-
fn classify_exec_provider_binding(
|
|
2179
|
-
workspace: &Path,
|
|
2180
|
-
plan: &LeaderStartPlan,
|
|
2181
|
-
authority: &VerifiedAmbientPaneAuthority,
|
|
2182
|
-
) -> Result<ExecProviderBinding, LeaderError> {
|
|
2183
|
-
let pane = authority.pane_id.as_str();
|
|
2184
|
-
let state = match crate::state::persist::load_runtime_state(workspace) {
|
|
2185
|
-
Ok(state) => state,
|
|
2186
|
-
Err(_) => return Ok(ExecProviderBinding::Unbound),
|
|
2187
|
-
};
|
|
2188
|
-
let team_key = plan
|
|
2189
|
-
.identity
|
|
2190
|
-
.as_ref()
|
|
2191
|
-
.map(|identity| identity.team_id.as_str().to_string())
|
|
2192
|
-
.or_else(|| {
|
|
2193
|
-
state
|
|
2194
|
-
.get("active_team_key")
|
|
2195
|
-
.and_then(serde_json::Value::as_str)
|
|
2196
|
-
.filter(|s| !s.is_empty())
|
|
2197
|
-
.map(str::to_string)
|
|
2198
|
-
});
|
|
2199
|
-
let Some(team_key) = team_key else {
|
|
2200
|
-
return Ok(ExecProviderBinding::Unbound);
|
|
2201
|
-
};
|
|
2202
|
-
let Some(receiver) = state
|
|
2203
|
-
.pointer(&format!("/teams/{team_key}/leader_receiver"))
|
|
2204
|
-
.and_then(serde_json::Value::as_object)
|
|
2205
|
-
else {
|
|
2206
|
-
return Ok(ExecProviderBinding::Unbound);
|
|
2207
|
-
};
|
|
2208
|
-
let receiver_pane = receiver
|
|
2209
|
-
.get("pane_id")
|
|
2210
|
-
.or_else(|| receiver.get("pane"))
|
|
2211
|
-
.and_then(serde_json::Value::as_str)
|
|
2212
|
-
.unwrap_or("");
|
|
2213
|
-
if receiver_pane.is_empty() {
|
|
2214
|
-
return Ok(ExecProviderBinding::Unbound);
|
|
2215
|
-
}
|
|
2216
|
-
if receiver_pane != pane {
|
|
2217
|
-
return Ok(ExecProviderBinding::DifferentPaneAlreadyBound);
|
|
2218
|
-
}
|
|
2219
|
-
let leader_prefixed_session = authority
|
|
2220
|
-
.observed
|
|
2221
|
-
.session
|
|
2222
|
-
.as_str()
|
|
2223
|
-
.starts_with(LEADER_SESSION_PREFIX);
|
|
2224
|
-
if !leader_prefixed_session {
|
|
2225
|
-
return Ok(ExecProviderBinding::DifferentPaneAlreadyBound);
|
|
2226
|
-
}
|
|
2227
|
-
let recorded_socket = receiver
|
|
2228
|
-
.get("tmux_socket")
|
|
2229
|
-
.and_then(serde_json::Value::as_str)
|
|
2230
|
-
.filter(|s| !s.is_empty());
|
|
2231
|
-
if let Some(recorded_socket) = recorded_socket {
|
|
2232
|
-
if authority.endpoint != recorded_socket {
|
|
2233
|
-
return Ok(ExecProviderBinding::DifferentPaneAlreadyBound);
|
|
2234
|
-
}
|
|
2235
|
-
}
|
|
2236
|
-
Ok(ExecProviderBinding::ManagedReentry)
|
|
2237
|
-
}
|
|
2238
|
-
|
|
2239
|
-
/// 0.5.35: same-pane provider re-entry refresh path. Preserves canonical
|
|
2240
|
-
/// team runtime identity (`session_name`/`team_dir`/`spec_path`/`agents`/
|
|
2241
|
-
/// `tasks`) and epoch non-regressively; updates only diagnostic receiver
|
|
2242
|
-
/// fields. Stage 3 strip preserved (root `team_owner`/`leader_receiver`/
|
|
2243
|
-
/// `owner_epoch` are NOT reintroduced — writes go through
|
|
2244
|
-
/// `state::ownership::write_owner` into the canonical teams.<key> slot).
|
|
2245
|
-
fn refresh_managed_leader_provider_binding(
|
|
2246
|
-
plan: &LeaderStartPlan,
|
|
2247
|
-
workspace: &Path,
|
|
2248
|
-
authority: &VerifiedAmbientPaneAuthority,
|
|
2249
|
-
) -> Result<(), LeaderError> {
|
|
2250
|
-
let identity = plan.identity.as_ref().ok_or_else(|| {
|
|
2251
|
-
LeaderError::Start("managed leader re-entry identity missing".to_string())
|
|
2252
|
-
})?;
|
|
2253
|
-
let pane = authority.pane_id.as_str();
|
|
2254
|
-
let target = &authority.observed;
|
|
2255
|
-
let mut state = crate::state::persist::load_runtime_state(workspace)
|
|
2256
|
-
.unwrap_or_else(|_| serde_json::json!({}));
|
|
2257
|
-
let team_key = identity.team_id.as_str();
|
|
2258
|
-
let existing_receiver = state
|
|
2259
|
-
.pointer(&format!("/teams/{team_key}/leader_receiver"))
|
|
2260
|
-
.cloned()
|
|
2261
|
-
.unwrap_or_else(|| serde_json::json!({}));
|
|
2262
|
-
let existing_owner = crate::state::ownership::read_owner_value(&state, team_key)
|
|
2263
|
-
.cloned()
|
|
2264
|
-
.unwrap_or_else(|| serde_json::json!({}));
|
|
2265
|
-
let existing_epoch = state
|
|
2266
|
-
.pointer(&format!("/teams/{team_key}/owner_epoch"))
|
|
2267
|
-
.and_then(serde_json::Value::as_u64)
|
|
2268
|
-
.or_else(|| {
|
|
2269
|
-
existing_owner
|
|
2270
|
-
.get("owner_epoch")
|
|
2271
|
-
.and_then(serde_json::Value::as_u64)
|
|
2272
|
-
})
|
|
2273
|
-
.or_else(|| {
|
|
2274
|
-
existing_receiver
|
|
2275
|
-
.get("owner_epoch")
|
|
2276
|
-
.and_then(serde_json::Value::as_u64)
|
|
2277
|
-
})
|
|
2278
|
-
.unwrap_or(0);
|
|
2279
|
-
let now = chrono::Utc::now().to_rfc3339();
|
|
2280
|
-
let provider = serde_json::to_value(plan.provider)?;
|
|
2281
|
-
let mut receiver = match existing_receiver.as_object() {
|
|
2282
|
-
Some(map) => serde_json::Value::Object(map.clone()),
|
|
2283
|
-
None => serde_json::json!({}),
|
|
2284
|
-
};
|
|
2285
|
-
if let Some(obj) = receiver.as_object_mut() {
|
|
2286
|
-
obj.insert("mode".to_string(), serde_json::json!("direct_tmux"));
|
|
2287
|
-
obj.insert("status".to_string(), serde_json::json!("attached"));
|
|
2288
|
-
obj.insert("provider".to_string(), provider.clone());
|
|
2289
|
-
obj.insert("pane_id".to_string(), serde_json::json!(pane));
|
|
2290
|
-
obj.insert("pane".to_string(), serde_json::json!(pane));
|
|
2291
|
-
obj.insert("attached_at".to_string(), serde_json::json!(now.clone()));
|
|
2292
|
-
obj.insert("discovery".to_string(), serde_json::json!("managed_leader"));
|
|
2293
|
-
obj.insert("owner_epoch".to_string(), serde_json::json!(existing_epoch));
|
|
2294
|
-
obj.entry("leader_session_uuid".to_string())
|
|
2295
|
-
.or_insert_with(|| serde_json::json!(identity.leader_session_uuid.as_str()));
|
|
2296
|
-
obj.insert(
|
|
2297
|
-
"session_name".to_string(),
|
|
2298
|
-
serde_json::json!(target.session.as_str()),
|
|
2299
|
-
);
|
|
2300
|
-
if let Some(window_name) = target.window_name.as_ref() {
|
|
2301
|
-
obj.insert(
|
|
2302
|
-
"window_name".to_string(),
|
|
2303
|
-
serde_json::json!(window_name.as_str()),
|
|
2304
|
-
);
|
|
2305
|
-
}
|
|
2306
|
-
if let Some(pane_pid) = target.pane_pid {
|
|
2307
|
-
obj.insert("pane_pid".to_string(), serde_json::json!(pane_pid));
|
|
2308
|
-
}
|
|
2309
|
-
}
|
|
2310
|
-
let mut owner = match existing_owner.as_object() {
|
|
2311
|
-
Some(map) => serde_json::Value::Object(map.clone()),
|
|
2312
|
-
None => serde_json::json!({}),
|
|
2313
|
-
};
|
|
2314
|
-
if let Some(obj) = owner.as_object_mut() {
|
|
2315
|
-
obj.insert("pane_id".to_string(), serde_json::json!(pane));
|
|
2316
|
-
obj.insert("provider".to_string(), provider);
|
|
2317
|
-
obj.insert("owner_epoch".to_string(), serde_json::json!(existing_epoch));
|
|
2318
|
-
obj.entry("machine_fingerprint".to_string())
|
|
2319
|
-
.or_insert_with(|| serde_json::json!(identity.machine_fingerprint.as_str()));
|
|
2320
|
-
obj.entry("leader_session_uuid".to_string())
|
|
2321
|
-
.or_insert_with(|| serde_json::json!(identity.leader_session_uuid.as_str()));
|
|
2322
|
-
obj.entry("claimed_via".to_string())
|
|
2323
|
-
.or_insert_with(|| serde_json::json!("claim-leader"));
|
|
2324
|
-
obj.entry("os_user".to_string())
|
|
2325
|
-
.or_insert_with(|| serde_json::json!(identity.os_user.as_str()));
|
|
2326
|
-
}
|
|
2327
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2328
|
-
obj.insert("active_team_key".to_string(), serde_json::json!(team_key));
|
|
2329
|
-
obj.insert(
|
|
2330
|
-
"leader_client".to_string(),
|
|
2331
|
-
serde_json::json!({
|
|
2332
|
-
"diagnostic_only": true,
|
|
2333
|
-
"attach_mode": "exec-provider",
|
|
2334
|
-
"tmux": authority.tmux.as_str(),
|
|
2335
|
-
"reentry": true,
|
|
2336
|
-
}),
|
|
2337
|
-
);
|
|
2338
|
-
}
|
|
2339
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
2340
|
-
.with_leader_receiver(receiver)
|
|
2341
|
-
.with_team_owner(owner)
|
|
2342
|
-
.with_owner_epoch(existing_epoch);
|
|
2343
|
-
crate::state::ownership::write_owner(&mut state, team_key, record);
|
|
2344
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2345
|
-
crate::state::repository::StateWriteIntent::LeaderStartBinding {
|
|
2346
|
-
team_key,
|
|
2347
|
-
transport_kind: "managed_reentry",
|
|
2348
|
-
},
|
|
2349
|
-
&state,
|
|
2350
|
-
)?;
|
|
2351
|
-
Ok(())
|
|
2352
|
-
}
|
|
2353
|
-
|
|
2354
|
-
enum CurrentTmuxPaneInfoError {
|
|
2355
|
-
QueryFailed,
|
|
2356
|
-
PaneNotFound,
|
|
2357
|
-
}
|
|
2358
|
-
|
|
2359
|
-
fn current_tmux_pane_info(
|
|
2360
|
-
pane_id: &PaneId,
|
|
2361
|
-
endpoint: &str,
|
|
2362
|
-
) -> Result<crate::transport::PaneInfo, CurrentTmuxPaneInfoError> {
|
|
2363
|
-
crate::transport_factory::tmux_endpoint_transport(endpoint)
|
|
2364
|
-
.list_targets()
|
|
2365
|
-
.map_err(|_| CurrentTmuxPaneInfoError::QueryFailed)?
|
|
2366
|
-
.into_iter()
|
|
2367
|
-
.find(|target| target.pane_id == *pane_id)
|
|
2368
|
-
.ok_or(CurrentTmuxPaneInfoError::PaneNotFound)
|
|
2369
|
-
}
|
|
2370
|
-
|
|
2371
|
-
fn persist_external_leader_topology_marker(
|
|
2372
|
-
plan: &LeaderStartPlan,
|
|
2373
|
-
workspace: &Path,
|
|
2374
|
-
) -> Result<(), LeaderError> {
|
|
2375
|
-
let identity = plan
|
|
2376
|
-
.identity
|
|
2377
|
-
.as_ref()
|
|
2378
|
-
.ok_or_else(|| LeaderError::Start("external leader identity missing".to_string()))?;
|
|
2379
|
-
let mut state = crate::state::persist::load_runtime_state(workspace)
|
|
2380
|
-
.unwrap_or_else(|_| serde_json::json!({}));
|
|
2381
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2382
|
-
obj.entry("workspace".to_string()).or_insert_with(|| {
|
|
2383
|
-
serde_json::json!(resolve_workspace_for_hash(workspace)
|
|
2384
|
-
.to_string_lossy()
|
|
2385
|
-
.to_string())
|
|
2386
|
-
});
|
|
2387
|
-
obj.entry("active_team_key".to_string())
|
|
2388
|
-
.or_insert_with(|| serde_json::json!(identity.team_id.as_str()));
|
|
2389
|
-
if let Some(session) = plan.session_name.as_ref() {
|
|
2390
|
-
obj.entry("session_name".to_string())
|
|
2391
|
-
.or_insert_with(|| serde_json::json!(session.as_str()));
|
|
2392
|
-
}
|
|
2393
|
-
obj.insert("is_external_leader".to_string(), serde_json::json!(true));
|
|
2394
|
-
}
|
|
2395
|
-
let entry = crate::state::projection::compact_team_state(&state);
|
|
2396
|
-
if let Some(obj) = state.as_object_mut() {
|
|
2397
|
-
let teams = obj
|
|
2398
|
-
.entry("teams".to_string())
|
|
2399
|
-
.or_insert_with(|| serde_json::json!({}));
|
|
2400
|
-
if let Some(teams) = teams.as_object_mut() {
|
|
2401
|
-
teams.insert(identity.team_id.as_str().to_string(), entry);
|
|
2402
|
-
}
|
|
2403
|
-
}
|
|
2404
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2405
|
-
crate::state::repository::StateWriteIntent::LeaderStartBinding {
|
|
2406
|
-
team_key: identity.team_id.as_str(),
|
|
2407
|
-
transport_kind: "external",
|
|
2408
|
-
},
|
|
2409
|
-
&state,
|
|
2410
|
-
)?;
|
|
2411
|
-
Ok(())
|
|
2412
|
-
}
|
|
2413
|
-
|
|
2414
|
-
fn insert_detach_flag(argv: &mut Vec<String>) -> bool {
|
|
2415
|
-
if argv.iter().any(|arg| arg == "-d") {
|
|
2416
|
-
return false;
|
|
2417
|
-
}
|
|
2418
|
-
let Some(pos) = argv.iter().position(|arg| arg == "new-session") else {
|
|
2419
|
-
return false;
|
|
2420
|
-
};
|
|
2421
|
-
argv.insert(pos + 1, "-d".to_string());
|
|
2422
|
-
true
|
|
2423
|
-
}
|
|
2424
|
-
|
|
2425
|
-
fn run_leader_argv(
|
|
2426
|
-
argv: &[String],
|
|
2427
|
-
env: &BTreeMap<String, String>,
|
|
2428
|
-
plan: &LeaderStartPlan,
|
|
2429
|
-
workspace: &Path,
|
|
2430
|
-
managed_watch: Option<ManagedAttachWatch<'_>>,
|
|
2431
|
-
) -> Result<LeaderProcessExit, LeaderError> {
|
|
2432
|
-
let Some(program) = argv.first() else {
|
|
2433
|
-
return Err(LeaderError::Start(
|
|
2434
|
-
"leader launch argv is empty".to_string(),
|
|
2435
|
-
));
|
|
2436
|
-
};
|
|
2437
|
-
let diagnostics_path = launcher_diagnostics_path(workspace);
|
|
2438
|
-
if let Err(error) = write_launcher_diagnostics_header(&diagnostics_path, plan, argv) {
|
|
2439
|
-
return Err(LeaderError::Start(format!(
|
|
2440
|
-
"leader launcher diagnostics unavailable; startup_stage=diagnostics_create; launcher_diagnostics={}; error={error}",
|
|
2441
|
-
diagnostics_path.display()
|
|
2442
|
-
)));
|
|
2443
|
-
}
|
|
2444
|
-
// 0.4.x regression fix (env-leak scenario 1, in-tmux ExecProvider path):
|
|
2445
|
-
// the managed-tmux path got the provider env-unset block via the shell
|
|
2446
|
-
// wrapper (cb9c217), but the ExecProvider in-tmux path here is a direct
|
|
2447
|
-
// Command::spawn().wait() — it inherits the parent process's full env
|
|
2448
|
-
// including any CLAUDE_CODE_SESSION_ID / CLAUDE_CODE_CHILD_SESSION /
|
|
2449
|
-
// CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS / CLAUDE_CODE_ENTRYPOINT /
|
|
2450
|
-
// CLAUDE_CODE_EXECPATH / CLAUDECODE that the launching shell carries.
|
|
2451
|
-
// Apply the SAME env-unset list used by the managed path (CR R6 single
|
|
2452
|
-
// source: profile_launch::provider_env_unsets via
|
|
2453
|
-
// leader_env_unset_for_provider).
|
|
2454
|
-
let env_unset = leader_env_unset_for_provider(plan.provider);
|
|
2455
|
-
let mut command = Command::new(program);
|
|
2456
|
-
command.args(argv.iter().skip(1)).stdin(Stdio::inherit());
|
|
2457
|
-
let capture_stdout = !std::io::stdout().is_terminal();
|
|
2458
|
-
command.stdout(if capture_stdout {
|
|
2459
|
-
Stdio::piped()
|
|
2460
|
-
} else {
|
|
2461
|
-
Stdio::inherit()
|
|
2462
|
-
});
|
|
2463
|
-
let capture_stderr =
|
|
2464
|
-
plan.mode != LeaderStartMode::ExecProvider || !std::io::stderr().is_terminal();
|
|
2465
|
-
command.stderr(if capture_stderr {
|
|
2466
|
-
Stdio::piped()
|
|
2467
|
-
} else {
|
|
2468
|
-
Stdio::inherit()
|
|
2469
|
-
});
|
|
2470
|
-
// 0.4.x order fix: env_remove MUST run AFTER envs(). The `env` map comes
|
|
2471
|
-
// from `merged_exec_env` which seeds with `std::env::vars().collect()` —
|
|
2472
|
-
// calling `.envs(env)` re-adds every inherited CLAUDE_CODE_* the launching
|
|
2473
|
-
// shell carried, overwriting any prior env_remove. By removing AFTER the
|
|
2474
|
-
// bulk envs() call, the final Command env table has the leak keys
|
|
2475
|
-
// structurally absent. Verified by the regression grep guard that the
|
|
2476
|
-
// env_remove call appears AFTER `command.envs(env)`.
|
|
2477
|
-
command.envs(env);
|
|
2478
|
-
for key in &env_unset {
|
|
2479
|
-
command.env_remove(key);
|
|
2480
|
-
}
|
|
2481
|
-
if plan.mode == LeaderStartMode::ManagedTmuxClient
|
|
2482
|
-
&& argv.iter().any(|arg| arg == "attach-session")
|
|
2483
|
-
{
|
|
2484
|
-
command.env_remove("TMUX");
|
|
2485
|
-
command.env_remove("TMUX_PANE");
|
|
2486
|
-
}
|
|
2487
|
-
let mut child = command.spawn().map_err(|error| {
|
|
2488
|
-
LeaderError::Start(format!(
|
|
2489
|
-
"leader launcher spawn failed; startup_stage=spawn; launcher_diagnostics={}; error={error}",
|
|
2490
|
-
diagnostics_path.display()
|
|
2491
|
-
))
|
|
2492
|
-
})?;
|
|
2493
|
-
append_launcher_diagnostics(&diagnostics_path, "startup_stage=spawned\n").map_err(|error| {
|
|
2494
|
-
LeaderError::Start(format!(
|
|
2495
|
-
"leader launcher diagnostics write failed; startup_stage=spawned; launcher_diagnostics={}; error={error}",
|
|
2496
|
-
diagnostics_path.display()
|
|
2497
|
-
))
|
|
2498
|
-
})?;
|
|
2499
|
-
// Captured transport diagnostics can echo the shell argv carrying the
|
|
2500
|
-
// prompt. Do not tee those bytes before redaction. Native ExecProvider
|
|
2501
|
-
// business streams and inherited TTY stdout keep their existing behavior.
|
|
2502
|
-
let withhold_transport_output = plan.leader_prompt.is_some()
|
|
2503
|
-
&& plan.mode != LeaderStartMode::ExecProvider;
|
|
2504
|
-
let stdout_reader = child.stdout.take().map(|mut child_stdout| {
|
|
2505
|
-
std::thread::spawn(move || {
|
|
2506
|
-
let mut captured = Vec::new();
|
|
2507
|
-
let mut buf = [0_u8; 4096];
|
|
2508
|
-
loop {
|
|
2509
|
-
let Ok(read) = child_stdout.read(&mut buf) else {
|
|
2510
|
-
break;
|
|
2511
|
-
};
|
|
2512
|
-
if read == 0 {
|
|
2513
|
-
break;
|
|
2514
|
-
}
|
|
2515
|
-
if !withhold_transport_output {
|
|
2516
|
-
let _ = std::io::stdout().write_all(&buf[..read]);
|
|
2517
|
-
}
|
|
2518
|
-
captured.extend_from_slice(&buf[..read]);
|
|
2519
|
-
}
|
|
2520
|
-
captured
|
|
2521
|
-
})
|
|
2522
|
-
});
|
|
2523
|
-
let stderr_reader = child.stderr.take().map(|mut child_stderr| {
|
|
2524
|
-
std::thread::spawn(move || {
|
|
2525
|
-
let mut captured = Vec::new();
|
|
2526
|
-
let mut buf = [0_u8; 4096];
|
|
2527
|
-
loop {
|
|
2528
|
-
let Ok(read) = child_stderr.read(&mut buf) else {
|
|
2529
|
-
break;
|
|
2530
|
-
};
|
|
2531
|
-
if read == 0 {
|
|
2532
|
-
break;
|
|
2533
|
-
}
|
|
2534
|
-
if !withhold_transport_output {
|
|
2535
|
-
let _ = std::io::stderr().write_all(&buf[..read]);
|
|
2536
|
-
}
|
|
2537
|
-
captured.extend_from_slice(&buf[..read]);
|
|
2538
|
-
}
|
|
2539
|
-
captured
|
|
2540
|
-
})
|
|
2541
|
-
});
|
|
2542
|
-
if plan.mode == LeaderStartMode::ExecProvider {
|
|
2543
|
-
spawn_exec_provider_startup_prompt_handler(plan.provider, workspace.to_path_buf());
|
|
2544
|
-
}
|
|
2545
|
-
#[cfg(unix)]
|
|
2546
|
-
let _term_guard = managed_watch.as_ref().map(|_| ManagedTermGuard::install());
|
|
2547
|
-
let (status, intentional_teardown) = if let Some(watch) = managed_watch.as_ref() {
|
|
2548
|
-
wait_managed_attach_child(&mut child, watch)?
|
|
2549
|
-
} else {
|
|
2550
|
-
(child.wait().map_err(LeaderError::Io)?, false)
|
|
2551
|
-
};
|
|
2552
|
-
let stdout = match stdout_reader {
|
|
2553
|
-
Some(reader) => match reader.join() {
|
|
2554
|
-
Ok(bytes) => String::from_utf8_lossy(&bytes).into_owned(),
|
|
2555
|
-
Err(_) => String::new(),
|
|
2556
|
-
},
|
|
2557
|
-
None => String::new(),
|
|
2558
|
-
};
|
|
2559
|
-
let stderr = match stderr_reader {
|
|
2560
|
-
Some(reader) => match reader.join() {
|
|
2561
|
-
Ok(bytes) => String::from_utf8_lossy(&bytes).into_owned(),
|
|
2562
|
-
Err(_) => String::new(),
|
|
2563
|
-
},
|
|
2564
|
-
None => String::new(),
|
|
2565
|
-
};
|
|
2566
|
-
append_launcher_diagnostics(
|
|
2567
|
-
&diagnostics_path,
|
|
2568
|
-
&format!(
|
|
2569
|
-
"startup_stage=exited\nexit_code={}\nchild_stdout={}\nchild_stderr={}\n",
|
|
2570
|
-
status
|
|
2571
|
-
.code()
|
|
2572
|
-
.map(|code| code.to_string())
|
|
2573
|
-
.unwrap_or_else(|| "signal".to_string()),
|
|
2574
|
-
prompt_aware_diagnostic_text(plan, &stdout),
|
|
2575
|
-
prompt_aware_diagnostic_text(plan, &stderr),
|
|
2576
|
-
),
|
|
2577
|
-
)
|
|
2578
|
-
.map_err(|error| {
|
|
2579
|
-
LeaderError::Start(format!(
|
|
2580
|
-
"leader launcher diagnostics write failed; startup_stage=exited; launcher_diagnostics={}; error={error}",
|
|
2581
|
-
diagnostics_path.display()
|
|
2582
|
-
))
|
|
2583
|
-
})?;
|
|
2584
|
-
let stderr = if plan.leader_prompt.is_some() {
|
|
2585
|
-
prompt_aware_diagnostic_text(plan, &stderr)
|
|
2586
|
-
} else {
|
|
2587
|
-
stderr
|
|
2588
|
-
};
|
|
2589
|
-
Ok(LeaderProcessExit {
|
|
2590
|
-
status,
|
|
2591
|
-
stderr,
|
|
2592
|
-
diagnostics_path,
|
|
2593
|
-
intentional_teardown,
|
|
2594
|
-
})
|
|
2595
|
-
}
|
|
2596
|
-
|
|
2597
|
-
fn wait_managed_attach_child(
|
|
2598
|
-
child: &mut std::process::Child,
|
|
2599
|
-
watch: &ManagedAttachWatch<'_>,
|
|
2600
|
-
) -> Result<(std::process::ExitStatus, bool), LeaderError> {
|
|
2601
|
-
loop {
|
|
2602
|
-
if let Some(status) = child.try_wait().map_err(LeaderError::Io)? {
|
|
2603
|
-
return Ok((status, false));
|
|
2604
|
-
}
|
|
2605
|
-
let signalled = {
|
|
2606
|
-
#[cfg(unix)]
|
|
2607
|
-
{
|
|
2608
|
-
MANAGED_ATTACH_TEARDOWN.load(Ordering::SeqCst)
|
|
2609
|
-
}
|
|
2610
|
-
#[cfg(not(unix))]
|
|
2611
|
-
{
|
|
2612
|
-
false
|
|
2613
|
-
}
|
|
2614
|
-
};
|
|
2615
|
-
if signalled || managed_attach_should_teardown(watch) {
|
|
2616
|
-
// `managed_attach_should_teardown` costs a tmux round-trip, and the
|
|
2617
|
-
// attach child can lose that race: it dies BY ITSELF inside the
|
|
2618
|
-
// window (`open terminal failed: not a terminal`, or a client whose
|
|
2619
|
-
// attach was rejected). Re-check before we touch anything. A child
|
|
2620
|
-
// that already failed on its own was never torn down by us, so it
|
|
2621
|
-
// must NOT be reported as an intentional teardown — its non-zero
|
|
2622
|
-
// status has to reach the launcher failure path
|
|
2623
|
-
// (`execute_managed_leader_plan_attempt`), which is what surfaces the
|
|
2624
|
-
// error and drives attach recovery. Only the FAILING self-exit is
|
|
2625
|
-
// diverted: a clean self-exit keeps the pre-existing behaviour
|
|
2626
|
-
// (cleanup + intentional teardown + exit 0), and an explicit signal
|
|
2627
|
-
// teardown stays intentional regardless.
|
|
2628
|
-
if !signalled {
|
|
2629
|
-
if let Some(status) = child.try_wait().map_err(LeaderError::Io)? {
|
|
2630
|
-
if !status.success() {
|
|
2631
|
-
return Ok((status, false));
|
|
2632
|
-
}
|
|
2633
|
-
}
|
|
2634
|
-
}
|
|
2635
|
-
let reason = if signalled {
|
|
2636
|
-
"launcher_signal"
|
|
2637
|
-
} else {
|
|
2638
|
-
"provider_exited"
|
|
2639
|
-
};
|
|
2640
|
-
cleanup_managed_leader_resources(
|
|
2641
|
-
watch.transport,
|
|
2642
|
-
watch.session,
|
|
2643
|
-
watch.spawned,
|
|
2644
|
-
watch.session_existed_before,
|
|
2645
|
-
watch.workspace,
|
|
2646
|
-
reason,
|
|
2647
|
-
);
|
|
2648
|
-
let status = terminate_managed_attach_child(child)?;
|
|
2649
|
-
return Ok((status, true));
|
|
2650
|
-
}
|
|
2651
|
-
std::thread::sleep(Duration::from_millis(200));
|
|
2652
|
-
}
|
|
2653
|
-
}
|
|
2654
|
-
|
|
2655
|
-
fn terminate_managed_attach_child(
|
|
2656
|
-
child: &mut std::process::Child,
|
|
2657
|
-
) -> Result<std::process::ExitStatus, LeaderError> {
|
|
2658
|
-
if let Some(status) = child.try_wait().map_err(LeaderError::Io)? {
|
|
2659
|
-
return Ok(status);
|
|
2660
|
-
}
|
|
2661
|
-
#[cfg(unix)]
|
|
2662
|
-
unsafe {
|
|
2663
|
-
libc::kill(child.id() as i32, libc::SIGTERM);
|
|
2664
|
-
}
|
|
2665
|
-
for _ in 0..20 {
|
|
2666
|
-
std::thread::sleep(Duration::from_millis(50));
|
|
2667
|
-
if let Some(status) = child.try_wait().map_err(LeaderError::Io)? {
|
|
2668
|
-
return Ok(status);
|
|
2669
|
-
}
|
|
2670
|
-
}
|
|
2671
|
-
let _ = child.kill();
|
|
2672
|
-
child.wait().map_err(LeaderError::Io)
|
|
2673
|
-
}
|
|
2674
|
-
|
|
2675
|
-
fn launcher_diagnostics_path(workspace: &Path) -> PathBuf {
|
|
2676
|
-
let stamp = chrono::Utc::now().format("%Y%m%d-%H%M%S%.6f");
|
|
2677
|
-
workspace.join(".team").join("logs").join(format!(
|
|
2678
|
-
"launcher-diagnostics-{stamp}-{}.log",
|
|
2679
|
-
std::process::id()
|
|
2680
|
-
))
|
|
2681
|
-
}
|
|
2682
|
-
|
|
2683
|
-
fn prompt_aware_diagnostic_text(plan: &LeaderStartPlan, text: &str) -> String {
|
|
2684
|
-
if plan.leader_prompt.is_some() {
|
|
2685
|
-
"[withheld: Leader prompt-bearing launch]".to_string()
|
|
2686
|
-
} else {
|
|
2687
|
-
crate::redaction::redact_external_text(text)
|
|
2688
|
-
}
|
|
2689
|
-
}
|
|
2690
|
-
|
|
2691
|
-
fn write_launcher_diagnostics_header(
|
|
2692
|
-
path: &Path,
|
|
2693
|
-
plan: &LeaderStartPlan,
|
|
2694
|
-
argv: &[String],
|
|
2695
|
-
) -> Result<(), std::io::Error> {
|
|
2696
|
-
if let Some(parent) = path.parent() {
|
|
2697
|
-
std::fs::create_dir_all(parent)?;
|
|
2698
|
-
}
|
|
2699
|
-
let metadata = plan
|
|
2700
|
-
.leader_prompt
|
|
2701
|
-
.as_ref()
|
|
2702
|
-
.map(serde_json::to_string)
|
|
2703
|
-
.transpose()
|
|
2704
|
-
.map_err(|error| std::io::Error::new(std::io::ErrorKind::InvalidData, error))?
|
|
2705
|
-
.map(|metadata| format!("leader_prompt={metadata}\n"))
|
|
2706
|
-
.unwrap_or_default();
|
|
2707
|
-
std::fs::write(
|
|
2708
|
-
path,
|
|
2709
|
-
format!(
|
|
2710
|
-
"startup_stage=prepare\nmode={:?}\nprovider={}\nargv={}\n{}",
|
|
2711
|
-
plan.mode,
|
|
2712
|
-
provider_wire(plan.provider),
|
|
2713
|
-
prompt_aware_diagnostic_text(plan, &argv.join(" ")),
|
|
2714
|
-
metadata,
|
|
2715
|
-
),
|
|
2716
|
-
)
|
|
2717
|
-
}
|
|
2718
|
-
|
|
2719
|
-
fn append_launcher_diagnostics(path: &Path, text: &str) -> Result<(), std::io::Error> {
|
|
2720
|
-
use std::io::Write as _;
|
|
2721
|
-
let mut file = std::fs::OpenOptions::new().append(true).open(path)?;
|
|
2722
|
-
file.write_all(text.as_bytes())
|
|
2723
|
-
}
|
|
2724
|
-
|
|
2725
|
-
const LEADER_STDERR_LIMIT: usize = 8192;
|
|
2726
|
-
|
|
2727
|
-
struct LeaderProcessExit {
|
|
2728
|
-
status: std::process::ExitStatus,
|
|
2729
|
-
stderr: String,
|
|
2730
|
-
diagnostics_path: PathBuf,
|
|
2731
|
-
intentional_teardown: bool,
|
|
2732
|
-
}
|
|
2733
|
-
|
|
2734
|
-
fn push_bounded_stderr(captured: &mut Vec<u8>, chunk: &[u8]) {
|
|
2735
|
-
if chunk.len() >= LEADER_STDERR_LIMIT {
|
|
2736
|
-
captured.clear();
|
|
2737
|
-
captured.extend_from_slice(&chunk[chunk.len() - LEADER_STDERR_LIMIT..]);
|
|
2738
|
-
return;
|
|
2739
|
-
}
|
|
2740
|
-
let excess = captured
|
|
2741
|
-
.len()
|
|
2742
|
-
.saturating_add(chunk.len())
|
|
2743
|
-
.saturating_sub(LEADER_STDERR_LIMIT);
|
|
2744
|
-
if excess > 0 {
|
|
2745
|
-
captured.drain(..excess);
|
|
2746
|
-
}
|
|
2747
|
-
captured.extend_from_slice(chunk);
|
|
2748
|
-
}
|
|
2749
|
-
|
|
2750
|
-
fn leader_launcher_failure(process: &LeaderProcessExit) -> String {
|
|
2751
|
-
let status = process
|
|
2752
|
-
.status
|
|
2753
|
-
.code()
|
|
2754
|
-
.map(|code| code.to_string())
|
|
2755
|
-
.unwrap_or_else(|| "signal".to_string());
|
|
2756
|
-
format!(
|
|
2757
|
-
"{}; startup_stage=exited; launcher_diagnostics={}",
|
|
2758
|
-
format_launcher_failure(&status, process.status.code().is_none(), &process.stderr),
|
|
2759
|
-
process.diagnostics_path.display()
|
|
2760
|
-
)
|
|
2761
|
-
}
|
|
2762
|
-
|
|
2763
|
-
fn format_launcher_failure(status: &str, signaled: bool, raw_stderr: &str) -> String {
|
|
2764
|
-
let stderr_class = classify_launcher_stderr(raw_stderr, signaled);
|
|
2765
|
-
let stderr = bounded_stderr_text(crate::redaction::redact_external_text(raw_stderr.trim()));
|
|
2766
|
-
let stderr = if stderr.is_empty() {
|
|
2767
|
-
"<empty>".to_string()
|
|
2768
|
-
} else {
|
|
2769
|
-
stderr
|
|
2770
|
-
};
|
|
2771
|
-
format!(
|
|
2772
|
-
"leader launcher exited with status {status}; stderr_class={stderr_class}; stderr_excerpt={stderr}"
|
|
2773
|
-
)
|
|
2774
|
-
}
|
|
2775
|
-
|
|
2776
|
-
fn bounded_stderr_text(stderr: String) -> String {
|
|
2777
|
-
if stderr.len() <= LEADER_STDERR_LIMIT {
|
|
2778
|
-
return stderr;
|
|
2779
|
-
}
|
|
2780
|
-
let mut start = stderr.len() - LEADER_STDERR_LIMIT;
|
|
2781
|
-
while !stderr.is_char_boundary(start) {
|
|
2782
|
-
start += 1;
|
|
2783
|
-
}
|
|
2784
|
-
stderr[start..].to_string()
|
|
2785
|
-
}
|
|
2786
|
-
|
|
2787
|
-
fn classify_launcher_stderr(stderr: &str, signaled: bool) -> &'static str {
|
|
2788
|
-
let stderr = stderr.to_ascii_lowercase();
|
|
2789
|
-
if stderr.contains("server exited") {
|
|
2790
|
-
"server_exited"
|
|
2791
|
-
} else if stderr.contains("no server running") || stderr.contains("failed to connect to server")
|
|
2792
|
-
{
|
|
2793
|
-
"no_server"
|
|
2794
|
-
} else if stderr.contains("not a terminal") {
|
|
2795
|
-
"not_a_terminal"
|
|
2796
|
-
} else if stderr.contains("can't find session") || stderr.contains("no sessions") {
|
|
2797
|
-
"target_missing"
|
|
2798
|
-
} else if signaled {
|
|
2799
|
-
"signal"
|
|
2800
|
-
} else {
|
|
2801
|
-
"non_zero"
|
|
2802
|
-
}
|
|
2803
|
-
}
|
|
2804
|
-
|
|
2805
|
-
fn spawn_exec_provider_startup_prompt_handler(provider: Provider, workspace: PathBuf) {
|
|
2806
|
-
let Some(pane_id) = std::env::var("TMUX_PANE")
|
|
2807
|
-
.ok()
|
|
2808
|
-
.filter(|value| !value.trim().is_empty())
|
|
2809
|
-
else {
|
|
2810
|
-
write_leader_startup_prompt_event(
|
|
2811
|
-
&workspace,
|
|
2812
|
-
"leader.startup_prompt_skipped",
|
|
2813
|
-
serde_json::json!({
|
|
2814
|
-
"provider": provider_wire(provider),
|
|
2815
|
-
"reason": "tmux_pane_missing",
|
|
2816
|
-
"action": "skip",
|
|
2817
|
-
}),
|
|
2818
|
-
);
|
|
2819
|
-
return;
|
|
2820
|
-
};
|
|
2821
|
-
std::thread::spawn(move || {
|
|
2822
|
-
let transport = tmux_transport_for_current_pane();
|
|
2823
|
-
let _ = handle_exec_provider_startup_prompts(
|
|
2824
|
-
provider, &workspace, &pane_id, &transport, 30, 0.5,
|
|
2825
|
-
);
|
|
2826
|
-
});
|
|
2827
|
-
}
|
|
2828
|
-
|
|
2829
|
-
fn spawn_managed_provider_startup_prompt_handler(
|
|
2830
|
-
provider: Provider,
|
|
2831
|
-
workspace: PathBuf,
|
|
2832
|
-
pane_id: String,
|
|
2833
|
-
) {
|
|
2834
|
-
std::thread::spawn(move || {
|
|
2835
|
-
// Phase 1d Batch 6: factory tmux workspace helper for
|
|
2836
|
-
// grep-visibility. Semantics unchanged.
|
|
2837
|
-
let transport = crate::transport_factory::tmux_workspace_transport(&workspace);
|
|
2838
|
-
let _ = handle_exec_provider_startup_prompts(
|
|
2839
|
-
provider, &workspace, &pane_id, &transport, 30, 0.5,
|
|
2840
|
-
);
|
|
2841
|
-
});
|
|
2842
|
-
}
|
|
2843
|
-
|
|
2844
|
-
fn tmux_transport_for_current_pane() -> TmuxBackend {
|
|
2845
|
-
// Phase 1d Batch 6: factory tmux channel helpers for
|
|
2846
|
-
// grep-visibility. Semantics unchanged; this is intentionally
|
|
2847
|
-
// tmux-only (caller pane = tmux `$TMUX` endpoint or default socket,
|
|
2848
|
-
// MUST-12 anchor).
|
|
2849
|
-
crate::tmux_backend::socket_name_from_tmux_env()
|
|
2850
|
-
.map(|endpoint| crate::transport_factory::tmux_endpoint_transport(&endpoint))
|
|
2851
|
-
.unwrap_or_else(crate::transport_factory::tmux_default_transport)
|
|
2852
|
-
}
|
|
2853
|
-
|
|
2854
|
-
fn handle_exec_provider_startup_prompts(
|
|
2855
|
-
provider: Provider,
|
|
2856
|
-
workspace: &Path,
|
|
2857
|
-
pane_id: &str,
|
|
2858
|
-
transport: &dyn Transport,
|
|
2859
|
-
checks: usize,
|
|
2860
|
-
sleep_s: f64,
|
|
2861
|
-
) -> crate::provider::StartupPromptOutcome {
|
|
2862
|
-
let target = Target::Pane(PaneId::new(pane_id.to_string()));
|
|
2863
|
-
let outcome =
|
|
2864
|
-
get_adapter(provider).handle_startup_prompts_outcome(transport, &target, checks, sleep_s);
|
|
2865
|
-
for handled in &outcome.handled {
|
|
2866
|
-
write_leader_startup_prompt_event(
|
|
2867
|
-
workspace,
|
|
2868
|
-
"leader.startup_prompt_handled",
|
|
2869
|
-
serde_json::json!({
|
|
2870
|
-
"provider": provider_wire(provider),
|
|
2871
|
-
"pane_id": pane_id,
|
|
2872
|
-
"prompt": handled.prompt,
|
|
2873
|
-
"action": handled.action,
|
|
2874
|
-
}),
|
|
2875
|
-
);
|
|
2876
|
-
}
|
|
2877
|
-
if let Some(error) = &outcome.capture_error {
|
|
2878
|
-
write_leader_startup_prompt_event(
|
|
2879
|
-
workspace,
|
|
2880
|
-
"leader.startup_prompt_capture_failed",
|
|
2881
|
-
serde_json::json!({
|
|
2882
|
-
"provider": provider_wire(provider),
|
|
2883
|
-
"pane_id": pane_id,
|
|
2884
|
-
"action": "capture",
|
|
2885
|
-
"error": error,
|
|
2886
|
-
}),
|
|
2887
|
-
);
|
|
2888
|
-
}
|
|
2889
|
-
outcome
|
|
2890
|
-
}
|
|
2891
|
-
|
|
2892
|
-
fn write_leader_startup_prompt_event(workspace: &Path, event: &str, fields: serde_json::Value) {
|
|
2893
|
-
let _ = crate::event_log::EventLog::new(workspace).write(event, fields);
|
|
2894
|
-
}
|
|
2895
|
-
|
|
2896
|
-
/// A-55 (window rename race): lock the freshly-spawned leader window against
|
|
2897
|
-
/// rename — `allow-rename off` (refuse pane-internal OSC title-set renames)
|
|
2898
|
-
/// AND `automatic-rename off` (refuse tmux's own command-driven rename). Both
|
|
2899
|
-
/// must be set; tmux treats them as independent. Best-effort: a failure must
|
|
2900
|
-
/// NOT abort the launcher (old tmux may lack the option) — return the outcome
|
|
2901
|
-
/// for audit instead of propagating an error. Returns (result, tmux_stderr).
|
|
2902
|
-
fn lock_down_window_rename(
|
|
2903
|
-
transport: &dyn Transport,
|
|
2904
|
-
session: &SessionName,
|
|
2905
|
-
window: &WindowName,
|
|
2906
|
-
) -> (String, String) {
|
|
2907
|
-
let allow_rename = transport.set_window_option(session, window, "allow-rename", "off");
|
|
2908
|
-
let automatic_rename = transport.set_window_option(session, window, "automatic-rename", "off");
|
|
2909
|
-
let (result, stderr) = match (&allow_rename, &automatic_rename) {
|
|
2910
|
-
(Ok(()), Ok(())) => ("ok".to_string(), String::new()),
|
|
2911
|
-
(Ok(()), Err(error)) => ("failed".to_string(), error.to_string()),
|
|
2912
|
-
(Err(error), Ok(())) => ("failed".to_string(), error.to_string()),
|
|
2913
|
-
(Err(a), Err(b)) => (
|
|
2914
|
-
"failed".to_string(),
|
|
2915
|
-
format!("allow-rename: {a}; automatic-rename: {b}"),
|
|
2916
|
-
),
|
|
2917
|
-
};
|
|
2918
|
-
(result, stderr)
|
|
2919
|
-
}
|
|
2920
|
-
|
|
2921
|
-
/// A-55: audit the rename-lockdown outcome to the event log. Failure does not
|
|
2922
|
-
/// abort the launcher; record ok/failed + tmux stderr for regression triage.
|
|
2923
|
-
fn write_window_rename_lockdown_event(workspace: &Path, result: &str, stderr: &str) {
|
|
2924
|
-
write_leader_startup_prompt_event(
|
|
2925
|
-
workspace,
|
|
2926
|
-
"leader.launcher.window_rename_lockdown",
|
|
2927
|
-
serde_json::json!({
|
|
2928
|
-
"result": result,
|
|
2929
|
-
"tmux_stderr": stderr,
|
|
2930
|
-
}),
|
|
2931
|
-
);
|
|
2932
|
-
}
|
|
2933
|
-
|
|
2934
|
-
fn ensure_tmux_installed() -> Result<(), LeaderError> {
|
|
2935
|
-
match Command::new("tmux").arg("-V").output() {
|
|
2936
|
-
Ok(output) if output.status.success() => Ok(()),
|
|
2937
|
-
Ok(_) | Err(_) => Err(LeaderError::Start(
|
|
2938
|
-
"tmux is not installed; install tmux 3.3+ or start the leader from an existing tmux pane"
|
|
2939
|
-
.to_string(),
|
|
2940
|
-
)),
|
|
2941
|
-
}
|
|
2942
|
-
}
|
|
2943
|
-
|
|
2944
|
-
fn provider_command_name(provider: Provider) -> &'static str {
|
|
2945
|
-
match provider {
|
|
2946
|
-
Provider::Claude | Provider::ClaudeCode => "claude",
|
|
2947
|
-
Provider::Codex => "codex",
|
|
2948
|
-
// §B leader 入口接缝(设计 design.md line 40):`team-agent copilot` 启 leader
|
|
2949
|
-
// 即 spawn 真 copilot 命令;B5 session 名前缀 `team-agent-leader-copilot-*`
|
|
2950
|
-
// (leader/start.rs:192-204 派生)自动覆盖前缀保护。
|
|
2951
|
-
Provider::Copilot => "copilot",
|
|
2952
|
-
Provider::GeminiCli => "gemini",
|
|
2953
|
-
Provider::Grok => "grok",
|
|
2954
|
-
Provider::Pi => "pi",
|
|
2955
|
-
Provider::Fake => "fake",
|
|
2956
|
-
}
|
|
2957
|
-
}
|
|
2958
|
-
|
|
2959
|
-
fn tmux_session_exists(workspace: &Path, session: &SessionName) -> Result<bool, LeaderError> {
|
|
2960
|
-
// Phase 1d Batch 6: factory tmux workspace helper for
|
|
2961
|
-
// grep-visibility. Tmux-only anchor (managed leader session lookup).
|
|
2962
|
-
crate::transport_factory::tmux_workspace_transport(workspace)
|
|
2963
|
-
.has_session(session)
|
|
2964
|
-
.map_err(|e| LeaderError::Start(format!("tmux has-session failed: {e}")))
|
|
2965
|
-
}
|
|
2966
|
-
|
|
2967
|
-
fn leader_export_assignments(leader_env: &BTreeMap<String, String>) -> Vec<String> {
|
|
2968
|
-
[
|
|
2969
|
-
"TEAM_AGENT_LEADER_PROVIDER",
|
|
2970
|
-
"TEAM_AGENT_LEADER_SESSION_UUID",
|
|
2971
|
-
"TEAM_AGENT_MACHINE_FINGERPRINT",
|
|
2972
|
-
"TEAM_AGENT_WORKSPACE",
|
|
2973
|
-
"TEAM_AGENT_TEAM_ID",
|
|
2974
|
-
]
|
|
2975
|
-
.iter()
|
|
2976
|
-
.filter_map(|key| {
|
|
2977
|
-
leader_env
|
|
2978
|
-
.get(*key)
|
|
2979
|
-
.map(|value| shlex_quote(&format!("{key}={value}")))
|
|
2980
|
-
})
|
|
2981
|
-
.collect()
|
|
2982
|
-
}
|
|
2983
|
-
|
|
2984
|
-
fn merged_exec_env(leader_env: &BTreeMap<String, String>) -> BTreeMap<String, String> {
|
|
2985
|
-
let mut env: BTreeMap<String, String> = std::env::vars().collect();
|
|
2986
|
-
env.extend(
|
|
2987
|
-
leader_env
|
|
2988
|
-
.iter()
|
|
2989
|
-
.map(|(key, value)| (key.clone(), value.clone())),
|
|
2990
|
-
);
|
|
2991
|
-
env
|
|
2992
|
-
}
|
|
2993
|
-
|
|
2994
|
-
fn shell_join(args: &[String]) -> String {
|
|
2995
|
-
args.iter()
|
|
2996
|
-
.map(|arg| shlex_quote(arg))
|
|
2997
|
-
.collect::<Vec<_>>()
|
|
2998
|
-
.join(" ")
|
|
2999
|
-
}
|
|
3000
|
-
|
|
3001
|
-
fn shlex_quote(raw: &str) -> String {
|
|
3002
|
-
if !raw.is_empty()
|
|
3003
|
-
&& raw.bytes().all(|b| {
|
|
3004
|
-
b.is_ascii_alphanumeric()
|
|
3005
|
-
|| matches!(
|
|
3006
|
-
b,
|
|
3007
|
-
b'@' | b'%' | b'_' | b'+' | b'=' | b':' | b',' | b'.' | b'/' | b'-'
|
|
3008
|
-
)
|
|
3009
|
-
})
|
|
3010
|
-
{
|
|
3011
|
-
raw.to_string()
|
|
3012
|
-
} else {
|
|
3013
|
-
format!("'{}'", raw.replace('\'', "'\"'\"'"))
|
|
3014
|
-
}
|
|
3015
|
-
}
|
|
3016
|
-
|
|
3017
|
-
#[cfg(test)]
|
|
3018
|
-
mod tests {
|
|
3019
|
-
use std::collections::BTreeMap;
|
|
3020
|
-
use std::path::Path;
|
|
3021
|
-
use std::sync::Mutex;
|
|
3022
|
-
|
|
3023
|
-
use crate::leader::{
|
|
3024
|
-
LeaderIdentity, LeaderLaunchSocket, LeaderSessionUuidSource, LeaderStartMode,
|
|
3025
|
-
LeaderStartPlan,
|
|
3026
|
-
};
|
|
3027
|
-
use crate::model::enums::PaneLiveness;
|
|
3028
|
-
use crate::model::ids::{LeaderSessionUuid, TeamKey};
|
|
3029
|
-
use crate::provider::{Provider, COPILOT_READY_MARKER, COPILOT_TRUST_PROMPT_MARKER};
|
|
3030
|
-
use crate::transport::{
|
|
3031
|
-
AttachOutcome, BackendKind, CaptureRange, CapturedText, InjectPayload, InjectReport,
|
|
3032
|
-
InjectStage, InjectVerification, Key, PaneField, PaneId, PaneInfo, SessionName,
|
|
3033
|
-
SetEnvOutcome, SpawnResult, SubmitVerification, Target, Transport, TransportError,
|
|
3034
|
-
TurnVerification, WindowName,
|
|
3035
|
-
};
|
|
3036
|
-
|
|
3037
|
-
use super::{
|
|
3038
|
-
clear_managed_leader_receiver_pane, ensure_managed_provider_live_after_attach,
|
|
3039
|
-
execute_leader_plan_after_ambient_authority, format_launcher_failure,
|
|
3040
|
-
handle_exec_provider_startup_prompts, is_interactive_shell_basename,
|
|
3041
|
-
lock_down_window_rename, managed_client_argv, managed_leader_window_from_occupied,
|
|
3042
|
-
persist_exec_provider_leader_binding, persist_managed_leader_binding,
|
|
3043
|
-
push_bounded_stderr, shlex_quote,
|
|
3044
|
-
write_window_rename_lockdown_event, ManagedClientAttachMode, VerifiedAmbientPaneAuthority,
|
|
3045
|
-
LEADER_STDERR_LIMIT,
|
|
3046
|
-
};
|
|
3047
|
-
|
|
3048
|
-
struct ScriptedTransport {
|
|
3049
|
-
screens: Mutex<Vec<String>>,
|
|
3050
|
-
sent: Mutex<Vec<(Target, Vec<Key>)>>,
|
|
3051
|
-
liveness: PaneLiveness,
|
|
3052
|
-
exit_status: Option<u8>,
|
|
3053
|
-
targets: Vec<PaneInfo>,
|
|
3054
|
-
window_options: Mutex<Vec<(String, String)>>,
|
|
3055
|
-
window_option_error: Mutex<Option<String>>,
|
|
3056
|
-
kills: Mutex<Vec<String>>,
|
|
3057
|
-
windows: Mutex<Vec<WindowName>>,
|
|
3058
|
-
}
|
|
3059
|
-
|
|
3060
|
-
impl ScriptedTransport {
|
|
3061
|
-
fn new(screens: Vec<String>) -> Self {
|
|
3062
|
-
Self {
|
|
3063
|
-
screens: Mutex::new(screens),
|
|
3064
|
-
sent: Mutex::new(Vec::new()),
|
|
3065
|
-
liveness: PaneLiveness::Unknown,
|
|
3066
|
-
exit_status: None,
|
|
3067
|
-
targets: Vec::new(),
|
|
3068
|
-
window_options: Mutex::new(Vec::new()),
|
|
3069
|
-
window_option_error: Mutex::new(None),
|
|
3070
|
-
kills: Mutex::new(Vec::new()),
|
|
3071
|
-
windows: Mutex::new(Vec::new()),
|
|
3072
|
-
}
|
|
3073
|
-
}
|
|
3074
|
-
|
|
3075
|
-
fn with_liveness(liveness: PaneLiveness) -> Self {
|
|
3076
|
-
Self {
|
|
3077
|
-
screens: Mutex::new(Vec::new()),
|
|
3078
|
-
sent: Mutex::new(Vec::new()),
|
|
3079
|
-
liveness,
|
|
3080
|
-
exit_status: None,
|
|
3081
|
-
targets: Vec::new(),
|
|
3082
|
-
window_options: Mutex::new(Vec::new()),
|
|
3083
|
-
window_option_error: Mutex::new(None),
|
|
3084
|
-
kills: Mutex::new(Vec::new()),
|
|
3085
|
-
windows: Mutex::new(Vec::new()),
|
|
3086
|
-
}
|
|
3087
|
-
}
|
|
3088
|
-
|
|
3089
|
-
fn with_liveness_and_targets(liveness: PaneLiveness, targets: Vec<PaneInfo>) -> Self {
|
|
3090
|
-
Self {
|
|
3091
|
-
screens: Mutex::new(Vec::new()),
|
|
3092
|
-
sent: Mutex::new(Vec::new()),
|
|
3093
|
-
liveness,
|
|
3094
|
-
exit_status: None,
|
|
3095
|
-
targets,
|
|
3096
|
-
window_options: Mutex::new(Vec::new()),
|
|
3097
|
-
window_option_error: Mutex::new(None),
|
|
3098
|
-
kills: Mutex::new(Vec::new()),
|
|
3099
|
-
windows: Mutex::new(Vec::new()),
|
|
3100
|
-
}
|
|
3101
|
-
}
|
|
3102
|
-
|
|
3103
|
-
/// A-55: a ScriptedTransport whose `set_window_option` always fails with
|
|
3104
|
-
/// the given tmux stderr — proves the lockdown never aborts the launcher.
|
|
3105
|
-
fn with_window_option_error(error: &str) -> Self {
|
|
3106
|
-
Self {
|
|
3107
|
-
screens: Mutex::new(Vec::new()),
|
|
3108
|
-
sent: Mutex::new(Vec::new()),
|
|
3109
|
-
liveness: PaneLiveness::Unknown,
|
|
3110
|
-
exit_status: None,
|
|
3111
|
-
targets: Vec::new(),
|
|
3112
|
-
window_options: Mutex::new(Vec::new()),
|
|
3113
|
-
window_option_error: Mutex::new(Some(error.to_string())),
|
|
3114
|
-
kills: Mutex::new(Vec::new()),
|
|
3115
|
-
windows: Mutex::new(Vec::new()),
|
|
3116
|
-
}
|
|
3117
|
-
}
|
|
3118
|
-
|
|
3119
|
-
fn sent(&self) -> Vec<(Target, Vec<Key>)> {
|
|
3120
|
-
match self.sent.lock() {
|
|
3121
|
-
Ok(guard) => guard.clone(),
|
|
3122
|
-
Err(poisoned) => poisoned.into_inner().clone(),
|
|
3123
|
-
}
|
|
3124
|
-
}
|
|
3125
|
-
|
|
3126
|
-
/// All `set-window-option option value` pairs, in call order.
|
|
3127
|
-
fn window_options(&self) -> Vec<(String, String)> {
|
|
3128
|
-
match self.window_options.lock() {
|
|
3129
|
-
Ok(guard) => guard.clone(),
|
|
3130
|
-
Err(poisoned) => poisoned.into_inner().clone(),
|
|
3131
|
-
}
|
|
3132
|
-
}
|
|
3133
|
-
|
|
3134
|
-
fn record_kill(&self, action: &str) {
|
|
3135
|
-
match self.kills.lock() {
|
|
3136
|
-
Ok(mut guard) => guard.push(action.to_string()),
|
|
3137
|
-
Err(poisoned) => poisoned.into_inner().push(action.to_string()),
|
|
3138
|
-
}
|
|
3139
|
-
}
|
|
3140
|
-
|
|
3141
|
-
fn kills(&self) -> Vec<String> {
|
|
3142
|
-
match self.kills.lock() {
|
|
3143
|
-
Ok(guard) => guard.clone(),
|
|
3144
|
-
Err(poisoned) => poisoned.into_inner().clone(),
|
|
3145
|
-
}
|
|
3146
|
-
}
|
|
3147
|
-
}
|
|
3148
|
-
|
|
3149
|
-
impl Transport for ScriptedTransport {
|
|
3150
|
-
fn kind(&self) -> BackendKind {
|
|
3151
|
-
BackendKind::Tmux
|
|
3152
|
-
}
|
|
3153
|
-
|
|
3154
|
-
fn spawn_first(
|
|
3155
|
-
&self,
|
|
3156
|
-
_session: &SessionName,
|
|
3157
|
-
_window: &WindowName,
|
|
3158
|
-
_argv: &[String],
|
|
3159
|
-
_cwd: &Path,
|
|
3160
|
-
_env: &BTreeMap<String, String>,
|
|
3161
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3162
|
-
Err(TransportError::Io(std::io::Error::other(
|
|
3163
|
-
"spawn_first not used by startup-prompt test",
|
|
3164
|
-
)))
|
|
3165
|
-
}
|
|
3166
|
-
|
|
3167
|
-
fn spawn_into(
|
|
3168
|
-
&self,
|
|
3169
|
-
_session: &SessionName,
|
|
3170
|
-
_window: &WindowName,
|
|
3171
|
-
_argv: &[String],
|
|
3172
|
-
_cwd: &Path,
|
|
3173
|
-
_env: &BTreeMap<String, String>,
|
|
3174
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3175
|
-
Err(TransportError::Io(std::io::Error::other(
|
|
3176
|
-
"spawn_into not used by startup-prompt test",
|
|
3177
|
-
)))
|
|
3178
|
-
}
|
|
3179
|
-
|
|
3180
|
-
fn inject(
|
|
3181
|
-
&self,
|
|
3182
|
-
_target: &Target,
|
|
3183
|
-
_payload: &InjectPayload,
|
|
3184
|
-
_submit: Key,
|
|
3185
|
-
_bracketed: bool,
|
|
3186
|
-
) -> Result<InjectReport, TransportError> {
|
|
3187
|
-
Ok(InjectReport {
|
|
3188
|
-
stage_reached: InjectStage::Submit,
|
|
3189
|
-
inject_verification: InjectVerification::CaptureContainsToken,
|
|
3190
|
-
submit_verification: SubmitVerification::EnterSentWithoutPlaceholderCheck,
|
|
3191
|
-
turn_verification: TurnVerification::NotRequired,
|
|
3192
|
-
attempts: 1,
|
|
3193
|
-
submit_diagnostics: None,
|
|
3194
|
-
})
|
|
3195
|
-
}
|
|
3196
|
-
|
|
3197
|
-
fn send_keys(&self, target: &Target, keys: &[Key]) -> Result<(), TransportError> {
|
|
3198
|
-
match self.sent.lock() {
|
|
3199
|
-
Ok(mut guard) => guard.push((target.clone(), keys.to_vec())),
|
|
3200
|
-
Err(poisoned) => poisoned.into_inner().push((target.clone(), keys.to_vec())),
|
|
3201
|
-
}
|
|
3202
|
-
Ok(())
|
|
3203
|
-
}
|
|
3204
|
-
|
|
3205
|
-
fn capture(
|
|
3206
|
-
&self,
|
|
3207
|
-
_target: &Target,
|
|
3208
|
-
range: CaptureRange,
|
|
3209
|
-
) -> Result<CapturedText, TransportError> {
|
|
3210
|
-
let text = match self.screens.lock() {
|
|
3211
|
-
Ok(mut guard) => {
|
|
3212
|
-
if guard.is_empty() {
|
|
3213
|
-
String::new()
|
|
3214
|
-
} else {
|
|
3215
|
-
guard.remove(0)
|
|
3216
|
-
}
|
|
3217
|
-
}
|
|
3218
|
-
Err(poisoned) => {
|
|
3219
|
-
let mut guard = poisoned.into_inner();
|
|
3220
|
-
if guard.is_empty() {
|
|
3221
|
-
String::new()
|
|
3222
|
-
} else {
|
|
3223
|
-
guard.remove(0)
|
|
3224
|
-
}
|
|
3225
|
-
}
|
|
3226
|
-
};
|
|
3227
|
-
Ok(CapturedText { text, range })
|
|
3228
|
-
}
|
|
3229
|
-
|
|
3230
|
-
fn query(
|
|
3231
|
-
&self,
|
|
3232
|
-
_target: &Target,
|
|
3233
|
-
_field: PaneField,
|
|
3234
|
-
) -> Result<Option<String>, TransportError> {
|
|
3235
|
-
Ok(None)
|
|
3236
|
-
}
|
|
3237
|
-
|
|
3238
|
-
fn liveness(&self, _pane: &PaneId) -> Result<PaneLiveness, TransportError> {
|
|
3239
|
-
Ok(self.liveness)
|
|
3240
|
-
}
|
|
3241
|
-
|
|
3242
|
-
fn provider_exit_status(&self, _pane: &PaneId) -> Result<Option<u8>, TransportError> {
|
|
3243
|
-
Ok(self.exit_status)
|
|
3244
|
-
}
|
|
3245
|
-
|
|
3246
|
-
fn list_targets(&self) -> Result<Vec<PaneInfo>, TransportError> {
|
|
3247
|
-
Ok(self.targets.clone())
|
|
3248
|
-
}
|
|
3249
|
-
|
|
3250
|
-
fn has_session(&self, _session: &SessionName) -> Result<bool, TransportError> {
|
|
3251
|
-
Ok(false)
|
|
3252
|
-
}
|
|
3253
|
-
|
|
3254
|
-
fn list_windows(&self, _session: &SessionName) -> Result<Vec<WindowName>, TransportError> {
|
|
3255
|
-
match self.windows.lock() {
|
|
3256
|
-
Ok(guard) => Ok(guard.clone()),
|
|
3257
|
-
Err(poisoned) => Ok(poisoned.into_inner().clone()),
|
|
3258
|
-
}
|
|
3259
|
-
}
|
|
3260
|
-
|
|
3261
|
-
fn set_session_env(
|
|
3262
|
-
&self,
|
|
3263
|
-
_session: &SessionName,
|
|
3264
|
-
_key: &str,
|
|
3265
|
-
_value: &str,
|
|
3266
|
-
) -> Result<SetEnvOutcome, TransportError> {
|
|
3267
|
-
Ok(SetEnvOutcome::Applied)
|
|
3268
|
-
}
|
|
3269
|
-
|
|
3270
|
-
fn set_window_option(
|
|
3271
|
-
&self,
|
|
3272
|
-
_session: &SessionName,
|
|
3273
|
-
_window: &WindowName,
|
|
3274
|
-
option: &str,
|
|
3275
|
-
value: &str,
|
|
3276
|
-
) -> Result<(), TransportError> {
|
|
3277
|
-
if let Some(stderr) = self
|
|
3278
|
-
.window_option_error
|
|
3279
|
-
.lock()
|
|
3280
|
-
.ok()
|
|
3281
|
-
.and_then(|guard| guard.clone())
|
|
3282
|
-
{
|
|
3283
|
-
return Err(TransportError::Subprocess {
|
|
3284
|
-
argv: vec!["tmux".to_string(), "set-window-option".to_string()],
|
|
3285
|
-
code: Some(1),
|
|
3286
|
-
stderr,
|
|
3287
|
-
});
|
|
3288
|
-
}
|
|
3289
|
-
match self.window_options.lock() {
|
|
3290
|
-
Ok(mut guard) => guard.push((option.to_string(), value.to_string())),
|
|
3291
|
-
Err(poisoned) => poisoned
|
|
3292
|
-
.into_inner()
|
|
3293
|
-
.push((option.to_string(), value.to_string())),
|
|
3294
|
-
}
|
|
3295
|
-
Ok(())
|
|
3296
|
-
}
|
|
3297
|
-
|
|
3298
|
-
fn kill_server(&self) -> Result<(), TransportError> {
|
|
3299
|
-
self.record_kill("kill_server");
|
|
3300
|
-
Ok(())
|
|
3301
|
-
}
|
|
3302
|
-
|
|
3303
|
-
fn kill_session(&self, session: &SessionName) -> Result<(), TransportError> {
|
|
3304
|
-
self.record_kill(&format!("kill_session:{}", session.as_str()));
|
|
3305
|
-
Ok(())
|
|
3306
|
-
}
|
|
3307
|
-
|
|
3308
|
-
fn kill_window(&self, target: &Target) -> Result<(), TransportError> {
|
|
3309
|
-
self.record_kill(&format!("kill_window:{target:?}"));
|
|
3310
|
-
match self.windows.lock() {
|
|
3311
|
-
Ok(mut guard) => guard.clear(),
|
|
3312
|
-
Err(poisoned) => poisoned.into_inner().clear(),
|
|
3313
|
-
}
|
|
3314
|
-
Ok(())
|
|
3315
|
-
}
|
|
3316
|
-
|
|
3317
|
-
fn attach_session(&self, _session: &SessionName) -> Result<AttachOutcome, TransportError> {
|
|
3318
|
-
Ok(AttachOutcome::Unsupported {
|
|
3319
|
-
reason: "not used by startup-prompt test".to_string(),
|
|
3320
|
-
})
|
|
3321
|
-
}
|
|
3322
|
-
}
|
|
3323
|
-
|
|
3324
|
-
fn managed_spawn_result() -> SpawnResult {
|
|
3325
|
-
SpawnResult {
|
|
3326
|
-
pane_id: PaneId::new("%42"),
|
|
3327
|
-
session: SessionName::new("team-agent-leader-claude_code-demo"),
|
|
3328
|
-
window: WindowName::new("claude_code"),
|
|
3329
|
-
child_pid: Some(1234),
|
|
3330
|
-
}
|
|
3331
|
-
}
|
|
3332
|
-
|
|
3333
|
-
fn managed_pane_info(spawned: &SpawnResult) -> PaneInfo {
|
|
3334
|
-
PaneInfo {
|
|
3335
|
-
pane_id: spawned.pane_id.clone(),
|
|
3336
|
-
session: spawned.session.clone(),
|
|
3337
|
-
window_index: Some(0),
|
|
3338
|
-
window_name: Some(spawned.window.clone()),
|
|
3339
|
-
pane_index: Some(0),
|
|
3340
|
-
tty: None,
|
|
3341
|
-
current_command: Some("claude".to_string()),
|
|
3342
|
-
current_path: None,
|
|
3343
|
-
active: true,
|
|
3344
|
-
pane_pid: spawned.child_pid,
|
|
3345
|
-
leader_env: BTreeMap::new(),
|
|
3346
|
-
}
|
|
3347
|
-
}
|
|
3348
|
-
|
|
3349
|
-
#[test]
|
|
3350
|
-
fn managed_attach_success_requires_live_provider_pane() {
|
|
3351
|
-
let spawned = managed_spawn_result();
|
|
3352
|
-
let transport = ScriptedTransport::with_liveness(PaneLiveness::Dead);
|
|
3353
|
-
|
|
3354
|
-
let err = ensure_managed_provider_live_after_attach(&transport, &spawned)
|
|
3355
|
-
.expect_err("dead provider pane must fail managed launch");
|
|
3356
|
-
|
|
3357
|
-
let text = err.to_string();
|
|
3358
|
-
assert!(
|
|
3359
|
-
text.contains("managed leader provider pane is not running"),
|
|
3360
|
-
"{text}"
|
|
3361
|
-
);
|
|
3362
|
-
assert!(text.contains("%42"), "{text}");
|
|
3363
|
-
assert!(text.contains("claude_code"), "{text}");
|
|
3364
|
-
}
|
|
3365
|
-
|
|
3366
|
-
#[test]
|
|
3367
|
-
fn managed_attach_success_accepts_live_provider_pane() {
|
|
3368
|
-
let spawned = managed_spawn_result();
|
|
3369
|
-
let transport = ScriptedTransport::with_liveness(PaneLiveness::Live);
|
|
3370
|
-
|
|
3371
|
-
ensure_managed_provider_live_after_attach(&transport, &spawned)
|
|
3372
|
-
.expect("live provider pane keeps managed launch successful");
|
|
3373
|
-
}
|
|
3374
|
-
|
|
3375
|
-
#[test]
|
|
3376
|
-
fn managed_attach_success_uses_target_scan_when_liveness_unknown() {
|
|
3377
|
-
let spawned = managed_spawn_result();
|
|
3378
|
-
let transport = ScriptedTransport::with_liveness_and_targets(
|
|
3379
|
-
PaneLiveness::Unknown,
|
|
3380
|
-
vec![managed_pane_info(&spawned)],
|
|
3381
|
-
);
|
|
3382
|
-
|
|
3383
|
-
ensure_managed_provider_live_after_attach(&transport, &spawned)
|
|
3384
|
-
.expect("target scan can prove provider pane is still live");
|
|
3385
|
-
}
|
|
3386
|
-
|
|
3387
|
-
struct EnvGuard {
|
|
3388
|
-
saved: Vec<(&'static str, Option<String>)>,
|
|
3389
|
-
}
|
|
3390
|
-
|
|
3391
|
-
impl EnvGuard {
|
|
3392
|
-
fn set(vars: &[(&'static str, Option<&str>)]) -> Self {
|
|
3393
|
-
let saved = vars
|
|
3394
|
-
.iter()
|
|
3395
|
-
.map(|(key, _)| (*key, std::env::var(key).ok()))
|
|
3396
|
-
.collect::<Vec<_>>();
|
|
3397
|
-
for (key, value) in vars {
|
|
3398
|
-
unsafe {
|
|
3399
|
-
match value {
|
|
3400
|
-
Some(value) => std::env::set_var(key, value),
|
|
3401
|
-
None => std::env::remove_var(key),
|
|
3402
|
-
}
|
|
3403
|
-
}
|
|
3404
|
-
}
|
|
3405
|
-
Self { saved }
|
|
3406
|
-
}
|
|
3407
|
-
}
|
|
3408
|
-
|
|
3409
|
-
impl Drop for EnvGuard {
|
|
3410
|
-
fn drop(&mut self) {
|
|
3411
|
-
for (key, value) in self.saved.drain(..).rev() {
|
|
3412
|
-
unsafe {
|
|
3413
|
-
match value {
|
|
3414
|
-
Some(value) => std::env::set_var(key, value),
|
|
3415
|
-
None => std::env::remove_var(key),
|
|
3416
|
-
}
|
|
3417
|
-
}
|
|
3418
|
-
}
|
|
3419
|
-
}
|
|
3420
|
-
}
|
|
3421
|
-
|
|
3422
|
-
#[test]
|
|
3423
|
-
fn external_exec_provider_persists_topology_before_provider_exec() {
|
|
3424
|
-
let workspace =
|
|
3425
|
-
std::env::temp_dir().join(format!("ta-external-pre-exec-{}", std::process::id()));
|
|
3426
|
-
std::fs::create_dir_all(&workspace).unwrap();
|
|
3427
|
-
let state_path = crate::state::persist::runtime_state_path(&workspace);
|
|
3428
|
-
let command = format!(
|
|
3429
|
-
"test -f {path} && grep -q is_external_leader {path}",
|
|
3430
|
-
path = shlex_quote(&state_path.to_string_lossy())
|
|
3431
|
-
);
|
|
3432
|
-
let identity = LeaderIdentity {
|
|
3433
|
-
leader_session_uuid: LeaderSessionUuid::derive(
|
|
3434
|
-
"fp",
|
|
3435
|
-
&workspace.to_string_lossy(),
|
|
3436
|
-
"tester",
|
|
3437
|
-
"current",
|
|
3438
|
-
)
|
|
3439
|
-
.unwrap(),
|
|
3440
|
-
leader_session_uuid_source: LeaderSessionUuidSource::Derived,
|
|
3441
|
-
machine_fingerprint: "fp".to_string(),
|
|
3442
|
-
workspace_abspath: workspace.clone(),
|
|
3443
|
-
os_user: "tester".to_string(),
|
|
3444
|
-
team_id: TeamKey::new("current"),
|
|
3445
|
-
};
|
|
3446
|
-
let plan = LeaderStartPlan {
|
|
3447
|
-
mode: LeaderStartMode::ExecProvider,
|
|
3448
|
-
provider: Provider::Codex,
|
|
3449
|
-
workspace: workspace.clone(),
|
|
3450
|
-
socket: LeaderLaunchSocket::Workspace,
|
|
3451
|
-
session_name: None,
|
|
3452
|
-
argv: vec!["sh".to_string(), "-c".to_string(), command],
|
|
3453
|
-
provider_argv: vec!["codex".to_string()],
|
|
3454
|
-
leader_prompt: None,
|
|
3455
|
-
session_capture: None,
|
|
3456
|
-
leader_window: None,
|
|
3457
|
-
is_external_leader: true,
|
|
3458
|
-
leader_env: BTreeMap::new(),
|
|
3459
|
-
identity: Some(identity),
|
|
3460
|
-
detached: false,
|
|
3461
|
-
};
|
|
3462
|
-
|
|
3463
|
-
let outcome = execute_leader_plan_after_ambient_authority(&plan, &workspace, None)
|
|
3464
|
-
.expect("external marker must be present before provider argv runs");
|
|
3465
|
-
|
|
3466
|
-
assert_eq!(outcome.status, crate::leader::LeaderLaunchStatus::Exited);
|
|
3467
|
-
let state = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
3468
|
-
assert_eq!(state["is_external_leader"], serde_json::json!(true));
|
|
3469
|
-
assert_eq!(
|
|
3470
|
-
state["teams"]["current"]["is_external_leader"],
|
|
3471
|
-
serde_json::json!(true)
|
|
3472
|
-
);
|
|
3473
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3474
|
-
}
|
|
3475
|
-
|
|
3476
|
-
fn exec_binding_fixture(workspace: &Path) -> (LeaderStartPlan, VerifiedAmbientPaneAuthority) {
|
|
3477
|
-
let identity = LeaderIdentity {
|
|
3478
|
-
leader_session_uuid: LeaderSessionUuid::derive(
|
|
3479
|
-
"fp", &workspace.to_string_lossy(), "tester", "current",
|
|
3480
|
-
).unwrap(),
|
|
3481
|
-
leader_session_uuid_source: LeaderSessionUuidSource::Derived,
|
|
3482
|
-
machine_fingerprint: "fp".into(), workspace_abspath: workspace.into(),
|
|
3483
|
-
os_user: "tester".into(), team_id: TeamKey::new("current"),
|
|
3484
|
-
};
|
|
3485
|
-
let plan = LeaderStartPlan {
|
|
3486
|
-
mode: LeaderStartMode::ExecProvider, provider: Provider::Pi,
|
|
3487
|
-
workspace: workspace.into(), socket: LeaderLaunchSocket::Workspace,
|
|
3488
|
-
session_name: None, argv: vec![], provider_argv: vec!["pi".into()],
|
|
3489
|
-
leader_prompt: None, session_capture: None, leader_window: None,
|
|
3490
|
-
is_external_leader: false, leader_env: BTreeMap::new(),
|
|
3491
|
-
identity: Some(identity), detached: false,
|
|
3492
|
-
};
|
|
3493
|
-
let authority = VerifiedAmbientPaneAuthority {
|
|
3494
|
-
pane_id: PaneId::new("%77"),
|
|
3495
|
-
observed: PaneInfo {
|
|
3496
|
-
pane_id: PaneId::new("%77"), session: SessionName::new("cursor-gate-leader"),
|
|
3497
|
-
window_index: Some(0), window_name: Some(WindowName::new("pi")),
|
|
3498
|
-
pane_index: Some(0), tty: Some("/dev/ttys077".into()),
|
|
3499
|
-
current_command: Some("pi".into()), current_path: Some(workspace.into()),
|
|
3500
|
-
active: true, pane_pid: None, leader_env: BTreeMap::new(),
|
|
3501
|
-
},
|
|
3502
|
-
endpoint: "/private/tmp/fixture-exec-leader.sock".into(),
|
|
3503
|
-
tmux: "/private/tmp/fixture-exec-leader.sock,123,0".into(),
|
|
3504
|
-
};
|
|
3505
|
-
(plan, authority)
|
|
3506
|
-
}
|
|
3507
|
-
|
|
3508
|
-
fn exec_binding_workspace() -> std::path::PathBuf {
|
|
3509
|
-
let workspace = std::env::temp_dir().join(format!("ta-exec-bootstrap-{}-{}",
|
|
3510
|
-
std::process::id(), std::time::SystemTime::now()
|
|
3511
|
-
.duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos()));
|
|
3512
|
-
std::fs::create_dir(&workspace).unwrap();
|
|
3513
|
-
workspace
|
|
3514
|
-
}
|
|
3515
|
-
|
|
3516
|
-
#[test]
|
|
3517
|
-
fn exec_provider_non_prefixed_receiver_produces_fresh_quick_start_bootstrap() {
|
|
3518
|
-
let workspace = exec_binding_workspace();
|
|
3519
|
-
let (plan, authority) = exec_binding_fixture(&workspace);
|
|
3520
|
-
persist_exec_provider_leader_binding(&plan, &workspace, &authority, false).unwrap();
|
|
3521
|
-
let state = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
3522
|
-
let before = state.clone();
|
|
3523
|
-
assert!(state["session_name"].is_null());
|
|
3524
|
-
assert!(state["teams"]["current"]["session_name"].is_null());
|
|
3525
|
-
assert_eq!(state["teams"]["current"]["leader_receiver"]["session_name"], "cursor-gate-leader");
|
|
3526
|
-
assert!(!crate::lifecycle::launch::quick_start_has_runtime_for_test(&state, "current"));
|
|
3527
|
-
assert_eq!(state, before);
|
|
3528
|
-
std::fs::remove_dir_all(workspace).unwrap();
|
|
3529
|
-
}
|
|
3530
|
-
|
|
3531
|
-
#[test]
|
|
3532
|
-
fn exec_provider_preserves_existing_workers_and_never_clears_runtime_markers() {
|
|
3533
|
-
for status in ["running", "stopped", "unknown"] {
|
|
3534
|
-
let workspace = exec_binding_workspace();
|
|
3535
|
-
let (plan, authority) = exec_binding_fixture(&workspace);
|
|
3536
|
-
let path = crate::state::persist::runtime_state_path(&workspace);
|
|
3537
|
-
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
|
|
3538
|
-
std::fs::write(&path, serde_json::json!({
|
|
3539
|
-
"active_team_key":"current", "session_name":"team-existing-workers",
|
|
3540
|
-
"spec_path":"/fixture/spec.yml", "team_dir":"/fixture/roles",
|
|
3541
|
-
"agents":{"worker":{"agent_id":"worker","provider":"copilot","status":status}},
|
|
3542
|
-
"tasks":[{"task_id":"existing-task"}],
|
|
3543
|
-
}).to_string()).unwrap();
|
|
3544
|
-
persist_exec_provider_leader_binding(&plan, &workspace, &authority, false).unwrap();
|
|
3545
|
-
let state = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
3546
|
-
for row in [&state, &state["teams"]["current"]] {
|
|
3547
|
-
assert_eq!(row["session_name"], "team-existing-workers");
|
|
3548
|
-
assert_eq!(row["agents"]["worker"]["status"], status);
|
|
3549
|
-
assert_eq!(row["spec_path"], "/fixture/spec.yml");
|
|
3550
|
-
assert_eq!(row["team_dir"], "/fixture/roles");
|
|
3551
|
-
assert_eq!(row["tasks"][0]["task_id"], "existing-task");
|
|
3552
|
-
}
|
|
3553
|
-
// Ownership writers update only the canonical team record, not the
|
|
3554
|
-
// legacy root view that retains the existing worker runtime.
|
|
3555
|
-
assert_eq!(
|
|
3556
|
-
state["teams"]["current"]["leader_receiver"]["session_name"],
|
|
3557
|
-
"cursor-gate-leader"
|
|
3558
|
-
);
|
|
3559
|
-
assert!(state["leader_receiver"].is_null());
|
|
3560
|
-
assert!(crate::lifecycle::launch::quick_start_has_runtime_for_test(&state, "current"));
|
|
3561
|
-
std::fs::remove_dir_all(workspace).unwrap();
|
|
3562
|
-
}
|
|
3563
|
-
}
|
|
3564
|
-
|
|
3565
|
-
#[test]
|
|
3566
|
-
#[serial_test::serial(env)]
|
|
3567
|
-
fn default_exec_provider_persists_current_pane_binding_before_provider_exec() {
|
|
3568
|
-
let workspace =
|
|
3569
|
-
std::env::temp_dir().join(format!("ta-current-pane-pre-exec-{}", std::process::id()));
|
|
3570
|
-
std::fs::create_dir_all(&workspace).unwrap();
|
|
3571
|
-
let state_path = crate::state::persist::runtime_state_path(&workspace);
|
|
3572
|
-
let command = format!(
|
|
3573
|
-
"test -f {path} && grep -q leader_receiver {path}",
|
|
3574
|
-
path = shlex_quote(&state_path.to_string_lossy())
|
|
3575
|
-
);
|
|
3576
|
-
let _env = EnvGuard::set(&[
|
|
3577
|
-
("TMUX", Some("/private/tmp/tmux-501/default,88432,187")),
|
|
3578
|
-
("TMUX_PANE", Some("%77")),
|
|
3579
|
-
]);
|
|
3580
|
-
let identity = LeaderIdentity {
|
|
3581
|
-
leader_session_uuid: LeaderSessionUuid::derive(
|
|
3582
|
-
"fp",
|
|
3583
|
-
&workspace.to_string_lossy(),
|
|
3584
|
-
"tester",
|
|
3585
|
-
"current",
|
|
3586
|
-
)
|
|
3587
|
-
.unwrap(),
|
|
3588
|
-
leader_session_uuid_source: LeaderSessionUuidSource::Derived,
|
|
3589
|
-
machine_fingerprint: "fp".to_string(),
|
|
3590
|
-
workspace_abspath: workspace.clone(),
|
|
3591
|
-
os_user: "tester".to_string(),
|
|
3592
|
-
team_id: TeamKey::new("current"),
|
|
3593
|
-
};
|
|
3594
|
-
let plan = LeaderStartPlan {
|
|
3595
|
-
mode: LeaderStartMode::ExecProvider,
|
|
3596
|
-
provider: Provider::Fake,
|
|
3597
|
-
workspace: workspace.clone(),
|
|
3598
|
-
socket: LeaderLaunchSocket::Workspace,
|
|
3599
|
-
session_name: None,
|
|
3600
|
-
argv: vec!["sh".to_string(), "-c".to_string(), command],
|
|
3601
|
-
provider_argv: vec!["fake".to_string()],
|
|
3602
|
-
leader_prompt: None,
|
|
3603
|
-
session_capture: None,
|
|
3604
|
-
leader_window: None,
|
|
3605
|
-
is_external_leader: false,
|
|
3606
|
-
leader_env: BTreeMap::new(),
|
|
3607
|
-
identity: Some(identity),
|
|
3608
|
-
detached: false,
|
|
3609
|
-
};
|
|
3610
|
-
|
|
3611
|
-
let authority = VerifiedAmbientPaneAuthority {
|
|
3612
|
-
pane_id: PaneId::new("%77"),
|
|
3613
|
-
observed: PaneInfo {
|
|
3614
|
-
pane_id: PaneId::new("%77"),
|
|
3615
|
-
session: SessionName::new("team-agent-leader-current"),
|
|
3616
|
-
window_index: Some(0),
|
|
3617
|
-
window_name: Some(WindowName::new("codex")),
|
|
3618
|
-
pane_index: Some(0),
|
|
3619
|
-
tty: Some("/dev/ttys077".to_string()),
|
|
3620
|
-
current_command: Some("codex".to_string()),
|
|
3621
|
-
current_path: Some(workspace.clone()),
|
|
3622
|
-
active: true,
|
|
3623
|
-
pane_pid: None,
|
|
3624
|
-
leader_env: BTreeMap::new(),
|
|
3625
|
-
},
|
|
3626
|
-
endpoint: "/private/tmp/tmux-501/default".to_string(),
|
|
3627
|
-
tmux: "/private/tmp/tmux-501/default,123,0".to_string(),
|
|
3628
|
-
};
|
|
3629
|
-
let outcome =
|
|
3630
|
-
execute_leader_plan_after_ambient_authority(&plan, &workspace, Some(&authority))
|
|
3631
|
-
.expect("current pane binding must be present before provider argv runs");
|
|
3632
|
-
|
|
3633
|
-
assert_eq!(outcome.status, crate::leader::LeaderLaunchStatus::Exited);
|
|
3634
|
-
let state = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
3635
|
-
assert_eq!(state["is_external_leader"], serde_json::json!(false));
|
|
3636
|
-
// Stage 3d: canonical owner/receiver at teams.<team_key>.
|
|
3637
|
-
assert_eq!(
|
|
3638
|
-
state["teams"]["current"]["leader_receiver"]["pane_id"],
|
|
3639
|
-
serde_json::json!("%77")
|
|
3640
|
-
);
|
|
3641
|
-
assert_eq!(
|
|
3642
|
-
state["teams"]["current"]["leader_receiver"]["tmux_socket"],
|
|
3643
|
-
serde_json::json!("/private/tmp/tmux-501/default")
|
|
3644
|
-
);
|
|
3645
|
-
assert_eq!(
|
|
3646
|
-
state["teams"]["current"]["team_owner"]["pane_id"],
|
|
3647
|
-
serde_json::json!("%77")
|
|
3648
|
-
);
|
|
3649
|
-
assert_eq!(
|
|
3650
|
-
state["leader_client"]["attach_mode"],
|
|
3651
|
-
serde_json::json!("exec-provider")
|
|
3652
|
-
);
|
|
3653
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3654
|
-
}
|
|
3655
|
-
|
|
3656
|
-
#[test]
|
|
3657
|
-
fn exec_provider_leader_startup_prompt_handler_reuses_copilot_adapter() {
|
|
3658
|
-
let transport = ScriptedTransport::new(vec![
|
|
3659
|
-
COPILOT_TRUST_PROMPT_MARKER.to_string(),
|
|
3660
|
-
COPILOT_READY_MARKER.to_string(),
|
|
3661
|
-
]);
|
|
3662
|
-
let workspace =
|
|
3663
|
-
std::env::temp_dir().join(format!("ta_rs_red2_leader_startup_{}", std::process::id()));
|
|
3664
|
-
let _ = std::fs::create_dir_all(&workspace);
|
|
3665
|
-
|
|
3666
|
-
let outcome = handle_exec_provider_startup_prompts(
|
|
3667
|
-
Provider::Copilot,
|
|
3668
|
-
&workspace,
|
|
3669
|
-
"%0",
|
|
3670
|
-
&transport,
|
|
3671
|
-
5,
|
|
3672
|
-
0.0,
|
|
3673
|
-
);
|
|
3674
|
-
|
|
3675
|
-
assert_eq!(outcome.handled.len(), 1);
|
|
3676
|
-
assert_eq!(outcome.handled[0].prompt, "copilot_workspace_trust");
|
|
3677
|
-
assert_eq!(outcome.handled[0].action, "sent_enter_yes_session");
|
|
3678
|
-
let sent = transport.sent();
|
|
3679
|
-
assert_eq!(sent.len(), 1);
|
|
3680
|
-
assert_eq!(sent[0].0, Target::Pane(PaneId::new("%0")));
|
|
3681
|
-
assert_eq!(sent[0].1, vec![Key::Enter]);
|
|
3682
|
-
}
|
|
3683
|
-
|
|
3684
|
-
#[test]
|
|
3685
|
-
fn interactive_shell_basename_recognizes_supported_shells() {
|
|
3686
|
-
let shells = [
|
|
3687
|
-
"zsh", "bash", "sh", "fish", "dash", "ksh", "tcsh", "csh", "ash", "mksh", "yash",
|
|
3688
|
-
"elvish", "nu", "nushell", "xonsh",
|
|
3689
|
-
];
|
|
3690
|
-
for shell in shells {
|
|
3691
|
-
assert!(is_interactive_shell_basename(shell));
|
|
3692
|
-
assert!(is_interactive_shell_basename(&shell.to_uppercase()));
|
|
3693
|
-
}
|
|
3694
|
-
for provider in ["claude", "codex", "copilot", "gemini"] {
|
|
3695
|
-
assert!(!is_interactive_shell_basename(provider));
|
|
3696
|
-
}
|
|
3697
|
-
}
|
|
3698
|
-
|
|
3699
|
-
// ═══════════════════════════════════════════════════════════════════
|
|
3700
|
-
// 0.4.10+ mirror-session fix v2 (option B: independent session per launch).
|
|
3701
|
-
//
|
|
3702
|
-
// The managed selector reuses a live provider leader prefix when present;
|
|
3703
|
-
// its no-candidate fallback appends a per-launch nonce.
|
|
3704
|
-
// ═══════════════════════════════════════════════════════════════════
|
|
3705
|
-
|
|
3706
|
-
#[test]
|
|
3707
|
-
fn managed_leader_session_name_carries_leader_prefix() {
|
|
3708
|
-
// Protection invariant: every session name returned by the
|
|
3709
|
-
// managed path must still match LEADER_SESSION_PREFIX so the
|
|
3710
|
-
// shutdown / cli/mod.rs prefix matchers still classify it as a
|
|
3711
|
-
// leader session.
|
|
3712
|
-
let workspace =
|
|
3713
|
-
std::env::temp_dir().join(format!("ta_rs_mgr_prefix_{}", std::process::id()));
|
|
3714
|
-
let _ = std::fs::create_dir_all(&workspace);
|
|
3715
|
-
let name = super::managed_leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3716
|
-
assert!(
|
|
3717
|
-
name.as_str()
|
|
3718
|
-
.starts_with(super::super::LEADER_SESSION_PREFIX),
|
|
3719
|
-
"managed session name must carry LEADER_SESSION_PREFIX (`{}`); \
|
|
3720
|
-
got `{}`",
|
|
3721
|
-
super::super::LEADER_SESSION_PREFIX,
|
|
3722
|
-
name.as_str()
|
|
3723
|
-
);
|
|
3724
|
-
assert!(
|
|
3725
|
-
name.as_str().contains("claude_code"),
|
|
3726
|
-
"managed session name must include provider wire; got `{}`",
|
|
3727
|
-
name.as_str()
|
|
3728
|
-
);
|
|
3729
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3730
|
-
}
|
|
3731
|
-
|
|
3732
|
-
#[test]
|
|
3733
|
-
fn managed_leader_session_name_is_unique_per_call() {
|
|
3734
|
-
// Two consecutive calls must return DIFFERENT names — the
|
|
3735
|
-
// per-launch nonce defeats the mirror-session bug.
|
|
3736
|
-
let workspace =
|
|
3737
|
-
std::env::temp_dir().join(format!("ta_rs_mgr_unique_{}", std::process::id()));
|
|
3738
|
-
let _ = std::fs::create_dir_all(&workspace);
|
|
3739
|
-
let a = super::managed_leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3740
|
-
// Sleep > 1ns to ensure epoch_nanos advances even on coarse clocks.
|
|
3741
|
-
std::thread::sleep(std::time::Duration::from_millis(1));
|
|
3742
|
-
let b = super::managed_leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3743
|
-
assert_ne!(
|
|
3744
|
-
a.as_str(),
|
|
3745
|
-
b.as_str(),
|
|
3746
|
-
"two managed launches in the same workspace must get \
|
|
3747
|
-
DIFFERENT session names (mirror-session fix v2); got \
|
|
3748
|
-
`{}` vs `{}`",
|
|
3749
|
-
a.as_str(),
|
|
3750
|
-
b.as_str()
|
|
3751
|
-
);
|
|
3752
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3753
|
-
}
|
|
3754
|
-
|
|
3755
|
-
#[test]
|
|
3756
|
-
fn leader_session_name_is_stable_across_calls() {
|
|
3757
|
-
// External / attach paths must keep the stable workspace-keyed
|
|
3758
|
-
// name — `--attach-session <name>` reattach would break if the
|
|
3759
|
-
// name varied per call.
|
|
3760
|
-
let workspace =
|
|
3761
|
-
std::env::temp_dir().join(format!("ta_rs_lsn_stable_{}", std::process::id()));
|
|
3762
|
-
let _ = std::fs::create_dir_all(&workspace);
|
|
3763
|
-
let a = super::leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3764
|
-
let b = super::leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3765
|
-
assert_eq!(
|
|
3766
|
-
a.as_str(),
|
|
3767
|
-
b.as_str(),
|
|
3768
|
-
"leader_session_name must be deterministic per workspace \
|
|
3769
|
-
(external/attach paths depend on stability); got `{}` vs `{}`",
|
|
3770
|
-
a.as_str(),
|
|
3771
|
-
b.as_str()
|
|
3772
|
-
);
|
|
3773
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3774
|
-
}
|
|
3775
|
-
|
|
3776
|
-
// Tombstone for `managed_path_uses_nonce_session_name_grep_guard`: A-22
|
|
3777
|
-
// replaced that implementation-shape assertion with the contract guard
|
|
3778
|
-
// below. Keep the old name here for audit/search provenance.
|
|
3779
|
-
#[test]
|
|
3780
|
-
fn a22_launch_session_reuse_contract() {
|
|
3781
|
-
let manifest = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
|
|
3782
|
-
let start_rs = manifest.join("src").join("leader").join("start.rs");
|
|
3783
|
-
let contents = std::fs::read_to_string(&start_rs).expect("read leader/start.rs");
|
|
3784
|
-
let start = contents
|
|
3785
|
-
.find("fn leader_start_plan_with_ambient_authority(")
|
|
3786
|
-
.expect("leader_start_plan_with_ambient_authority must exist");
|
|
3787
|
-
let end = contents[start + 1..]
|
|
3788
|
-
.find("\nfn ")
|
|
3789
|
-
.map(|offset| start + 1 + offset)
|
|
3790
|
-
.unwrap_or(contents.len());
|
|
3791
|
-
let body = &contents[start..end];
|
|
3792
|
-
assert!(
|
|
3793
|
-
body.contains("managed_leader_session_for_launch(provider, workspace)"),
|
|
3794
|
-
"managed launch must select from the A-22 candidate contract; body excerpt: {body}"
|
|
3795
|
-
);
|
|
3796
|
-
assert!(
|
|
3797
|
-
body.contains("leader_session_name(provider, workspace)"),
|
|
3798
|
-
"leader_start_plan must keep leader_session_name on the \
|
|
3799
|
-
external/attach paths; body excerpt: {body}"
|
|
3800
|
-
);
|
|
3801
|
-
let workspace =
|
|
3802
|
-
std::env::temp_dir().join(format!("ta_rs_a22_contract_{}", std::process::id()));
|
|
3803
|
-
let reused = super::managed_leader_session_from_candidates(
|
|
3804
|
-
Provider::ClaudeCode,
|
|
3805
|
-
&workspace,
|
|
3806
|
-
vec![
|
|
3807
|
-
"team-worker-not-a-leader".to_string(),
|
|
3808
|
-
"team-agent-leader-claude_code-z".to_string(),
|
|
3809
|
-
"team-agent-leader-codex-other".to_string(),
|
|
3810
|
-
"team-agent-leader-claude_code-a".to_string(),
|
|
3811
|
-
],
|
|
3812
|
-
);
|
|
3813
|
-
assert_eq!(
|
|
3814
|
-
reused.as_str(),
|
|
3815
|
-
"team-agent-leader-claude_code-a",
|
|
3816
|
-
"managed launch must deterministically reuse a matching leader prefix session"
|
|
3817
|
-
);
|
|
3818
|
-
let _ = std::fs::remove_dir_all(workspace);
|
|
3819
|
-
}
|
|
3820
|
-
|
|
3821
|
-
#[test]
|
|
3822
|
-
fn a22_launch_session_without_candidate_gets_nonce() {
|
|
3823
|
-
let workspace =
|
|
3824
|
-
std::env::temp_dir().join(format!("ta_rs_a22_nonce_{}", std::process::id()));
|
|
3825
|
-
let fresh = super::managed_leader_session_from_candidates(
|
|
3826
|
-
Provider::ClaudeCode,
|
|
3827
|
-
&workspace,
|
|
3828
|
-
std::iter::empty(),
|
|
3829
|
-
);
|
|
3830
|
-
assert!(
|
|
3831
|
-
fresh.as_str().starts_with("team-agent-leader-claude_code-"),
|
|
3832
|
-
"no candidate must create a leader-prefixed managed session: {}",
|
|
3833
|
-
fresh.as_str()
|
|
3834
|
-
);
|
|
3835
|
-
assert_ne!(
|
|
3836
|
-
fresh.as_str(),
|
|
3837
|
-
super::leader_session_name(Provider::ClaudeCode, &workspace).as_str(),
|
|
3838
|
-
"managed fallback must carry a per-launch nonce"
|
|
3839
|
-
);
|
|
3840
|
-
let _ = std::fs::remove_dir_all(workspace);
|
|
3841
|
-
}
|
|
3842
|
-
|
|
3843
|
-
#[test]
|
|
3844
|
-
fn a22_external_attach_session_name_remains_stable() {
|
|
3845
|
-
let workspace =
|
|
3846
|
-
std::env::temp_dir().join(format!("ta_rs_a22_external_{}", std::process::id()));
|
|
3847
|
-
let stable = super::leader_session_name(Provider::ClaudeCode, &workspace);
|
|
3848
|
-
assert_eq!(
|
|
3849
|
-
stable.as_str(),
|
|
3850
|
-
super::leader_session_name(Provider::ClaudeCode, &workspace).as_str(),
|
|
3851
|
-
"external/attach paths must keep the stable workspace-keyed session name"
|
|
3852
|
-
);
|
|
3853
|
-
let _ = std::fs::remove_dir_all(workspace);
|
|
3854
|
-
}
|
|
3855
|
-
|
|
3856
|
-
#[test]
|
|
3857
|
-
fn launcher_failure_redacts_credentials_before_persistence() {
|
|
3858
|
-
let failure = format_launcher_failure(
|
|
3859
|
-
"1",
|
|
3860
|
-
false,
|
|
3861
|
-
"open terminal failed: not a terminal API_TOKEN=secret-value \
|
|
3862
|
-
Authorization: Bearer abcdefghijklmnopqrstuvwxyz",
|
|
3863
|
-
);
|
|
3864
|
-
|
|
3865
|
-
assert!(failure.contains("stderr_class=not_a_terminal"));
|
|
3866
|
-
assert!(failure.contains("[REDACTED]"));
|
|
3867
|
-
assert!(!failure.contains("secret-value"));
|
|
3868
|
-
assert!(!failure.contains("abcdefghijklmnopqrstuvwxyz"));
|
|
3869
|
-
}
|
|
3870
|
-
|
|
3871
|
-
#[test]
|
|
3872
|
-
fn launcher_stderr_capture_is_bounded_to_tail() {
|
|
3873
|
-
let mut captured = vec![b'a'; LEADER_STDERR_LIMIT - 2];
|
|
3874
|
-
push_bounded_stderr(&mut captured, b"XYZ");
|
|
3875
|
-
|
|
3876
|
-
assert_eq!(captured.len(), LEADER_STDERR_LIMIT);
|
|
3877
|
-
assert!(captured.ends_with(b"XYZ"));
|
|
3878
|
-
}
|
|
3879
|
-
|
|
3880
|
-
#[test]
|
|
3881
|
-
fn managed_leader_launch_disables_window_rename() {
|
|
3882
|
-
let transport = ScriptedTransport::with_liveness(PaneLiveness::Live);
|
|
3883
|
-
let session = SessionName::new("team-agent-leader-claude_code-demo");
|
|
3884
|
-
let window = WindowName::new("claude_code");
|
|
3885
|
-
|
|
3886
|
-
let (result, stderr) = lock_down_window_rename(&transport, &session, &window);
|
|
3887
|
-
|
|
3888
|
-
assert_eq!(result, "ok", "both set-window-option calls must succeed");
|
|
3889
|
-
assert!(stderr.is_empty());
|
|
3890
|
-
let options = transport.window_options();
|
|
3891
|
-
assert_eq!(
|
|
3892
|
-
options,
|
|
3893
|
-
vec![
|
|
3894
|
-
("allow-rename".to_string(), "off".to_string()),
|
|
3895
|
-
("automatic-rename".to_string(), "off".to_string()),
|
|
3896
|
-
],
|
|
3897
|
-
"both rename lockdown options must be issued, in order"
|
|
3898
|
-
);
|
|
3899
|
-
}
|
|
3900
|
-
|
|
3901
|
-
#[test]
|
|
3902
|
-
fn launcher_survives_set_window_option_failure() {
|
|
3903
|
-
let workspace =
|
|
3904
|
-
std::env::temp_dir().join(format!("ta-rename-lockdown-fail-{}", std::process::id()));
|
|
3905
|
-
std::fs::create_dir_all(&workspace).unwrap();
|
|
3906
|
-
let transport = ScriptedTransport::with_window_option_error(
|
|
3907
|
-
"set-window-option: unknown option: allow-rename",
|
|
3908
|
-
);
|
|
3909
|
-
let session = SessionName::new("team-agent-leader-claude_code-demo");
|
|
3910
|
-
let window = WindowName::new("claude_code");
|
|
3911
|
-
|
|
3912
|
-
// Lockdown must NOT abort the launcher: it returns a failed outcome
|
|
3913
|
-
// (recorded for audit) instead of propagating an error.
|
|
3914
|
-
let (result, stderr) = lock_down_window_rename(&transport, &session, &window);
|
|
3915
|
-
|
|
3916
|
-
assert_eq!(
|
|
3917
|
-
result, "failed",
|
|
3918
|
-
"a set-window-option failure is audited, not fatal"
|
|
3919
|
-
);
|
|
3920
|
-
assert!(
|
|
3921
|
-
stderr.contains("unknown option"),
|
|
3922
|
-
"tmux stderr must surface in the audit payload: {stderr}"
|
|
3923
|
-
);
|
|
3924
|
-
|
|
3925
|
-
// The audit event lands in the workspace event log with result=failed.
|
|
3926
|
-
write_window_rename_lockdown_event(&workspace, &result, &stderr);
|
|
3927
|
-
let events = crate::event_log::EventLog::new(&workspace).tail(0).unwrap();
|
|
3928
|
-
let lockdown = events
|
|
3929
|
-
.iter()
|
|
3930
|
-
.find(|event| event["event"] == "leader.launcher.window_rename_lockdown")
|
|
3931
|
-
.expect("rename_lockdown event must be written even on failure");
|
|
3932
|
-
assert_eq!(lockdown["result"], "failed");
|
|
3933
|
-
assert!(
|
|
3934
|
-
lockdown["tmux_stderr"]
|
|
3935
|
-
.as_str()
|
|
3936
|
-
.unwrap_or_default()
|
|
3937
|
-
.contains("unknown option"),
|
|
3938
|
-
"event must carry tmux stderr for regression triage: {lockdown}"
|
|
3939
|
-
);
|
|
3940
|
-
|
|
3941
|
-
std::fs::remove_dir_all(&workspace).ok();
|
|
3942
|
-
}
|
|
3943
|
-
|
|
3944
|
-
#[test]
|
|
3945
|
-
fn cleanup_managed_leader_kills_own_window_not_server() {
|
|
3946
|
-
let workspace =
|
|
3947
|
-
std::env::temp_dir().join(format!("ta-cleanup-own-window-{}", std::process::id()));
|
|
3948
|
-
std::fs::create_dir_all(&workspace).unwrap();
|
|
3949
|
-
let spawned = managed_spawn_result();
|
|
3950
|
-
let transport = ScriptedTransport::with_liveness(PaneLiveness::Live);
|
|
3951
|
-
super::cleanup_managed_leader_resources(
|
|
3952
|
-
&transport,
|
|
3953
|
-
&spawned.session,
|
|
3954
|
-
&spawned,
|
|
3955
|
-
false,
|
|
3956
|
-
&workspace,
|
|
3957
|
-
"test_own_window",
|
|
3958
|
-
);
|
|
3959
|
-
let kills = transport.kills();
|
|
3960
|
-
assert!(
|
|
3961
|
-
kills.iter().any(|k| k.starts_with("kill_window:")),
|
|
3962
|
-
"cleanup must kill the launched window: {kills:?}"
|
|
3963
|
-
);
|
|
3964
|
-
assert!(
|
|
3965
|
-
!kills.iter().any(|k| k == "kill_server"),
|
|
3966
|
-
"cleanup must not kill-server: {kills:?}"
|
|
3967
|
-
);
|
|
3968
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
3969
|
-
}
|
|
3970
|
-
|
|
3971
|
-
#[test]
|
|
3972
|
-
fn cleanup_managed_leader_clears_stale_pane_pointer() {
|
|
3973
|
-
let workspace =
|
|
3974
|
-
std::env::temp_dir().join(format!("ta-cleanup-pane-pointer-{}", std::process::id()));
|
|
3975
|
-
std::fs::create_dir_all(workspace.join(".team").join("runtime")).unwrap();
|
|
3976
|
-
let state = serde_json::json!({
|
|
3977
|
-
"active_team_key": "current",
|
|
3978
|
-
"teams": {
|
|
3979
|
-
"current": {
|
|
3980
|
-
"leader_receiver": {
|
|
3981
|
-
"status": "attached",
|
|
3982
|
-
"pane_id": "%42",
|
|
3983
|
-
"pane": "%42"
|
|
3984
|
-
},
|
|
3985
|
-
"team_owner": { "pane_id": "%42" }
|
|
3986
|
-
}
|
|
3987
|
-
}
|
|
3988
|
-
});
|
|
3989
|
-
std::fs::write(
|
|
3990
|
-
crate::state::persist::runtime_state_path(&workspace),
|
|
3991
|
-
serde_json::to_vec_pretty(&state).unwrap(),
|
|
3992
|
-
)
|
|
3993
|
-
.unwrap();
|
|
3994
|
-
super::clear_managed_leader_receiver_pane(&workspace, "%42");
|
|
3995
|
-
let loaded = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
3996
|
-
let recv = &loaded["teams"]["current"]["leader_receiver"];
|
|
3997
|
-
assert_eq!(recv["status"], serde_json::json!("exited"));
|
|
3998
|
-
assert!(
|
|
3999
|
-
recv.get("pane_id").is_none(),
|
|
4000
|
-
"dangling pane_id must be gone: {recv}"
|
|
4001
|
-
);
|
|
4002
|
-
assert!(
|
|
4003
|
-
loaded["teams"]["current"]["team_owner"]
|
|
4004
|
-
.get("pane_id")
|
|
4005
|
-
.is_none(),
|
|
4006
|
-
"owner pane_id must be gone: {loaded}"
|
|
4007
|
-
);
|
|
4008
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
4009
|
-
}
|
|
4010
|
-
|
|
4011
|
-
#[test]
|
|
4012
|
-
fn managed_attach_teardown_requires_exit_receipt_not_replayed_markers() {
|
|
4013
|
-
let spawned = managed_spawn_result();
|
|
4014
|
-
let mut transport = ScriptedTransport::new(vec![
|
|
4015
|
-
"[team-agent] pi exited with 1\n[team-agent] Provider exited".to_string(),
|
|
4016
|
-
]);
|
|
4017
|
-
transport.liveness = PaneLiveness::Live;
|
|
4018
|
-
for exit_status in [None, Some(0), Some(17)] {
|
|
4019
|
-
transport.exit_status = exit_status;
|
|
4020
|
-
let watch = super::ManagedAttachWatch {
|
|
4021
|
-
transport: &transport,
|
|
4022
|
-
spawned: &spawned,
|
|
4023
|
-
session: &spawned.session,
|
|
4024
|
-
session_existed_before: false,
|
|
4025
|
-
workspace: Path::new("/tmp"),
|
|
4026
|
-
provider_label: "pi",
|
|
4027
|
-
};
|
|
4028
|
-
assert_eq!(
|
|
4029
|
-
super::managed_attach_should_teardown(&watch),
|
|
4030
|
-
exit_status.is_some()
|
|
4031
|
-
);
|
|
4032
|
-
}
|
|
4033
|
-
assert_eq!(
|
|
4034
|
-
transport.screens.lock().unwrap().len(),
|
|
4035
|
-
1,
|
|
4036
|
-
"health must not read history"
|
|
4037
|
-
);
|
|
4038
|
-
transport.liveness = PaneLiveness::Dead;
|
|
4039
|
-
transport.exit_status = None;
|
|
4040
|
-
assert_eq!(
|
|
4041
|
-
super::leader_provider_health(&transport, &spawned.pane_id, "pi"),
|
|
4042
|
-
super::LeaderProviderHealth::Unreachable
|
|
4043
|
-
);
|
|
4044
|
-
}
|
|
4045
|
-
|
|
4046
|
-
#[test]
|
|
4047
|
-
fn managed_attach_teardown_does_not_fire_on_live_provider_screen() {
|
|
4048
|
-
let spawned = managed_spawn_result();
|
|
4049
|
-
let transport = ScriptedTransport::new(vec!["Welcome to Claude Code".to_string()]);
|
|
4050
|
-
let watch = super::ManagedAttachWatch {
|
|
4051
|
-
transport: &transport,
|
|
4052
|
-
spawned: &spawned,
|
|
4053
|
-
session: &spawned.session,
|
|
4054
|
-
session_existed_before: false,
|
|
4055
|
-
workspace: Path::new("/tmp"),
|
|
4056
|
-
provider_label: "claude",
|
|
4057
|
-
};
|
|
4058
|
-
assert!(
|
|
4059
|
-
!super::managed_attach_should_teardown(&watch),
|
|
4060
|
-
"live welcome screen must not teardown"
|
|
4061
|
-
);
|
|
4062
|
-
}
|
|
4063
|
-
|
|
4064
|
-
#[test]
|
|
4065
|
-
fn managed_attach_wait_watches_provider_exit_grep_guard() {
|
|
4066
|
-
let manifest = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
|
|
4067
|
-
let start_rs = manifest.join("src").join("leader").join("start.rs");
|
|
4068
|
-
let contents = std::fs::read_to_string(&start_rs).expect("read leader/start.rs");
|
|
4069
|
-
let start = contents
|
|
4070
|
-
.find("fn run_leader_argv(")
|
|
4071
|
-
.expect("run_leader_argv must exist");
|
|
4072
|
-
let end = contents[start + 1..]
|
|
4073
|
-
.find("\nfn ")
|
|
4074
|
-
.map(|offset| start + 1 + offset)
|
|
4075
|
-
.unwrap_or(contents.len());
|
|
4076
|
-
let body = &contents[start..end];
|
|
4077
|
-
assert!(
|
|
4078
|
-
body.contains("wait_managed_attach_child"),
|
|
4079
|
-
"managed attach wait must watch provider lifetime; body excerpt: {body}"
|
|
4080
|
-
);
|
|
4081
|
-
let cleanup = contents
|
|
4082
|
-
.find("fn cleanup_managed_leader_resources(")
|
|
4083
|
-
.expect("cleanup_managed_leader_resources must exist");
|
|
4084
|
-
let cleanup_end = contents[cleanup + 1..]
|
|
4085
|
-
.find("\nfn ")
|
|
4086
|
-
.map(|offset| cleanup + 1 + offset)
|
|
4087
|
-
.unwrap_or(contents.len());
|
|
4088
|
-
let cleanup_body = &contents[cleanup..cleanup_end];
|
|
4089
|
-
assert!(
|
|
4090
|
-
!cleanup_body.contains("kill_server"),
|
|
4091
|
-
"cleanup must not call kill_server; body excerpt: {cleanup_body}"
|
|
4092
|
-
);
|
|
4093
|
-
assert!(
|
|
4094
|
-
cleanup_body.contains("kill_window"),
|
|
4095
|
-
"cleanup must kill own window; body excerpt: {cleanup_body}"
|
|
4096
|
-
);
|
|
4097
|
-
assert!(
|
|
4098
|
-
cleanup_body.contains("clear_managed_leader_receiver_pane"),
|
|
4099
|
-
"cleanup must clear state.json pane pointer; body excerpt: {cleanup_body}"
|
|
4100
|
-
);
|
|
4101
|
-
}
|
|
4102
|
-
|
|
4103
|
-
fn persist_test_identity(workspace: &Path) -> LeaderIdentity {
|
|
4104
|
-
persist_test_identity_named(workspace, "tester")
|
|
4105
|
-
}
|
|
4106
|
-
|
|
4107
|
-
fn persist_test_identity_named(workspace: &Path, os_user: &str) -> LeaderIdentity {
|
|
4108
|
-
LeaderIdentity {
|
|
4109
|
-
leader_session_uuid: LeaderSessionUuid::derive(
|
|
4110
|
-
"fp",
|
|
4111
|
-
&workspace.to_string_lossy(),
|
|
4112
|
-
os_user,
|
|
4113
|
-
"current",
|
|
4114
|
-
)
|
|
4115
|
-
.unwrap(),
|
|
4116
|
-
leader_session_uuid_source: LeaderSessionUuidSource::Derived,
|
|
4117
|
-
machine_fingerprint: "fp".to_string(),
|
|
4118
|
-
workspace_abspath: workspace.to_path_buf(),
|
|
4119
|
-
os_user: os_user.to_string(),
|
|
4120
|
-
team_id: TeamKey::new("current"),
|
|
4121
|
-
}
|
|
4122
|
-
}
|
|
4123
|
-
|
|
4124
|
-
fn persist_test_plan(workspace: &Path) -> LeaderStartPlan {
|
|
4125
|
-
LeaderStartPlan {
|
|
4126
|
-
mode: LeaderStartMode::ManagedTmuxClient,
|
|
4127
|
-
provider: Provider::ClaudeCode,
|
|
4128
|
-
workspace: workspace.to_path_buf(),
|
|
4129
|
-
socket: LeaderLaunchSocket::Workspace,
|
|
4130
|
-
session_name: Some(SessionName::new("team-agent-leader-claude_code-demo")),
|
|
4131
|
-
argv: vec!["tmux".to_string(), "attach-session".to_string()],
|
|
4132
|
-
provider_argv: vec!["claude".to_string()],
|
|
4133
|
-
leader_prompt: None,
|
|
4134
|
-
session_capture: None,
|
|
4135
|
-
leader_window: Some(WindowName::new("claude_code")),
|
|
4136
|
-
is_external_leader: false,
|
|
4137
|
-
leader_env: BTreeMap::new(),
|
|
4138
|
-
identity: Some(persist_test_identity(workspace)),
|
|
4139
|
-
detached: false,
|
|
4140
|
-
}
|
|
4141
|
-
}
|
|
4142
|
-
|
|
4143
|
-
#[cfg(unix)]
|
|
4144
|
-
#[test]
|
|
4145
|
-
fn leader_prompt_transport_capture_hides_argv_echo_without_muting_native_exec() {
|
|
4146
|
-
const TEST: &str = "leader::start::tests::leader_prompt_transport_capture_hides_argv_echo_without_muting_native_exec";
|
|
4147
|
-
const KEY: &str = "TEAM_AGENT_TEST_PROMPT_CAPTURE_CASE";
|
|
4148
|
-
const BODY: &str = "SENSITIVE_PROMPT_309_CAPTURE";
|
|
4149
|
-
if let Ok(case) = std::env::var(KEY) {
|
|
4150
|
-
let root = std::env::temp_dir().join(format!("ta-prompt-capture-{}-{case}", std::process::id()));
|
|
4151
|
-
std::fs::create_dir_all(&root).unwrap();
|
|
4152
|
-
let mut plan = persist_test_plan(&root);
|
|
4153
|
-
plan.mode = if case == "exec_configured" { LeaderStartMode::ExecProvider } else { LeaderStartMode::NewTmuxSession };
|
|
4154
|
-
if case != "transport_absent" {
|
|
4155
|
-
plan.leader_prompt = Some(crate::leader::prompt::PromptMetadata {
|
|
4156
|
-
config_path: root.join("leader-prompt.txt"), carrier: "--append-system-prompt", bytes: BODY.len(),
|
|
4157
|
-
});
|
|
4158
|
-
}
|
|
4159
|
-
// Controlled launcher echoes its received argv and fails; no native Agent/Team.
|
|
4160
|
-
let argv = vec!["/bin/sh".to_string(), "-c".to_string(),
|
|
4161
|
-
"printf '%s\\n' \"$1\"; printf '%s\\n' \"$1\" >&2; exit 23".to_string(), "launcher".to_string(), BODY.to_string()];
|
|
4162
|
-
let outcome = super::run_leader_argv(&argv, &BTreeMap::new(), &plan, &root, None).unwrap();
|
|
4163
|
-
assert_eq!(outcome.status.code(), Some(23));
|
|
4164
|
-
if plan.leader_prompt.is_some() { assert!(!outcome.stderr.contains(BODY)); }
|
|
4165
|
-
std::fs::remove_dir_all(root).unwrap();
|
|
4166
|
-
return;
|
|
4167
|
-
}
|
|
4168
|
-
for case in ["transport_configured", "transport_absent", "exec_configured"] {
|
|
4169
|
-
let output = std::process::Command::new(std::env::current_exe().unwrap())
|
|
4170
|
-
.args(["--exact", TEST, "--nocapture", "--test-threads=1"])
|
|
4171
|
-
.env(KEY, case).env_remove("TMUX").env_remove("TMUX_PANE")
|
|
4172
|
-
.output().unwrap();
|
|
4173
|
-
assert!(output.status.success(), "controlled child failed: {:?} {}", output.status, String::from_utf8_lossy(&output.stderr));
|
|
4174
|
-
for bytes in [&output.stdout, &output.stderr] {
|
|
4175
|
-
assert_eq!(String::from_utf8_lossy(bytes).contains(BODY), case != "transport_configured", "capture policy differs for {case}");
|
|
4176
|
-
}
|
|
4177
|
-
}
|
|
4178
|
-
}
|
|
4179
|
-
|
|
4180
|
-
#[test]
|
|
4181
|
-
fn leader_prompt_diagnostics_hide_payload_but_keep_unconfigured_baseline_and_native_cause() {
|
|
4182
|
-
let root = std::env::temp_dir().join(format!("ta-prompt-diagnostics-{}", std::process::id()));
|
|
4183
|
-
std::fs::create_dir_all(&root).unwrap();
|
|
4184
|
-
let path = root.join("launcher.log");
|
|
4185
|
-
let mut plan = persist_test_plan(&root);
|
|
4186
|
-
let plain = vec!["tmux".to_string(), "attach-session".to_string()];
|
|
4187
|
-
super::write_launcher_diagnostics_header(&path, &plan, &plain).unwrap();
|
|
4188
|
-
assert_eq!(std::fs::read_to_string(&path).unwrap(),
|
|
4189
|
-
"startup_stage=prepare\nmode=ManagedTmuxClient\nprovider=claude_code\nargv=tmux attach-session\n");
|
|
4190
|
-
const BODY: &str = "LEADER_ONLY_SENSITIVE_309";
|
|
4191
|
-
plan.leader_prompt = Some(crate::leader::prompt::PromptMetadata {
|
|
4192
|
-
config_path: root.join("leader-prompt.txt"), carrier: "--append-system-prompt", bytes: BODY.len(),
|
|
4193
|
-
});
|
|
4194
|
-
let shell = vec!["tmux".to_string(), "new-session".to_string(),
|
|
4195
|
-
format!("claude --append-system-prompt '{BODY}'")];
|
|
4196
|
-
super::write_launcher_diagnostics_header(&path, &plan, &shell).unwrap();
|
|
4197
|
-
let header = std::fs::read_to_string(&path).unwrap();
|
|
4198
|
-
assert!(!header.contains(BODY));
|
|
4199
|
-
assert!(header.contains("leader_prompt={") && header.contains("--append-system-prompt"));
|
|
4200
|
-
assert!(!super::prompt_aware_diagnostic_text(&plan, BODY).contains(BODY));
|
|
4201
|
-
let error = super::prompt_aware_spawn_error(&plan, TransportError::Subprocess {
|
|
4202
|
-
argv: shell, code: Some(7), stderr: BODY.to_string(),
|
|
4203
|
-
});
|
|
4204
|
-
let crate::leader::LeaderError::Prompt(error) = error else { panic!("typed carrier failure required") };
|
|
4205
|
-
assert_eq!(error.reason, "leader_prompt_carrier_failed");
|
|
4206
|
-
assert_eq!(error.exit_code, Some(7));
|
|
4207
|
-
assert!(!error.report().to_string().contains(BODY));
|
|
4208
|
-
std::fs::remove_dir_all(root).unwrap();
|
|
4209
|
-
}
|
|
4210
|
-
|
|
4211
|
-
#[test]
|
|
4212
|
-
fn multi_leader_window_keeps_base_when_free() {
|
|
4213
|
-
let window =
|
|
4214
|
-
managed_leader_window_from_occupied("claude_code", Vec::<String>::new(), "deadbeef");
|
|
4215
|
-
assert_eq!(window.as_str(), "claude_code");
|
|
4216
|
-
}
|
|
4217
|
-
|
|
4218
|
-
#[test]
|
|
4219
|
-
fn multi_leader_window_suffixes_when_taken() {
|
|
4220
|
-
let window = managed_leader_window_from_occupied(
|
|
4221
|
-
"claude_code",
|
|
4222
|
-
vec!["claude_code".to_string()],
|
|
4223
|
-
"aa-bb",
|
|
4224
|
-
);
|
|
4225
|
-
assert_eq!(window.as_str(), "claude_code-aa-bb");
|
|
4226
|
-
assert_ne!(window.as_str(), "claude_code");
|
|
4227
|
-
}
|
|
4228
|
-
|
|
4229
|
-
#[test]
|
|
4230
|
-
fn multi_leader_attach_targets_unique_window() {
|
|
4231
|
-
let session = SessionName::new("team-agent-leader-claude_code-demo");
|
|
4232
|
-
let window = WindowName::new("claude_code-aa-bb");
|
|
4233
|
-
let argv = managed_client_argv(
|
|
4234
|
-
Path::new("/tmp"),
|
|
4235
|
-
&session,
|
|
4236
|
-
&window,
|
|
4237
|
-
ManagedClientAttachMode::AttachSession,
|
|
4238
|
-
)
|
|
4239
|
-
.expect("argv");
|
|
4240
|
-
let target = argv
|
|
4241
|
-
.windows(2)
|
|
4242
|
-
.find(|pair| pair[0] == "-t")
|
|
4243
|
-
.map(|pair| pair[1].as_str())
|
|
4244
|
-
.expect("-t target");
|
|
4245
|
-
assert_eq!(
|
|
4246
|
-
target,
|
|
4247
|
-
"team-agent-leader-claude_code-demo:claude_code-aa-bb"
|
|
4248
|
-
);
|
|
4249
|
-
assert!(
|
|
4250
|
-
!target.ends_with(":claude_code"),
|
|
4251
|
-
"attach must not collapse to the colliding provider_wire name: {target}"
|
|
4252
|
-
);
|
|
4253
|
-
}
|
|
4254
|
-
|
|
4255
|
-
#[test]
|
|
4256
|
-
fn multi_leader_persist_keeps_first_pane_id() {
|
|
4257
|
-
let workspace =
|
|
4258
|
-
std::env::temp_dir().join(format!("ta-multi-leader-persist-{}", std::process::id()));
|
|
4259
|
-
std::fs::create_dir_all(workspace.join(".team").join("runtime")).unwrap();
|
|
4260
|
-
let plan = persist_test_plan(&workspace);
|
|
4261
|
-
let first = SpawnResult {
|
|
4262
|
-
pane_id: PaneId::new("%0"),
|
|
4263
|
-
session: SessionName::new("team-agent-leader-claude_code-demo"),
|
|
4264
|
-
window: WindowName::new("claude_code"),
|
|
4265
|
-
child_pid: Some(1),
|
|
4266
|
-
};
|
|
4267
|
-
persist_managed_leader_binding(&plan, &workspace, &first).expect("first persist");
|
|
4268
|
-
let second = SpawnResult {
|
|
4269
|
-
pane_id: PaneId::new("%1"),
|
|
4270
|
-
session: SessionName::new("team-agent-leader-claude_code-demo"),
|
|
4271
|
-
window: WindowName::new("claude_code-aa-bb"),
|
|
4272
|
-
child_pid: Some(2),
|
|
4273
|
-
};
|
|
4274
|
-
persist_managed_leader_binding(&plan, &workspace, &second).expect("second persist");
|
|
4275
|
-
let loaded = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
4276
|
-
let recv = &loaded["teams"]["current"]["leader_receiver"];
|
|
4277
|
-
assert_eq!(
|
|
4278
|
-
recv["pane_id"],
|
|
4279
|
-
serde_json::json!("%0"),
|
|
4280
|
-
"second launch must not overwrite the first pane pointer: {recv}"
|
|
4281
|
-
);
|
|
4282
|
-
let panes = recv["bound_panes"].as_array().expect("bound_panes");
|
|
4283
|
-
let ids: Vec<&str> = panes
|
|
4284
|
-
.iter()
|
|
4285
|
-
.filter_map(|pane| pane.get("pane_id").and_then(serde_json::Value::as_str))
|
|
4286
|
-
.collect();
|
|
4287
|
-
assert!(ids.contains(&"%0"), "bound_panes missing first: {recv}");
|
|
4288
|
-
assert!(ids.contains(&"%1"), "bound_panes missing second: {recv}");
|
|
4289
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
4290
|
-
}
|
|
4291
|
-
|
|
4292
|
-
#[test]
|
|
4293
|
-
fn pi_managed_leader_persists_native_identity_with_the_canonical_pane() {
|
|
4294
|
-
let workspace = std::env::temp_dir().join(format!(
|
|
4295
|
-
"ta-pi-leader-native-binding-{}", std::process::id()
|
|
4296
|
-
));
|
|
4297
|
-
std::fs::create_dir_all(workspace.join(".team/runtime")).unwrap();
|
|
4298
|
-
let mut plan = persist_test_plan(&workspace);
|
|
4299
|
-
plan.provider = Provider::Pi;
|
|
4300
|
-
plan.session_capture = Some(crate::provider::CaptureSessionContext {
|
|
4301
|
-
agent_id: "leader".into(),
|
|
4302
|
-
spawn_cwd: workspace.clone(),
|
|
4303
|
-
pane_id: None,
|
|
4304
|
-
pane_pid: None,
|
|
4305
|
-
spawned_at: Some("2026-10-10T03:59:07Z".into()),
|
|
4306
|
-
expected_session_id: Some(crate::provider::SessionId::new("native-first")),
|
|
4307
|
-
provider_projects_root: Some(workspace.join("pi-sessions")),
|
|
4308
|
-
});
|
|
4309
|
-
let mut pane = SpawnResult {
|
|
4310
|
-
pane_id: PaneId::new("%0"),
|
|
4311
|
-
session: SessionName::new("team-agent-leader-pi-demo"),
|
|
4312
|
-
window: WindowName::new("pi"),
|
|
4313
|
-
child_pid: Some(1),
|
|
4314
|
-
};
|
|
4315
|
-
persist_managed_leader_binding(&plan, &workspace, &pane).unwrap();
|
|
4316
|
-
let first = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
4317
|
-
let receiver = &first["teams"]["current"]["leader_receiver"];
|
|
4318
|
-
let native = &receiver["native_session"];
|
|
4319
|
-
assert_eq!(native["expected_session_id"], "native-first");
|
|
4320
|
-
assert_ne!(native["expected_session_id"], receiver["leader_session_uuid"]);
|
|
4321
|
-
assert_eq!(native["provider_projects_root"], serde_json::json!(workspace.join("pi-sessions")));
|
|
4322
|
-
for key in ["pane_id", "tmux_socket", "leader_session_uuid", "owner_epoch"] {
|
|
4323
|
-
assert_eq!(native[key], receiver[key]);
|
|
4324
|
-
}
|
|
4325
|
-
pane.pane_id = PaneId::new("%1");
|
|
4326
|
-
plan.session_capture.as_mut().unwrap().expected_session_id =
|
|
4327
|
-
Some(crate::provider::SessionId::new("native-second"));
|
|
4328
|
-
persist_managed_leader_binding(&plan, &workspace, &pane).unwrap();
|
|
4329
|
-
let second = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
4330
|
-
assert_eq!(second["teams"]["current"]["leader_receiver"]["native_session"], *native);
|
|
4331
|
-
let _ = std::fs::remove_dir_all(workspace);
|
|
4332
|
-
}
|
|
4333
|
-
|
|
4334
|
-
#[test]
|
|
4335
|
-
fn multi_leader_persist_keeps_first_owner_uuid() {
|
|
4336
|
-
let workspace = std::env::temp_dir().join(format!(
|
|
4337
|
-
"ta-multi-leader-uuid-{}",
|
|
4338
|
-
std::process::id()
|
|
4339
|
-
));
|
|
4340
|
-
std::fs::create_dir_all(workspace.join(".team").join("runtime")).unwrap();
|
|
4341
|
-
let original_uuid = "b2b230cfd645e78cf49e8147ba32ff3b";
|
|
4342
|
-
let state = serde_json::json!({
|
|
4343
|
-
"active_team_key": "current",
|
|
4344
|
-
"teams": {
|
|
4345
|
-
"current": {
|
|
4346
|
-
"leader_receiver": {
|
|
4347
|
-
"status": "attached",
|
|
4348
|
-
"pane_id": "%0",
|
|
4349
|
-
"discovery": "env_pane",
|
|
4350
|
-
"leader_session_uuid": original_uuid,
|
|
4351
|
-
"owner_epoch": 1,
|
|
4352
|
-
"attached_at": "2026-09-09T17:08:31.965311+00:00",
|
|
4353
|
-
"tmux_socket": "/private/tmp/tmux-501/ta-33bddc6e7687",
|
|
4354
|
-
"session_name": null,
|
|
4355
|
-
"provider": "codex"
|
|
4356
|
-
},
|
|
4357
|
-
"team_owner": {
|
|
4358
|
-
"pane_id": "%0",
|
|
4359
|
-
"leader_session_uuid": original_uuid,
|
|
4360
|
-
"owner_epoch": 1,
|
|
4361
|
-
"claimed_via": "quick-start"
|
|
4362
|
-
}
|
|
4363
|
-
}
|
|
4364
|
-
}
|
|
4365
|
-
});
|
|
4366
|
-
std::fs::write(
|
|
4367
|
-
crate::state::persist::runtime_state_path(&workspace),
|
|
4368
|
-
serde_json::to_vec_pretty(&state).unwrap(),
|
|
4369
|
-
)
|
|
4370
|
-
.unwrap();
|
|
4371
|
-
let mut plan = persist_test_plan(&workspace);
|
|
4372
|
-
plan.identity = Some(persist_test_identity_named(&workspace, "second-launcher"));
|
|
4373
|
-
let second_uuid = plan
|
|
4374
|
-
.identity
|
|
4375
|
-
.as_ref()
|
|
4376
|
-
.unwrap()
|
|
4377
|
-
.leader_session_uuid
|
|
4378
|
-
.as_str()
|
|
4379
|
-
.to_string();
|
|
4380
|
-
assert_ne!(second_uuid, original_uuid);
|
|
4381
|
-
let spawned = SpawnResult {
|
|
4382
|
-
pane_id: PaneId::new("%2"),
|
|
4383
|
-
session: SessionName::new(
|
|
4384
|
-
"team-agent-leader-codex-team-agent-live-0578-r4-19450903",
|
|
4385
|
-
),
|
|
4386
|
-
window: WindowName::new("codex-second"),
|
|
4387
|
-
child_pid: Some(2),
|
|
4388
|
-
};
|
|
4389
|
-
persist_managed_leader_binding(&plan, &workspace, &spawned).expect("second persist");
|
|
4390
|
-
let loaded = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
4391
|
-
let recv = &loaded["teams"]["current"]["leader_receiver"];
|
|
4392
|
-
let owner = &loaded["teams"]["current"]["team_owner"];
|
|
4393
|
-
assert_eq!(recv["pane_id"], serde_json::json!("%0"));
|
|
4394
|
-
assert_eq!(recv["leader_session_uuid"], serde_json::json!(original_uuid));
|
|
4395
|
-
assert_eq!(recv["discovery"], serde_json::json!("env_pane"));
|
|
4396
|
-
assert_eq!(recv["session_name"], serde_json::Value::Null);
|
|
4397
|
-
assert_eq!(recv["owner_epoch"], serde_json::json!(1));
|
|
4398
|
-
assert_eq!(
|
|
4399
|
-
owner["leader_session_uuid"],
|
|
4400
|
-
serde_json::json!(original_uuid)
|
|
4401
|
-
);
|
|
4402
|
-
let panes = recv["bound_panes"].as_array().expect("bound_panes");
|
|
4403
|
-
let ids: Vec<&str> = panes
|
|
4404
|
-
.iter()
|
|
4405
|
-
.filter_map(|pane| pane.get("pane_id").and_then(serde_json::Value::as_str))
|
|
4406
|
-
.collect();
|
|
4407
|
-
assert!(ids.contains(&"%0"), "bound_panes missing first: {recv}");
|
|
4408
|
-
assert!(ids.contains(&"%2"), "bound_panes missing second: {recv}");
|
|
4409
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
4410
|
-
}
|
|
4411
|
-
|
|
4412
|
-
#[test]
|
|
4413
|
-
fn multi_leader_clear_promotes_remaining() {
|
|
4414
|
-
let workspace =
|
|
4415
|
-
std::env::temp_dir().join(format!("ta-multi-leader-promote-{}", std::process::id()));
|
|
4416
|
-
std::fs::create_dir_all(workspace.join(".team").join("runtime")).unwrap();
|
|
4417
|
-
let state = serde_json::json!({
|
|
4418
|
-
"active_team_key": "current",
|
|
4419
|
-
"teams": {
|
|
4420
|
-
"current": {
|
|
4421
|
-
"leader_receiver": {
|
|
4422
|
-
"status": "attached",
|
|
4423
|
-
"pane_id": "%0",
|
|
4424
|
-
"pane": "%0",
|
|
4425
|
-
"session_name": "s",
|
|
4426
|
-
"window_name": "claude_code",
|
|
4427
|
-
"bound_panes": [
|
|
4428
|
-
{
|
|
4429
|
-
"pane_id": "%0",
|
|
4430
|
-
"session_name": "s",
|
|
4431
|
-
"window_name": "claude_code"
|
|
4432
|
-
},
|
|
4433
|
-
{
|
|
4434
|
-
"pane_id": "%1",
|
|
4435
|
-
"session_name": "s",
|
|
4436
|
-
"window_name": "claude_code-2"
|
|
4437
|
-
}
|
|
4438
|
-
]
|
|
4439
|
-
},
|
|
4440
|
-
"team_owner": { "pane_id": "%0" }
|
|
4441
|
-
}
|
|
4442
|
-
}
|
|
4443
|
-
});
|
|
4444
|
-
std::fs::write(
|
|
4445
|
-
crate::state::persist::runtime_state_path(&workspace),
|
|
4446
|
-
serde_json::to_vec_pretty(&state).unwrap(),
|
|
4447
|
-
)
|
|
4448
|
-
.unwrap();
|
|
4449
|
-
clear_managed_leader_receiver_pane(&workspace, "%0");
|
|
4450
|
-
let loaded = crate::state::persist::load_runtime_state(&workspace).unwrap();
|
|
4451
|
-
let recv = &loaded["teams"]["current"]["leader_receiver"];
|
|
4452
|
-
assert_eq!(recv["pane_id"], serde_json::json!("%1"));
|
|
4453
|
-
assert_eq!(recv["status"], serde_json::json!("attached"));
|
|
4454
|
-
let panes = recv["bound_panes"].as_array().expect("bound_panes");
|
|
4455
|
-
assert_eq!(panes.len(), 1);
|
|
4456
|
-
assert_eq!(panes[0]["pane_id"], serde_json::json!("%1"));
|
|
4457
|
-
assert!(
|
|
4458
|
-
loaded["teams"]["current"]["team_owner"]
|
|
4459
|
-
.get("pane_id")
|
|
4460
|
-
.is_none(),
|
|
4461
|
-
"owner pane for the exited leader must be gone: {loaded}"
|
|
4462
|
-
);
|
|
4463
|
-
let _ = std::fs::remove_dir_all(&workspace);
|
|
4464
|
-
}
|
|
4465
|
-
|
|
4466
|
-
#[test]
|
|
4467
|
-
fn multi_leader_launch_window_dedup_contract() {
|
|
4468
|
-
let manifest = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
|
|
4469
|
-
let start_rs = manifest.join("src").join("leader").join("start.rs");
|
|
4470
|
-
let contents = std::fs::read_to_string(&start_rs).expect("read leader/start.rs");
|
|
4471
|
-
let start = contents
|
|
4472
|
-
.find("fn leader_start_plan_with_ambient_authority(")
|
|
4473
|
-
.expect("leader_start_plan_with_ambient_authority must exist");
|
|
4474
|
-
let end = contents[start + 1..]
|
|
4475
|
-
.find("\nfn ")
|
|
4476
|
-
.map(|offset| start + 1 + offset)
|
|
4477
|
-
.unwrap_or(contents.len());
|
|
4478
|
-
let body = &contents[start..end];
|
|
4479
|
-
assert!(
|
|
4480
|
-
body.contains("managed_leader_window_for_launch(provider, workspace, session)"),
|
|
4481
|
-
"managed launch must pick a unique window in the A-22 session; body excerpt: {body}"
|
|
4482
|
-
);
|
|
4483
|
-
let argv_start = contents
|
|
4484
|
-
.find("fn managed_client_argv(")
|
|
4485
|
-
.expect("managed_client_argv must exist");
|
|
4486
|
-
let argv_end = contents[argv_start + 1..]
|
|
4487
|
-
.find("\nfn ")
|
|
4488
|
-
.map(|offset| argv_start + 1 + offset)
|
|
4489
|
-
.unwrap_or(contents.len());
|
|
4490
|
-
let argv_body = &contents[argv_start..argv_end];
|
|
4491
|
-
assert!(
|
|
4492
|
-
argv_body.contains("window.as_str()"),
|
|
4493
|
-
"attach target must use the launch window, not a hardcoded wire name; body excerpt: {argv_body}"
|
|
4494
|
-
);
|
|
4495
|
-
assert!(
|
|
4496
|
-
!argv_body.contains("provider_wire(provider)"),
|
|
4497
|
-
"attach target must not collapse to provider_wire; body excerpt: {argv_body}"
|
|
4498
|
-
);
|
|
4499
|
-
}
|
|
4500
|
-
}
|