@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,3356 +0,0 @@
|
|
|
1
|
-
//!
|
|
2
|
-
//! leader::lease — attach / claim / autobind 统一 CAS 路径 + claim_lease_no_incident
|
|
3
|
-
//! + 双写 / 分叉检测。
|
|
4
|
-
|
|
5
|
-
use std::collections::BTreeSet;
|
|
6
|
-
use std::path::{Path, PathBuf};
|
|
7
|
-
|
|
8
|
-
use serde_json::{json, Value};
|
|
9
|
-
use sha2::{Digest, Sha256};
|
|
10
|
-
|
|
11
|
-
use crate::message_store::MessageStore;
|
|
12
|
-
use crate::model::enums::PaneLiveness;
|
|
13
|
-
use crate::model::ids::TeamKey;
|
|
14
|
-
use crate::provider::Provider;
|
|
15
|
-
use crate::state::owner_gate::PaneLivenessProbe;
|
|
16
|
-
use crate::transport::{PaneId, PaneInfo, Transport};
|
|
17
|
-
|
|
18
|
-
use super::helpers::{get_path_str, get_path_u64, now_ts, parse_provider};
|
|
19
|
-
use super::owner_bind::leader_identity_context;
|
|
20
|
-
use super::{
|
|
21
|
-
ClaimedVia, Discovery, LeaderError, LeaderIncident, LeaderReceiver, LeaseReason, LeaseResult,
|
|
22
|
-
LeaseSource, LeaseStatus, OwnerEpoch, ReceiverMode, ReceiverStatus, TeamOwner,
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
// ── leader::lease — attach / claim / takeover / autobind / readopt 统一 CAS 路径 ──
|
|
26
|
-
|
|
27
|
-
#[derive(Debug, Clone)]
|
|
28
|
-
pub(crate) struct AppliedLeaderGrant {
|
|
29
|
-
pub(crate) owner: Value,
|
|
30
|
-
pub(crate) receiver: Value,
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
#[derive(Debug, Default)]
|
|
34
|
-
struct AttachRecovery {
|
|
35
|
-
blocked_counts: crate::message_store::BlockedLeaderRequeueCounts,
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
#[derive(Debug)]
|
|
39
|
-
pub(crate) struct AttachLeaderError {
|
|
40
|
-
source: LeaderError,
|
|
41
|
-
applied_grant: Option<AppliedLeaderGrant>,
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
impl AttachLeaderError {
|
|
45
|
-
fn with_applied(source: LeaderError, applied_grant: Option<AppliedLeaderGrant>) -> Self {
|
|
46
|
-
Self {
|
|
47
|
-
source,
|
|
48
|
-
applied_grant,
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
pub(crate) fn into_parts(self) -> (LeaderError, Option<AppliedLeaderGrant>) {
|
|
53
|
-
(self.source, self.applied_grant)
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
fn into_error(self) -> LeaderError {
|
|
57
|
-
self.source
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
impl From<LeaderError> for AttachLeaderError {
|
|
62
|
-
fn from(source: LeaderError) -> Self {
|
|
63
|
-
Self::with_applied(source, None)
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
/// `attach_leader`(card §42;`__init__.py:19`)。手动 CLI attach;持 `LEADER_OWNERSHIP_LOCK`
|
|
68
|
-
/// 整段临界区做 state 变更 + 事件 + 双写 + requeue exhausted watchers。
|
|
69
|
-
pub fn attach_leader(
|
|
70
|
-
workspace: &Path,
|
|
71
|
-
team: Option<&str>,
|
|
72
|
-
pane: Option<&PaneId>,
|
|
73
|
-
provider: Provider,
|
|
74
|
-
) -> Result<LeaseResult, LeaderError> {
|
|
75
|
-
let event_log = crate::event_log::EventLog::new(workspace);
|
|
76
|
-
let scoped_team = team.filter(|value| !value.is_empty());
|
|
77
|
-
let mut state = if scoped_team.is_some() {
|
|
78
|
-
crate::state::projection::select_runtime_state(workspace, scoped_team)?
|
|
79
|
-
} else {
|
|
80
|
-
crate::state::persist::load_runtime_state(workspace)?
|
|
81
|
-
};
|
|
82
|
-
let targets = attach_leader_targets(workspace, &state);
|
|
83
|
-
let pane_id = pane
|
|
84
|
-
.cloned()
|
|
85
|
-
.or_else(|| {
|
|
86
|
-
std::env::var("TMUX_PANE")
|
|
87
|
-
.ok()
|
|
88
|
-
.filter(|p| !p.is_empty())
|
|
89
|
-
.map(PaneId::new)
|
|
90
|
-
})
|
|
91
|
-
.ok_or_else(|| LeaderError::Validation("tmux pane not found".to_string()))?;
|
|
92
|
-
let non_empty_pane_id = NonEmptyPaneId::try_from_pane(&pane_id)?;
|
|
93
|
-
let Some(target) = targets.iter().find(|target| target.info.pane_id == pane_id) else {
|
|
94
|
-
return Err(LeaderError::Validation(format!(
|
|
95
|
-
"tmux pane not found: {pane_id}"
|
|
96
|
-
)));
|
|
97
|
-
};
|
|
98
|
-
if let Some(bound) = live_bound_pane_blocking_other_attach(&state, &pane_id, &targets) {
|
|
99
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(&state));
|
|
100
|
-
emit_lease_refusal(
|
|
101
|
-
&event_log,
|
|
102
|
-
LeaseReason::PreviousOwnerAliveRefused,
|
|
103
|
-
&state,
|
|
104
|
-
Some(bound.as_str()),
|
|
105
|
-
Some(pane_id.as_str()),
|
|
106
|
-
&team_id,
|
|
107
|
-
)?;
|
|
108
|
-
return Ok(refused(
|
|
109
|
-
LeaseReason::PreviousOwnerAliveRefused,
|
|
110
|
-
"team already has a live owner pane; do not attach-leader from another pane",
|
|
111
|
-
Some(current_owner_epoch(&state)),
|
|
112
|
-
Some(bound),
|
|
113
|
-
));
|
|
114
|
-
}
|
|
115
|
-
let mut receiver = receiver_for_attach_target(
|
|
116
|
-
workspace,
|
|
117
|
-
&state,
|
|
118
|
-
&target.info,
|
|
119
|
-
provider,
|
|
120
|
-
Discovery::ExplicitPane,
|
|
121
|
-
)?;
|
|
122
|
-
if let Some(endpoint) = target.endpoint.as_ref() {
|
|
123
|
-
receiver.tmux_socket = Some(endpoint.clone());
|
|
124
|
-
}
|
|
125
|
-
let validation = validate_attach_target(
|
|
126
|
-
workspace,
|
|
127
|
-
&state,
|
|
128
|
-
&target.info,
|
|
129
|
-
provider,
|
|
130
|
-
target.endpoint.as_deref(),
|
|
131
|
-
);
|
|
132
|
-
if validation.is_ok() {
|
|
133
|
-
copy_verified_grant_from_state(
|
|
134
|
-
workspace,
|
|
135
|
-
&state,
|
|
136
|
-
&target.info,
|
|
137
|
-
provider,
|
|
138
|
-
target.endpoint.as_deref(),
|
|
139
|
-
&mut receiver,
|
|
140
|
-
);
|
|
141
|
-
}
|
|
142
|
-
if validation.is_err() {
|
|
143
|
-
let pane_info = pane_info_value(&target.info);
|
|
144
|
-
let targets_value = Value::Array(
|
|
145
|
-
targets
|
|
146
|
-
.iter()
|
|
147
|
-
.map(|target| pane_info_value(&target.info))
|
|
148
|
-
.collect(),
|
|
149
|
-
);
|
|
150
|
-
let owner_record = state_owner(&state);
|
|
151
|
-
if let Some((readopted, validation)) = crate::leader::try_readopt_leader_pane(
|
|
152
|
-
workspace,
|
|
153
|
-
&mut state,
|
|
154
|
-
&mut receiver,
|
|
155
|
-
&pane_info,
|
|
156
|
-
&targets_value,
|
|
157
|
-
owner_record.as_ref(),
|
|
158
|
-
provider,
|
|
159
|
-
LeaseSource::Manual,
|
|
160
|
-
&event_log,
|
|
161
|
-
)? {
|
|
162
|
-
if let Some(endpoint) = target.endpoint.as_deref() {
|
|
163
|
-
quiet_fake_leader_pane_echo(provider, &target.info, endpoint);
|
|
164
|
-
}
|
|
165
|
-
let recovery =
|
|
166
|
-
requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
167
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(&state));
|
|
168
|
-
let attach_window_failures =
|
|
169
|
-
attach_window_failure_value(recovery.blocked_counts, &team_id, &pane_id);
|
|
170
|
-
return Ok(LeaseResult {
|
|
171
|
-
ok: true,
|
|
172
|
-
status: LeaseStatus::Claimed,
|
|
173
|
-
receiver: Some(readopted),
|
|
174
|
-
owner: state_owner(&state),
|
|
175
|
-
owner_epoch: current_owner_epoch(&state).0.checked_sub(0).map(OwnerEpoch),
|
|
176
|
-
reason: Some(LeaseReason::PreviousOwnerPaneDead),
|
|
177
|
-
action: validation
|
|
178
|
-
.get("action")
|
|
179
|
-
.and_then(Value::as_str)
|
|
180
|
-
.map(str::to_string),
|
|
181
|
-
bound_pane_id: Some(pane_id),
|
|
182
|
-
topology_convergence: None,
|
|
183
|
-
attach_window_failures,
|
|
184
|
-
});
|
|
185
|
-
}
|
|
186
|
-
event_log.write(
|
|
187
|
-
super::LeaderEvent::ReceiverAttachFailed.name(),
|
|
188
|
-
json!({
|
|
189
|
-
"pane_id": pane_id.as_str(),
|
|
190
|
-
"reason": validation.err().unwrap_or("leader_pane_validation_failed"),
|
|
191
|
-
}),
|
|
192
|
-
)?;
|
|
193
|
-
return Err(LeaderError::Validation(format!(
|
|
194
|
-
"leader pane validation failed: {pane_id}"
|
|
195
|
-
)));
|
|
196
|
-
}
|
|
197
|
-
let epoch = current_owner_epoch(&state);
|
|
198
|
-
if state.get("team_owner").is_some() {
|
|
199
|
-
write_receiver_to_state(&mut state, &receiver)?;
|
|
200
|
-
write_claim_state(workspace, &state, scoped_team, None)?;
|
|
201
|
-
event_log.write(
|
|
202
|
-
super::LeaderEvent::ReceiverAttached.name(),
|
|
203
|
-
json!({"pane_id": pane_id.as_str(), "owner_epoch": epoch.0}),
|
|
204
|
-
)?;
|
|
205
|
-
if let Some(endpoint) = target.endpoint.as_deref() {
|
|
206
|
-
quiet_fake_leader_pane_echo(provider, &target.info, endpoint);
|
|
207
|
-
}
|
|
208
|
-
let recovery = requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
209
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(&state));
|
|
210
|
-
let attach_window_failures =
|
|
211
|
-
attach_window_failure_value(recovery.blocked_counts, &team_id, &pane_id);
|
|
212
|
-
return Ok(LeaseResult {
|
|
213
|
-
ok: true,
|
|
214
|
-
status: LeaseStatus::AlreadyBound,
|
|
215
|
-
receiver: Some(receiver),
|
|
216
|
-
owner: state_owner(&state),
|
|
217
|
-
owner_epoch: Some(epoch),
|
|
218
|
-
reason: None,
|
|
219
|
-
action: None,
|
|
220
|
-
bound_pane_id: Some(pane_id),
|
|
221
|
-
topology_convergence: None,
|
|
222
|
-
attach_window_failures,
|
|
223
|
-
});
|
|
224
|
-
}
|
|
225
|
-
let identity = leader_identity_context(workspace, None, Some(&state))?;
|
|
226
|
-
let next_epoch = OwnerEpoch(epoch.0.saturating_add(1));
|
|
227
|
-
receiver.owner_epoch = Some(next_epoch);
|
|
228
|
-
receiver.leader_session_uuid = Some(identity.leader_session_uuid.clone());
|
|
229
|
-
let owner = make_owner(provider, &non_empty_pane_id, &identity, next_epoch);
|
|
230
|
-
write_binding_to_state(&mut state, &receiver, &owner)?;
|
|
231
|
-
write_claim_state(workspace, &state, scoped_team, None)?;
|
|
232
|
-
event_log.write(
|
|
233
|
-
super::LeaderEvent::ReceiverAttached.name(),
|
|
234
|
-
json!({"pane_id": pane_id.as_str(), "owner_epoch": next_epoch.0}),
|
|
235
|
-
)?;
|
|
236
|
-
if let Some(endpoint) = target.endpoint.as_deref() {
|
|
237
|
-
quiet_fake_leader_pane_echo(provider, &target.info, endpoint);
|
|
238
|
-
}
|
|
239
|
-
let recovery = requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
240
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(&state));
|
|
241
|
-
let attach_window_failures =
|
|
242
|
-
attach_window_failure_value(recovery.blocked_counts, &team_id, &pane_id);
|
|
243
|
-
Ok(LeaseResult {
|
|
244
|
-
ok: true,
|
|
245
|
-
status: LeaseStatus::Claimed,
|
|
246
|
-
receiver: Some(receiver),
|
|
247
|
-
owner: Some(owner),
|
|
248
|
-
owner_epoch: Some(next_epoch),
|
|
249
|
-
reason: Some(LeaseReason::VacantAcquired),
|
|
250
|
-
action: None,
|
|
251
|
-
bound_pane_id: Some(pane_id),
|
|
252
|
-
topology_convergence: None,
|
|
253
|
-
attach_window_failures,
|
|
254
|
-
})
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
/// 0.5.9 (E6 real-machine e2e wiring): Fake-provider leader panes in the
|
|
258
|
-
/// e2e harness run `/bin/cat`, which lets the TTY driver echo every
|
|
259
|
-
/// injected byte AND then prints the same bytes on stdout — so pane
|
|
260
|
-
/// capture ends up with two copies of every delivered token. Real Codex/
|
|
261
|
-
/// Claude/Copilot binaries drive the pane through their own TUI and never
|
|
262
|
-
/// echo raw input, so they don't need this. Attach-leader is the
|
|
263
|
-
/// canonical binding hook for this pane, so it's the right place to
|
|
264
|
-
/// disable the TTY echo bit once. Best-effort: any failure is silent
|
|
265
|
-
/// (Fake-provider binding stays useful even without echo suppression).
|
|
266
|
-
///
|
|
267
|
-
/// N16/CP-1 (`.team/anchors/REQUIREMENTS.md`): all tmux invocations MUST
|
|
268
|
-
/// go through the `TmuxBackend` single entry point. The pane's tty query
|
|
269
|
-
/// is done via `TmuxBackend::for_tmux_endpoint(endpoint).query(...,
|
|
270
|
-
/// PaneField::PaneTty)` — socket-scoped by construction. The `stty` call
|
|
271
|
-
/// itself is not a tmux operation, so it uses `Command` directly.
|
|
272
|
-
fn quiet_fake_leader_pane_echo(provider: Provider, target: &PaneInfo, endpoint: &str) {
|
|
273
|
-
use crate::transport::{PaneField, Target as TransportTarget};
|
|
274
|
-
if !matches!(provider, Provider::Fake) {
|
|
275
|
-
return;
|
|
276
|
-
}
|
|
277
|
-
if endpoint.is_empty() {
|
|
278
|
-
return;
|
|
279
|
-
}
|
|
280
|
-
let backend = crate::tmux_backend::TmuxBackend::for_tmux_endpoint(endpoint);
|
|
281
|
-
let Ok(Some(tty)) = <crate::tmux_backend::TmuxBackend as crate::transport::Transport>::query(
|
|
282
|
-
&backend,
|
|
283
|
-
&TransportTarget::Pane(target.pane_id.clone()),
|
|
284
|
-
PaneField::PaneTty,
|
|
285
|
-
) else {
|
|
286
|
-
return;
|
|
287
|
-
};
|
|
288
|
-
if tty.trim().is_empty() {
|
|
289
|
-
return;
|
|
290
|
-
}
|
|
291
|
-
// stty against the pane's tty flips the terminal driver's echo bit
|
|
292
|
-
// without asking the pane process (`/bin/cat`) to interpret any
|
|
293
|
-
// command. Best-effort: failure is silent.
|
|
294
|
-
//
|
|
295
|
-
// Cross-platform tty-file flag: macOS/BSD uses `-f <file>`; GNU
|
|
296
|
-
// coreutils on Linux uses `-F <file>`. CI runs on Linux and the
|
|
297
|
-
// previous BSD-only invocation silently no-op'd there — the token
|
|
298
|
-
// was double-injected because echo stayed on. Try `-F` first (Linux
|
|
299
|
-
// is the CI baseline), then fall back to `-f` on macOS. Both are
|
|
300
|
-
// safe to run: the wrong-platform variant just fails silently.
|
|
301
|
-
let tty = tty.trim();
|
|
302
|
-
let linux_ok = std::process::Command::new("stty")
|
|
303
|
-
.args(["-F", tty, "-echo"])
|
|
304
|
-
.output()
|
|
305
|
-
.map(|o| o.status.success())
|
|
306
|
-
.unwrap_or(false);
|
|
307
|
-
if !linux_ok {
|
|
308
|
-
let _ = std::process::Command::new("stty")
|
|
309
|
-
.args(["-f", tty, "-echo"])
|
|
310
|
-
.output();
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
/// Explicit app-server leader binding. Validates the supplied socket/thread tuple
|
|
315
|
-
/// before writing the typed physical-channel anchor through the lease primitive.
|
|
316
|
-
pub fn attach_app_server_leader(
|
|
317
|
-
workspace: &Path,
|
|
318
|
-
team: Option<&str>,
|
|
319
|
-
socket: &str,
|
|
320
|
-
thread_id: &str,
|
|
321
|
-
) -> Result<Value, LeaderError> {
|
|
322
|
-
let binding = crate::codex_app_server::attach_probe(socket, thread_id)
|
|
323
|
-
.map_err(|error| LeaderError::Validation(error.to_string()))?;
|
|
324
|
-
let event_log = crate::event_log::EventLog::new(workspace);
|
|
325
|
-
let scoped_team = team.filter(|value| !value.is_empty());
|
|
326
|
-
let mut state = if scoped_team.is_some() {
|
|
327
|
-
crate::state::projection::select_runtime_state(workspace, scoped_team)?
|
|
328
|
-
} else {
|
|
329
|
-
crate::state::persist::load_runtime_state(workspace)?
|
|
330
|
-
};
|
|
331
|
-
if !state.is_object() {
|
|
332
|
-
state = json!({});
|
|
333
|
-
}
|
|
334
|
-
if let Some(team) = scoped_team {
|
|
335
|
-
state["active_team_key"] = json!(team);
|
|
336
|
-
}
|
|
337
|
-
let team_key = canonical_owner_write_key(&state);
|
|
338
|
-
let next_epoch = OwnerEpoch(current_owner_epoch(&state).0.saturating_add(1));
|
|
339
|
-
let receiver = app_server_receiver_value(&binding, next_epoch);
|
|
340
|
-
let owner = app_server_owner_value(next_epoch);
|
|
341
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
342
|
-
.with_leader_receiver(receiver.clone())
|
|
343
|
-
.with_team_owner(owner.clone())
|
|
344
|
-
.with_owner_epoch(next_epoch.0);
|
|
345
|
-
crate::state::ownership::write_owner(&mut state, &team_key, record);
|
|
346
|
-
write_claim_state(workspace, &state, scoped_team, Some(&team_key))?;
|
|
347
|
-
event_log.write(
|
|
348
|
-
super::LeaderEvent::ReceiverAttached.name(),
|
|
349
|
-
json!({
|
|
350
|
-
"transport_kind": "codex_app_server",
|
|
351
|
-
"thread_id": binding.thread_id,
|
|
352
|
-
"owner_epoch": next_epoch.0,
|
|
353
|
-
"team": team_key,
|
|
354
|
-
}),
|
|
355
|
-
)?;
|
|
356
|
-
Ok(json!({
|
|
357
|
-
"ok": true,
|
|
358
|
-
"status": "claimed",
|
|
359
|
-
"team": team_key,
|
|
360
|
-
"owner_epoch": next_epoch.0,
|
|
361
|
-
"leader_receiver": receiver,
|
|
362
|
-
"team_owner": owner,
|
|
363
|
-
}))
|
|
364
|
-
}
|
|
365
|
-
|
|
366
|
-
#[derive(Clone)]
|
|
367
|
-
struct AttachLeaderTarget {
|
|
368
|
-
info: PaneInfo,
|
|
369
|
-
endpoint: Option<String>,
|
|
370
|
-
}
|
|
371
|
-
|
|
372
|
-
fn attach_leader_targets(workspace: &Path, state: &Value) -> Vec<AttachLeaderTarget> {
|
|
373
|
-
let mut targets = Vec::new();
|
|
374
|
-
// The caller's verified tmux server is authoritative for discovering its
|
|
375
|
-
// leader pane. Keep state-recorded worker endpoints as additional targets,
|
|
376
|
-
// but do not let a cross-socket pane-id collision hide the caller pane.
|
|
377
|
-
if let Some(endpoint) = crate::tmux_backend::socket_name_from_tmux_env() {
|
|
378
|
-
extend_attach_leader_targets(
|
|
379
|
-
&mut targets,
|
|
380
|
-
crate::transport_factory::leader_endpoint_transport(&endpoint).as_ref(),
|
|
381
|
-
);
|
|
382
|
-
}
|
|
383
|
-
for endpoint in state_recorded_tmux_endpoints(state) {
|
|
384
|
-
extend_attach_leader_targets(
|
|
385
|
-
&mut targets,
|
|
386
|
-
crate::transport_factory::leader_endpoint_transport(&endpoint).as_ref(),
|
|
387
|
-
);
|
|
388
|
-
}
|
|
389
|
-
// Phase 1d Batch 6: factory tmux workspace helper for
|
|
390
|
-
// grep-visibility. Semantics unchanged; leader lease discovery is
|
|
391
|
-
// tmux-only (caller pane = tmux pane, MUST-12 anchor).
|
|
392
|
-
let workspace_backend = crate::transport_factory::tmux_workspace_transport(workspace);
|
|
393
|
-
let workspace_endpoint = workspace_backend.tmux_endpoint();
|
|
394
|
-
let workspace_transport: Box<dyn Transport> = match workspace_endpoint
|
|
395
|
-
.as_deref()
|
|
396
|
-
.filter(|endpoint| !endpoint.is_empty() && *endpoint != "default")
|
|
397
|
-
{
|
|
398
|
-
Some(endpoint) => crate::transport_factory::leader_endpoint_transport(endpoint),
|
|
399
|
-
None => Box::new(workspace_backend),
|
|
400
|
-
};
|
|
401
|
-
extend_attach_leader_targets(&mut targets, workspace_transport.as_ref());
|
|
402
|
-
targets
|
|
403
|
-
}
|
|
404
|
-
|
|
405
|
-
fn extend_attach_leader_targets(targets: &mut Vec<AttachLeaderTarget>, transport: &dyn Transport) {
|
|
406
|
-
let resolved_endpoint = transport.tmux_endpoint();
|
|
407
|
-
targets.extend(
|
|
408
|
-
transport
|
|
409
|
-
.list_targets()
|
|
410
|
-
.unwrap_or_default()
|
|
411
|
-
.into_iter()
|
|
412
|
-
.map(|info| AttachLeaderTarget {
|
|
413
|
-
info,
|
|
414
|
-
endpoint: resolved_endpoint.clone(),
|
|
415
|
-
}),
|
|
416
|
-
);
|
|
417
|
-
}
|
|
418
|
-
|
|
419
|
-
fn tmux_backend_for_endpoint(endpoint: &str) -> crate::tmux_backend::TmuxBackend {
|
|
420
|
-
// Phase 1d Batch 6: factory tmux channel helpers for grep-visibility.
|
|
421
|
-
// Same tmux-only semantics as before.
|
|
422
|
-
if endpoint.is_empty() || endpoint == "default" {
|
|
423
|
-
crate::transport_factory::tmux_default_transport()
|
|
424
|
-
} else {
|
|
425
|
-
crate::transport_factory::tmux_endpoint_transport(endpoint)
|
|
426
|
-
}
|
|
427
|
-
}
|
|
428
|
-
|
|
429
|
-
fn state_recorded_tmux_endpoints(state: &Value) -> BTreeSet<String> {
|
|
430
|
-
let mut out = BTreeSet::new();
|
|
431
|
-
push_state_tmux_endpoints(state, &mut out);
|
|
432
|
-
if let Some(teams) = state.get("teams").and_then(Value::as_object) {
|
|
433
|
-
for team_state in teams.values() {
|
|
434
|
-
push_state_tmux_endpoints(team_state, &mut out);
|
|
435
|
-
}
|
|
436
|
-
}
|
|
437
|
-
out
|
|
438
|
-
}
|
|
439
|
-
|
|
440
|
-
fn push_state_tmux_endpoints(state: &Value, out: &mut BTreeSet<String>) {
|
|
441
|
-
for key in ["tmux_socket", "tmux_endpoint"] {
|
|
442
|
-
if let Some(endpoint) = state
|
|
443
|
-
.get(key)
|
|
444
|
-
.and_then(Value::as_str)
|
|
445
|
-
.filter(|value| !value.is_empty())
|
|
446
|
-
{
|
|
447
|
-
out.insert(endpoint.to_string());
|
|
448
|
-
}
|
|
449
|
-
}
|
|
450
|
-
for key in ["team_owner", "leader_receiver"] {
|
|
451
|
-
if let Some(endpoint) = state
|
|
452
|
-
.get(key)
|
|
453
|
-
.and_then(|value| value.get("tmux_socket"))
|
|
454
|
-
.and_then(Value::as_str)
|
|
455
|
-
.filter(|value| !value.is_empty())
|
|
456
|
-
{
|
|
457
|
-
out.insert(endpoint.to_string());
|
|
458
|
-
}
|
|
459
|
-
}
|
|
460
|
-
}
|
|
461
|
-
|
|
462
|
-
fn state_records_pane_endpoint(state: &Value, pane_id: &str, endpoint: &str) -> bool {
|
|
463
|
-
let record_matches = |record: &Value| {
|
|
464
|
-
record.get("pane_id").and_then(Value::as_str) == Some(pane_id)
|
|
465
|
-
&& record
|
|
466
|
-
.get("tmux_socket")
|
|
467
|
-
.and_then(Value::as_str)
|
|
468
|
-
.is_some_and(|recorded| tmux_endpoints_match(recorded, endpoint))
|
|
469
|
-
};
|
|
470
|
-
["team_owner", "leader_receiver"]
|
|
471
|
-
.iter()
|
|
472
|
-
.any(|key| state.get(*key).is_some_and(&record_matches))
|
|
473
|
-
|| state
|
|
474
|
-
.get("teams")
|
|
475
|
-
.and_then(Value::as_object)
|
|
476
|
-
.is_some_and(|teams| {
|
|
477
|
-
teams.values().any(|team| {
|
|
478
|
-
["team_owner", "leader_receiver"]
|
|
479
|
-
.iter()
|
|
480
|
-
.any(|key| team.get(*key).is_some_and(&record_matches))
|
|
481
|
-
})
|
|
482
|
-
})
|
|
483
|
-
}
|
|
484
|
-
|
|
485
|
-
fn requeue_exhausted_watchers_after_attach(
|
|
486
|
-
workspace: &Path,
|
|
487
|
-
state: &Value,
|
|
488
|
-
event_log: &crate::event_log::EventLog,
|
|
489
|
-
pane_id: &PaneId,
|
|
490
|
-
) -> Result<AttachRecovery, LeaderError> {
|
|
491
|
-
let store = MessageStore::open(workspace)?;
|
|
492
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(state));
|
|
493
|
-
let (notices, blocked_counts) =
|
|
494
|
-
crate::messaging::watchers::requeue_delivery_exhausted_watchers_with_counts(
|
|
495
|
-
workspace, &store, event_log, &team_id, pane_id,
|
|
496
|
-
)?;
|
|
497
|
-
event_log.write(
|
|
498
|
-
super::LeaderEvent::ReceiverRequeuedExhaustedWatchers.name(),
|
|
499
|
-
requeued_exhausted_watchers_event_payload(pane_id, &team_id, ¬ices),
|
|
500
|
-
)?;
|
|
501
|
-
Ok(AttachRecovery { blocked_counts })
|
|
502
|
-
}
|
|
503
|
-
|
|
504
|
-
fn attach_window_failure_value(
|
|
505
|
-
counts: crate::message_store::BlockedLeaderRequeueCounts,
|
|
506
|
-
team_id: &TeamKey,
|
|
507
|
-
pane_id: &PaneId,
|
|
508
|
-
) -> Option<Value> {
|
|
509
|
-
(counts.blocked_leader_unbound > 0).then(|| {
|
|
510
|
-
json!({
|
|
511
|
-
"team_id": team_id.as_str(),
|
|
512
|
-
"pane_id": pane_id.as_str(),
|
|
513
|
-
"reason": "leader_not_attached",
|
|
514
|
-
"count": counts.blocked_leader_unbound,
|
|
515
|
-
"status": "requeued_pending_physical_retry",
|
|
516
|
-
})
|
|
517
|
-
})
|
|
518
|
-
}
|
|
519
|
-
|
|
520
|
-
/// R8 D4 (decoupled for offline byte-lock — c-lite): build the `leader_receiver.requeued_exhausted_watchers`
|
|
521
|
-
/// event payload from the requeued notices, independent of the real-tmux attach flow.
|
|
522
|
-
/// golden (leader/__init__.py:39-44): EXACTLY `{watcher_ids, count, trigger:"attach_leader"}`.
|
|
523
|
-
/// (Current divergent body — {pane_id, team_id, watcher_ids, requeued} — kept until porter-c ports;
|
|
524
|
-
/// pinned RED in leader::tests asserts the golden shape.)
|
|
525
|
-
pub(crate) fn requeued_exhausted_watchers_event_payload(
|
|
526
|
-
_pane_id: &PaneId,
|
|
527
|
-
_team_id: &TeamKey,
|
|
528
|
-
notices: &[crate::messaging::WatcherNotice],
|
|
529
|
-
) -> serde_json::Value {
|
|
530
|
-
let watcher_ids: Vec<&str> = notices
|
|
531
|
-
.iter()
|
|
532
|
-
.map(|notice| notice.watcher_id.as_str())
|
|
533
|
-
.collect();
|
|
534
|
-
json!({
|
|
535
|
-
"watcher_ids": watcher_ids,
|
|
536
|
-
"count": watcher_ids.len(),
|
|
537
|
-
"trigger": "attach_leader",
|
|
538
|
-
})
|
|
539
|
-
}
|
|
540
|
-
|
|
541
|
-
/// `attach_leader_to_state`(card §43;`__init__.py:256`)。核心绑定逻辑(autobind/launch/runtime 复用)。
|
|
542
|
-
/// 首次(无 team_owner 且 source∈{launch,quick_start})走 `apply_first_time_leader_binding`
|
|
543
|
-
/// (cwd+command 宽松匹配);否则严格 UUID 门 + `try_readopt_leader_pane` 收敛到 lease claim。
|
|
544
|
-
/// 返回 `(receiver, validation)`。
|
|
545
|
-
#[allow(clippy::too_many_arguments)]
|
|
546
|
-
pub(crate) fn attach_leader_to_state(
|
|
547
|
-
workspace: &Path,
|
|
548
|
-
state: &mut Value,
|
|
549
|
-
pane: Option<&PaneId>,
|
|
550
|
-
provider: Provider,
|
|
551
|
-
event_log: &crate::event_log::EventLog,
|
|
552
|
-
source: LeaseSource,
|
|
553
|
-
require_current: bool,
|
|
554
|
-
) -> Result<(LeaderReceiver, Value), LeaderError> {
|
|
555
|
-
attach_leader_to_state_with_target_and_controls(
|
|
556
|
-
workspace,
|
|
557
|
-
state,
|
|
558
|
-
pane,
|
|
559
|
-
provider,
|
|
560
|
-
event_log,
|
|
561
|
-
source,
|
|
562
|
-
require_current,
|
|
563
|
-
None,
|
|
564
|
-
None,
|
|
565
|
-
None,
|
|
566
|
-
None,
|
|
567
|
-
)
|
|
568
|
-
.map_err(AttachLeaderError::into_error)
|
|
569
|
-
}
|
|
570
|
-
|
|
571
|
-
#[allow(clippy::too_many_arguments)]
|
|
572
|
-
pub(crate) fn attach_leader_to_state_with_target(
|
|
573
|
-
workspace: &Path,
|
|
574
|
-
state: &mut Value,
|
|
575
|
-
pane: Option<&PaneId>,
|
|
576
|
-
provider: Provider,
|
|
577
|
-
event_log: &crate::event_log::EventLog,
|
|
578
|
-
source: LeaseSource,
|
|
579
|
-
require_current: bool,
|
|
580
|
-
caller_target: Option<&PaneInfo>,
|
|
581
|
-
) -> Result<(LeaderReceiver, Value), LeaderError> {
|
|
582
|
-
attach_leader_to_state_with_target_and_controls(
|
|
583
|
-
workspace,
|
|
584
|
-
state,
|
|
585
|
-
pane,
|
|
586
|
-
provider,
|
|
587
|
-
event_log,
|
|
588
|
-
source,
|
|
589
|
-
require_current,
|
|
590
|
-
caller_target,
|
|
591
|
-
None,
|
|
592
|
-
None,
|
|
593
|
-
None,
|
|
594
|
-
)
|
|
595
|
-
.map_err(AttachLeaderError::into_error)
|
|
596
|
-
}
|
|
597
|
-
|
|
598
|
-
#[allow(clippy::too_many_arguments)]
|
|
599
|
-
pub(crate) fn attach_leader_to_state_with_target_and_controls(
|
|
600
|
-
workspace: &Path,
|
|
601
|
-
state: &mut Value,
|
|
602
|
-
pane: Option<&PaneId>,
|
|
603
|
-
provider: Provider,
|
|
604
|
-
event_log: &crate::event_log::EventLog,
|
|
605
|
-
source: LeaseSource,
|
|
606
|
-
require_current: bool,
|
|
607
|
-
caller_target: Option<&PaneInfo>,
|
|
608
|
-
expected_owner: Option<&Value>,
|
|
609
|
-
expected_receiver: Option<&Value>,
|
|
610
|
-
nonce_writer: Option<&dyn Fn(&str, &PaneId, &str) -> Result<String, LeaderError>>,
|
|
611
|
-
) -> Result<(LeaderReceiver, Value), AttachLeaderError> {
|
|
612
|
-
if expected_owner.is_some() != expected_receiver.is_some() {
|
|
613
|
-
return Err(AttachLeaderError::from(LeaderError::Validation(
|
|
614
|
-
"fresh caller CAS requires both expected owner and receiver".to_string(),
|
|
615
|
-
)));
|
|
616
|
-
}
|
|
617
|
-
let pane_id = pane
|
|
618
|
-
.cloned()
|
|
619
|
-
.ok_or_else(|| LeaderError::Validation("tmux pane not found".to_string()))?;
|
|
620
|
-
let non_empty_pane_id = NonEmptyPaneId::try_from_pane(&pane_id)?;
|
|
621
|
-
let identity = leader_identity_context(workspace, None, Some(state))?;
|
|
622
|
-
let epoch = current_owner_epoch(state);
|
|
623
|
-
let has_owner = state.get("team_owner").is_some();
|
|
624
|
-
let binding_epoch = if has_owner {
|
|
625
|
-
epoch
|
|
626
|
-
} else {
|
|
627
|
-
OwnerEpoch(epoch.0.saturating_add(1))
|
|
628
|
-
};
|
|
629
|
-
let mut receiver = make_receiver(
|
|
630
|
-
provider,
|
|
631
|
-
&non_empty_pane_id,
|
|
632
|
-
&identity.leader_session_uuid,
|
|
633
|
-
binding_epoch,
|
|
634
|
-
Discovery::EnvPane,
|
|
635
|
-
None,
|
|
636
|
-
);
|
|
637
|
-
authorize_fresh_caller_receiver(
|
|
638
|
-
workspace,
|
|
639
|
-
&mut receiver,
|
|
640
|
-
&non_empty_pane_id,
|
|
641
|
-
source,
|
|
642
|
-
require_current,
|
|
643
|
-
caller_target,
|
|
644
|
-
nonce_writer,
|
|
645
|
-
)?;
|
|
646
|
-
let receiver_value = serde_json::to_value(&receiver).map_err(LeaderError::from)?;
|
|
647
|
-
if has_owner {
|
|
648
|
-
write_receiver_to_state(state, &receiver)?;
|
|
649
|
-
} else {
|
|
650
|
-
let owner = make_owner(provider, &non_empty_pane_id, &identity, binding_epoch);
|
|
651
|
-
write_binding_to_state(state, &receiver, &owner)?;
|
|
652
|
-
}
|
|
653
|
-
if let (Some(expected_owner), Some(expected_receiver)) = (expected_owner, expected_receiver) {
|
|
654
|
-
write_lease_dual_state_with_expected(
|
|
655
|
-
workspace,
|
|
656
|
-
state,
|
|
657
|
-
expected_owner,
|
|
658
|
-
expected_receiver,
|
|
659
|
-
)?;
|
|
660
|
-
} else {
|
|
661
|
-
write_lease_dual_state(workspace, state)?;
|
|
662
|
-
}
|
|
663
|
-
let applied_grant = state
|
|
664
|
-
.get("team_owner")
|
|
665
|
-
.cloned()
|
|
666
|
-
.map(|owner| AppliedLeaderGrant {
|
|
667
|
-
owner,
|
|
668
|
-
receiver: receiver_value,
|
|
669
|
-
});
|
|
670
|
-
if let Err(error) = event_log.write(
|
|
671
|
-
super::LeaderEvent::ReceiverAttached.name(),
|
|
672
|
-
json!({"pane_id": pane_id.as_str(), "owner_epoch": binding_epoch.0}),
|
|
673
|
-
) {
|
|
674
|
-
return Err(AttachLeaderError::with_applied(
|
|
675
|
-
error.into(),
|
|
676
|
-
applied_grant.clone(),
|
|
677
|
-
));
|
|
678
|
-
}
|
|
679
|
-
let team_id = TeamKey::new(crate::state::projection::team_state_key(state));
|
|
680
|
-
if let Err(error) = crate::messaging::watchers::recover_watchers_for_incident(
|
|
681
|
-
workspace,
|
|
682
|
-
event_log,
|
|
683
|
-
&team_id,
|
|
684
|
-
&pane_id,
|
|
685
|
-
LeaderIncident::LeaderAttached,
|
|
686
|
-
) {
|
|
687
|
-
return Err(AttachLeaderError::with_applied(error.into(), applied_grant));
|
|
688
|
-
}
|
|
689
|
-
Ok((receiver, json!({"ok": true})))
|
|
690
|
-
}
|
|
691
|
-
|
|
692
|
-
/// `claim_leader`(card §45;`__init__.py:744`)。`team-agent claim-leader` 入口。
|
|
693
|
-
/// 有 ambiguous incident → 多候选 broadcast-claim 流;否则 `claim_lease_no_incident` 直接 acquire/CAS。
|
|
694
|
-
/// 持 `LEADER_OWNERSHIP_LOCK`。
|
|
695
|
-
pub fn claim_leader(
|
|
696
|
-
workspace: &Path,
|
|
697
|
-
team: Option<&str>,
|
|
698
|
-
confirm: bool,
|
|
699
|
-
) -> Result<LeaseResult, LeaderError> {
|
|
700
|
-
let caller = std::env::var("TMUX_PANE")
|
|
701
|
-
.ok()
|
|
702
|
-
.filter(|pane| !pane.is_empty())
|
|
703
|
-
.or_else(|| {
|
|
704
|
-
std::env::var("TEAM_AGENT_LEADER_PANE_ID")
|
|
705
|
-
.ok()
|
|
706
|
-
.filter(|pane| !pane.is_empty())
|
|
707
|
-
})
|
|
708
|
-
.unwrap_or_default();
|
|
709
|
-
let raw_state = crate::state::persist::load_runtime_state_without_migrations(workspace)?;
|
|
710
|
-
let event_log = crate::event_log::EventLog::new(workspace);
|
|
711
|
-
let active_team = crate::messaging::leader_receiver::active_team_key(workspace, &raw_state);
|
|
712
|
-
let requested_team = team
|
|
713
|
-
.filter(|team| !team.is_empty())
|
|
714
|
-
.or_else(|| {
|
|
715
|
-
raw_state
|
|
716
|
-
.get("active_team_key")
|
|
717
|
-
.and_then(Value::as_str)
|
|
718
|
-
.filter(|team| !team.is_empty())
|
|
719
|
-
})
|
|
720
|
-
.unwrap_or(active_team.as_str());
|
|
721
|
-
let team_id = TeamKey::new(requested_team.to_string());
|
|
722
|
-
let targets = claim_leader_targets(workspace, &raw_state);
|
|
723
|
-
let caller_candidate =
|
|
724
|
-
select_claim_authority(workspace, &raw_state, team_id.as_str(), &targets, &caller);
|
|
725
|
-
let caller_pane_info = caller_candidate.map(|target| &target.info);
|
|
726
|
-
let observed_endpoint = caller_candidate.and_then(|candidate| {
|
|
727
|
-
authoritative_observed_endpoint(workspace, &raw_state, &targets, candidate)
|
|
728
|
-
});
|
|
729
|
-
let mut caller_target = caller_candidate.and_then(|target| {
|
|
730
|
-
claim_target_from_pane_info(&target.info).map(|mut claim_target| {
|
|
731
|
-
claim_target.endpoint.clone_from(&observed_endpoint);
|
|
732
|
-
claim_target
|
|
733
|
-
})
|
|
734
|
-
});
|
|
735
|
-
if let (Some(candidate), Some(target)) = (caller_candidate, caller_target.as_mut()) {
|
|
736
|
-
if candidate.info.current_path.as_deref().is_some_and(|path| {
|
|
737
|
-
!crate::messaging::leader_channel::path_is_in_workspace(path, workspace)
|
|
738
|
-
}) {
|
|
739
|
-
let endpoint = target.endpoint.as_deref().ok_or_else(|| {
|
|
740
|
-
LeaderError::Validation(
|
|
741
|
-
"explicit cross-workspace claim requires a canonical tmux endpoint".to_string(),
|
|
742
|
-
)
|
|
743
|
-
})?;
|
|
744
|
-
if !Path::new(endpoint).is_absolute() {
|
|
745
|
-
return Err(LeaderError::Validation(
|
|
746
|
-
"explicit cross-workspace claim requires an absolute tmux endpoint".to_string(),
|
|
747
|
-
));
|
|
748
|
-
}
|
|
749
|
-
// A live pane nonce identifies the pane instance, not this team's
|
|
750
|
-
// claim. Preserve it so another child team remains authorized.
|
|
751
|
-
let nonce = pane_binding_nonce_for_claim(
|
|
752
|
-
workspace,
|
|
753
|
-
endpoint,
|
|
754
|
-
&candidate.info.pane_id,
|
|
755
|
-
candidate
|
|
756
|
-
.info
|
|
757
|
-
.leader_env
|
|
758
|
-
.get(crate::tmux_backend::PANE_BINDING_NONCE_METADATA_KEY)
|
|
759
|
-
.map(String::as_str),
|
|
760
|
-
);
|
|
761
|
-
target.scope_authority = Some("explicit_claim".to_string());
|
|
762
|
-
target.authorized_team_workspace = Some(canonical_workspace(workspace));
|
|
763
|
-
target.binding_nonce = Some(nonce);
|
|
764
|
-
}
|
|
765
|
-
}
|
|
766
|
-
let scoped_team = if team_id.as_str() == active_team
|
|
767
|
-
|| raw_state
|
|
768
|
-
.get("teams")
|
|
769
|
-
.and_then(|teams| teams.get(team_id.as_str()))
|
|
770
|
-
.is_some()
|
|
771
|
-
{
|
|
772
|
-
Some(team_id.as_str())
|
|
773
|
-
} else {
|
|
774
|
-
None
|
|
775
|
-
};
|
|
776
|
-
let scoped_team = scoped_team.filter(|team| {
|
|
777
|
-
*team == active_team
|
|
778
|
-
|| raw_state
|
|
779
|
-
.get("teams")
|
|
780
|
-
.and_then(|teams| teams.get(*team))
|
|
781
|
-
.is_some()
|
|
782
|
-
});
|
|
783
|
-
let mut state = if let Some(team) = scoped_team {
|
|
784
|
-
if raw_state
|
|
785
|
-
.get("teams")
|
|
786
|
-
.and_then(|teams| teams.get(team))
|
|
787
|
-
.is_some()
|
|
788
|
-
{
|
|
789
|
-
crate::state::projection::select_runtime_state(workspace, Some(team))?
|
|
790
|
-
} else {
|
|
791
|
-
crate::state::projection::project_top_level_view(&raw_state, team)
|
|
792
|
-
}
|
|
793
|
-
} else {
|
|
794
|
-
raw_state
|
|
795
|
-
};
|
|
796
|
-
let liveness = AnyPaneLiveness::from_claim_targets(&targets);
|
|
797
|
-
let result = claim_lease_no_incident_with_target(
|
|
798
|
-
workspace,
|
|
799
|
-
&mut state,
|
|
800
|
-
Some(team_id.as_str()),
|
|
801
|
-
&team_id,
|
|
802
|
-
&PaneId::new(caller),
|
|
803
|
-
confirm,
|
|
804
|
-
&event_log,
|
|
805
|
-
&liveness,
|
|
806
|
-
caller_target.as_mut(),
|
|
807
|
-
caller_pane_info,
|
|
808
|
-
scoped_team.map(|_| team_id.as_str()),
|
|
809
|
-
)?;
|
|
810
|
-
if result.ok {
|
|
811
|
-
if let Some(pane) = result.bound_pane_id.as_ref() {
|
|
812
|
-
crate::messaging::watchers::recover_watchers_for_incident(
|
|
813
|
-
workspace,
|
|
814
|
-
&event_log,
|
|
815
|
-
&team_id,
|
|
816
|
-
pane,
|
|
817
|
-
LeaderIncident::LeaderClaimed,
|
|
818
|
-
)?;
|
|
819
|
-
}
|
|
820
|
-
}
|
|
821
|
-
Ok(result)
|
|
822
|
-
}
|
|
823
|
-
|
|
824
|
-
/// `_claim_lease_no_incident`(`__init__.py:598`)。Gap 39 统一 lease:无 ambiguous incident →
|
|
825
|
-
/// 直接 acquire/CAS against live evidence。precheck epoch + caller 资格门 + confirm 门 +
|
|
826
|
-
/// **锁内 revalidate(TOCTOU C3/C15)** + 双写 + 审计。
|
|
827
|
-
#[allow(clippy::too_many_arguments)]
|
|
828
|
-
pub(crate) fn claim_lease_no_incident(
|
|
829
|
-
workspace: &Path,
|
|
830
|
-
state: &mut Value,
|
|
831
|
-
team: Option<&str>,
|
|
832
|
-
team_id: &TeamKey,
|
|
833
|
-
caller_pane: &PaneId,
|
|
834
|
-
confirm: bool,
|
|
835
|
-
event_log: &crate::event_log::EventLog,
|
|
836
|
-
liveness: &dyn crate::state::owner_gate::PaneLivenessProbe,
|
|
837
|
-
) -> Result<LeaseResult, LeaderError> {
|
|
838
|
-
let requested_team = team.filter(|team| !team.is_empty());
|
|
839
|
-
let mut scoped_team = None;
|
|
840
|
-
if let Some(team) = requested_team {
|
|
841
|
-
let active_team = crate::messaging::leader_receiver::active_team_key(workspace, state);
|
|
842
|
-
if (team == active_team
|
|
843
|
-
|| state
|
|
844
|
-
.get("teams")
|
|
845
|
-
.and_then(|teams| teams.get(team))
|
|
846
|
-
.is_some())
|
|
847
|
-
&& team != active_team
|
|
848
|
-
{
|
|
849
|
-
*state = crate::state::projection::project_top_level_view(state, team);
|
|
850
|
-
scoped_team = Some(team);
|
|
851
|
-
} else if team == active_team {
|
|
852
|
-
*state = crate::state::projection::project_top_level_view(state, team);
|
|
853
|
-
scoped_team = Some(team);
|
|
854
|
-
}
|
|
855
|
-
}
|
|
856
|
-
claim_lease_no_incident_with_target(
|
|
857
|
-
workspace,
|
|
858
|
-
state,
|
|
859
|
-
team,
|
|
860
|
-
team_id,
|
|
861
|
-
caller_pane,
|
|
862
|
-
confirm,
|
|
863
|
-
event_log,
|
|
864
|
-
liveness,
|
|
865
|
-
None,
|
|
866
|
-
None,
|
|
867
|
-
scoped_team,
|
|
868
|
-
)
|
|
869
|
-
}
|
|
870
|
-
|
|
871
|
-
struct NonEmptyPaneId(PaneId);
|
|
872
|
-
|
|
873
|
-
impl NonEmptyPaneId {
|
|
874
|
-
fn try_from_pane(pane: &PaneId) -> Result<Self, LeaderError> {
|
|
875
|
-
if pane.as_str().trim().is_empty() {
|
|
876
|
-
return Err(LeaderError::Validation(
|
|
877
|
-
"leader pane id is empty".to_string(),
|
|
878
|
-
));
|
|
879
|
-
}
|
|
880
|
-
Ok(Self(pane.clone()))
|
|
881
|
-
}
|
|
882
|
-
|
|
883
|
-
fn as_pane_id(&self) -> &PaneId {
|
|
884
|
-
&self.0
|
|
885
|
-
}
|
|
886
|
-
}
|
|
887
|
-
|
|
888
|
-
#[allow(clippy::too_many_arguments)]
|
|
889
|
-
fn claim_lease_no_incident_with_target(
|
|
890
|
-
workspace: &Path,
|
|
891
|
-
state: &mut Value,
|
|
892
|
-
team: Option<&str>,
|
|
893
|
-
team_id: &TeamKey,
|
|
894
|
-
caller_pane: &PaneId,
|
|
895
|
-
confirm: bool,
|
|
896
|
-
event_log: &crate::event_log::EventLog,
|
|
897
|
-
liveness: &dyn crate::state::owner_gate::PaneLivenessProbe,
|
|
898
|
-
mut caller_target: Option<&mut LeaderClaimTarget>,
|
|
899
|
-
caller_pane_info: Option<&PaneInfo>,
|
|
900
|
-
scoped_team: Option<&str>,
|
|
901
|
-
) -> Result<LeaseResult, LeaderError> {
|
|
902
|
-
let _ = team;
|
|
903
|
-
let pre_epoch = current_owner_epoch(state);
|
|
904
|
-
let bound_pane_id = bound_pane(state);
|
|
905
|
-
if caller_pane.as_str().is_empty() {
|
|
906
|
-
emit_lease_refusal(
|
|
907
|
-
event_log,
|
|
908
|
-
LeaseReason::NotInTmuxPane,
|
|
909
|
-
state,
|
|
910
|
-
bound_pane_id.as_deref(),
|
|
911
|
-
None,
|
|
912
|
-
team_id,
|
|
913
|
-
)?;
|
|
914
|
-
return Ok(refused(
|
|
915
|
-
LeaseReason::NotInTmuxPane,
|
|
916
|
-
"run team-agent claim-leader from the leader's tmux pane",
|
|
917
|
-
None,
|
|
918
|
-
None,
|
|
919
|
-
));
|
|
920
|
-
}
|
|
921
|
-
if liveness.liveness(caller_pane.as_str()) != PaneLiveness::Live {
|
|
922
|
-
emit_lease_refusal(
|
|
923
|
-
event_log,
|
|
924
|
-
LeaseReason::CallerPaneNotLive,
|
|
925
|
-
state,
|
|
926
|
-
bound_pane_id.as_deref(),
|
|
927
|
-
Some(caller_pane.as_str()),
|
|
928
|
-
team_id,
|
|
929
|
-
)?;
|
|
930
|
-
return Ok(refused(
|
|
931
|
-
LeaseReason::CallerPaneNotLive,
|
|
932
|
-
"run team-agent claim-leader from a live tmux pane",
|
|
933
|
-
None,
|
|
934
|
-
None,
|
|
935
|
-
));
|
|
936
|
-
}
|
|
937
|
-
let non_empty_caller_pane = NonEmptyPaneId::try_from_pane(caller_pane)?;
|
|
938
|
-
let bound_endpoint_matches_caller = bound_endpoint_matches_current_process(state);
|
|
939
|
-
if bound_pane_id.as_deref() == Some(caller_pane.as_str()) && bound_endpoint_matches_caller {
|
|
940
|
-
if let Some(target) = caller_target.as_deref_mut() {
|
|
941
|
-
write_claim_target_pane_nonce(target)?;
|
|
942
|
-
}
|
|
943
|
-
let current_endpoint = crate::tmux_backend::socket_name_from_tmux_env();
|
|
944
|
-
let observed_endpoint = caller_target
|
|
945
|
-
.as_deref()
|
|
946
|
-
.and_then(|target| target.endpoint.as_deref());
|
|
947
|
-
let convergence_candidate = observed_endpoint.or(current_endpoint.as_deref());
|
|
948
|
-
let candidate_source = if observed_endpoint.is_some() {
|
|
949
|
-
Some("observed_target_endpoint")
|
|
950
|
-
} else if current_endpoint.is_some() {
|
|
951
|
-
Some("fallback_tmux_env")
|
|
952
|
-
} else {
|
|
953
|
-
None
|
|
954
|
-
};
|
|
955
|
-
let (mut topology_convergence, converged) = apply_endpoint_convergence(
|
|
956
|
-
state,
|
|
957
|
-
team_id,
|
|
958
|
-
convergence_candidate,
|
|
959
|
-
candidate_source,
|
|
960
|
-
pre_epoch,
|
|
961
|
-
);
|
|
962
|
-
let observation_refreshed = caller_pane_info.is_some_and(|pane_info| {
|
|
963
|
-
refresh_already_bound_receiver_observation(
|
|
964
|
-
state,
|
|
965
|
-
pane_info,
|
|
966
|
-
observed_endpoint.or(current_endpoint.as_deref()),
|
|
967
|
-
scoped_team.or(team),
|
|
968
|
-
caller_target.as_deref(),
|
|
969
|
-
)
|
|
970
|
-
});
|
|
971
|
-
if converged || observation_refreshed {
|
|
972
|
-
write_claim_state(workspace, state, scoped_team, team)?;
|
|
973
|
-
if observation_refreshed {
|
|
974
|
-
event_log.write(
|
|
975
|
-
"leader_receiver.observation_refreshed",
|
|
976
|
-
json!({
|
|
977
|
-
"pane_id": caller_pane.as_str(),
|
|
978
|
-
"owner_epoch": pre_epoch.0,
|
|
979
|
-
"owner_changed": false,
|
|
980
|
-
"source": "claim_leader_already_bound",
|
|
981
|
-
}),
|
|
982
|
-
)?;
|
|
983
|
-
}
|
|
984
|
-
if converged {
|
|
985
|
-
topology_convergence = verify_persisted_topology_convergence(
|
|
986
|
-
workspace,
|
|
987
|
-
team_id.as_str(),
|
|
988
|
-
topology_convergence,
|
|
989
|
-
pre_epoch,
|
|
990
|
-
)?;
|
|
991
|
-
if topology_convergence
|
|
992
|
-
.as_ref()
|
|
993
|
-
.and_then(|metadata| metadata.get("status"))
|
|
994
|
-
.and_then(Value::as_str)
|
|
995
|
-
!= Some("converged")
|
|
996
|
-
{
|
|
997
|
-
return Ok(convergence_persistence_refusal(
|
|
998
|
-
topology_convergence,
|
|
999
|
-
pre_epoch,
|
|
1000
|
-
Some(caller_pane.clone()),
|
|
1001
|
-
));
|
|
1002
|
-
}
|
|
1003
|
-
}
|
|
1004
|
-
}
|
|
1005
|
-
return Ok(LeaseResult {
|
|
1006
|
-
ok: true,
|
|
1007
|
-
status: LeaseStatus::AlreadyBound,
|
|
1008
|
-
receiver: state_receiver(state),
|
|
1009
|
-
owner: state_owner(state),
|
|
1010
|
-
owner_epoch: Some(pre_epoch),
|
|
1011
|
-
reason: None,
|
|
1012
|
-
action: None,
|
|
1013
|
-
bound_pane_id: Some(caller_pane.clone()),
|
|
1014
|
-
topology_convergence,
|
|
1015
|
-
attach_window_failures: None,
|
|
1016
|
-
});
|
|
1017
|
-
}
|
|
1018
|
-
let owner_live = bound_pane_id.as_deref().is_some_and(|pane| {
|
|
1019
|
-
if pane == caller_pane.as_str() && !bound_endpoint_matches_caller {
|
|
1020
|
-
return false;
|
|
1021
|
-
}
|
|
1022
|
-
liveness.liveness(pane) == PaneLiveness::Live
|
|
1023
|
-
});
|
|
1024
|
-
if owner_live && !confirm {
|
|
1025
|
-
emit_lease_refusal(
|
|
1026
|
-
event_log,
|
|
1027
|
-
LeaseReason::PreviousOwnerAliveRefused,
|
|
1028
|
-
state,
|
|
1029
|
-
bound_pane_id.as_deref(),
|
|
1030
|
-
Some(caller_pane.as_str()),
|
|
1031
|
-
team_id,
|
|
1032
|
-
)?;
|
|
1033
|
-
return Ok(refused(
|
|
1034
|
-
LeaseReason::ForceConfirmRequired,
|
|
1035
|
-
"rerun with --confirm to take over the live leader pane",
|
|
1036
|
-
Some(pre_epoch),
|
|
1037
|
-
bound_pane_id.clone().map(PaneId::new),
|
|
1038
|
-
));
|
|
1039
|
-
}
|
|
1040
|
-
if let Some(locked) = locked_runtime_state(workspace, scoped_team)? {
|
|
1041
|
-
let locked_epoch = current_owner_epoch(&locked);
|
|
1042
|
-
if locked_epoch != pre_epoch {
|
|
1043
|
-
emit_lease_refusal(
|
|
1044
|
-
event_log,
|
|
1045
|
-
LeaseReason::OwnerEpochAdvanced,
|
|
1046
|
-
state,
|
|
1047
|
-
bound_pane_id.as_deref(),
|
|
1048
|
-
Some(caller_pane.as_str()),
|
|
1049
|
-
team_id,
|
|
1050
|
-
)?;
|
|
1051
|
-
return Ok(refused(
|
|
1052
|
-
LeaseReason::OwnerEpochAdvanced,
|
|
1053
|
-
"",
|
|
1054
|
-
Some(OwnerEpoch(locked_epoch.0.max(pre_epoch.0))),
|
|
1055
|
-
bound_pane_id.clone().map(PaneId::new),
|
|
1056
|
-
));
|
|
1057
|
-
}
|
|
1058
|
-
let locked_bound_pane = bound_pane(&locked);
|
|
1059
|
-
let locked_owner_live = locked_bound_pane.as_deref().is_some_and(|pane| {
|
|
1060
|
-
pane != caller_pane.as_str() && liveness.liveness(pane) == PaneLiveness::Live
|
|
1061
|
-
});
|
|
1062
|
-
if locked_owner_live && !confirm {
|
|
1063
|
-
emit_lease_refusal(
|
|
1064
|
-
event_log,
|
|
1065
|
-
LeaseReason::OwnerEpochAdvanced,
|
|
1066
|
-
&locked,
|
|
1067
|
-
locked_bound_pane.as_deref(),
|
|
1068
|
-
Some(caller_pane.as_str()),
|
|
1069
|
-
team_id,
|
|
1070
|
-
)?;
|
|
1071
|
-
return Ok(refused(
|
|
1072
|
-
LeaseReason::OwnerEpochAdvanced,
|
|
1073
|
-
"",
|
|
1074
|
-
Some(locked_epoch),
|
|
1075
|
-
locked_bound_pane.clone().map(PaneId::new),
|
|
1076
|
-
));
|
|
1077
|
-
}
|
|
1078
|
-
}
|
|
1079
|
-
// E51 (0.3.26 P0, lease guard): refuse to write the leader binding when the
|
|
1080
|
-
// caller pane is a REGISTERED WORKER pane. Without this, claim_leader from a
|
|
1081
|
-
// worker's tmux pane overwrites leader_receiver.pane_id with the worker's
|
|
1082
|
-
// pane → delivery routes worker messages to itself (loop) and the leader
|
|
1083
|
-
// loses its handle (the macmini "hand-handle mapping 灾难" truth source).
|
|
1084
|
-
if let Some(caller_pane_info) = caller_pane_info {
|
|
1085
|
-
match crate::topology::classify_registered_worker_for_observed_pane(state, caller_pane_info)
|
|
1086
|
-
{
|
|
1087
|
-
crate::topology::WorkerPaneBindingMatch::LiveSameWorker { agent_id } => {
|
|
1088
|
-
emit_lease_refusal(
|
|
1089
|
-
event_log,
|
|
1090
|
-
LeaseReason::CallerNotLeaderShaped,
|
|
1091
|
-
state,
|
|
1092
|
-
bound_pane_id.as_deref(),
|
|
1093
|
-
Some(caller_pane.as_str()),
|
|
1094
|
-
team_id,
|
|
1095
|
-
)?;
|
|
1096
|
-
return Ok(refused(
|
|
1097
|
-
LeaseReason::CallerNotLeaderShaped,
|
|
1098
|
-
&format!(
|
|
1099
|
-
"pane {} is registered as worker {agent_id}; \
|
|
1100
|
-
run claim-leader from the leader's own pane, not a worker pane",
|
|
1101
|
-
caller_pane.as_str()
|
|
1102
|
-
),
|
|
1103
|
-
None,
|
|
1104
|
-
bound_pane_id.clone().map(PaneId::new),
|
|
1105
|
-
));
|
|
1106
|
-
}
|
|
1107
|
-
crate::topology::WorkerPaneBindingMatch::Stale { agent_id, reason } => {
|
|
1108
|
-
event_log.write(
|
|
1109
|
-
"leader_receiver.worker_pane_binding_ignored",
|
|
1110
|
-
json!({
|
|
1111
|
-
"agent_id": agent_id,
|
|
1112
|
-
"pane_id": caller_pane.as_str(),
|
|
1113
|
-
"reason": reason,
|
|
1114
|
-
}),
|
|
1115
|
-
)?;
|
|
1116
|
-
}
|
|
1117
|
-
crate::topology::WorkerPaneBindingMatch::IncompleteLegacy { agent_id } => {
|
|
1118
|
-
event_log.write(
|
|
1119
|
-
"leader_receiver.worker_pane_binding_ignored",
|
|
1120
|
-
json!({
|
|
1121
|
-
"agent_id": agent_id,
|
|
1122
|
-
"pane_id": caller_pane.as_str(),
|
|
1123
|
-
"reason": "incomplete_legacy_tuple",
|
|
1124
|
-
}),
|
|
1125
|
-
)?;
|
|
1126
|
-
}
|
|
1127
|
-
crate::topology::WorkerPaneBindingMatch::NoMatch => {}
|
|
1128
|
-
}
|
|
1129
|
-
}
|
|
1130
|
-
let reason = if bound_pane_id.is_some() {
|
|
1131
|
-
LeaseReason::PreviousOwnerPaneDead
|
|
1132
|
-
} else {
|
|
1133
|
-
LeaseReason::VacantAcquired
|
|
1134
|
-
};
|
|
1135
|
-
if let Some(target) = caller_target.as_deref_mut() {
|
|
1136
|
-
write_claim_target_pane_nonce(target)?;
|
|
1137
|
-
}
|
|
1138
|
-
let mut identity = leader_identity_context(workspace, Some(team_id.as_str()), Some(state))?;
|
|
1139
|
-
if let Some(uuid) = caller_target
|
|
1140
|
-
.as_deref()
|
|
1141
|
-
.and_then(|target| target.leader_session_uuid.as_ref()) {
|
|
1142
|
-
identity.leader_session_uuid = uuid.clone();
|
|
1143
|
-
}
|
|
1144
|
-
let next_epoch = OwnerEpoch(pre_epoch.0.saturating_add(1));
|
|
1145
|
-
let provider = caller_target
|
|
1146
|
-
.as_deref()
|
|
1147
|
-
.map_or_else(|| prior_provider(state), |target| target.provider);
|
|
1148
|
-
let observed_endpoint = caller_target
|
|
1149
|
-
.as_deref()
|
|
1150
|
-
.and_then(|target| target.endpoint.clone());
|
|
1151
|
-
let mut receiver = make_receiver(
|
|
1152
|
-
provider,
|
|
1153
|
-
&non_empty_caller_pane,
|
|
1154
|
-
&identity.leader_session_uuid,
|
|
1155
|
-
next_epoch,
|
|
1156
|
-
Discovery::ClaimLeader,
|
|
1157
|
-
caller_target
|
|
1158
|
-
.as_deref()
|
|
1159
|
-
.and_then(|target| target.pane_info.clone()),
|
|
1160
|
-
);
|
|
1161
|
-
if let Some(target) = caller_target.as_deref() {
|
|
1162
|
-
receiver.scope_authority.clone_from(&target.scope_authority);
|
|
1163
|
-
receiver
|
|
1164
|
-
.authorized_team_workspace
|
|
1165
|
-
.clone_from(&target.authorized_team_workspace);
|
|
1166
|
-
receiver.binding_nonce.clone_from(&target.binding_nonce);
|
|
1167
|
-
}
|
|
1168
|
-
if let Some(endpoint) = observed_endpoint.as_ref() {
|
|
1169
|
-
receiver.tmux_socket = Some(endpoint.clone());
|
|
1170
|
-
}
|
|
1171
|
-
let owner = make_owner(provider, &non_empty_caller_pane, &identity, next_epoch);
|
|
1172
|
-
write_binding_to_state(state, &receiver, &owner)?;
|
|
1173
|
-
let candidate_source = if observed_endpoint.is_some() {
|
|
1174
|
-
Some("observed_target_endpoint")
|
|
1175
|
-
} else if receiver.tmux_socket.is_some() {
|
|
1176
|
-
Some("fallback_tmux_env")
|
|
1177
|
-
} else {
|
|
1178
|
-
None
|
|
1179
|
-
};
|
|
1180
|
-
let (mut topology_convergence, converged) = apply_endpoint_convergence(
|
|
1181
|
-
state,
|
|
1182
|
-
team_id,
|
|
1183
|
-
receiver.tmux_socket.as_deref(),
|
|
1184
|
-
candidate_source,
|
|
1185
|
-
next_epoch,
|
|
1186
|
-
);
|
|
1187
|
-
write_claim_state(workspace, state, scoped_team, team)?;
|
|
1188
|
-
if converged {
|
|
1189
|
-
topology_convergence = verify_persisted_topology_convergence(
|
|
1190
|
-
workspace,
|
|
1191
|
-
team_id.as_str(),
|
|
1192
|
-
topology_convergence,
|
|
1193
|
-
next_epoch,
|
|
1194
|
-
)?;
|
|
1195
|
-
if topology_convergence
|
|
1196
|
-
.as_ref()
|
|
1197
|
-
.and_then(|metadata| metadata.get("status"))
|
|
1198
|
-
.and_then(Value::as_str)
|
|
1199
|
-
!= Some("converged")
|
|
1200
|
-
{
|
|
1201
|
-
return Ok(convergence_persistence_refusal(
|
|
1202
|
-
topology_convergence,
|
|
1203
|
-
next_epoch,
|
|
1204
|
-
Some(caller_pane.clone()),
|
|
1205
|
-
));
|
|
1206
|
-
}
|
|
1207
|
-
}
|
|
1208
|
-
let uuid_prefix = identity
|
|
1209
|
-
.leader_session_uuid
|
|
1210
|
-
.as_str()
|
|
1211
|
-
.chars()
|
|
1212
|
-
.take(8)
|
|
1213
|
-
.collect::<String>();
|
|
1214
|
-
if reason == LeaseReason::PreviousOwnerPaneDead {
|
|
1215
|
-
event_log.write(
|
|
1216
|
-
super::LeaderEvent::OwnerAdoptedOnRestart.name(),
|
|
1217
|
-
json!({
|
|
1218
|
-
"reason": serde_json::to_value(reason)?,
|
|
1219
|
-
"old_pane_id": bound_pane_id,
|
|
1220
|
-
"new_pane_id": caller_pane.as_str(),
|
|
1221
|
-
"owner_epoch": next_epoch.0,
|
|
1222
|
-
"uuid_prefix": uuid_prefix,
|
|
1223
|
-
"team_id": team_id.as_str(),
|
|
1224
|
-
"host": owner.machine_fingerprint,
|
|
1225
|
-
"os_user": identity.os_user,
|
|
1226
|
-
}),
|
|
1227
|
-
)?;
|
|
1228
|
-
}
|
|
1229
|
-
event_log.write(
|
|
1230
|
-
super::LeaderEvent::ReceiverRebindApplied.name(),
|
|
1231
|
-
json!({
|
|
1232
|
-
"reason": serde_json::to_value(reason)?,
|
|
1233
|
-
"old_pane_id": bound_pane_id,
|
|
1234
|
-
"new_pane_id": caller_pane.as_str(),
|
|
1235
|
-
"owner_epoch": next_epoch.0,
|
|
1236
|
-
"uuid_prefix": uuid_prefix,
|
|
1237
|
-
"team_id": team_id.as_str(),
|
|
1238
|
-
}),
|
|
1239
|
-
)?;
|
|
1240
|
-
event_log.write(
|
|
1241
|
-
super::LeaderEvent::OwnerEpochAdvanced.name(),
|
|
1242
|
-
json!({
|
|
1243
|
-
"reason": serde_json::to_value(reason)?,
|
|
1244
|
-
"old_pane_id": bound_pane_id,
|
|
1245
|
-
"new_pane_id": caller_pane.as_str(),
|
|
1246
|
-
"owner_epoch": next_epoch.0,
|
|
1247
|
-
"uuid_prefix": uuid_prefix,
|
|
1248
|
-
"team_id": team_id.as_str(),
|
|
1249
|
-
}),
|
|
1250
|
-
)?;
|
|
1251
|
-
Ok(LeaseResult {
|
|
1252
|
-
ok: true,
|
|
1253
|
-
status: LeaseStatus::Claimed,
|
|
1254
|
-
receiver: Some(receiver),
|
|
1255
|
-
owner: Some(owner),
|
|
1256
|
-
owner_epoch: Some(next_epoch),
|
|
1257
|
-
reason: Some(reason),
|
|
1258
|
-
action: None,
|
|
1259
|
-
bound_pane_id: Some(caller_pane.clone()),
|
|
1260
|
-
topology_convergence,
|
|
1261
|
-
attach_window_failures: None,
|
|
1262
|
-
})
|
|
1263
|
-
}
|
|
1264
|
-
|
|
1265
|
-
fn apply_endpoint_convergence(
|
|
1266
|
-
state: &mut Value,
|
|
1267
|
-
team_id: &TeamKey,
|
|
1268
|
-
candidate_endpoint: Option<&str>,
|
|
1269
|
-
candidate_source: Option<&'static str>,
|
|
1270
|
-
owner_epoch: OwnerEpoch,
|
|
1271
|
-
) -> (Option<Value>, bool) {
|
|
1272
|
-
let explicit_candidate = candidate_endpoint
|
|
1273
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
1274
|
-
.map(str::to_string);
|
|
1275
|
-
let (candidate_endpoint, candidate_source) = if let Some(endpoint) = explicit_candidate {
|
|
1276
|
-
(endpoint, candidate_source.unwrap_or("candidate"))
|
|
1277
|
-
} else if let Some(endpoint) = state_tmux_socket_candidate(state, team_id.as_str()) {
|
|
1278
|
-
(endpoint, "fallback_state")
|
|
1279
|
-
} else {
|
|
1280
|
-
return (None, false);
|
|
1281
|
-
};
|
|
1282
|
-
match crate::topology::endpoint_convergence_decision(
|
|
1283
|
-
state,
|
|
1284
|
-
team_id.as_str(),
|
|
1285
|
-
&candidate_endpoint,
|
|
1286
|
-
) {
|
|
1287
|
-
crate::topology::EndpointConvergenceDecision::NoConflict => (None, false),
|
|
1288
|
-
crate::topology::EndpointConvergenceDecision::Unknown => (
|
|
1289
|
-
Some(json!({
|
|
1290
|
-
"status": "unknown",
|
|
1291
|
-
"new_tmux_endpoint": candidate_endpoint,
|
|
1292
|
-
"candidate_source": candidate_source,
|
|
1293
|
-
"owner_epoch": owner_epoch.0,
|
|
1294
|
-
"persisted": false,
|
|
1295
|
-
"checked_paths": convergence_checked_paths(team_id.as_str()),
|
|
1296
|
-
})),
|
|
1297
|
-
false,
|
|
1298
|
-
),
|
|
1299
|
-
crate::topology::EndpointConvergenceDecision::RefuseLiveOldEndpoint {
|
|
1300
|
-
old_endpoint,
|
|
1301
|
-
new_endpoint,
|
|
1302
|
-
reason,
|
|
1303
|
-
} => (
|
|
1304
|
-
Some(json!({
|
|
1305
|
-
"status": "not_converged_old_endpoint_live",
|
|
1306
|
-
"old_tmux_endpoint": old_endpoint,
|
|
1307
|
-
"new_tmux_endpoint": new_endpoint,
|
|
1308
|
-
"reason": reason,
|
|
1309
|
-
"candidate_source": candidate_source,
|
|
1310
|
-
"owner_epoch": owner_epoch.0,
|
|
1311
|
-
"persisted": false,
|
|
1312
|
-
"checked_paths": convergence_checked_paths(team_id.as_str()),
|
|
1313
|
-
"action": format!(
|
|
1314
|
-
"old tmux endpoint {old_endpoint} still has this team's session or pane tuple; run team-agent doctor --json before retrying restart"
|
|
1315
|
-
),
|
|
1316
|
-
})),
|
|
1317
|
-
false,
|
|
1318
|
-
),
|
|
1319
|
-
crate::topology::EndpointConvergenceDecision::Converge {
|
|
1320
|
-
old_endpoint,
|
|
1321
|
-
new_endpoint,
|
|
1322
|
-
reason,
|
|
1323
|
-
} => {
|
|
1324
|
-
let metadata = json!({
|
|
1325
|
-
"status": "converged",
|
|
1326
|
-
"old_tmux_endpoint": old_endpoint,
|
|
1327
|
-
"new_tmux_endpoint": new_endpoint,
|
|
1328
|
-
"reason": reason,
|
|
1329
|
-
"candidate_source": candidate_source,
|
|
1330
|
-
"owner_epoch": owner_epoch.0,
|
|
1331
|
-
});
|
|
1332
|
-
write_endpoint_fields(state, team_id.as_str(), &new_endpoint);
|
|
1333
|
-
write_convergence_marker(state, team_id.as_str(), &metadata);
|
|
1334
|
-
(Some(metadata), true)
|
|
1335
|
-
}
|
|
1336
|
-
}
|
|
1337
|
-
}
|
|
1338
|
-
|
|
1339
|
-
fn state_tmux_socket_candidate(state: &Value, team_id: &str) -> Option<String> {
|
|
1340
|
-
state
|
|
1341
|
-
.get("tmux_socket")
|
|
1342
|
-
.and_then(Value::as_str)
|
|
1343
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
1344
|
-
.map(str::to_string)
|
|
1345
|
-
.or_else(|| {
|
|
1346
|
-
state
|
|
1347
|
-
.get("teams")
|
|
1348
|
-
.and_then(Value::as_object)
|
|
1349
|
-
.and_then(|teams| teams.get(team_id))
|
|
1350
|
-
.and_then(|team| team.get("tmux_socket"))
|
|
1351
|
-
.and_then(Value::as_str)
|
|
1352
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
1353
|
-
.map(str::to_string)
|
|
1354
|
-
})
|
|
1355
|
-
}
|
|
1356
|
-
|
|
1357
|
-
fn write_endpoint_fields(state: &mut Value, team_id: &str, endpoint: &str) {
|
|
1358
|
-
if !state.is_object() {
|
|
1359
|
-
*state = json!({});
|
|
1360
|
-
}
|
|
1361
|
-
if let Some(obj) = state.as_object_mut() {
|
|
1362
|
-
obj.insert("tmux_endpoint".to_string(), json!(endpoint));
|
|
1363
|
-
obj.insert("tmux_socket".to_string(), json!(endpoint));
|
|
1364
|
-
obj.insert("tmux_socket_source".to_string(), json!("leader_env"));
|
|
1365
|
-
if let Some(team_obj) = obj
|
|
1366
|
-
.get_mut("teams")
|
|
1367
|
-
.and_then(Value::as_object_mut)
|
|
1368
|
-
.and_then(|teams| teams.get_mut(team_id))
|
|
1369
|
-
.and_then(Value::as_object_mut)
|
|
1370
|
-
{
|
|
1371
|
-
team_obj.insert("tmux_endpoint".to_string(), json!(endpoint));
|
|
1372
|
-
team_obj.insert("tmux_socket".to_string(), json!(endpoint));
|
|
1373
|
-
team_obj.insert("tmux_socket_source".to_string(), json!("leader_env"));
|
|
1374
|
-
}
|
|
1375
|
-
}
|
|
1376
|
-
}
|
|
1377
|
-
|
|
1378
|
-
/// Persist the user-visible endpoint convergence marker.
|
|
1379
|
-
///
|
|
1380
|
-
/// This field is written by real `claim-leader` / `takeover` success paths, so
|
|
1381
|
-
/// any restart-side harness bypass that keys off it must carry a second
|
|
1382
|
-
/// production-safety gate such as a fake-only predicate or a `TEAM_AGENT_TEST_*`
|
|
1383
|
-
/// env var.
|
|
1384
|
-
fn write_convergence_marker(state: &mut Value, team_id: &str, metadata: &Value) {
|
|
1385
|
-
let Some(obj) = state.as_object_mut() else {
|
|
1386
|
-
return;
|
|
1387
|
-
};
|
|
1388
|
-
obj.insert("topology_convergence".to_string(), metadata.clone());
|
|
1389
|
-
if let Some(team_obj) = obj
|
|
1390
|
-
.get_mut("teams")
|
|
1391
|
-
.and_then(Value::as_object_mut)
|
|
1392
|
-
.and_then(|teams| teams.get_mut(team_id))
|
|
1393
|
-
.and_then(Value::as_object_mut)
|
|
1394
|
-
{
|
|
1395
|
-
team_obj.insert("topology_convergence".to_string(), metadata.clone());
|
|
1396
|
-
}
|
|
1397
|
-
}
|
|
1398
|
-
|
|
1399
|
-
fn verify_persisted_topology_convergence(
|
|
1400
|
-
workspace: &Path,
|
|
1401
|
-
team_id: &str,
|
|
1402
|
-
metadata: Option<Value>,
|
|
1403
|
-
owner_epoch: OwnerEpoch,
|
|
1404
|
-
) -> Result<Option<Value>, LeaderError> {
|
|
1405
|
-
let Some(mut metadata) = metadata else {
|
|
1406
|
-
return Ok(None);
|
|
1407
|
-
};
|
|
1408
|
-
if metadata.get("status").and_then(Value::as_str) != Some("converged") {
|
|
1409
|
-
return Ok(Some(metadata));
|
|
1410
|
-
}
|
|
1411
|
-
let Some(new_endpoint) = metadata
|
|
1412
|
-
.get("new_tmux_endpoint")
|
|
1413
|
-
.and_then(Value::as_str)
|
|
1414
|
-
.map(str::to_string)
|
|
1415
|
-
else {
|
|
1416
|
-
mark_convergence_persistence_conflict(&mut metadata, team_id);
|
|
1417
|
-
return Ok(Some(metadata));
|
|
1418
|
-
};
|
|
1419
|
-
let state = crate::state::persist::load_runtime_state(workspace)?;
|
|
1420
|
-
if endpoint_convergence_persisted(&state, team_id, &new_endpoint, owner_epoch.0) {
|
|
1421
|
-
mark_convergence_persisted(&mut metadata, team_id);
|
|
1422
|
-
} else {
|
|
1423
|
-
mark_convergence_persistence_conflict(&mut metadata, team_id);
|
|
1424
|
-
}
|
|
1425
|
-
Ok(Some(metadata))
|
|
1426
|
-
}
|
|
1427
|
-
|
|
1428
|
-
fn endpoint_convergence_persisted(
|
|
1429
|
-
state: &Value,
|
|
1430
|
-
team_id: &str,
|
|
1431
|
-
endpoint: &str,
|
|
1432
|
-
owner_epoch: u64,
|
|
1433
|
-
) -> bool {
|
|
1434
|
-
if !endpoint_convergence_node_matches(state, endpoint, owner_epoch) {
|
|
1435
|
-
return false;
|
|
1436
|
-
}
|
|
1437
|
-
state
|
|
1438
|
-
.get("teams")
|
|
1439
|
-
.and_then(Value::as_object)
|
|
1440
|
-
.and_then(|teams| teams.get(team_id))
|
|
1441
|
-
.is_some_and(|team| endpoint_convergence_node_matches(team, endpoint, owner_epoch))
|
|
1442
|
-
}
|
|
1443
|
-
|
|
1444
|
-
fn endpoint_convergence_node_matches(node: &Value, endpoint: &str, owner_epoch: u64) -> bool {
|
|
1445
|
-
node.get("tmux_endpoint").and_then(Value::as_str) == Some(endpoint)
|
|
1446
|
-
&& node.get("tmux_socket").and_then(Value::as_str) == Some(endpoint)
|
|
1447
|
-
&& node.get("tmux_socket_source").and_then(Value::as_str) == Some("leader_env")
|
|
1448
|
-
&& node
|
|
1449
|
-
.get("topology_convergence")
|
|
1450
|
-
.and_then(|marker| marker.get("status"))
|
|
1451
|
-
.and_then(Value::as_str)
|
|
1452
|
-
== Some("converged")
|
|
1453
|
-
&& node
|
|
1454
|
-
.get("topology_convergence")
|
|
1455
|
-
.and_then(|marker| marker.get("owner_epoch"))
|
|
1456
|
-
.and_then(Value::as_u64)
|
|
1457
|
-
== Some(owner_epoch)
|
|
1458
|
-
}
|
|
1459
|
-
|
|
1460
|
-
fn mark_convergence_persisted(metadata: &mut Value, team_id: &str) {
|
|
1461
|
-
let Some(obj) = metadata.as_object_mut() else {
|
|
1462
|
-
return;
|
|
1463
|
-
};
|
|
1464
|
-
obj.insert("persisted".to_string(), json!(true));
|
|
1465
|
-
obj.insert(
|
|
1466
|
-
"checked_paths".to_string(),
|
|
1467
|
-
json!(convergence_checked_paths(team_id)),
|
|
1468
|
-
);
|
|
1469
|
-
}
|
|
1470
|
-
|
|
1471
|
-
fn mark_convergence_persistence_conflict(metadata: &mut Value, team_id: &str) {
|
|
1472
|
-
let Some(obj) = metadata.as_object_mut() else {
|
|
1473
|
-
return;
|
|
1474
|
-
};
|
|
1475
|
-
obj.insert("status".to_string(), json!("persistence_conflict"));
|
|
1476
|
-
obj.insert("persisted".to_string(), json!(false));
|
|
1477
|
-
obj.insert(
|
|
1478
|
-
"checked_paths".to_string(),
|
|
1479
|
-
json!(convergence_checked_paths(team_id)),
|
|
1480
|
-
);
|
|
1481
|
-
obj.insert(
|
|
1482
|
-
"action".to_string(),
|
|
1483
|
-
json!("endpoint convergence was not durably persisted; retry claim-leader or takeover"),
|
|
1484
|
-
);
|
|
1485
|
-
}
|
|
1486
|
-
|
|
1487
|
-
fn convergence_checked_paths(team_id: &str) -> Vec<String> {
|
|
1488
|
-
[
|
|
1489
|
-
"/tmux_endpoint".to_string(),
|
|
1490
|
-
"/tmux_socket".to_string(),
|
|
1491
|
-
"/tmux_socket_source".to_string(),
|
|
1492
|
-
"/topology_convergence".to_string(),
|
|
1493
|
-
format!("/teams/{team_id}/tmux_endpoint"),
|
|
1494
|
-
format!("/teams/{team_id}/tmux_socket"),
|
|
1495
|
-
format!("/teams/{team_id}/tmux_socket_source"),
|
|
1496
|
-
format!("/teams/{team_id}/topology_convergence"),
|
|
1497
|
-
]
|
|
1498
|
-
.into_iter()
|
|
1499
|
-
.collect()
|
|
1500
|
-
}
|
|
1501
|
-
|
|
1502
|
-
fn convergence_persistence_refusal(
|
|
1503
|
-
topology_convergence: Option<Value>,
|
|
1504
|
-
owner_epoch: OwnerEpoch,
|
|
1505
|
-
bound_pane_id: Option<PaneId>,
|
|
1506
|
-
) -> LeaseResult {
|
|
1507
|
-
LeaseResult {
|
|
1508
|
-
ok: false,
|
|
1509
|
-
status: LeaseStatus::Refused,
|
|
1510
|
-
receiver: None,
|
|
1511
|
-
owner: None,
|
|
1512
|
-
owner_epoch: Some(owner_epoch),
|
|
1513
|
-
reason: Some(LeaseReason::OwnerEpochAdvanced),
|
|
1514
|
-
action: Some(
|
|
1515
|
-
"endpoint convergence was not durably persisted; retry claim-leader or takeover"
|
|
1516
|
-
.to_string(),
|
|
1517
|
-
),
|
|
1518
|
-
bound_pane_id,
|
|
1519
|
-
topology_convergence,
|
|
1520
|
-
attach_window_failures: None,
|
|
1521
|
-
}
|
|
1522
|
-
}
|
|
1523
|
-
|
|
1524
|
-
fn refused(
|
|
1525
|
-
reason: LeaseReason,
|
|
1526
|
-
action: &str,
|
|
1527
|
-
epoch: Option<OwnerEpoch>,
|
|
1528
|
-
bound_pane_id: Option<PaneId>,
|
|
1529
|
-
) -> LeaseResult {
|
|
1530
|
-
LeaseResult {
|
|
1531
|
-
ok: false,
|
|
1532
|
-
status: LeaseStatus::Refused,
|
|
1533
|
-
receiver: None,
|
|
1534
|
-
owner: None,
|
|
1535
|
-
owner_epoch: epoch,
|
|
1536
|
-
reason: Some(reason),
|
|
1537
|
-
action: if action.is_empty() {
|
|
1538
|
-
None
|
|
1539
|
-
} else {
|
|
1540
|
-
Some(action.to_string())
|
|
1541
|
-
},
|
|
1542
|
-
bound_pane_id,
|
|
1543
|
-
topology_convergence: None,
|
|
1544
|
-
attach_window_failures: None,
|
|
1545
|
-
}
|
|
1546
|
-
}
|
|
1547
|
-
|
|
1548
|
-
fn current_owner_epoch(state: &Value) -> OwnerEpoch {
|
|
1549
|
-
let owner_epoch = get_path_u64(state, &["team_owner", "owner_epoch"]).filter(|v| *v != 0);
|
|
1550
|
-
let receiver_epoch =
|
|
1551
|
-
get_path_u64(state, &["leader_receiver", "owner_epoch"]).filter(|v| *v != 0);
|
|
1552
|
-
OwnerEpoch(owner_epoch.or(receiver_epoch).unwrap_or(0))
|
|
1553
|
-
}
|
|
1554
|
-
|
|
1555
|
-
fn bound_pane(state: &Value) -> Option<String> {
|
|
1556
|
-
get_path_str(state, &["leader_receiver", "pane_id"])
|
|
1557
|
-
.filter(|v| !v.is_empty())
|
|
1558
|
-
.or_else(|| get_path_str(state, &["team_owner", "pane_id"]).filter(|v| !v.is_empty()))
|
|
1559
|
-
}
|
|
1560
|
-
|
|
1561
|
-
/// Live owner on this socket, different caller pane → ownership conflict,
|
|
1562
|
-
/// not "caller pane failed validation". Presence in list-panes is enough;
|
|
1563
|
-
/// do not require the owner pane to be the session's active pane.
|
|
1564
|
-
fn live_bound_pane_blocking_other_attach(
|
|
1565
|
-
state: &Value,
|
|
1566
|
-
caller: &PaneId,
|
|
1567
|
-
targets: &[AttachLeaderTarget],
|
|
1568
|
-
) -> Option<PaneId> {
|
|
1569
|
-
let bound = bound_pane(state)?;
|
|
1570
|
-
if bound == caller.as_str() {
|
|
1571
|
-
return None;
|
|
1572
|
-
}
|
|
1573
|
-
let live = targets.iter().any(|target| target.info.pane_id.as_str() == bound);
|
|
1574
|
-
live.then(|| PaneId::new(bound))
|
|
1575
|
-
}
|
|
1576
|
-
|
|
1577
|
-
fn bound_endpoint_matches_current_process(state: &Value) -> bool {
|
|
1578
|
-
let Some(bound) =
|
|
1579
|
-
get_path_str(state, &["leader_receiver", "tmux_socket"]).filter(|v| !v.is_empty())
|
|
1580
|
-
else {
|
|
1581
|
-
return true;
|
|
1582
|
-
};
|
|
1583
|
-
let Some(current) = crate::tmux_backend::socket_name_from_tmux_env() else {
|
|
1584
|
-
return false;
|
|
1585
|
-
};
|
|
1586
|
-
tmux_endpoints_match(&bound, ¤t)
|
|
1587
|
-
}
|
|
1588
|
-
|
|
1589
|
-
fn tmux_endpoints_match(bound: &str, current: &str) -> bool {
|
|
1590
|
-
bound == current
|
|
1591
|
-
}
|
|
1592
|
-
|
|
1593
|
-
fn prior_provider(state: &Value) -> Provider {
|
|
1594
|
-
get_path_str(state, &["leader_receiver", "provider"])
|
|
1595
|
-
.or_else(|| get_path_str(state, &["team_owner", "provider"]))
|
|
1596
|
-
.and_then(|raw| parse_provider(&raw))
|
|
1597
|
-
.unwrap_or(Provider::Codex)
|
|
1598
|
-
}
|
|
1599
|
-
|
|
1600
|
-
struct LeaderClaimTarget {
|
|
1601
|
-
provider: Provider,
|
|
1602
|
-
leader_session_uuid: Option<crate::model::ids::LeaderSessionUuid>,
|
|
1603
|
-
team_id: Option<String>,
|
|
1604
|
-
pane_info: Option<PaneInfo>,
|
|
1605
|
-
endpoint: Option<String>,
|
|
1606
|
-
scope_authority: Option<String>,
|
|
1607
|
-
authorized_team_workspace: Option<PathBuf>,
|
|
1608
|
-
binding_nonce: Option<String>,
|
|
1609
|
-
}
|
|
1610
|
-
|
|
1611
|
-
#[derive(Clone)]
|
|
1612
|
-
struct ClaimLeaderTargetCandidate {
|
|
1613
|
-
info: PaneInfo,
|
|
1614
|
-
endpoint: Option<String>,
|
|
1615
|
-
}
|
|
1616
|
-
|
|
1617
|
-
fn select_claim_authority<'a>(
|
|
1618
|
-
workspace: &Path,
|
|
1619
|
-
state: &Value,
|
|
1620
|
-
team_id: &str,
|
|
1621
|
-
targets: &'a [ClaimLeaderTargetCandidate],
|
|
1622
|
-
caller: &str,
|
|
1623
|
-
) -> Option<&'a ClaimLeaderTargetCandidate> {
|
|
1624
|
-
targets
|
|
1625
|
-
.iter()
|
|
1626
|
-
.filter(|target| {
|
|
1627
|
-
target.info.pane_id.as_str() == caller
|
|
1628
|
-
&& target.info.active
|
|
1629
|
-
&& super::attribute_pane_provider(&target.info).is_some()
|
|
1630
|
-
})
|
|
1631
|
-
.min_by_key(|target| {
|
|
1632
|
-
let recorded = target
|
|
1633
|
-
.endpoint
|
|
1634
|
-
.as_deref()
|
|
1635
|
-
.is_some_and(|endpoint| state_records_pane_endpoint(state, caller, endpoint));
|
|
1636
|
-
let in_workspace = target.info.current_path.as_deref().is_some_and(|path| {
|
|
1637
|
-
crate::messaging::leader_channel::path_is_in_workspace(path, workspace)
|
|
1638
|
-
});
|
|
1639
|
-
let team_affinity = match target
|
|
1640
|
-
.info
|
|
1641
|
-
.leader_env
|
|
1642
|
-
.get("TEAM_AGENT_TEAM_ID")
|
|
1643
|
-
.filter(|value| !value.is_empty())
|
|
1644
|
-
{
|
|
1645
|
-
Some(observed) if observed == team_id => 0,
|
|
1646
|
-
None => 1,
|
|
1647
|
-
Some(_) => 2,
|
|
1648
|
-
};
|
|
1649
|
-
(
|
|
1650
|
-
!recorded,
|
|
1651
|
-
!in_workspace,
|
|
1652
|
-
team_affinity,
|
|
1653
|
-
target.info.pane_pid.unwrap_or(u32::MAX),
|
|
1654
|
-
target.info.session.as_str().to_string(),
|
|
1655
|
-
target.info.window_index.unwrap_or(u32::MAX),
|
|
1656
|
-
target.info.pane_index.unwrap_or(u32::MAX),
|
|
1657
|
-
target.info.tty.clone().unwrap_or_default(),
|
|
1658
|
-
)
|
|
1659
|
-
})
|
|
1660
|
-
}
|
|
1661
|
-
|
|
1662
|
-
fn authoritative_observed_endpoint(
|
|
1663
|
-
workspace: &Path,
|
|
1664
|
-
state: &Value,
|
|
1665
|
-
targets: &[ClaimLeaderTargetCandidate],
|
|
1666
|
-
authority: &ClaimLeaderTargetCandidate,
|
|
1667
|
-
) -> Option<String> {
|
|
1668
|
-
let recorded = state_recorded_tmux_endpoints(state);
|
|
1669
|
-
let workspace_name = crate::tmux_backend::socket_name_for_workspace(workspace);
|
|
1670
|
-
let workspace_path = crate::tmux_backend::socket_path_for_workspace(workspace);
|
|
1671
|
-
targets
|
|
1672
|
-
.iter()
|
|
1673
|
-
.filter(|candidate| candidate.info == authority.info)
|
|
1674
|
-
.filter_map(|candidate| candidate.endpoint.as_ref())
|
|
1675
|
-
.min_by_key(|endpoint| {
|
|
1676
|
-
let canonical_workspace_endpoint = endpoint.as_str() == workspace_name
|
|
1677
|
-
|| workspace_path
|
|
1678
|
-
.as_ref()
|
|
1679
|
-
.is_some_and(|path| path.to_string_lossy().as_ref() == endpoint.as_str());
|
|
1680
|
-
(
|
|
1681
|
-
!state_records_pane_endpoint(state, authority.info.pane_id.as_str(), endpoint),
|
|
1682
|
-
!recorded.contains(endpoint.as_str()),
|
|
1683
|
-
!canonical_workspace_endpoint,
|
|
1684
|
-
!Path::new(endpoint.as_str()).is_absolute(),
|
|
1685
|
-
endpoint.as_str(),
|
|
1686
|
-
)
|
|
1687
|
-
})
|
|
1688
|
-
.cloned()
|
|
1689
|
-
}
|
|
1690
|
-
|
|
1691
|
-
fn claim_leader_targets(workspace: &Path, state: &Value) -> Vec<ClaimLeaderTargetCandidate> {
|
|
1692
|
-
let mut targets = Vec::new();
|
|
1693
|
-
if let Some(endpoint) = crate::tmux_backend::socket_name_from_tmux_env() {
|
|
1694
|
-
let backend = tmux_backend_for_endpoint(&endpoint);
|
|
1695
|
-
let resolved_endpoint = backend.tmux_endpoint();
|
|
1696
|
-
targets.extend(
|
|
1697
|
-
backend
|
|
1698
|
-
.list_targets()
|
|
1699
|
-
.unwrap_or_default()
|
|
1700
|
-
.into_iter()
|
|
1701
|
-
.map(|info| ClaimLeaderTargetCandidate {
|
|
1702
|
-
info,
|
|
1703
|
-
endpoint: resolved_endpoint.clone(),
|
|
1704
|
-
}),
|
|
1705
|
-
);
|
|
1706
|
-
}
|
|
1707
|
-
for endpoint in state_recorded_tmux_endpoints(state) {
|
|
1708
|
-
let backend = tmux_backend_for_endpoint(&endpoint);
|
|
1709
|
-
let resolved_endpoint = backend.tmux_endpoint();
|
|
1710
|
-
targets.extend(
|
|
1711
|
-
backend
|
|
1712
|
-
.list_targets()
|
|
1713
|
-
.unwrap_or_default()
|
|
1714
|
-
.into_iter()
|
|
1715
|
-
.map(|info| ClaimLeaderTargetCandidate {
|
|
1716
|
-
info,
|
|
1717
|
-
endpoint: resolved_endpoint.clone(),
|
|
1718
|
-
}),
|
|
1719
|
-
);
|
|
1720
|
-
}
|
|
1721
|
-
let workspace_backend = crate::transport_factory::tmux_workspace_transport(workspace);
|
|
1722
|
-
let workspace_endpoint = workspace_backend.tmux_endpoint();
|
|
1723
|
-
targets.extend(
|
|
1724
|
-
workspace_backend
|
|
1725
|
-
.list_targets()
|
|
1726
|
-
.unwrap_or_default()
|
|
1727
|
-
.into_iter()
|
|
1728
|
-
.map(|info| ClaimLeaderTargetCandidate {
|
|
1729
|
-
info,
|
|
1730
|
-
endpoint: workspace_endpoint.clone(),
|
|
1731
|
-
}),
|
|
1732
|
-
);
|
|
1733
|
-
let default_backend = crate::transport_factory::tmux_default_transport();
|
|
1734
|
-
let default_endpoint = default_backend.tmux_endpoint();
|
|
1735
|
-
targets.extend(
|
|
1736
|
-
default_backend
|
|
1737
|
-
.list_targets()
|
|
1738
|
-
.unwrap_or_default()
|
|
1739
|
-
.into_iter()
|
|
1740
|
-
.map(|info| ClaimLeaderTargetCandidate {
|
|
1741
|
-
info,
|
|
1742
|
-
endpoint: default_endpoint.clone(),
|
|
1743
|
-
}),
|
|
1744
|
-
);
|
|
1745
|
-
targets
|
|
1746
|
-
}
|
|
1747
|
-
|
|
1748
|
-
fn claim_target_from_pane_info(target: &PaneInfo) -> Option<LeaderClaimTarget> {
|
|
1749
|
-
if !target.active {
|
|
1750
|
-
return None;
|
|
1751
|
-
}
|
|
1752
|
-
claim_target_from_observed_pane(target)
|
|
1753
|
-
}
|
|
1754
|
-
|
|
1755
|
-
fn claim_target_from_observed_pane(target: &PaneInfo) -> Option<LeaderClaimTarget> {
|
|
1756
|
-
let provider = super::attribute_pane_provider(target)?;
|
|
1757
|
-
Some(claim_target_with_provider(target, provider))
|
|
1758
|
-
}
|
|
1759
|
-
|
|
1760
|
-
fn claim_target_with_provider(target: &PaneInfo, provider: Provider) -> LeaderClaimTarget {
|
|
1761
|
-
LeaderClaimTarget {
|
|
1762
|
-
provider,
|
|
1763
|
-
leader_session_uuid: target_leader_session_uuid(target),
|
|
1764
|
-
team_id: target
|
|
1765
|
-
.leader_env
|
|
1766
|
-
.get("TEAM_AGENT_TEAM_ID")
|
|
1767
|
-
.filter(|raw| !raw.is_empty())
|
|
1768
|
-
.cloned(),
|
|
1769
|
-
pane_info: Some(target.clone()),
|
|
1770
|
-
endpoint: None,
|
|
1771
|
-
scope_authority: None,
|
|
1772
|
-
authorized_team_workspace: None,
|
|
1773
|
-
binding_nonce: None,
|
|
1774
|
-
}
|
|
1775
|
-
}
|
|
1776
|
-
|
|
1777
|
-
fn workspace_claim_target_from_pane_info(
|
|
1778
|
-
workspace: &Path,
|
|
1779
|
-
target: &PaneInfo,
|
|
1780
|
-
) -> Option<LeaderClaimTarget> {
|
|
1781
|
-
let current_path = target.current_path.as_deref()?;
|
|
1782
|
-
if !crate::state::owner_gate::workspace_paths_match(current_path, workspace) {
|
|
1783
|
-
return None;
|
|
1784
|
-
}
|
|
1785
|
-
claim_target_from_observed_pane(target)
|
|
1786
|
-
}
|
|
1787
|
-
|
|
1788
|
-
fn write_claim_target_pane_nonce(target: &mut LeaderClaimTarget) -> Result<(), LeaderError> {
|
|
1789
|
-
if target.scope_authority.is_none() {
|
|
1790
|
-
return Ok(());
|
|
1791
|
-
}
|
|
1792
|
-
let endpoint = target.endpoint.as_deref().ok_or_else(|| {
|
|
1793
|
-
LeaderError::Validation("explicit claim is missing its tmux endpoint".to_string())
|
|
1794
|
-
})?;
|
|
1795
|
-
let pane = target
|
|
1796
|
-
.pane_info
|
|
1797
|
-
.as_ref()
|
|
1798
|
-
.map(|info| &info.pane_id)
|
|
1799
|
-
.ok_or_else(|| {
|
|
1800
|
-
LeaderError::Validation("explicit claim is missing its pane observation".to_string())
|
|
1801
|
-
})?;
|
|
1802
|
-
let nonce = target.binding_nonce.as_deref().ok_or_else(|| {
|
|
1803
|
-
LeaderError::Validation("explicit claim is missing its pane binding nonce".to_string())
|
|
1804
|
-
})?;
|
|
1805
|
-
let live_nonce = target
|
|
1806
|
-
.pane_info
|
|
1807
|
-
.as_ref()
|
|
1808
|
-
.and_then(|info| {
|
|
1809
|
-
info.leader_env
|
|
1810
|
-
.get(crate::tmux_backend::PANE_BINDING_NONCE_METADATA_KEY)
|
|
1811
|
-
.map(String::as_str)
|
|
1812
|
-
})
|
|
1813
|
-
.filter(|nonce| !nonce.is_empty());
|
|
1814
|
-
// The pane option is the pane-instance identity shared by all authorized
|
|
1815
|
-
// teams. Rewriting an observed value would revoke another team's grant.
|
|
1816
|
-
let effective_nonce = if let Some(live_nonce) = live_nonce {
|
|
1817
|
-
live_nonce.to_string()
|
|
1818
|
-
} else {
|
|
1819
|
-
tmux_backend_for_endpoint(endpoint)
|
|
1820
|
-
.set_pane_binding_nonce_if_unset(pane, nonce)
|
|
1821
|
-
.map_err(|error| {
|
|
1822
|
-
LeaderError::Validation(format!(
|
|
1823
|
-
"failed to bind the explicit leader pane instance: {error}"
|
|
1824
|
-
))
|
|
1825
|
-
})?
|
|
1826
|
-
};
|
|
1827
|
-
target.binding_nonce = Some(effective_nonce);
|
|
1828
|
-
Ok(())
|
|
1829
|
-
}
|
|
1830
|
-
|
|
1831
|
-
fn canonical_workspace(workspace: &Path) -> PathBuf {
|
|
1832
|
-
workspace
|
|
1833
|
-
.canonicalize()
|
|
1834
|
-
.unwrap_or_else(|_| workspace.to_path_buf())
|
|
1835
|
-
}
|
|
1836
|
-
|
|
1837
|
-
fn next_pane_binding_nonce(workspace: &Path, endpoint: &str, pane: &PaneId) -> String {
|
|
1838
|
-
crate::tmux_backend::next_pane_binding_nonce(workspace, endpoint, pane)
|
|
1839
|
-
}
|
|
1840
|
-
|
|
1841
|
-
fn pane_binding_nonce_for_claim(
|
|
1842
|
-
workspace: &Path,
|
|
1843
|
-
endpoint: &str,
|
|
1844
|
-
pane: &PaneId,
|
|
1845
|
-
live_nonce: Option<&str>,
|
|
1846
|
-
) -> String {
|
|
1847
|
-
live_nonce
|
|
1848
|
-
.filter(|nonce| !nonce.is_empty())
|
|
1849
|
-
.map(str::to_string)
|
|
1850
|
-
.unwrap_or_else(|| next_pane_binding_nonce(workspace, endpoint, pane))
|
|
1851
|
-
}
|
|
1852
|
-
|
|
1853
|
-
fn target_leader_session_uuid(target: &PaneInfo) -> Option<crate::model::ids::LeaderSessionUuid> {
|
|
1854
|
-
target
|
|
1855
|
-
.leader_env
|
|
1856
|
-
.get("TEAM_AGENT_LEADER_SESSION_UUID")
|
|
1857
|
-
.filter(|raw| !raw.is_empty())
|
|
1858
|
-
.and_then(|raw| serde_json::from_value(json!(raw)).ok())
|
|
1859
|
-
}
|
|
1860
|
-
|
|
1861
|
-
fn validate_attach_target(
|
|
1862
|
-
workspace: &Path,
|
|
1863
|
-
state: &Value,
|
|
1864
|
-
target: &PaneInfo,
|
|
1865
|
-
requested_provider: Provider,
|
|
1866
|
-
endpoint: Option<&str>,
|
|
1867
|
-
) -> Result<(), &'static str> {
|
|
1868
|
-
// 0.5.9 (E6 real-machine e2e wiring): an explicit `--provider fake`
|
|
1869
|
-
// is the operator's declaration that this pane is a fake-provider
|
|
1870
|
-
// stub for tests / fixtures. The normal pane-command attribution
|
|
1871
|
-
// path can't recognize `/bin/cat` (or any bare shell process) as a
|
|
1872
|
-
// provider, so honoring the explicit request here is the only way
|
|
1873
|
-
// real-machine E6 acceptance can spin up a leader without shipping
|
|
1874
|
-
// a real Codex/Claude/Copilot binary. This is a targeted escape
|
|
1875
|
-
// hatch — `Provider::Fake` is not selectable from the user-facing
|
|
1876
|
-
// provider list, only wired in test/fixture flows.
|
|
1877
|
-
let claim_target = match workspace_claim_target_from_pane_info(workspace, target) {
|
|
1878
|
-
Some(target) => Some(target),
|
|
1879
|
-
None if grant_allows_attach_target(workspace, state, target, requested_provider, endpoint)
|
|
1880
|
-
|| recorded_owner_live_facts_match(
|
|
1881
|
-
workspace,
|
|
1882
|
-
state,
|
|
1883
|
-
target,
|
|
1884
|
-
requested_provider,
|
|
1885
|
-
endpoint,
|
|
1886
|
-
) =>
|
|
1887
|
-
{
|
|
1888
|
-
Some(
|
|
1889
|
-
claim_target_from_observed_pane(target)
|
|
1890
|
-
.unwrap_or_else(|| claim_target_with_provider(target, requested_provider)),
|
|
1891
|
-
)
|
|
1892
|
-
}
|
|
1893
|
-
None if matches!(requested_provider, Provider::Fake) => None,
|
|
1894
|
-
None => return Err("leader_pane_validation_failed"),
|
|
1895
|
-
};
|
|
1896
|
-
let Some(claim_target) = claim_target else {
|
|
1897
|
-
if matches!(requested_provider, Provider::Fake) {
|
|
1898
|
-
return Ok(());
|
|
1899
|
-
}
|
|
1900
|
-
return Err("leader_pane_validation_failed");
|
|
1901
|
-
};
|
|
1902
|
-
let recorded_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"])
|
|
1903
|
-
.or_else(|| get_path_str(state, &["leader_receiver", "leader_session_uuid"]));
|
|
1904
|
-
if let (Some(recorded), Some(target_uuid)) = (
|
|
1905
|
-
recorded_uuid.as_deref(),
|
|
1906
|
-
claim_target
|
|
1907
|
-
.leader_session_uuid
|
|
1908
|
-
.as_ref()
|
|
1909
|
-
.map(|u| u.as_str()),
|
|
1910
|
-
) {
|
|
1911
|
-
if recorded != target_uuid {
|
|
1912
|
-
return Err("leader_session_uuid_mismatch");
|
|
1913
|
-
}
|
|
1914
|
-
}
|
|
1915
|
-
Ok(())
|
|
1916
|
-
}
|
|
1917
|
-
|
|
1918
|
-
fn receiver_for_attach_target(
|
|
1919
|
-
workspace: &Path,
|
|
1920
|
-
state: &Value,
|
|
1921
|
-
target: &PaneInfo,
|
|
1922
|
-
provider: Provider,
|
|
1923
|
-
discovery: Discovery,
|
|
1924
|
-
) -> Result<LeaderReceiver, LeaderError> {
|
|
1925
|
-
let identity = leader_identity_context(workspace, None, Some(state))?;
|
|
1926
|
-
let epoch = current_owner_epoch(state);
|
|
1927
|
-
let pane = NonEmptyPaneId::try_from_pane(&target.pane_id)?;
|
|
1928
|
-
Ok(make_receiver(
|
|
1929
|
-
provider,
|
|
1930
|
-
&pane,
|
|
1931
|
-
&identity.leader_session_uuid,
|
|
1932
|
-
epoch,
|
|
1933
|
-
discovery,
|
|
1934
|
-
Some(target.clone()),
|
|
1935
|
-
))
|
|
1936
|
-
}
|
|
1937
|
-
|
|
1938
|
-
fn selected_grant_receiver<'a>(state: &'a Value) -> Option<&'a Value> {
|
|
1939
|
-
let key = crate::state::projection::team_state_key(state);
|
|
1940
|
-
crate::lifecycle::launch::selected_team_leader_receiver(state, &key)
|
|
1941
|
-
}
|
|
1942
|
-
|
|
1943
|
-
pub(crate) fn grant_allows_attach_target(
|
|
1944
|
-
workspace: &Path,
|
|
1945
|
-
state: &Value,
|
|
1946
|
-
target: &PaneInfo,
|
|
1947
|
-
requested_provider: Provider,
|
|
1948
|
-
endpoint: Option<&str>,
|
|
1949
|
-
) -> bool {
|
|
1950
|
-
let Some(receiver) = selected_grant_receiver(state) else {
|
|
1951
|
-
return false;
|
|
1952
|
-
};
|
|
1953
|
-
let authority = receiver
|
|
1954
|
-
.get("scope_authority")
|
|
1955
|
-
.and_then(Value::as_str)
|
|
1956
|
-
.unwrap_or("");
|
|
1957
|
-
if authority != "explicit_claim" && authority != "fresh_caller" {
|
|
1958
|
-
return false;
|
|
1959
|
-
}
|
|
1960
|
-
let Some(authorized) = receiver
|
|
1961
|
-
.get("authorized_team_workspace")
|
|
1962
|
-
.and_then(Value::as_str)
|
|
1963
|
-
.filter(|raw| !raw.is_empty())
|
|
1964
|
-
else {
|
|
1965
|
-
return false;
|
|
1966
|
-
};
|
|
1967
|
-
if !crate::state::owner_gate::workspace_paths_match(Path::new(authorized), workspace) {
|
|
1968
|
-
return false;
|
|
1969
|
-
}
|
|
1970
|
-
let Some(recorded_nonce) = receiver
|
|
1971
|
-
.get("binding_nonce")
|
|
1972
|
-
.and_then(Value::as_str)
|
|
1973
|
-
.filter(|raw| !raw.is_empty())
|
|
1974
|
-
else {
|
|
1975
|
-
return false;
|
|
1976
|
-
};
|
|
1977
|
-
let live_nonce = target
|
|
1978
|
-
.leader_env
|
|
1979
|
-
.get(crate::tmux_backend::PANE_BINDING_NONCE_METADATA_KEY)
|
|
1980
|
-
.map(String::as_str);
|
|
1981
|
-
let pane_ok = receiver.get("pane_id").and_then(Value::as_str) == Some(target.pane_id.as_str());
|
|
1982
|
-
let socket_ok = match (receiver.get("tmux_socket").and_then(Value::as_str), endpoint) {
|
|
1983
|
-
(Some(recorded), Some(actual)) => recorded == actual,
|
|
1984
|
-
(None, _) | (_, None) => false,
|
|
1985
|
-
};
|
|
1986
|
-
let provider_ok = receiver
|
|
1987
|
-
.get("provider")
|
|
1988
|
-
.and_then(Value::as_str)
|
|
1989
|
-
.and_then(crate::provider::wire::parse_provider)
|
|
1990
|
-
== Some(requested_provider);
|
|
1991
|
-
let owner_epoch = get_path_u64(state, &["team_owner", "owner_epoch"])
|
|
1992
|
-
.or_else(|| get_path_u64(state, &["leader_receiver", "owner_epoch"]));
|
|
1993
|
-
let receiver_epoch = receiver.get("owner_epoch").and_then(Value::as_u64);
|
|
1994
|
-
let epoch_ok = match (owner_epoch, receiver_epoch) {
|
|
1995
|
-
(Some(owner), Some(recv)) => owner == recv && owner > 0,
|
|
1996
|
-
_ => false,
|
|
1997
|
-
};
|
|
1998
|
-
pane_ok && socket_ok && live_nonce == Some(recorded_nonce) && provider_ok && epoch_ok
|
|
1999
|
-
}
|
|
2000
|
-
|
|
2001
|
-
fn recorded_owner_live_facts_match(
|
|
2002
|
-
workspace: &Path,
|
|
2003
|
-
state: &Value,
|
|
2004
|
-
target: &PaneInfo,
|
|
2005
|
-
requested_provider: Provider,
|
|
2006
|
-
endpoint: Option<&str>,
|
|
2007
|
-
) -> bool {
|
|
2008
|
-
let current_path = target.current_path.as_deref();
|
|
2009
|
-
let Some(current_path) = current_path else {
|
|
2010
|
-
return false;
|
|
2011
|
-
};
|
|
2012
|
-
if !crate::state::owner_gate::workspace_paths_match(current_path, workspace) {
|
|
2013
|
-
return false;
|
|
2014
|
-
}
|
|
2015
|
-
let receiver = selected_grant_receiver(state);
|
|
2016
|
-
let recorded_pane = get_path_str(state, &["team_owner", "pane_id"])
|
|
2017
|
-
.or_else(|| get_path_str(state, &["leader_receiver", "pane_id"]))
|
|
2018
|
-
.or_else(|| {
|
|
2019
|
-
receiver
|
|
2020
|
-
.and_then(|value| value.get("pane_id"))
|
|
2021
|
-
.and_then(Value::as_str)
|
|
2022
|
-
.map(str::to_string)
|
|
2023
|
-
});
|
|
2024
|
-
if recorded_pane.as_deref() != Some(target.pane_id.as_str()) {
|
|
2025
|
-
return false;
|
|
2026
|
-
}
|
|
2027
|
-
let recorded_socket = get_path_str(state, &["leader_receiver", "tmux_socket"]).or_else(|| {
|
|
2028
|
-
receiver
|
|
2029
|
-
.and_then(|value| value.get("tmux_socket"))
|
|
2030
|
-
.and_then(Value::as_str)
|
|
2031
|
-
.map(str::to_string)
|
|
2032
|
-
});
|
|
2033
|
-
match (recorded_socket.as_deref(), endpoint) {
|
|
2034
|
-
(Some(recorded), Some(actual)) if recorded == actual => {}
|
|
2035
|
-
_ => return false,
|
|
2036
|
-
}
|
|
2037
|
-
let recorded_provider = get_path_str(state, &["team_owner", "provider"])
|
|
2038
|
-
.or_else(|| get_path_str(state, &["leader_receiver", "provider"]))
|
|
2039
|
-
.or_else(|| {
|
|
2040
|
-
receiver
|
|
2041
|
-
.and_then(|value| value.get("provider"))
|
|
2042
|
-
.and_then(Value::as_str)
|
|
2043
|
-
.map(str::to_string)
|
|
2044
|
-
})
|
|
2045
|
-
.and_then(|raw| parse_provider(&raw));
|
|
2046
|
-
if recorded_provider != Some(requested_provider) {
|
|
2047
|
-
return false;
|
|
2048
|
-
}
|
|
2049
|
-
let recorded_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"])
|
|
2050
|
-
.or_else(|| get_path_str(state, &["leader_receiver", "leader_session_uuid"]));
|
|
2051
|
-
let Some(recorded_uuid) = recorded_uuid.filter(|raw| !raw.is_empty()) else {
|
|
2052
|
-
return false;
|
|
2053
|
-
};
|
|
2054
|
-
match target_leader_session_uuid(target) {
|
|
2055
|
-
Some(live_uuid) => live_uuid.as_str() == recorded_uuid,
|
|
2056
|
-
None => true,
|
|
2057
|
-
}
|
|
2058
|
-
}
|
|
2059
|
-
|
|
2060
|
-
fn copy_verified_grant_from_state(
|
|
2061
|
-
workspace: &Path,
|
|
2062
|
-
state: &Value,
|
|
2063
|
-
target: &PaneInfo,
|
|
2064
|
-
provider: Provider,
|
|
2065
|
-
endpoint: Option<&str>,
|
|
2066
|
-
receiver: &mut LeaderReceiver,
|
|
2067
|
-
) {
|
|
2068
|
-
if !grant_allows_attach_target(workspace, state, target, provider, endpoint) {
|
|
2069
|
-
return;
|
|
2070
|
-
}
|
|
2071
|
-
let Some(existing) = selected_grant_receiver(state) else {
|
|
2072
|
-
return;
|
|
2073
|
-
};
|
|
2074
|
-
let authority = existing
|
|
2075
|
-
.get("scope_authority")
|
|
2076
|
-
.and_then(Value::as_str)
|
|
2077
|
-
.filter(|raw| *raw == "explicit_claim" || *raw == "fresh_caller");
|
|
2078
|
-
let nonce = existing
|
|
2079
|
-
.get("binding_nonce")
|
|
2080
|
-
.and_then(Value::as_str)
|
|
2081
|
-
.filter(|raw| !raw.is_empty());
|
|
2082
|
-
let authorized = existing
|
|
2083
|
-
.get("authorized_team_workspace")
|
|
2084
|
-
.and_then(Value::as_str)
|
|
2085
|
-
.filter(|raw| !raw.is_empty());
|
|
2086
|
-
if let (Some(authority), Some(nonce), Some(authorized)) = (authority, nonce, authorized) {
|
|
2087
|
-
receiver.scope_authority = Some(authority.to_string());
|
|
2088
|
-
receiver.binding_nonce = Some(nonce.to_string());
|
|
2089
|
-
receiver.authorized_team_workspace = Some(PathBuf::from(authorized));
|
|
2090
|
-
}
|
|
2091
|
-
}
|
|
2092
|
-
|
|
2093
|
-
fn pane_info_value(target: &PaneInfo) -> Value {
|
|
2094
|
-
let leader_env = target
|
|
2095
|
-
.leader_env
|
|
2096
|
-
.iter()
|
|
2097
|
-
.map(|(key, value)| (key.clone(), Value::String(value.clone())))
|
|
2098
|
-
.collect::<serde_json::Map<_, _>>();
|
|
2099
|
-
json!({
|
|
2100
|
-
"pane_id": target.pane_id.as_str(),
|
|
2101
|
-
"session_name": target.session.as_str(),
|
|
2102
|
-
"window_index": target.window_index.map(|v| v.to_string()),
|
|
2103
|
-
"window_name": target.window_name.as_ref().map(|v| v.as_str().to_string()),
|
|
2104
|
-
"pane_index": target.pane_index.map(|v| v.to_string()),
|
|
2105
|
-
"pane_tty": target.tty.as_ref(),
|
|
2106
|
-
"pane_current_command": target.current_command.as_ref(),
|
|
2107
|
-
"pane_current_path": target.current_path.as_ref().map(|p| p.to_string_lossy().to_string()),
|
|
2108
|
-
"active": target.active,
|
|
2109
|
-
"leader_env": leader_env,
|
|
2110
|
-
})
|
|
2111
|
-
}
|
|
2112
|
-
|
|
2113
|
-
/// `AnyPaneLiveness` — minimal "does this tmux pane id exist in the server's current
|
|
2114
|
-
/// target list?" probe. Unlike [`TargetScanLiveness`], it does NOT additionally require
|
|
2115
|
-
/// the pane to be running a leader-shaped command (claude/codex/fake) or to match the
|
|
2116
|
-
/// workspace cwd. Explicit claim/takeover only require a positive caller pane source
|
|
2117
|
-
/// that is live; ownership replacement stays inside the normal lease write path.
|
|
2118
|
-
struct AnyPaneLiveness {
|
|
2119
|
-
live_panes: std::collections::BTreeSet<String>,
|
|
2120
|
-
}
|
|
2121
|
-
|
|
2122
|
-
impl AnyPaneLiveness {
|
|
2123
|
-
fn from_claim_targets(targets: &[ClaimLeaderTargetCandidate]) -> Self {
|
|
2124
|
-
Self {
|
|
2125
|
-
live_panes: targets
|
|
2126
|
-
.iter()
|
|
2127
|
-
.map(|target| target.info.pane_id.as_str().to_string())
|
|
2128
|
-
.collect(),
|
|
2129
|
-
}
|
|
2130
|
-
}
|
|
2131
|
-
}
|
|
2132
|
-
|
|
2133
|
-
impl crate::state::owner_gate::PaneLivenessProbe for AnyPaneLiveness {
|
|
2134
|
-
fn liveness(&self, pane_id: &str) -> PaneLiveness {
|
|
2135
|
-
if self.live_panes.contains(pane_id) {
|
|
2136
|
-
PaneLiveness::Live
|
|
2137
|
-
} else {
|
|
2138
|
-
PaneLiveness::Dead
|
|
2139
|
-
}
|
|
2140
|
-
}
|
|
2141
|
-
}
|
|
2142
|
-
|
|
2143
|
-
struct TargetScanLiveness {
|
|
2144
|
-
live_panes: std::collections::BTreeSet<String>,
|
|
2145
|
-
}
|
|
2146
|
-
|
|
2147
|
-
impl TargetScanLiveness {
|
|
2148
|
-
fn new(state: &Value, targets: &[PaneInfo], workspace: &Path) -> Self {
|
|
2149
|
-
let owner_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"]);
|
|
2150
|
-
let live_panes = targets
|
|
2151
|
-
.iter()
|
|
2152
|
-
.filter_map(|target| {
|
|
2153
|
-
let claim_target = workspace_claim_target_from_pane_info(workspace, target)?;
|
|
2154
|
-
if let Some(owner_uuid) = owner_uuid.as_deref() {
|
|
2155
|
-
let target_uuid = claim_target.leader_session_uuid.as_ref()?.as_str();
|
|
2156
|
-
if target_uuid != owner_uuid {
|
|
2157
|
-
return None;
|
|
2158
|
-
}
|
|
2159
|
-
}
|
|
2160
|
-
Some(target.pane_id.as_str().to_string())
|
|
2161
|
-
})
|
|
2162
|
-
.collect();
|
|
2163
|
-
Self { live_panes }
|
|
2164
|
-
}
|
|
2165
|
-
}
|
|
2166
|
-
|
|
2167
|
-
impl crate::state::owner_gate::PaneLivenessProbe for TargetScanLiveness {
|
|
2168
|
-
fn liveness(&self, pane_id: &str) -> PaneLiveness {
|
|
2169
|
-
if self.live_panes.contains(pane_id) {
|
|
2170
|
-
PaneLiveness::Live
|
|
2171
|
-
} else {
|
|
2172
|
-
PaneLiveness::Dead
|
|
2173
|
-
}
|
|
2174
|
-
}
|
|
2175
|
-
}
|
|
2176
|
-
|
|
2177
|
-
fn locked_runtime_state(
|
|
2178
|
-
workspace: &Path,
|
|
2179
|
-
scoped_team: Option<&str>,
|
|
2180
|
-
) -> Result<Option<Value>, LeaderError> {
|
|
2181
|
-
let path = crate::state::persist::runtime_state_path(workspace);
|
|
2182
|
-
if !path.exists() {
|
|
2183
|
-
return Ok(None);
|
|
2184
|
-
}
|
|
2185
|
-
let raw = crate::state::persist::load_runtime_state_without_migrations(workspace)?;
|
|
2186
|
-
let state = if let Some(team) = scoped_team {
|
|
2187
|
-
crate::state::projection::project_top_level_view(&raw, team)
|
|
2188
|
-
} else {
|
|
2189
|
-
raw
|
|
2190
|
-
};
|
|
2191
|
-
Ok(Some(state))
|
|
2192
|
-
}
|
|
2193
|
-
|
|
2194
|
-
fn emit_lease_refusal(
|
|
2195
|
-
event_log: &crate::event_log::EventLog,
|
|
2196
|
-
reason: LeaseReason,
|
|
2197
|
-
state: &Value,
|
|
2198
|
-
old_pane: Option<&str>,
|
|
2199
|
-
new_pane: Option<&str>,
|
|
2200
|
-
team_id: &TeamKey,
|
|
2201
|
-
) -> Result<(), LeaderError> {
|
|
2202
|
-
let event = if reason.is_rebind_required() {
|
|
2203
|
-
super::LeaderEvent::ReceiverRebindRequired
|
|
2204
|
-
} else {
|
|
2205
|
-
super::LeaderEvent::ReceiverClaimRefused
|
|
2206
|
-
};
|
|
2207
|
-
let uuid_prefix = get_path_str(state, &["team_owner", "leader_session_uuid"])
|
|
2208
|
-
.unwrap_or_default()
|
|
2209
|
-
.chars()
|
|
2210
|
-
.take(8)
|
|
2211
|
-
.collect::<String>();
|
|
2212
|
-
let host = get_path_str(state, &["team_owner", "machine_fingerprint"])
|
|
2213
|
-
.unwrap_or_else(|| "local-machine".to_string());
|
|
2214
|
-
let os_user = std::env::var("USER")
|
|
2215
|
-
.or_else(|_| std::env::var("USERNAME"))
|
|
2216
|
-
.unwrap_or_default();
|
|
2217
|
-
event_log.write(
|
|
2218
|
-
event.name(),
|
|
2219
|
-
json!({
|
|
2220
|
-
"reason": serde_json::to_value(reason)?,
|
|
2221
|
-
"old_pane_id": old_pane,
|
|
2222
|
-
"new_pane_id": new_pane,
|
|
2223
|
-
"uuid_prefix": uuid_prefix,
|
|
2224
|
-
"team_id": team_id.as_str(),
|
|
2225
|
-
"host": host,
|
|
2226
|
-
"os_user": os_user,
|
|
2227
|
-
}),
|
|
2228
|
-
)?;
|
|
2229
|
-
Ok(())
|
|
2230
|
-
}
|
|
2231
|
-
|
|
2232
|
-
fn authorize_fresh_caller_receiver(
|
|
2233
|
-
workspace: &Path,
|
|
2234
|
-
receiver: &mut LeaderReceiver,
|
|
2235
|
-
pane: &NonEmptyPaneId,
|
|
2236
|
-
source: LeaseSource,
|
|
2237
|
-
require_current: bool,
|
|
2238
|
-
caller_target: Option<&PaneInfo>,
|
|
2239
|
-
nonce_writer: Option<&dyn Fn(&str, &PaneId, &str) -> Result<String, LeaderError>>,
|
|
2240
|
-
) -> Result<(), LeaderError> {
|
|
2241
|
-
if !matches!(source, LeaseSource::QuickStart) || !require_current {
|
|
2242
|
-
return Ok(());
|
|
2243
|
-
}
|
|
2244
|
-
let Some(target) = caller_target else {
|
|
2245
|
-
return Ok(());
|
|
2246
|
-
};
|
|
2247
|
-
if target.pane_id.as_str() != pane.as_pane_id().as_str() {
|
|
2248
|
-
return Err(LeaderError::Validation(
|
|
2249
|
-
"fresh caller pane observation does not match the bound pane".to_string(),
|
|
2250
|
-
));
|
|
2251
|
-
}
|
|
2252
|
-
let Some(current_path) = target.current_path.as_deref() else {
|
|
2253
|
-
return Ok(());
|
|
2254
|
-
};
|
|
2255
|
-
if crate::messaging::leader_channel::path_is_in_workspace(current_path, workspace) {
|
|
2256
|
-
return Ok(());
|
|
2257
|
-
}
|
|
2258
|
-
let Some(endpoint) = receiver
|
|
2259
|
-
.tmux_socket
|
|
2260
|
-
.as_deref()
|
|
2261
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
2262
|
-
else {
|
|
2263
|
-
return Err(LeaderError::Validation(
|
|
2264
|
-
"fresh cross-workspace caller requires a tmux endpoint".to_string(),
|
|
2265
|
-
));
|
|
2266
|
-
};
|
|
2267
|
-
if !Path::new(endpoint).is_absolute() {
|
|
2268
|
-
return Err(LeaderError::Validation(
|
|
2269
|
-
"fresh cross-workspace caller requires an absolute tmux endpoint".to_string(),
|
|
2270
|
-
));
|
|
2271
|
-
}
|
|
2272
|
-
let pane_id = pane.as_pane_id();
|
|
2273
|
-
let live_nonce = if let Some(live_nonce) = target
|
|
2274
|
-
.leader_env
|
|
2275
|
-
.get(crate::tmux_backend::PANE_BINDING_NONCE_METADATA_KEY)
|
|
2276
|
-
.filter(|nonce| !nonce.is_empty())
|
|
2277
|
-
.cloned()
|
|
2278
|
-
{
|
|
2279
|
-
live_nonce
|
|
2280
|
-
} else {
|
|
2281
|
-
let nonce = pane_binding_nonce_for_claim(workspace, endpoint, pane_id, None);
|
|
2282
|
-
if let Some(writer) = nonce_writer {
|
|
2283
|
-
writer(endpoint, pane_id, &nonce)?
|
|
2284
|
-
} else {
|
|
2285
|
-
tmux_backend_for_endpoint(endpoint)
|
|
2286
|
-
.set_pane_binding_nonce_if_unset(pane_id, &nonce)
|
|
2287
|
-
.map_err(|error| LeaderError::Tmux(error.to_string()))?
|
|
2288
|
-
}
|
|
2289
|
-
};
|
|
2290
|
-
receiver.scope_authority = Some(
|
|
2291
|
-
crate::messaging::leader_channel::FRESH_CALLER_SCOPE_AUTHORITY.to_string(),
|
|
2292
|
-
);
|
|
2293
|
-
receiver.authorized_team_workspace = Some(canonical_workspace(workspace));
|
|
2294
|
-
receiver.binding_nonce = Some(live_nonce);
|
|
2295
|
-
Ok(())
|
|
2296
|
-
}
|
|
2297
|
-
|
|
2298
|
-
fn make_receiver(
|
|
2299
|
-
provider: Provider,
|
|
2300
|
-
pane: &NonEmptyPaneId,
|
|
2301
|
-
uuid: &crate::model::ids::LeaderSessionUuid,
|
|
2302
|
-
epoch: OwnerEpoch,
|
|
2303
|
-
discovery: Discovery,
|
|
2304
|
-
target: Option<PaneInfo>,
|
|
2305
|
-
) -> LeaderReceiver {
|
|
2306
|
-
LeaderReceiver {
|
|
2307
|
-
mode: ReceiverMode::DirectTmux,
|
|
2308
|
-
status: ReceiverStatus::Attached,
|
|
2309
|
-
provider,
|
|
2310
|
-
pane_id: pane.as_pane_id().clone(),
|
|
2311
|
-
session_name: target.as_ref().map(|t| t.session.clone()),
|
|
2312
|
-
window_index: target
|
|
2313
|
-
.as_ref()
|
|
2314
|
-
.and_then(|t| t.window_index.map(|v| v.to_string())),
|
|
2315
|
-
window_name: target.as_ref().and_then(|t| t.window_name.clone()),
|
|
2316
|
-
pane_index: target
|
|
2317
|
-
.as_ref()
|
|
2318
|
-
.and_then(|t| t.pane_index.map(|v| v.to_string())),
|
|
2319
|
-
pane_tty: target.as_ref().and_then(|t| t.tty.clone()),
|
|
2320
|
-
pane_current_command: target.as_ref().and_then(|t| t.current_command.clone()),
|
|
2321
|
-
tmux_socket: crate::tmux_backend::socket_name_from_tmux_env(),
|
|
2322
|
-
scope_authority: None,
|
|
2323
|
-
authorized_team_workspace: None,
|
|
2324
|
-
binding_nonce: None,
|
|
2325
|
-
fingerprint: target.as_ref().map(receiver_fingerprint),
|
|
2326
|
-
leader_session_uuid: Some(uuid.clone()),
|
|
2327
|
-
owner_epoch: Some(epoch),
|
|
2328
|
-
attached_at: Some(now_ts()),
|
|
2329
|
-
discovery: Some(discovery),
|
|
2330
|
-
requested_provider: None,
|
|
2331
|
-
warning: None,
|
|
2332
|
-
}
|
|
2333
|
-
}
|
|
2334
|
-
|
|
2335
|
-
fn receiver_fingerprint(target: &PaneInfo) -> String {
|
|
2336
|
-
format!(
|
|
2337
|
-
"{}|{}|{}|{}",
|
|
2338
|
-
target.session.as_str(),
|
|
2339
|
-
target
|
|
2340
|
-
.window_index
|
|
2341
|
-
.map_or_else(String::new, |v| v.to_string()),
|
|
2342
|
-
target
|
|
2343
|
-
.pane_index
|
|
2344
|
-
.map_or_else(String::new, |v| v.to_string()),
|
|
2345
|
-
target.tty.as_deref().unwrap_or("")
|
|
2346
|
-
)
|
|
2347
|
-
}
|
|
2348
|
-
|
|
2349
|
-
fn refresh_already_bound_receiver_observation(
|
|
2350
|
-
state: &mut Value,
|
|
2351
|
-
observed: &PaneInfo,
|
|
2352
|
-
observed_endpoint: Option<&str>,
|
|
2353
|
-
team_key: Option<&str>,
|
|
2354
|
-
claim_target: Option<&LeaderClaimTarget>,
|
|
2355
|
-
) -> bool {
|
|
2356
|
-
let attached_at = now_ts();
|
|
2357
|
-
let mut refreshed = state
|
|
2358
|
-
.get_mut("leader_receiver")
|
|
2359
|
-
.and_then(Value::as_object_mut)
|
|
2360
|
-
.is_some_and(|receiver| {
|
|
2361
|
-
refresh_receiver_observation(
|
|
2362
|
-
receiver,
|
|
2363
|
-
observed,
|
|
2364
|
-
observed_endpoint,
|
|
2365
|
-
attached_at.as_str(),
|
|
2366
|
-
claim_target,
|
|
2367
|
-
)
|
|
2368
|
-
});
|
|
2369
|
-
if let Some(team_key) = team_key {
|
|
2370
|
-
refreshed |= state
|
|
2371
|
-
.get_mut("teams")
|
|
2372
|
-
.and_then(|teams| teams.get_mut(team_key))
|
|
2373
|
-
.and_then(|entry| entry.get_mut("leader_receiver"))
|
|
2374
|
-
.and_then(Value::as_object_mut)
|
|
2375
|
-
.is_some_and(|receiver| {
|
|
2376
|
-
refresh_receiver_observation(
|
|
2377
|
-
receiver,
|
|
2378
|
-
observed,
|
|
2379
|
-
observed_endpoint,
|
|
2380
|
-
attached_at.as_str(),
|
|
2381
|
-
claim_target,
|
|
2382
|
-
)
|
|
2383
|
-
});
|
|
2384
|
-
}
|
|
2385
|
-
refreshed
|
|
2386
|
-
}
|
|
2387
|
-
|
|
2388
|
-
fn refresh_receiver_observation(
|
|
2389
|
-
receiver: &mut serde_json::Map<String, Value>,
|
|
2390
|
-
observed: &PaneInfo,
|
|
2391
|
-
observed_endpoint: Option<&str>,
|
|
2392
|
-
attached_at: &str,
|
|
2393
|
-
claim_target: Option<&LeaderClaimTarget>,
|
|
2394
|
-
) -> bool {
|
|
2395
|
-
let before = Value::Object(receiver.clone());
|
|
2396
|
-
receiver.insert(
|
|
2397
|
-
"session_name".to_string(),
|
|
2398
|
-
Value::String(observed.session.as_str().to_string()),
|
|
2399
|
-
);
|
|
2400
|
-
receiver.insert(
|
|
2401
|
-
"window_index".to_string(),
|
|
2402
|
-
observed
|
|
2403
|
-
.window_index
|
|
2404
|
-
.map(|value| Value::String(value.to_string()))
|
|
2405
|
-
.unwrap_or(Value::Null),
|
|
2406
|
-
);
|
|
2407
|
-
receiver.insert(
|
|
2408
|
-
"window_name".to_string(),
|
|
2409
|
-
observed
|
|
2410
|
-
.window_name
|
|
2411
|
-
.as_ref()
|
|
2412
|
-
.map(|value| Value::String(value.as_str().to_string()))
|
|
2413
|
-
.unwrap_or(Value::Null),
|
|
2414
|
-
);
|
|
2415
|
-
receiver.insert(
|
|
2416
|
-
"pane_index".to_string(),
|
|
2417
|
-
observed
|
|
2418
|
-
.pane_index
|
|
2419
|
-
.map(|value| Value::String(value.to_string()))
|
|
2420
|
-
.unwrap_or(Value::Null),
|
|
2421
|
-
);
|
|
2422
|
-
receiver.insert(
|
|
2423
|
-
"pane_tty".to_string(),
|
|
2424
|
-
observed
|
|
2425
|
-
.tty
|
|
2426
|
-
.as_ref()
|
|
2427
|
-
.map(|value| Value::String(value.clone()))
|
|
2428
|
-
.unwrap_or(Value::Null),
|
|
2429
|
-
);
|
|
2430
|
-
receiver.insert(
|
|
2431
|
-
"pane_current_command".to_string(),
|
|
2432
|
-
observed
|
|
2433
|
-
.current_command
|
|
2434
|
-
.as_ref()
|
|
2435
|
-
.map(|value| Value::String(value.clone()))
|
|
2436
|
-
.unwrap_or(Value::Null),
|
|
2437
|
-
);
|
|
2438
|
-
receiver.insert(
|
|
2439
|
-
"fingerprint".to_string(),
|
|
2440
|
-
Value::String(receiver_fingerprint(observed)),
|
|
2441
|
-
);
|
|
2442
|
-
if let Some(endpoint) = observed_endpoint.filter(|value| !value.is_empty()) {
|
|
2443
|
-
receiver.insert(
|
|
2444
|
-
"tmux_socket".to_string(),
|
|
2445
|
-
Value::String(endpoint.to_string()),
|
|
2446
|
-
);
|
|
2447
|
-
}
|
|
2448
|
-
if let Some(target) = claim_target.filter(|target| target.scope_authority.is_some()) {
|
|
2449
|
-
receiver.insert(
|
|
2450
|
-
"scope_authority".to_string(),
|
|
2451
|
-
Value::String(target.scope_authority.clone().unwrap_or_default()),
|
|
2452
|
-
);
|
|
2453
|
-
receiver.insert(
|
|
2454
|
-
"authorized_team_workspace".to_string(),
|
|
2455
|
-
Value::String(
|
|
2456
|
-
target
|
|
2457
|
-
.authorized_team_workspace
|
|
2458
|
-
.as_deref()
|
|
2459
|
-
.map(|path| path.to_string_lossy().into_owned())
|
|
2460
|
-
.unwrap_or_default(),
|
|
2461
|
-
),
|
|
2462
|
-
);
|
|
2463
|
-
receiver.insert(
|
|
2464
|
-
"binding_nonce".to_string(),
|
|
2465
|
-
Value::String(target.binding_nonce.clone().unwrap_or_default()),
|
|
2466
|
-
);
|
|
2467
|
-
}
|
|
2468
|
-
receiver.insert(
|
|
2469
|
-
"attached_at".to_string(),
|
|
2470
|
-
Value::String(attached_at.to_string()),
|
|
2471
|
-
);
|
|
2472
|
-
Value::Object(receiver.clone()) != before
|
|
2473
|
-
}
|
|
2474
|
-
|
|
2475
|
-
fn make_owner(
|
|
2476
|
-
provider: Provider,
|
|
2477
|
-
pane: &NonEmptyPaneId,
|
|
2478
|
-
identity: &super::LeaderIdentity,
|
|
2479
|
-
epoch: OwnerEpoch,
|
|
2480
|
-
) -> TeamOwner {
|
|
2481
|
-
TeamOwner {
|
|
2482
|
-
pane_id: pane.as_pane_id().clone(),
|
|
2483
|
-
provider,
|
|
2484
|
-
machine_fingerprint: identity.machine_fingerprint.clone(),
|
|
2485
|
-
leader_session_uuid: Some(identity.leader_session_uuid.clone()),
|
|
2486
|
-
owner_epoch: epoch,
|
|
2487
|
-
claimed_at: now_ts(),
|
|
2488
|
-
claimed_via: ClaimedVia::ClaimLeader,
|
|
2489
|
-
os_user: Some(
|
|
2490
|
-
std::env::var("USER")
|
|
2491
|
-
.or_else(|_| std::env::var("USERNAME"))
|
|
2492
|
-
.unwrap_or_default(),
|
|
2493
|
-
),
|
|
2494
|
-
}
|
|
2495
|
-
}
|
|
2496
|
-
|
|
2497
|
-
/// Stage 3a (identity-boundary unified plan, architect direction 2026-06-23)
|
|
2498
|
-
/// + Stage 3 owner persist fix (architect direction 2026-06-24): route the
|
|
2499
|
-
/// in-memory binding write through the `state::ownership` API. The
|
|
2500
|
-
/// canonical team_key is derived from `active_team_key` first (the explicit
|
|
2501
|
-
/// scope set by `project_top_level_view` when an explicit team was passed
|
|
2502
|
-
/// to claim-leader) and only falls back to `team_state_key(state)` for the
|
|
2503
|
-
/// legacy unscoped flow. Without the `active_team_key` preference, an
|
|
2504
|
-
/// explicit `claim-leader --team alpha` whose projected state was emptied
|
|
2505
|
-
/// of team_dir/session_name would derive "current" and write the owner to
|
|
2506
|
-
/// `teams.current`, while `save_claim_team_scoped_state` expected
|
|
2507
|
-
/// `teams.alpha` — the S3-OWNER-001 persistence loss shape.
|
|
2508
|
-
fn write_binding_to_state(
|
|
2509
|
-
state: &mut Value,
|
|
2510
|
-
receiver: &LeaderReceiver,
|
|
2511
|
-
owner: &TeamOwner,
|
|
2512
|
-
) -> Result<(), LeaderError> {
|
|
2513
|
-
if !state.is_object() {
|
|
2514
|
-
*state = json!({});
|
|
2515
|
-
}
|
|
2516
|
-
if !state.is_object() {
|
|
2517
|
-
return Err(LeaderError::Validation(
|
|
2518
|
-
"state root is not an object".to_string(),
|
|
2519
|
-
));
|
|
2520
|
-
}
|
|
2521
|
-
let team_key = canonical_owner_write_key(state);
|
|
2522
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
2523
|
-
.with_leader_receiver(tmux_receiver_value(receiver)?)
|
|
2524
|
-
.with_team_owner(serde_json::to_value(owner)?)
|
|
2525
|
-
.with_owner_epoch(owner.owner_epoch.0);
|
|
2526
|
-
crate::state::ownership::write_owner(state, &team_key, record);
|
|
2527
|
-
Ok(())
|
|
2528
|
-
}
|
|
2529
|
-
|
|
2530
|
-
fn write_receiver_to_state(
|
|
2531
|
-
state: &mut Value,
|
|
2532
|
-
receiver: &LeaderReceiver,
|
|
2533
|
-
) -> Result<(), LeaderError> {
|
|
2534
|
-
if !state.is_object() {
|
|
2535
|
-
*state = json!({});
|
|
2536
|
-
}
|
|
2537
|
-
if !state.is_object() {
|
|
2538
|
-
return Err(LeaderError::Validation(
|
|
2539
|
-
"state root is not an object".to_string(),
|
|
2540
|
-
));
|
|
2541
|
-
}
|
|
2542
|
-
let team_key = canonical_owner_write_key(state);
|
|
2543
|
-
let record = crate::state::ownership::OwnershipWrite::new()
|
|
2544
|
-
.with_leader_receiver(tmux_receiver_value(receiver)?);
|
|
2545
|
-
crate::state::ownership::write_owner(state, &team_key, record);
|
|
2546
|
-
Ok(())
|
|
2547
|
-
}
|
|
2548
|
-
|
|
2549
|
-
fn tmux_receiver_value(receiver: &LeaderReceiver) -> Result<Value, LeaderError> {
|
|
2550
|
-
Ok(write_leader_receiver_transport(
|
|
2551
|
-
serde_json::to_value(receiver)?,
|
|
2552
|
-
"direct_tmux",
|
|
2553
|
-
))
|
|
2554
|
-
}
|
|
2555
|
-
|
|
2556
|
-
fn app_server_receiver_value(
|
|
2557
|
-
binding: &crate::codex_app_server::AppServerBinding,
|
|
2558
|
-
epoch: OwnerEpoch,
|
|
2559
|
-
) -> Value {
|
|
2560
|
-
write_leader_receiver_transport(
|
|
2561
|
-
json!({
|
|
2562
|
-
"status": "attached",
|
|
2563
|
-
"provider": "codex",
|
|
2564
|
-
"owner_epoch": epoch.0,
|
|
2565
|
-
"app_server": {
|
|
2566
|
-
"socket": binding.socket,
|
|
2567
|
-
"thread_id": binding.thread_id,
|
|
2568
|
-
"session_id": binding.session_id,
|
|
2569
|
-
"cwd": binding.cwd,
|
|
2570
|
-
"cli_version": binding.cli_version,
|
|
2571
|
-
"bound_at": binding.bound_at,
|
|
2572
|
-
"source": "app-server"
|
|
2573
|
-
}
|
|
2574
|
-
}),
|
|
2575
|
-
"codex_app_server",
|
|
2576
|
-
)
|
|
2577
|
-
}
|
|
2578
|
-
|
|
2579
|
-
fn app_server_owner_value(epoch: OwnerEpoch) -> Value {
|
|
2580
|
-
json!({
|
|
2581
|
-
"provider": "codex",
|
|
2582
|
-
"transport_kind": "codex_app_server",
|
|
2583
|
-
"owner_epoch": epoch.0,
|
|
2584
|
-
"claimed_at": now_ts(),
|
|
2585
|
-
"claimed_via": "attach-app-server-leader",
|
|
2586
|
-
"os_user": std::env::var("USER")
|
|
2587
|
-
.or_else(|_| std::env::var("USERNAME"))
|
|
2588
|
-
.unwrap_or_default(),
|
|
2589
|
-
})
|
|
2590
|
-
}
|
|
2591
|
-
|
|
2592
|
-
fn write_leader_receiver_transport(mut receiver: Value, transport_kind: &str) -> Value {
|
|
2593
|
-
if let Some(obj) = receiver.as_object_mut() {
|
|
2594
|
-
obj.insert("mode".to_string(), json!(transport_kind));
|
|
2595
|
-
match transport_kind {
|
|
2596
|
-
"codex_app_server" => {
|
|
2597
|
-
obj.insert("transport_kind".to_string(), json!(transport_kind));
|
|
2598
|
-
for legacy in [
|
|
2599
|
-
"pane_id",
|
|
2600
|
-
"tmux_socket",
|
|
2601
|
-
"session_name",
|
|
2602
|
-
"window_index",
|
|
2603
|
-
"window_name",
|
|
2604
|
-
"pane_index",
|
|
2605
|
-
"pane_tty",
|
|
2606
|
-
"pane_current_command",
|
|
2607
|
-
"fingerprint",
|
|
2608
|
-
"leader_session_uuid",
|
|
2609
|
-
"attached_at",
|
|
2610
|
-
"discovery",
|
|
2611
|
-
"requested_provider",
|
|
2612
|
-
"warning",
|
|
2613
|
-
] {
|
|
2614
|
-
obj.remove(legacy);
|
|
2615
|
-
}
|
|
2616
|
-
}
|
|
2617
|
-
"direct_tmux" => {
|
|
2618
|
-
obj.remove("app_server");
|
|
2619
|
-
obj.remove("transport_kind");
|
|
2620
|
-
}
|
|
2621
|
-
_ => {}
|
|
2622
|
-
}
|
|
2623
|
-
}
|
|
2624
|
-
receiver
|
|
2625
|
-
}
|
|
2626
|
-
|
|
2627
|
-
/// Stage 3 owner persist fix (architect direction 2026-06-24): determine
|
|
2628
|
-
/// the canonical team_key for an in-memory ownership write. When the state
|
|
2629
|
-
/// carries an `active_team_key` (set by `project_top_level_view` whenever
|
|
2630
|
-
/// an explicit team was scoped into the claim path), trust it — that's the
|
|
2631
|
-
/// requested team that `save_claim_team_scoped_state` will read back. Only
|
|
2632
|
-
/// fall back to `team_state_key(state)` for the legacy unscoped flow where
|
|
2633
|
-
/// the writer must derive team identity from session/dir/spec_path fields.
|
|
2634
|
-
fn canonical_owner_write_key(state: &Value) -> String {
|
|
2635
|
-
if let Some(active) = state
|
|
2636
|
-
.get("active_team_key")
|
|
2637
|
-
.and_then(Value::as_str)
|
|
2638
|
-
.filter(|key| !key.is_empty())
|
|
2639
|
-
{
|
|
2640
|
-
return active.to_string();
|
|
2641
|
-
}
|
|
2642
|
-
crate::state::projection::team_state_key(state)
|
|
2643
|
-
}
|
|
2644
|
-
|
|
2645
|
-
fn state_receiver(state: &Value) -> Option<LeaderReceiver> {
|
|
2646
|
-
state
|
|
2647
|
-
.get("leader_receiver")
|
|
2648
|
-
.cloned()
|
|
2649
|
-
.and_then(|v| serde_json::from_value(v).ok())
|
|
2650
|
-
}
|
|
2651
|
-
|
|
2652
|
-
fn state_owner(state: &Value) -> Option<TeamOwner> {
|
|
2653
|
-
state
|
|
2654
|
-
.get("team_owner")
|
|
2655
|
-
.cloned()
|
|
2656
|
-
.and_then(|v| serde_json::from_value(v).ok())
|
|
2657
|
-
}
|
|
2658
|
-
|
|
2659
|
-
/// `_write_lease_dual_state` — Foundation-0 F0-2: the historical dual
|
|
2660
|
-
/// write to the legacy per-session snapshot has been retired
|
|
2661
|
-
/// (`.team/artifacts/foundation-0-slice-design.md` §§4-5). This helper
|
|
2662
|
-
/// now persists ONLY the canonical root state; retaining the public
|
|
2663
|
-
/// name for 0.5.x call-site stability. The B0 legacy snapshot is
|
|
2664
|
-
/// diagnostic-only via `lifecycle::save_team_runtime_snapshot`.
|
|
2665
|
-
pub(crate) fn write_lease_dual_state_with_expected(
|
|
2666
|
-
workspace: &Path,
|
|
2667
|
-
state: &Value,
|
|
2668
|
-
expected_owner: &Value,
|
|
2669
|
-
expected_receiver: &Value,
|
|
2670
|
-
) -> Result<(), LeaderError> {
|
|
2671
|
-
let team_key = canonical_owner_write_key(state);
|
|
2672
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2673
|
-
crate::state::repository::StateWriteIntent::ClaimLeaderFreshCaller {
|
|
2674
|
-
team_key: team_key.as_str(),
|
|
2675
|
-
expected_owner,
|
|
2676
|
-
expected_receiver,
|
|
2677
|
-
},
|
|
2678
|
-
state,
|
|
2679
|
-
)?;
|
|
2680
|
-
Ok(())
|
|
2681
|
-
}
|
|
2682
|
-
|
|
2683
|
-
pub fn write_lease_dual_state(workspace: &Path, state: &Value) -> Result<(), LeaderError> {
|
|
2684
|
-
// 0.5.42 S1b (s1b-writer-cluster-locate.md §4.4): terminal root
|
|
2685
|
-
// save routes through `StateRepository` with the `ClaimLeader`
|
|
2686
|
-
// intent. Dispatch is byte-identical to the old
|
|
2687
|
-
// `save_runtime_state` helper (see
|
|
2688
|
-
// `state/repository.rs:ClaimLeader => helper_write_root`), so the
|
|
2689
|
-
// full lease writer cluster (attach_leader / attach_app_server /
|
|
2690
|
-
// attach_leader_to_state / claim_lease_no_incident_with_target /
|
|
2691
|
-
// rediscover) keeps its persist/merge/CAS/readback semantics.
|
|
2692
|
-
// Public signature/error mapping preserved for caller stability.
|
|
2693
|
-
// Repository does NOT compute owner_epoch, re-run convergence,
|
|
2694
|
-
// emit ownership events, or acquire a second lease lock — the
|
|
2695
|
-
// caller still owns all of that.
|
|
2696
|
-
let team_key = canonical_owner_write_key(state);
|
|
2697
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2698
|
-
crate::state::repository::StateWriteIntent::ClaimLeader {
|
|
2699
|
-
team_key: team_key.as_str(),
|
|
2700
|
-
},
|
|
2701
|
-
state,
|
|
2702
|
-
)?;
|
|
2703
|
-
Ok(())
|
|
2704
|
-
}
|
|
2705
|
-
|
|
2706
|
-
fn write_claim_state(
|
|
2707
|
-
workspace: &Path,
|
|
2708
|
-
state: &Value,
|
|
2709
|
-
scoped_team: Option<&str>,
|
|
2710
|
-
team_key: Option<&str>,
|
|
2711
|
-
) -> Result<(), LeaderError> {
|
|
2712
|
-
if let Some(team) = scoped_team {
|
|
2713
|
-
save_claim_team_scoped_state(workspace, state, team)?;
|
|
2714
|
-
Ok(())
|
|
2715
|
-
} else {
|
|
2716
|
-
let _ = team_key;
|
|
2717
|
-
write_lease_dual_state(workspace, state)
|
|
2718
|
-
}
|
|
2719
|
-
}
|
|
2720
|
-
|
|
2721
|
-
fn save_claim_team_scoped_state(
|
|
2722
|
-
workspace: &Path,
|
|
2723
|
-
state: &Value,
|
|
2724
|
-
target_key: &str,
|
|
2725
|
-
) -> Result<(), LeaderError> {
|
|
2726
|
-
let existing = crate::state::persist::load_runtime_state_without_migrations(workspace)?;
|
|
2727
|
-
let mut teams = existing
|
|
2728
|
-
.get("teams")
|
|
2729
|
-
.and_then(Value::as_object)
|
|
2730
|
-
.cloned()
|
|
2731
|
-
.unwrap_or_default();
|
|
2732
|
-
let had_existing_teams = !teams.is_empty();
|
|
2733
|
-
if existing
|
|
2734
|
-
.get("session_name")
|
|
2735
|
-
.and_then(Value::as_str)
|
|
2736
|
-
.is_some_and(|session| !session.is_empty())
|
|
2737
|
-
{
|
|
2738
|
-
let existing_key = crate::state::projection::team_state_key(&existing);
|
|
2739
|
-
teams
|
|
2740
|
-
.entry(existing_key)
|
|
2741
|
-
.or_insert_with(|| crate::state::projection::compact_team_state(&existing));
|
|
2742
|
-
}
|
|
2743
|
-
// Stage 3 owner persist fix (architect direction 2026-06-24,
|
|
2744
|
-
// .team/artifacts/stage3-owner-persist-fix.md): after Stage 3d removed
|
|
2745
|
-
// top-level dual-write, the canonical ownership record lives ONLY at
|
|
2746
|
-
// `state.teams[target_key].{team_owner, leader_receiver, owner_epoch}`.
|
|
2747
|
-
// `compact_team_state(state)` strips the `teams` key entirely — that
|
|
2748
|
-
// dropped the just-written nested ownership record on disk. Use the
|
|
2749
|
-
// preserving helper so the canonical fields survive the compaction.
|
|
2750
|
-
teams.insert(
|
|
2751
|
-
target_key.to_string(),
|
|
2752
|
-
compact_team_state_preserving_claim_fields(state, target_key),
|
|
2753
|
-
);
|
|
2754
|
-
let existing_primary_key = existing
|
|
2755
|
-
.get("session_name")
|
|
2756
|
-
.and_then(Value::as_str)
|
|
2757
|
-
.filter(|session| !session.is_empty())
|
|
2758
|
-
.map(|_| crate::state::projection::team_state_key(&existing));
|
|
2759
|
-
let existing_active_key = existing.get("active_team_key").and_then(Value::as_str);
|
|
2760
|
-
let updates_active_team = existing_active_key == Some(target_key);
|
|
2761
|
-
let writes_endpoint_convergence = state
|
|
2762
|
-
.get("topology_convergence")
|
|
2763
|
-
.and_then(|marker| marker.get("status"))
|
|
2764
|
-
.and_then(Value::as_str)
|
|
2765
|
-
== Some("converged");
|
|
2766
|
-
let mut merged = if existing_primary_key
|
|
2767
|
-
.as_deref()
|
|
2768
|
-
.is_none_or(|key| key == target_key)
|
|
2769
|
-
|| updates_active_team
|
|
2770
|
-
|| writes_endpoint_convergence
|
|
2771
|
-
{
|
|
2772
|
-
value_object(state)
|
|
2773
|
-
} else {
|
|
2774
|
-
value_object(&existing)
|
|
2775
|
-
};
|
|
2776
|
-
// Stage 3 top-level cleanup (architect direction 2026-06-24,
|
|
2777
|
-
// .team/artifacts/stage3-toplevel-cleanup-fix.md + stage3-save-strip-fix.md):
|
|
2778
|
-
// the legacy top-level owner copy loop is gone; the canonical-aware
|
|
2779
|
-
// strip is now performed at the persistence boundary
|
|
2780
|
-
// (`state::persist::save_runtime_state_with_merge_exceptions`), which
|
|
2781
|
-
// every save_runtime_state* path funnels through. This per-call-site
|
|
2782
|
-
// strip call has been removed — the save output handles cleanup
|
|
2783
|
-
// uniformly for claim / restart / shutdown / start-agent / stop-agent
|
|
2784
|
-
// / coordinator tick / promote sibling. `had_existing_teams` /
|
|
2785
|
-
// primary/active key computations are retained as dead writes only
|
|
2786
|
-
// via _ binding — they no longer gate any owner promote.
|
|
2787
|
-
let _ = (
|
|
2788
|
-
had_existing_teams,
|
|
2789
|
-
existing_primary_key,
|
|
2790
|
-
existing_active_key,
|
|
2791
|
-
writes_endpoint_convergence,
|
|
2792
|
-
);
|
|
2793
|
-
merged.insert("teams".to_string(), Value::Object(teams));
|
|
2794
|
-
// 0.5.42 S1b (s1b-writer-cluster-locate.md §4.4): only the
|
|
2795
|
-
// terminal save routes through `StateRepository`; the entire
|
|
2796
|
-
// load/merge/compact block above stays in place — repository is a
|
|
2797
|
-
// writer facade, not a projection assembler.
|
|
2798
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
2799
|
-
crate::state::repository::StateWriteIntent::ClaimLeader {
|
|
2800
|
-
team_key: target_key,
|
|
2801
|
-
},
|
|
2802
|
-
&Value::Object(merged),
|
|
2803
|
-
)?;
|
|
2804
|
-
Ok(())
|
|
2805
|
-
}
|
|
2806
|
-
|
|
2807
|
-
fn value_object(value: &Value) -> serde_json::Map<String, Value> {
|
|
2808
|
-
value.as_object().cloned().unwrap_or_default()
|
|
2809
|
-
}
|
|
2810
|
-
|
|
2811
|
-
/// Stage 3 owner persist fix (architect direction 2026-06-24,
|
|
2812
|
-
/// .team/artifacts/stage3-owner-persist-fix.md): build the per-team
|
|
2813
|
-
/// snapshot used by `save_claim_team_scoped_state` so the canonical
|
|
2814
|
-
/// `teams.<target_key>.{team_owner, leader_receiver, owner_epoch}` record
|
|
2815
|
-
/// survives the `compact_team_state` strip. Without this helper the
|
|
2816
|
-
/// claim-leader save loses the just-written nested ownership record (the
|
|
2817
|
-
/// S3-OWNER-001 evidence shape: `persisted_owner_locations=[]`).
|
|
2818
|
-
///
|
|
2819
|
-
/// Behaviour:
|
|
2820
|
-
/// - Start from the existing `compact_team_state(state)` (strips `teams`).
|
|
2821
|
-
/// - Look up `state.teams[target_key].{team_owner, leader_receiver, owner_epoch}`
|
|
2822
|
-
/// and copy each present field into the compacted entry.
|
|
2823
|
-
/// - Top-level owner fields stay UNTOUCHED — Stage 3d's canonical-only
|
|
2824
|
-
/// shape is preserved on disk.
|
|
2825
|
-
fn compact_team_state_preserving_claim_fields(state: &Value, target_key: &str) -> Value {
|
|
2826
|
-
let mut entry = crate::state::projection::compact_team_state(state);
|
|
2827
|
-
let Some(entry_obj) = entry.as_object_mut() else {
|
|
2828
|
-
return entry;
|
|
2829
|
-
};
|
|
2830
|
-
let Some(owner_obj) = state
|
|
2831
|
-
.get("teams")
|
|
2832
|
-
.and_then(Value::as_object)
|
|
2833
|
-
.and_then(|teams| teams.get(target_key))
|
|
2834
|
-
.and_then(Value::as_object)
|
|
2835
|
-
else {
|
|
2836
|
-
return entry;
|
|
2837
|
-
};
|
|
2838
|
-
for key in [
|
|
2839
|
-
"team_owner",
|
|
2840
|
-
"leader_receiver",
|
|
2841
|
-
"owner_epoch",
|
|
2842
|
-
"tmux_endpoint",
|
|
2843
|
-
"tmux_socket",
|
|
2844
|
-
"tmux_socket_source",
|
|
2845
|
-
"topology_convergence",
|
|
2846
|
-
] {
|
|
2847
|
-
if let Some(value) = owner_obj.get(key) {
|
|
2848
|
-
entry_obj.insert(key.to_string(), value.clone());
|
|
2849
|
-
}
|
|
2850
|
-
}
|
|
2851
|
-
entry
|
|
2852
|
-
}
|
|
2853
|
-
|
|
2854
|
-
/// Foundation-0 F0-2: reader for legacy per-session snapshot vs
|
|
2855
|
-
/// canonical root state. Diagnostic-only after the dual-write retirement
|
|
2856
|
-
/// (`.team/artifacts/foundation-0-slice-design.md` §§4-5); product
|
|
2857
|
-
/// authority code never consults this — it exists so `status`/`diagnose`
|
|
2858
|
-
/// can surface `legacy_snapshot_stale` when the on-disk sidecar has
|
|
2859
|
-
/// drifted. Every touch of the legacy path constants below is marked
|
|
2860
|
-
/// `B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ` so the RED3 grep guard admits
|
|
2861
|
-
/// them as documented exceptions.
|
|
2862
|
-
type BP = Path;
|
|
2863
|
-
type BJ = Value;
|
|
2864
|
-
type BF = PathBuf;
|
|
2865
|
-
type B0 = Result<Option<Value>, LeaderError>;
|
|
2866
|
-
|
|
2867
|
-
pub fn detect_dual_state_divergence(w: &BP, s: &BJ) -> B0 /* B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ */ {
|
|
2868
|
-
let workspace = w;
|
|
2869
|
-
let state = s;
|
|
2870
|
-
let Some(session_name) = state.get("session_name").and_then(Value::as_str) else {
|
|
2871
|
-
return Ok(None);
|
|
2872
|
-
};
|
|
2873
|
-
let snap_path = readable_team_snapshot_path(workspace, session_name); // B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ: diagnostic legacy-shape path lookup.
|
|
2874
|
-
if !snap_path.exists() {
|
|
2875
|
-
return Ok(None);
|
|
2876
|
-
}
|
|
2877
|
-
let snap: Value = serde_json::from_str(&std::fs::read_to_string(snap_path)?)?;
|
|
2878
|
-
let workspace_owner_pane = get_path_str(state, &["team_owner", "pane_id"]);
|
|
2879
|
-
let team_owner_pane = get_path_str(&snap, &["team_owner", "pane_id"]);
|
|
2880
|
-
let workspace_owner_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"]);
|
|
2881
|
-
let team_owner_uuid = get_path_str(&snap, &["team_owner", "leader_session_uuid"]);
|
|
2882
|
-
let workspace_receiver_pane = get_path_str(state, &["leader_receiver", "pane_id"]);
|
|
2883
|
-
let team_receiver_pane = get_path_str(&snap, &["leader_receiver", "pane_id"]);
|
|
2884
|
-
let workspace_epoch = get_path_u64(state, &["team_owner", "owner_epoch"])
|
|
2885
|
-
.or_else(|| get_path_u64(state, &["leader_receiver", "owner_epoch"]));
|
|
2886
|
-
let team_epoch = get_path_u64(&snap, &["team_owner", "owner_epoch"])
|
|
2887
|
-
.or_else(|| get_path_u64(&snap, &["leader_receiver", "owner_epoch"]));
|
|
2888
|
-
let workspace_agent_bindings = agent_binding_summary(state);
|
|
2889
|
-
let team_agent_bindings = agent_binding_summary(&snap);
|
|
2890
|
-
let diverged = workspace_owner_pane != team_owner_pane
|
|
2891
|
-
|| workspace_owner_uuid != team_owner_uuid
|
|
2892
|
-
|| workspace_receiver_pane != team_receiver_pane
|
|
2893
|
-
|| workspace_epoch != team_epoch
|
|
2894
|
-
|| workspace_agent_bindings != team_agent_bindings;
|
|
2895
|
-
if !diverged {
|
|
2896
|
-
return Ok(None);
|
|
2897
|
-
}
|
|
2898
|
-
Ok(Some(json!({
|
|
2899
|
-
"workspace_owner_pane": workspace_owner_pane,
|
|
2900
|
-
"team_owner_pane": team_owner_pane,
|
|
2901
|
-
"workspace_owner_uuid": workspace_owner_uuid,
|
|
2902
|
-
"team_owner_uuid": team_owner_uuid,
|
|
2903
|
-
"workspace_receiver_pane": workspace_receiver_pane,
|
|
2904
|
-
"team_receiver_pane": team_receiver_pane,
|
|
2905
|
-
"workspace_owner_epoch": workspace_epoch,
|
|
2906
|
-
"team_owner_epoch": team_epoch,
|
|
2907
|
-
"workspace_agent_bindings": workspace_agent_bindings,
|
|
2908
|
-
"team_agent_bindings": team_agent_bindings,
|
|
2909
|
-
"_legacy_snapshot_stale": true,
|
|
2910
|
-
})))
|
|
2911
|
-
}
|
|
2912
|
-
|
|
2913
|
-
fn agent_binding_summary(state: &Value) -> Value {
|
|
2914
|
-
let mut out = serde_json::Map::new();
|
|
2915
|
-
let Some(agents) = state.get("agents").and_then(Value::as_object) else {
|
|
2916
|
-
return Value::Object(out);
|
|
2917
|
-
};
|
|
2918
|
-
for (agent_id, agent) in agents {
|
|
2919
|
-
let mut binding = serde_json::Map::new();
|
|
2920
|
-
for key in [
|
|
2921
|
-
"pane_id",
|
|
2922
|
-
"pane_pid",
|
|
2923
|
-
"tmux_endpoint",
|
|
2924
|
-
"tmux_socket",
|
|
2925
|
-
"window",
|
|
2926
|
-
"window_name",
|
|
2927
|
-
] {
|
|
2928
|
-
if let Some(value) = agent.get(key) {
|
|
2929
|
-
binding.insert(key.to_string(), value.clone());
|
|
2930
|
-
}
|
|
2931
|
-
}
|
|
2932
|
-
if !binding.is_empty() {
|
|
2933
|
-
out.insert(agent_id.clone(), Value::Object(binding));
|
|
2934
|
-
}
|
|
2935
|
-
}
|
|
2936
|
-
Value::Object(out)
|
|
2937
|
-
}
|
|
2938
|
-
|
|
2939
|
-
fn readable_team_snapshot_path(w: &BP, n: &str) -> BF /* B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ */ {
|
|
2940
|
-
let workspace = w;
|
|
2941
|
-
let session_name = n;
|
|
2942
|
-
let safe_path = crate::lifecycle::helpers::team_snapshot_path(workspace, session_name); // B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ: reuses helpers safe legacy path.
|
|
2943
|
-
if safe_path.exists() {
|
|
2944
|
-
return safe_path;
|
|
2945
|
-
}
|
|
2946
|
-
// Raw legacy `runtime/teams` fallback for pre-safe-shape snapshots. // B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ
|
|
2947
|
-
let legacy_dir = "teams"; // B0_DIAGNOSTIC_LEGACY_SNAPSHOT_READ
|
|
2948
|
-
crate::model::paths::runtime_dir(workspace)
|
|
2949
|
-
.join(legacy_dir)
|
|
2950
|
-
.join(session_name)
|
|
2951
|
-
.join("state.json")
|
|
2952
|
-
}
|
|
2953
|
-
|
|
2954
|
-
#[cfg(test)]
|
|
2955
|
-
mod tests {
|
|
2956
|
-
use super::*;
|
|
2957
|
-
|
|
2958
|
-
fn observed_pane() -> PaneInfo {
|
|
2959
|
-
PaneInfo {
|
|
2960
|
-
pane_id: PaneId::new("%7"),
|
|
2961
|
-
session: crate::transport::SessionName::new("new-session"),
|
|
2962
|
-
window_index: Some(3),
|
|
2963
|
-
window_name: Some(crate::transport::WindowName::new("new-window")),
|
|
2964
|
-
pane_index: Some(1),
|
|
2965
|
-
tty: Some("/dev/ttys007".to_string()),
|
|
2966
|
-
current_command: Some("codex".to_string()),
|
|
2967
|
-
current_path: None,
|
|
2968
|
-
active: true,
|
|
2969
|
-
pane_pid: Some(700),
|
|
2970
|
-
leader_env: std::collections::BTreeMap::new(),
|
|
2971
|
-
}
|
|
2972
|
-
}
|
|
2973
|
-
|
|
2974
|
-
#[test]
|
|
2975
|
-
fn attribute_command_provider_recognizes_copilot() {
|
|
2976
|
-
assert_eq!(
|
|
2977
|
-
super::super::attribute_command_provider("copilot --allow-all-tools"),
|
|
2978
|
-
Some(Provider::Copilot)
|
|
2979
|
-
);
|
|
2980
|
-
assert_eq!(
|
|
2981
|
-
super::super::attribute_command_provider("/usr/local/bin/copilot"),
|
|
2982
|
-
Some(Provider::Copilot)
|
|
2983
|
-
);
|
|
2984
|
-
}
|
|
2985
|
-
|
|
2986
|
-
#[test]
|
|
2987
|
-
fn already_bound_refresh_updates_observations_without_reclaiming() {
|
|
2988
|
-
let mut state = json!({
|
|
2989
|
-
"leader_receiver": {
|
|
2990
|
-
"status": "attached",
|
|
2991
|
-
"pane_id": "%7",
|
|
2992
|
-
"owner_epoch": 10,
|
|
2993
|
-
"owner_agent_id": "leader",
|
|
2994
|
-
"session_name": "old-session",
|
|
2995
|
-
"pane_tty": "/dev/old",
|
|
2996
|
-
"attached_at": "2026-01-01T00:00:00Z"
|
|
2997
|
-
},
|
|
2998
|
-
"teams": {"team-a": {"leader_receiver": {
|
|
2999
|
-
"status": "attached",
|
|
3000
|
-
"pane_id": "%7",
|
|
3001
|
-
"owner_epoch": 10,
|
|
3002
|
-
"owner_agent_id": "leader",
|
|
3003
|
-
"session_name": "old-session",
|
|
3004
|
-
"pane_tty": "/dev/old",
|
|
3005
|
-
"attached_at": "2026-01-01T00:00:00Z"
|
|
3006
|
-
}}}
|
|
3007
|
-
});
|
|
3008
|
-
|
|
3009
|
-
assert!(refresh_already_bound_receiver_observation(
|
|
3010
|
-
&mut state,
|
|
3011
|
-
&observed_pane(),
|
|
3012
|
-
Some("/tmp/team-agent-live.sock"),
|
|
3013
|
-
Some("team-a"),
|
|
3014
|
-
None,
|
|
3015
|
-
));
|
|
3016
|
-
let receiver = &state["leader_receiver"];
|
|
3017
|
-
assert_eq!(receiver["owner_epoch"], json!(10));
|
|
3018
|
-
assert_eq!(receiver["owner_agent_id"], json!("leader"));
|
|
3019
|
-
assert_eq!(receiver["session_name"], json!("new-session"));
|
|
3020
|
-
assert_eq!(receiver["window_name"], json!("new-window"));
|
|
3021
|
-
assert_eq!(receiver["pane_tty"], json!("/dev/ttys007"));
|
|
3022
|
-
assert_eq!(receiver["tmux_socket"], json!("/tmp/team-agent-live.sock"));
|
|
3023
|
-
assert_ne!(receiver["attached_at"], json!("2026-01-01T00:00:00Z"));
|
|
3024
|
-
assert_eq!(
|
|
3025
|
-
state["teams"]["team-a"]["leader_receiver"]["session_name"],
|
|
3026
|
-
json!("new-session")
|
|
3027
|
-
);
|
|
3028
|
-
assert_eq!(
|
|
3029
|
-
state["teams"]["team-a"]["leader_receiver"]["owner_epoch"],
|
|
3030
|
-
json!(10)
|
|
3031
|
-
);
|
|
3032
|
-
}
|
|
3033
|
-
|
|
3034
|
-
#[test]
|
|
3035
|
-
fn already_bound_explicit_claim_persists_cross_workspace_authority() {
|
|
3036
|
-
let mut state = json!({
|
|
3037
|
-
"leader_receiver": {"status": "attached", "pane_id": "%7"},
|
|
3038
|
-
"teams": {"team-a": {"leader_receiver": {
|
|
3039
|
-
"status": "attached", "pane_id": "%7"
|
|
3040
|
-
}}}
|
|
3041
|
-
});
|
|
3042
|
-
let target = LeaderClaimTarget {
|
|
3043
|
-
provider: Provider::Codex,
|
|
3044
|
-
leader_session_uuid: None,
|
|
3045
|
-
team_id: Some("team-a".to_string()),
|
|
3046
|
-
pane_info: Some(observed_pane()),
|
|
3047
|
-
endpoint: Some("/tmp/team-agent-live.sock".to_string()),
|
|
3048
|
-
scope_authority: Some("explicit_claim".to_string()),
|
|
3049
|
-
authorized_team_workspace: Some(PathBuf::from("/tmp/workspace-a")),
|
|
3050
|
-
binding_nonce: Some("nonce-7".to_string()),
|
|
3051
|
-
};
|
|
3052
|
-
|
|
3053
|
-
assert!(refresh_already_bound_receiver_observation(
|
|
3054
|
-
&mut state,
|
|
3055
|
-
&observed_pane(),
|
|
3056
|
-
Some("/tmp/team-agent-live.sock"),
|
|
3057
|
-
Some("team-a"),
|
|
3058
|
-
Some(&target),
|
|
3059
|
-
));
|
|
3060
|
-
for receiver in [
|
|
3061
|
-
&state["leader_receiver"],
|
|
3062
|
-
&state["teams"]["team-a"]["leader_receiver"],
|
|
3063
|
-
] {
|
|
3064
|
-
assert_eq!(receiver["scope_authority"], json!("explicit_claim"));
|
|
3065
|
-
assert_eq!(
|
|
3066
|
-
receiver["authorized_team_workspace"],
|
|
3067
|
-
json!("/tmp/workspace-a")
|
|
3068
|
-
);
|
|
3069
|
-
assert_eq!(receiver["binding_nonce"], json!("nonce-7"));
|
|
3070
|
-
}
|
|
3071
|
-
}
|
|
3072
|
-
|
|
3073
|
-
#[test]
|
|
3074
|
-
fn pane_binding_nonce_rotates_per_explicit_claim() {
|
|
3075
|
-
let workspace = Path::new("/tmp/workspace-a");
|
|
3076
|
-
let endpoint = "/tmp/team-agent-live.sock";
|
|
3077
|
-
let pane = PaneId::new("%7");
|
|
3078
|
-
let first = next_pane_binding_nonce(workspace, endpoint, &pane);
|
|
3079
|
-
let second = next_pane_binding_nonce(workspace, endpoint, &pane);
|
|
3080
|
-
assert_eq!(first.len(), 32);
|
|
3081
|
-
assert!(first.chars().all(|ch| ch.is_ascii_hexdigit()));
|
|
3082
|
-
assert_ne!(first, second);
|
|
3083
|
-
}
|
|
3084
|
-
|
|
3085
|
-
#[test]
|
|
3086
|
-
fn explicit_claim_generates_nonce_only_when_live_nonce_is_missing() {
|
|
3087
|
-
let workspace = Path::new("/tmp/workspace-a");
|
|
3088
|
-
let endpoint = "/tmp/team-agent-live.sock";
|
|
3089
|
-
let pane = PaneId::new("%7");
|
|
3090
|
-
let generated = pane_binding_nonce_for_claim(workspace, endpoint, &pane, None);
|
|
3091
|
-
assert_eq!(generated.len(), 32);
|
|
3092
|
-
assert!(generated.chars().all(|ch| ch.is_ascii_hexdigit()));
|
|
3093
|
-
assert_eq!(
|
|
3094
|
-
pane_binding_nonce_for_claim(workspace, endpoint, &pane, Some("live-nonce")),
|
|
3095
|
-
"live-nonce"
|
|
3096
|
-
);
|
|
3097
|
-
}
|
|
3098
|
-
|
|
3099
|
-
#[test]
|
|
3100
|
-
fn claim_authority_preserves_recorded_absolute_observation() {
|
|
3101
|
-
let workspace = Path::new("/tmp/workspace-a");
|
|
3102
|
-
let absolute = "/tmp/tmux-501/ta-live";
|
|
3103
|
-
let state = json!({
|
|
3104
|
-
"leader_receiver": {"pane_id": "%9", "tmux_socket": absolute}
|
|
3105
|
-
});
|
|
3106
|
-
let pane = observed_pane();
|
|
3107
|
-
let targets = vec![
|
|
3108
|
-
ClaimLeaderTargetCandidate {
|
|
3109
|
-
info: pane.clone(),
|
|
3110
|
-
endpoint: Some(crate::tmux_backend::socket_name_for_workspace(workspace)),
|
|
3111
|
-
},
|
|
3112
|
-
ClaimLeaderTargetCandidate {
|
|
3113
|
-
info: pane,
|
|
3114
|
-
endpoint: Some(absolute.to_string()),
|
|
3115
|
-
},
|
|
3116
|
-
];
|
|
3117
|
-
|
|
3118
|
-
assert_eq!(
|
|
3119
|
-
authoritative_observed_endpoint(workspace, &state, &targets, &targets[0]).as_deref(),
|
|
3120
|
-
Some(absolute)
|
|
3121
|
-
);
|
|
3122
|
-
}
|
|
3123
|
-
|
|
3124
|
-
fn grant_state(endpoint: &str, nonce: &str, epoch: u64, provider: &str) -> Value {
|
|
3125
|
-
json!({
|
|
3126
|
-
"team_owner": {
|
|
3127
|
-
"pane_id": "%1",
|
|
3128
|
-
"provider": provider,
|
|
3129
|
-
"owner_epoch": epoch
|
|
3130
|
-
},
|
|
3131
|
-
"leader_receiver": {
|
|
3132
|
-
"status": "attached",
|
|
3133
|
-
"pane_id": "%1",
|
|
3134
|
-
"provider": provider,
|
|
3135
|
-
"owner_epoch": epoch,
|
|
3136
|
-
"tmux_socket": endpoint,
|
|
3137
|
-
"scope_authority": "fresh_caller",
|
|
3138
|
-
"authorized_team_workspace": "/tmp/grant-ws",
|
|
3139
|
-
"binding_nonce": nonce
|
|
3140
|
-
}
|
|
3141
|
-
})
|
|
3142
|
-
}
|
|
3143
|
-
|
|
3144
|
-
fn grant_pane(nonce: &str) -> PaneInfo {
|
|
3145
|
-
let mut leader_env = std::collections::BTreeMap::new();
|
|
3146
|
-
leader_env.insert(
|
|
3147
|
-
crate::tmux_backend::PANE_BINDING_NONCE_METADATA_KEY.to_string(),
|
|
3148
|
-
nonce.to_string(),
|
|
3149
|
-
);
|
|
3150
|
-
PaneInfo {
|
|
3151
|
-
pane_id: PaneId::new("%1"),
|
|
3152
|
-
session: crate::transport::SessionName::new("s"),
|
|
3153
|
-
window_index: None,
|
|
3154
|
-
window_name: None,
|
|
3155
|
-
pane_index: None,
|
|
3156
|
-
tty: None,
|
|
3157
|
-
current_command: Some("codex".to_string()),
|
|
3158
|
-
current_path: Some(PathBuf::from("/tmp/grant-ws")),
|
|
3159
|
-
active: true,
|
|
3160
|
-
pane_pid: None,
|
|
3161
|
-
leader_env,
|
|
3162
|
-
}
|
|
3163
|
-
}
|
|
3164
|
-
|
|
3165
|
-
#[test]
|
|
3166
|
-
#[serial_test::serial(env)]
|
|
3167
|
-
fn grant_reuses_verified_endpoint() {
|
|
3168
|
-
let workspace = PathBuf::from("/tmp/grant-ws");
|
|
3169
|
-
let state = grant_state("/tmp/leader.sock", "n1", 2, "codex");
|
|
3170
|
-
let pane = grant_pane("n1");
|
|
3171
|
-
let transport = crate::transport::test_support::OfflineTransport::default()
|
|
3172
|
-
.with_tmux_endpoint("/tmp/leader.sock")
|
|
3173
|
-
.with_targets(vec![pane.clone()]);
|
|
3174
|
-
crate::transport_factory::with_leader_endpoint_transport(
|
|
3175
|
-
"/tmp/leader.sock",
|
|
3176
|
-
transport,
|
|
3177
|
-
|| {
|
|
3178
|
-
let targets = attach_leader_targets(&workspace, &state);
|
|
3179
|
-
let target = targets
|
|
3180
|
-
.iter()
|
|
3181
|
-
.find(|target| {
|
|
3182
|
-
target.info.pane_id.as_str() == "%1"
|
|
3183
|
-
&& target.endpoint.as_deref() == Some("/tmp/leader.sock")
|
|
3184
|
-
})
|
|
3185
|
-
.expect("attach_leader_targets must discover the recorded endpoint");
|
|
3186
|
-
assert!(grant_allows_attach_target(
|
|
3187
|
-
&workspace,
|
|
3188
|
-
&state,
|
|
3189
|
-
&target.info,
|
|
3190
|
-
crate::provider::Provider::Codex,
|
|
3191
|
-
target.endpoint.as_deref(),
|
|
3192
|
-
));
|
|
3193
|
-
let mut receiver = crate::leader::LeaderReceiver {
|
|
3194
|
-
mode: crate::leader::ReceiverMode::DirectTmux,
|
|
3195
|
-
status: crate::leader::ReceiverStatus::Attached,
|
|
3196
|
-
provider: crate::provider::Provider::Codex,
|
|
3197
|
-
pane_id: PaneId::new("%1"),
|
|
3198
|
-
session_name: None,
|
|
3199
|
-
window_index: None,
|
|
3200
|
-
window_name: None,
|
|
3201
|
-
pane_index: None,
|
|
3202
|
-
pane_tty: None,
|
|
3203
|
-
pane_current_command: None,
|
|
3204
|
-
tmux_socket: None,
|
|
3205
|
-
scope_authority: None,
|
|
3206
|
-
authorized_team_workspace: None,
|
|
3207
|
-
binding_nonce: None,
|
|
3208
|
-
fingerprint: None,
|
|
3209
|
-
leader_session_uuid: None,
|
|
3210
|
-
owner_epoch: None,
|
|
3211
|
-
attached_at: None,
|
|
3212
|
-
discovery: None,
|
|
3213
|
-
requested_provider: None,
|
|
3214
|
-
warning: None,
|
|
3215
|
-
};
|
|
3216
|
-
copy_verified_grant_from_state(
|
|
3217
|
-
&workspace,
|
|
3218
|
-
&state,
|
|
3219
|
-
&target.info,
|
|
3220
|
-
crate::provider::Provider::Codex,
|
|
3221
|
-
target.endpoint.as_deref(),
|
|
3222
|
-
&mut receiver,
|
|
3223
|
-
);
|
|
3224
|
-
assert_eq!(receiver.binding_nonce.as_deref(), Some("n1"));
|
|
3225
|
-
assert_eq!(receiver.scope_authority.as_deref(), Some("fresh_caller"));
|
|
3226
|
-
},
|
|
3227
|
-
);
|
|
3228
|
-
}
|
|
3229
|
-
|
|
3230
|
-
#[test]
|
|
3231
|
-
fn claim_leader_discovery_still_requires_focus() {
|
|
3232
|
-
let mut pane = grant_pane("n1");
|
|
3233
|
-
pane.active = false;
|
|
3234
|
-
pane.current_command = Some("codex".to_string());
|
|
3235
|
-
assert!(
|
|
3236
|
-
claim_target_from_pane_info(&pane).is_none(),
|
|
3237
|
-
"claim-leader discovery must keep pane_active; attach validation uses observed pane"
|
|
3238
|
-
);
|
|
3239
|
-
assert!(claim_target_from_observed_pane(&pane).is_some());
|
|
3240
|
-
}
|
|
3241
|
-
|
|
3242
|
-
#[test]
|
|
3243
|
-
fn grant_rejects_wrong_socket_same_pane() {
|
|
3244
|
-
let workspace = PathBuf::from("/tmp/grant-ws");
|
|
3245
|
-
let state = grant_state("/tmp/leader.sock", "n1", 2, "codex");
|
|
3246
|
-
let pane = grant_pane("n1");
|
|
3247
|
-
assert!(!grant_allows_attach_target(
|
|
3248
|
-
&workspace,
|
|
3249
|
-
&state,
|
|
3250
|
-
&pane,
|
|
3251
|
-
crate::provider::Provider::Codex,
|
|
3252
|
-
Some("/tmp/other.sock"),
|
|
3253
|
-
));
|
|
3254
|
-
}
|
|
3255
|
-
|
|
3256
|
-
#[test]
|
|
3257
|
-
fn grant_rejects_missing_epoch() {
|
|
3258
|
-
let workspace = PathBuf::from("/tmp/grant-ws");
|
|
3259
|
-
let mut state = grant_state("/tmp/leader.sock", "n1", 2, "codex");
|
|
3260
|
-
state["leader_receiver"]
|
|
3261
|
-
.as_object_mut()
|
|
3262
|
-
.unwrap()
|
|
3263
|
-
.remove("owner_epoch");
|
|
3264
|
-
let pane = grant_pane("n1");
|
|
3265
|
-
assert!(!grant_allows_attach_target(
|
|
3266
|
-
&workspace,
|
|
3267
|
-
&state,
|
|
3268
|
-
&pane,
|
|
3269
|
-
crate::provider::Provider::Codex,
|
|
3270
|
-
Some("/tmp/leader.sock"),
|
|
3271
|
-
));
|
|
3272
|
-
}
|
|
3273
|
-
|
|
3274
|
-
#[test]
|
|
3275
|
-
fn grant_rejects_wrong_nonce_and_provider() {
|
|
3276
|
-
let workspace = PathBuf::from("/tmp/grant-ws");
|
|
3277
|
-
let state = grant_state("/tmp/leader.sock", "n1", 2, "codex");
|
|
3278
|
-
let pane = grant_pane("other-nonce");
|
|
3279
|
-
assert!(!grant_allows_attach_target(
|
|
3280
|
-
&workspace,
|
|
3281
|
-
&state,
|
|
3282
|
-
&pane,
|
|
3283
|
-
crate::provider::Provider::Codex,
|
|
3284
|
-
Some("/tmp/leader.sock"),
|
|
3285
|
-
));
|
|
3286
|
-
let pane = grant_pane("n1");
|
|
3287
|
-
assert!(!grant_allows_attach_target(
|
|
3288
|
-
&workspace,
|
|
3289
|
-
&state,
|
|
3290
|
-
&pane,
|
|
3291
|
-
crate::provider::Provider::Copilot,
|
|
3292
|
-
Some("/tmp/leader.sock"),
|
|
3293
|
-
));
|
|
3294
|
-
}
|
|
3295
|
-
|
|
3296
|
-
fn listed(pane: &str) -> AttachLeaderTarget {
|
|
3297
|
-
AttachLeaderTarget {
|
|
3298
|
-
info: PaneInfo {
|
|
3299
|
-
pane_id: PaneId::new(pane),
|
|
3300
|
-
session: crate::transport::SessionName::new("leader"),
|
|
3301
|
-
window_index: None,
|
|
3302
|
-
window_name: None,
|
|
3303
|
-
pane_index: None,
|
|
3304
|
-
tty: None,
|
|
3305
|
-
current_command: None,
|
|
3306
|
-
current_path: None,
|
|
3307
|
-
active: pane == "%6",
|
|
3308
|
-
pane_pid: None,
|
|
3309
|
-
leader_env: std::collections::BTreeMap::new(),
|
|
3310
|
-
},
|
|
3311
|
-
endpoint: Some("/tmp/ta.sock".to_string()),
|
|
3312
|
-
}
|
|
3313
|
-
}
|
|
3314
|
-
|
|
3315
|
-
#[test]
|
|
3316
|
-
fn live_owner_blocks_other_pane_even_if_owner_is_not_active() {
|
|
3317
|
-
// R3 same-socket: owner %0 exists (pane_dead=0) but is not the
|
|
3318
|
-
// session's active pane; caller %6 must not skip to pane validation.
|
|
3319
|
-
let state = serde_json::json!({
|
|
3320
|
-
"leader_receiver": {"pane_id": "%0", "owner_epoch": 1},
|
|
3321
|
-
"team_owner": {"pane_id": "%0", "owner_epoch": 1},
|
|
3322
|
-
});
|
|
3323
|
-
let targets = vec![listed("%0"), listed("%6")];
|
|
3324
|
-
let blocked =
|
|
3325
|
-
live_bound_pane_blocking_other_attach(&state, &PaneId::new("%6"), &targets);
|
|
3326
|
-
assert_eq!(blocked, Some(PaneId::new("%0")));
|
|
3327
|
-
}
|
|
3328
|
-
|
|
3329
|
-
#[test]
|
|
3330
|
-
fn live_owner_does_not_block_attach_from_bound_pane() {
|
|
3331
|
-
let state = serde_json::json!({
|
|
3332
|
-
"leader_receiver": {"pane_id": "%0"},
|
|
3333
|
-
});
|
|
3334
|
-
let targets = vec![listed("%0"), listed("%6")];
|
|
3335
|
-
assert!(live_bound_pane_blocking_other_attach(
|
|
3336
|
-
&state,
|
|
3337
|
-
&PaneId::new("%0"),
|
|
3338
|
-
&targets,
|
|
3339
|
-
)
|
|
3340
|
-
.is_none());
|
|
3341
|
-
}
|
|
3342
|
-
|
|
3343
|
-
#[test]
|
|
3344
|
-
fn missing_owner_pane_is_not_treated_as_live_conflict() {
|
|
3345
|
-
let state = serde_json::json!({
|
|
3346
|
-
"leader_receiver": {"pane_id": "%0"},
|
|
3347
|
-
});
|
|
3348
|
-
let targets = vec![listed("%6")];
|
|
3349
|
-
assert!(live_bound_pane_blocking_other_attach(
|
|
3350
|
-
&state,
|
|
3351
|
-
&PaneId::new("%6"),
|
|
3352
|
-
&targets,
|
|
3353
|
-
)
|
|
3354
|
-
.is_none());
|
|
3355
|
-
}
|
|
3356
|
-
}
|