@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,1651 +0,0 @@
|
|
|
1
|
-
//!
|
|
2
|
-
//! CLI-local stable name resolver for `team-agent send --to-name`.
|
|
3
|
-
|
|
4
|
-
use std::path::{Path, PathBuf};
|
|
5
|
-
|
|
6
|
-
use serde_json::{json, Value};
|
|
7
|
-
|
|
8
|
-
use crate::transport::{PaneInfo, Transport};
|
|
9
|
-
|
|
10
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
11
|
-
pub(crate) enum NamedTargetKind {
|
|
12
|
-
Worker,
|
|
13
|
-
Leader,
|
|
14
|
-
SessionWindow,
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
18
|
-
pub(crate) enum NamedAddressErrorKind {
|
|
19
|
-
NameInvalid,
|
|
20
|
-
WorkspaceNotFound,
|
|
21
|
-
StateNotFound,
|
|
22
|
-
// E6 (0.5.9 offline-mailbox-toname-design §3.1): three-way taxonomy for
|
|
23
|
-
// `--to-name <team>/leader` refusal — required by the E6 RED so the top-level
|
|
24
|
-
// `leader_receiver` fallback is no longer reached for a wrong runtime key.
|
|
25
|
-
// `WorkspaceNoState` mirrors `StateNotFound` semantics but keeps the wire
|
|
26
|
-
// reason distinct for third-party sender copy.
|
|
27
|
-
WorkspaceNoState,
|
|
28
|
-
TeamKeyNotFound,
|
|
29
|
-
LeaderNotAttached,
|
|
30
|
-
NameNotResolvable,
|
|
31
|
-
NameNotLive,
|
|
32
|
-
NameAmbiguous,
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
impl NamedAddressErrorKind {
|
|
36
|
-
pub(crate) fn as_str(self) -> &'static str {
|
|
37
|
-
match self {
|
|
38
|
-
Self::NameInvalid => "name_invalid",
|
|
39
|
-
Self::WorkspaceNotFound => "workspace_not_found",
|
|
40
|
-
Self::StateNotFound => "state_not_found",
|
|
41
|
-
Self::WorkspaceNoState => "workspace_no_state",
|
|
42
|
-
Self::TeamKeyNotFound => "team_key_not_found",
|
|
43
|
-
Self::LeaderNotAttached => "leader_not_attached",
|
|
44
|
-
Self::NameNotResolvable => "name_not_resolvable",
|
|
45
|
-
Self::NameNotLive => "name_not_live",
|
|
46
|
-
Self::NameAmbiguous => "name_ambiguous",
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
52
|
-
pub(crate) struct NamedAddressError {
|
|
53
|
-
pub kind: NamedAddressErrorKind,
|
|
54
|
-
pub message: String,
|
|
55
|
-
pub action: String,
|
|
56
|
-
pub log: String,
|
|
57
|
-
pub candidates: Vec<Value>,
|
|
58
|
-
/// A typed live-channel refusal retained separately from the broader
|
|
59
|
-
/// address error (for example `PaneWorkspaceMismatch` while the address
|
|
60
|
-
/// remains a leader-not-attached refusal).
|
|
61
|
-
pub channel_reason: Option<String>,
|
|
62
|
-
// E6: when the caller supplied a `<team>/leader` name that isn't a runtime
|
|
63
|
-
// team_key, echo the requested value + the canonical alternatives so
|
|
64
|
-
// spec/display-name confusion is visibly diagnosed. Empty for other
|
|
65
|
-
// refusal kinds.
|
|
66
|
-
pub requested_team: Option<String>,
|
|
67
|
-
pub available_team_keys: Vec<String>,
|
|
68
|
-
pub suggested_name: Option<String>,
|
|
69
|
-
/// 0.5.45 naming-addressing (design §3.4, RED-2/RED-3): echo the
|
|
70
|
-
/// user's original typo so JSON consumers + N38 human can pair
|
|
71
|
-
/// `requested_name`/`suggested_name` without re-parsing. Absent
|
|
72
|
-
/// for exact refusals like empty-workspace.
|
|
73
|
-
pub requested_name: Option<String>,
|
|
74
|
-
// Presentation only: never serialized or used as routing authority.
|
|
75
|
-
human_scope: Option<PathBuf>,
|
|
76
|
-
human_team: Option<String>,
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
pub(crate) fn human_address_reason(reason: &str) -> Option<&'static str> {
|
|
80
|
-
Some(match reason {
|
|
81
|
-
"name_invalid" => "Invalid recipient name; use a name from the agent list.",
|
|
82
|
-
"workspace_not_found" => "The selected workspace directory does not exist; verify the path.",
|
|
83
|
-
"state_not_found" | "workspace_no_state" => {
|
|
84
|
-
"No usable team exists in the selected workspace; use quick-start for initial creation or restart for an initialized team."
|
|
85
|
-
}
|
|
86
|
-
"team_key_not_found" => "The selected workspace has no such team; verify --workspace and --team.",
|
|
87
|
-
"leader_not_attached" => "No leader is attached to this team; diagnose it and follow the recovery action.",
|
|
88
|
-
"name_not_resolvable" => "This team has no such agent; check the agent list.",
|
|
89
|
-
"name_not_live" => "The agent is not running or its channel is stale; check status before recovery.",
|
|
90
|
-
"name_ambiguous" => "Multiple targets share this name; select an explicit workspace and team.",
|
|
91
|
-
_ => return None,
|
|
92
|
-
})
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
impl NamedAddressError {
|
|
96
|
-
pub(crate) fn new(kind: NamedAddressErrorKind, message: impl Into<String>) -> Self {
|
|
97
|
-
Self {
|
|
98
|
-
kind,
|
|
99
|
-
message: message.into(),
|
|
100
|
-
action: "inspect team-agent status and use an explicit workspace/team name".to_string(),
|
|
101
|
-
log: "named-address resolver refused before injection".to_string(),
|
|
102
|
-
candidates: Vec::new(),
|
|
103
|
-
channel_reason: None,
|
|
104
|
-
requested_team: None,
|
|
105
|
-
available_team_keys: Vec::new(),
|
|
106
|
-
suggested_name: None,
|
|
107
|
-
requested_name: None,
|
|
108
|
-
human_scope: None,
|
|
109
|
-
human_team: None,
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
fn with_human_scope(mut self, workspace: Option<&Path>, team: Option<&str>) -> Self {
|
|
114
|
-
self.human_scope = workspace.map(Path::to_path_buf);
|
|
115
|
-
if self.human_team.is_none() {
|
|
116
|
-
self.human_team = team.map(str::to_string);
|
|
117
|
-
}
|
|
118
|
-
self
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
pub(crate) fn human_guidance(&self, requested: &str) -> (String, String) {
|
|
122
|
-
let workspace = self.human_scope.as_deref();
|
|
123
|
-
let mut message = format!(
|
|
124
|
-
"{}\nRequested recipient: {requested:?}\nReason: {}",
|
|
125
|
-
human_address_reason(self.kind.as_str()).unwrap_or("No usable recipient could be resolved."),
|
|
126
|
-
self.message
|
|
127
|
-
);
|
|
128
|
-
if let Some(workspace) = workspace {
|
|
129
|
-
message.push_str(&format!("\nSelected workspace: {:?}", workspace.to_string_lossy()));
|
|
130
|
-
}
|
|
131
|
-
if let Some(team) = self.human_team.as_deref() {
|
|
132
|
-
message.push_str(&format!("\nSelected team: {team:?}"));
|
|
133
|
-
}
|
|
134
|
-
let mut action = "No reliable spelling suggestion is available; verify the workspace and team before choosing a target.".to_string();
|
|
135
|
-
for candidate in &self.candidates {
|
|
136
|
-
if let (Some(agent), Some(team)) = (
|
|
137
|
-
candidate.get("agent_id").and_then(Value::as_str),
|
|
138
|
-
candidate.get("team_key").and_then(Value::as_str),
|
|
139
|
-
) {
|
|
140
|
-
message.push_str(&format!(
|
|
141
|
-
"\nCandidate team {team:?}, agent {agent:?}; confirm the intended target."
|
|
142
|
-
));
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
if let Some(candidate) = self.suggested_name.as_deref().and_then(|suggested| {
|
|
146
|
-
self.candidates
|
|
147
|
-
.iter()
|
|
148
|
-
.find(|candidate| candidate.get("name").and_then(Value::as_str) == Some(suggested))
|
|
149
|
-
}) {
|
|
150
|
-
if let (Some(workspace), Some(agent), Some(team)) = (
|
|
151
|
-
workspace,
|
|
152
|
-
candidate.get("agent_id").and_then(Value::as_str),
|
|
153
|
-
candidate.get("team_key").and_then(Value::as_str),
|
|
154
|
-
) {
|
|
155
|
-
if !agent.is_empty()
|
|
156
|
-
&& !team.is_empty()
|
|
157
|
-
&& !agent
|
|
158
|
-
.chars()
|
|
159
|
-
.chain(team.chars())
|
|
160
|
-
.chain(workspace.to_string_lossy().chars())
|
|
161
|
-
.any(char::is_control)
|
|
162
|
-
{
|
|
163
|
-
if let Some(command) =
|
|
164
|
-
super::adapters::send_command(agent, workspace, Some(team))
|
|
165
|
-
{
|
|
166
|
-
action = format!("Did you mean agent {agent:?} in team {team:?}? After confirmation, replace the example message below. Nothing was sent:\n{command}");
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
if let Some(workspace) =
|
|
172
|
-
workspace.filter(|path| !path.to_string_lossy().chars().any(char::is_control))
|
|
173
|
-
{
|
|
174
|
-
action.push_str(&format!(
|
|
175
|
-
"\nList available agents with:\nteam-agent status --workspace {}",
|
|
176
|
-
super::adapters::shell_quote(&workspace.to_string_lossy())
|
|
177
|
-
));
|
|
178
|
-
}
|
|
179
|
-
(message, action)
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
pub(crate) fn n38_message(&self) -> String {
|
|
183
|
-
// 0.5.45 naming-addressing (design §3.4, RED-3): the N38 first
|
|
184
|
-
// line embeds the human-readable `message` (which contains
|
|
185
|
-
// the original typo like `qa-namng`/`btea`) after the reason.
|
|
186
|
-
// Pre-0.5.45 the line was `Error: <reason>` only; the typo
|
|
187
|
-
// hid in the JSON-only `error` field, so the human line
|
|
188
|
-
// couldn't be scanned to recover the original request.
|
|
189
|
-
format!(
|
|
190
|
-
"Error: {}: {}\nAction: {}\nLog: {}",
|
|
191
|
-
self.kind.as_str(),
|
|
192
|
-
self.message,
|
|
193
|
-
self.action,
|
|
194
|
-
self.log
|
|
195
|
-
)
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
/// 0.5.45 (design §3.4, RED-2 named-team): rank team-scope typo
|
|
199
|
-
/// against target workspace `teams.*` keys; candidate `name`
|
|
200
|
-
/// preserves the qualified `team/entity` shape so the copyable
|
|
201
|
-
/// token in Action can be pasted back into `--to-name` unchanged.
|
|
202
|
-
fn with_scoped_suggestions_for_team(
|
|
203
|
-
self,
|
|
204
|
-
state: &Value,
|
|
205
|
-
team_typo: &str,
|
|
206
|
-
entity: &str,
|
|
207
|
-
parsed: &ParsedNamedAddress,
|
|
208
|
-
) -> Self {
|
|
209
|
-
use crate::model::name_similarity::{rank, Candidate};
|
|
210
|
-
let candidates: Vec<Candidate<(String, String)>> = state
|
|
211
|
-
.get("teams")
|
|
212
|
-
.and_then(Value::as_object)
|
|
213
|
-
.map(|teams| {
|
|
214
|
-
teams
|
|
215
|
-
.keys()
|
|
216
|
-
.map(|team_key| Candidate {
|
|
217
|
-
match_key: team_key.clone(),
|
|
218
|
-
stable_key: team_key.clone(),
|
|
219
|
-
payload: (team_key.clone(), entity.to_string()),
|
|
220
|
-
})
|
|
221
|
-
.collect()
|
|
222
|
-
})
|
|
223
|
-
.unwrap_or_default();
|
|
224
|
-
let ranked = rank(team_typo, &candidates);
|
|
225
|
-
let requested_display = parsed.display_name();
|
|
226
|
-
let candidate_values: Vec<Value> = ranked
|
|
227
|
-
.iter()
|
|
228
|
-
.map(|(team_key, entity)| {
|
|
229
|
-
let name = format!("{team_key}/{entity}");
|
|
230
|
-
json!({
|
|
231
|
-
"name": name,
|
|
232
|
-
"team_key": team_key,
|
|
233
|
-
"agent_id": entity,
|
|
234
|
-
"advisory": true,
|
|
235
|
-
})
|
|
236
|
-
})
|
|
237
|
-
.collect();
|
|
238
|
-
let best = ranked
|
|
239
|
-
.first()
|
|
240
|
-
.map(|(team_key, entity)| format!("{team_key}/{entity}"));
|
|
241
|
-
self.with_scoped_suggestions(requested_display, candidate_values, best)
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
/// 0.5.45 (design §3.4, RED-2 named-agent): rank agent-scope typo
|
|
245
|
-
/// against the legal `teams[team].agents` keys.
|
|
246
|
-
fn with_scoped_suggestions_for_agent(
|
|
247
|
-
self,
|
|
248
|
-
team_entry: &Value,
|
|
249
|
-
team: &str,
|
|
250
|
-
agent_typo: &str,
|
|
251
|
-
parsed: &ParsedNamedAddress,
|
|
252
|
-
) -> Self {
|
|
253
|
-
use crate::model::name_similarity::{rank, Candidate};
|
|
254
|
-
let candidates: Vec<Candidate<String>> = team_entry
|
|
255
|
-
.get("agents")
|
|
256
|
-
.and_then(Value::as_object)
|
|
257
|
-
.map(|agents| {
|
|
258
|
-
agents
|
|
259
|
-
.keys()
|
|
260
|
-
.map(|agent_id| Candidate {
|
|
261
|
-
match_key: agent_id.clone(),
|
|
262
|
-
stable_key: agent_id.clone(),
|
|
263
|
-
payload: agent_id.clone(),
|
|
264
|
-
})
|
|
265
|
-
.collect()
|
|
266
|
-
})
|
|
267
|
-
.unwrap_or_default();
|
|
268
|
-
let ranked = rank(agent_typo, &candidates);
|
|
269
|
-
let requested_display = parsed.display_name();
|
|
270
|
-
let candidate_values: Vec<Value> = ranked
|
|
271
|
-
.iter()
|
|
272
|
-
.map(|agent_id| {
|
|
273
|
-
json!({
|
|
274
|
-
"name": format!("{team}/{agent_id}"),
|
|
275
|
-
"team_key": team,
|
|
276
|
-
"agent_id": agent_id,
|
|
277
|
-
"advisory": true,
|
|
278
|
-
})
|
|
279
|
-
})
|
|
280
|
-
.collect();
|
|
281
|
-
let best = ranked.first().map(|agent_id| format!("{team}/{agent_id}"));
|
|
282
|
-
self.with_scoped_suggestions(requested_display, candidate_values, best)
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
///
|
|
286
|
-
/// 0.5.45 naming-addressing (design §3.3/§3.4): attach an
|
|
287
|
-
/// advisory suggestion payload. `requested` is the original typo
|
|
288
|
-
/// (surfaced verbatim in JSON + N38 Action); `ranked_candidates`
|
|
289
|
-
/// carry the scope-safe candidate payloads produced by
|
|
290
|
-
/// `model::name_similarity::rank`. The best candidate populates
|
|
291
|
-
/// `suggested_name` for convenience; the full list appears as
|
|
292
|
-
/// `candidates` in the JSON envelope.
|
|
293
|
-
pub(crate) fn with_scoped_suggestions(
|
|
294
|
-
mut self,
|
|
295
|
-
requested: impl Into<String>,
|
|
296
|
-
ranked_candidates: Vec<Value>,
|
|
297
|
-
best_copyable: Option<String>,
|
|
298
|
-
) -> Self {
|
|
299
|
-
let requested = requested.into();
|
|
300
|
-
self.requested_name = Some(requested.clone());
|
|
301
|
-
self.candidates = ranked_candidates;
|
|
302
|
-
self.suggested_name = best_copyable.clone();
|
|
303
|
-
// Rewrite Action so the human line points at the actual
|
|
304
|
-
// returned candidate (RED-4). Falls back to a status-JSON
|
|
305
|
-
// hint when no candidate cleared the threshold.
|
|
306
|
-
if let Some(best) = best_copyable {
|
|
307
|
-
self.action = format!("Did you mean `{best}`? Rerun with `--to-name {best}`.");
|
|
308
|
-
} else {
|
|
309
|
-
self.action = format!(
|
|
310
|
-
"No close matches for `{requested}`. \
|
|
311
|
-
Run `team-agent status --json` for the current team_key + agent list \
|
|
312
|
-
and combine them as `<team>/<agent>` for `--to-name`."
|
|
313
|
-
);
|
|
314
|
-
}
|
|
315
|
-
self
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
pub(crate) fn to_json(&self) -> Value {
|
|
319
|
-
let mut obj = serde_json::Map::new();
|
|
320
|
-
obj.insert("ok".to_string(), Value::Bool(false));
|
|
321
|
-
obj.insert("status".to_string(), Value::String("refused".to_string()));
|
|
322
|
-
obj.insert(
|
|
323
|
-
"reason".to_string(),
|
|
324
|
-
Value::String(self.kind.as_str().to_string()),
|
|
325
|
-
);
|
|
326
|
-
obj.insert("error".to_string(), Value::String(self.message.clone()));
|
|
327
|
-
obj.insert("action".to_string(), Value::String(self.action.clone()));
|
|
328
|
-
obj.insert("log".to_string(), Value::String(self.log.clone()));
|
|
329
|
-
obj.insert(
|
|
330
|
-
"candidates".to_string(),
|
|
331
|
-
Value::Array(self.candidates.clone()),
|
|
332
|
-
);
|
|
333
|
-
if let Some(channel_reason) = self.channel_reason.as_deref() {
|
|
334
|
-
obj.insert(
|
|
335
|
-
"channel_reason".to_string(),
|
|
336
|
-
Value::String(channel_reason.to_string()),
|
|
337
|
-
);
|
|
338
|
-
}
|
|
339
|
-
if let Some(requested) = self.requested_team.as_deref() {
|
|
340
|
-
obj.insert(
|
|
341
|
-
"requested_team".to_string(),
|
|
342
|
-
Value::String(requested.to_string()),
|
|
343
|
-
);
|
|
344
|
-
}
|
|
345
|
-
if !self.available_team_keys.is_empty() {
|
|
346
|
-
obj.insert(
|
|
347
|
-
"available_team_keys".to_string(),
|
|
348
|
-
Value::Array(
|
|
349
|
-
self.available_team_keys
|
|
350
|
-
.iter()
|
|
351
|
-
.map(|k| Value::String(k.clone()))
|
|
352
|
-
.collect(),
|
|
353
|
-
),
|
|
354
|
-
);
|
|
355
|
-
}
|
|
356
|
-
if let Some(suggested) = self.suggested_name.as_deref() {
|
|
357
|
-
obj.insert(
|
|
358
|
-
"suggested_name".to_string(),
|
|
359
|
-
Value::String(suggested.to_string()),
|
|
360
|
-
);
|
|
361
|
-
}
|
|
362
|
-
if let Some(requested) = self.requested_name.as_deref() {
|
|
363
|
-
obj.insert(
|
|
364
|
-
"requested_name".to_string(),
|
|
365
|
-
Value::String(requested.to_string()),
|
|
366
|
-
);
|
|
367
|
-
}
|
|
368
|
-
Value::Object(obj)
|
|
369
|
-
}
|
|
370
|
-
}
|
|
371
|
-
|
|
372
|
-
impl std::fmt::Display for NamedAddressError {
|
|
373
|
-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
374
|
-
f.write_str(&self.n38_message())
|
|
375
|
-
}
|
|
376
|
-
}
|
|
377
|
-
|
|
378
|
-
impl std::error::Error for NamedAddressError {}
|
|
379
|
-
|
|
380
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
381
|
-
pub(crate) struct ResolvedNamedAddress {
|
|
382
|
-
pub raw_name: String,
|
|
383
|
-
pub target_kind: NamedTargetKind,
|
|
384
|
-
pub sender_workspace: PathBuf,
|
|
385
|
-
pub target_workspace: PathBuf,
|
|
386
|
-
pub team_key: Option<String>,
|
|
387
|
-
pub agent_id: Option<String>,
|
|
388
|
-
pub pane_id: String,
|
|
389
|
-
pub session_name: Option<String>,
|
|
390
|
-
pub window_name: Option<String>,
|
|
391
|
-
pub tmux_endpoint: Option<String>,
|
|
392
|
-
pub transport_kind: Option<String>,
|
|
393
|
-
pub app_server: Option<Value>,
|
|
394
|
-
pub state_pane_id: Option<String>,
|
|
395
|
-
pub state_pane_stale: bool,
|
|
396
|
-
pub agent_status: Option<String>,
|
|
397
|
-
pub warning: Option<String>,
|
|
398
|
-
}
|
|
399
|
-
|
|
400
|
-
#[derive(Clone, Copy)]
|
|
401
|
-
pub(crate) struct NamedWorkspaceTransport<'a> {
|
|
402
|
-
pub workspace: &'a Path,
|
|
403
|
-
pub transport: &'a dyn Transport,
|
|
404
|
-
}
|
|
405
|
-
|
|
406
|
-
pub(crate) fn resolve_name_with_transport(
|
|
407
|
-
sender_workspace: &Path,
|
|
408
|
-
raw_name: &str,
|
|
409
|
-
transport: &dyn Transport,
|
|
410
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
411
|
-
let parsed = parse_named_address(raw_name)?;
|
|
412
|
-
let target_workspace = resolve_workspace(sender_workspace, parsed.workspace.as_deref())?;
|
|
413
|
-
let state = load_state_checked(&target_workspace)?;
|
|
414
|
-
resolve_in_workspace(
|
|
415
|
-
sender_workspace,
|
|
416
|
-
&target_workspace,
|
|
417
|
-
&state,
|
|
418
|
-
&parsed,
|
|
419
|
-
transport,
|
|
420
|
-
)
|
|
421
|
-
}
|
|
422
|
-
|
|
423
|
-
pub(crate) fn resolve_name_with_workspace_transports(
|
|
424
|
-
sender_workspace: &Path,
|
|
425
|
-
raw_name: &str,
|
|
426
|
-
workspaces: &[NamedWorkspaceTransport<'_>],
|
|
427
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
428
|
-
let parsed = parse_named_address(raw_name)?;
|
|
429
|
-
if parsed.workspace.is_some() {
|
|
430
|
-
let target_workspace = resolve_workspace(sender_workspace, parsed.workspace.as_deref())?;
|
|
431
|
-
let Some(entry) = workspaces.iter().find(|entry| {
|
|
432
|
-
resolve_workspace(sender_workspace, Some(entry.workspace))
|
|
433
|
-
.ok()
|
|
434
|
-
.as_ref()
|
|
435
|
-
== Some(&target_workspace)
|
|
436
|
-
}) else {
|
|
437
|
-
return Err(workspace_not_found(&target_workspace));
|
|
438
|
-
};
|
|
439
|
-
let state = load_state_checked(&target_workspace)?;
|
|
440
|
-
return resolve_in_workspace(
|
|
441
|
-
sender_workspace,
|
|
442
|
-
&target_workspace,
|
|
443
|
-
&state,
|
|
444
|
-
&parsed,
|
|
445
|
-
entry.transport,
|
|
446
|
-
);
|
|
447
|
-
}
|
|
448
|
-
|
|
449
|
-
let mut successes = Vec::new();
|
|
450
|
-
let mut first_error = None;
|
|
451
|
-
for entry in workspaces {
|
|
452
|
-
let target_workspace = resolve_workspace(sender_workspace, Some(entry.workspace))?;
|
|
453
|
-
match load_state_checked(&target_workspace).and_then(|state| {
|
|
454
|
-
resolve_in_workspace(
|
|
455
|
-
sender_workspace,
|
|
456
|
-
&target_workspace,
|
|
457
|
-
&state,
|
|
458
|
-
&parsed,
|
|
459
|
-
entry.transport,
|
|
460
|
-
)
|
|
461
|
-
}) {
|
|
462
|
-
Ok(resolved) => successes.push(resolved),
|
|
463
|
-
Err(err) => {
|
|
464
|
-
if first_error.is_none() {
|
|
465
|
-
first_error = Some(err);
|
|
466
|
-
}
|
|
467
|
-
}
|
|
468
|
-
}
|
|
469
|
-
}
|
|
470
|
-
|
|
471
|
-
match successes.len() {
|
|
472
|
-
1 => successes.into_iter().next().ok_or_else(|| {
|
|
473
|
-
NamedAddressError::new(
|
|
474
|
-
NamedAddressErrorKind::NameNotResolvable,
|
|
475
|
-
"named address was not resolvable",
|
|
476
|
-
)
|
|
477
|
-
}),
|
|
478
|
-
n if n > 1 => {
|
|
479
|
-
let mut err = NamedAddressError::new(
|
|
480
|
-
NamedAddressErrorKind::NameAmbiguous,
|
|
481
|
-
"name matches multiple workspaces",
|
|
482
|
-
);
|
|
483
|
-
let name = parsed.display_name();
|
|
484
|
-
err.action =
|
|
485
|
-
format!("Use an explicit workspace-qualified name such as <workspace>::{name}");
|
|
486
|
-
err.log = "same team/name is live in multiple workspaces".to_string();
|
|
487
|
-
err.candidates = successes
|
|
488
|
-
.into_iter()
|
|
489
|
-
.map(|resolved| candidate_json(&resolved))
|
|
490
|
-
.collect();
|
|
491
|
-
Err(err)
|
|
492
|
-
}
|
|
493
|
-
_ => Err(first_error.unwrap_or_else(|| {
|
|
494
|
-
NamedAddressError::new(
|
|
495
|
-
NamedAddressErrorKind::NameNotResolvable,
|
|
496
|
-
"named address was not resolvable",
|
|
497
|
-
)
|
|
498
|
-
})),
|
|
499
|
-
}
|
|
500
|
-
}
|
|
501
|
-
|
|
502
|
-
pub(crate) fn resolve_name_for_cli(
|
|
503
|
-
sender_workspace: &Path,
|
|
504
|
-
raw_name: &str,
|
|
505
|
-
bare_team_scope: Option<&str>,
|
|
506
|
-
) -> Result<(ResolvedNamedAddress, Box<dyn Transport>), NamedAddressError> {
|
|
507
|
-
let parsed = parse_named_address(raw_name)?;
|
|
508
|
-
// 0.5.45 naming-addressing (design §3.1, RED-1): bare `--to-name`
|
|
509
|
-
// + explicit `--team` normalizes to `ParsedTarget::TeamEntity`
|
|
510
|
-
// BEFORE transport selection. Only fires when:
|
|
511
|
-
// 1. address parsed as bare (no `team/`, no `workspace::`),
|
|
512
|
-
// 2. caller passed a non-empty `bare_team_scope`.
|
|
513
|
-
// Qualified addresses keep the scope in the address (design §1
|
|
514
|
-
// priority: workspace::team/entity > team/entity > bare + --team
|
|
515
|
-
// > bare workspace-unique). resolve_name_with_transport and the
|
|
516
|
-
// registry-to-E6 internal helper deliberately pass `None` so
|
|
517
|
-
// caller-supplied `--team` never overrides a full address.
|
|
518
|
-
let parsed = normalize_bare_with_team_scope(parsed, bare_team_scope);
|
|
519
|
-
let requested_team = match &parsed.target {
|
|
520
|
-
ParsedTarget::TeamEntity { team, .. } => Some(team.as_str()),
|
|
521
|
-
_ => None,
|
|
522
|
-
};
|
|
523
|
-
let target_workspace = resolve_workspace(sender_workspace, parsed.workspace.as_deref())
|
|
524
|
-
.map_err(|error| error.with_human_scope(None, requested_team))?;
|
|
525
|
-
let state = load_state_checked(&target_workspace)
|
|
526
|
-
.map_err(|error| error.with_human_scope(Some(&target_workspace), requested_team))?;
|
|
527
|
-
let transport = transport_for_cli_target(&target_workspace, &state, &parsed);
|
|
528
|
-
let resolved = resolve_in_workspace(
|
|
529
|
-
sender_workspace,
|
|
530
|
-
&target_workspace,
|
|
531
|
-
&state,
|
|
532
|
-
&parsed,
|
|
533
|
-
transport.as_ref(),
|
|
534
|
-
)
|
|
535
|
-
.map_err(|error| error.with_human_scope(Some(&target_workspace), requested_team))?;
|
|
536
|
-
Ok((resolved, transport))
|
|
537
|
-
}
|
|
538
|
-
|
|
539
|
-
/// 0.5.45 naming-addressing (design §3.1): apply bare-team scope归一.
|
|
540
|
-
/// Only bare targets with no workspace prefix consume `--team`;
|
|
541
|
-
/// qualified addresses keep the scope embedded in the address.
|
|
542
|
-
fn normalize_bare_with_team_scope(
|
|
543
|
-
parsed: ParsedNamedAddress,
|
|
544
|
-
bare_team_scope: Option<&str>,
|
|
545
|
-
) -> ParsedNamedAddress {
|
|
546
|
-
let Some(scope) = bare_team_scope.map(str::trim).filter(|s| !s.is_empty()) else {
|
|
547
|
-
return parsed;
|
|
548
|
-
};
|
|
549
|
-
if parsed.workspace.is_some() {
|
|
550
|
-
return parsed;
|
|
551
|
-
}
|
|
552
|
-
match parsed.target {
|
|
553
|
-
ParsedTarget::BareAgent(agent) => ParsedNamedAddress {
|
|
554
|
-
workspace: parsed.workspace,
|
|
555
|
-
target: ParsedTarget::TeamEntity {
|
|
556
|
-
team: scope.to_string(),
|
|
557
|
-
entity: agent,
|
|
558
|
-
},
|
|
559
|
-
},
|
|
560
|
-
target => ParsedNamedAddress {
|
|
561
|
-
workspace: parsed.workspace,
|
|
562
|
-
target,
|
|
563
|
-
},
|
|
564
|
-
}
|
|
565
|
-
}
|
|
566
|
-
|
|
567
|
-
///
|
|
568
|
-
/// E6 wiring helper (`cli::send::maybe_enqueue_offline_leader_mailbox`):
|
|
569
|
-
/// re-parse a `<workspace>::<team>/leader` name and return the resolved
|
|
570
|
-
/// target workspace + canonical team_key so send.rs can enqueue the
|
|
571
|
-
/// mailbox without duplicating the parser. Returns `Ok(None)` for names
|
|
572
|
-
/// that aren't `<team>/leader` shapes (worker sends, session:window,
|
|
573
|
-
/// etc. keep their existing refusal semantics).
|
|
574
|
-
pub(crate) fn parse_leader_target_workspace_and_team(
|
|
575
|
-
sender_workspace: &Path,
|
|
576
|
-
raw_name: &str,
|
|
577
|
-
) -> Result<Option<(PathBuf, String)>, NamedAddressError> {
|
|
578
|
-
let parsed = parse_named_address(raw_name)?;
|
|
579
|
-
let target_workspace = resolve_workspace(sender_workspace, parsed.workspace.as_deref())?;
|
|
580
|
-
match parsed.target {
|
|
581
|
-
ParsedTarget::TeamEntity { team, entity } if entity == "leader" => {
|
|
582
|
-
let state = load_state_checked(&target_workspace)?;
|
|
583
|
-
let canonical =
|
|
584
|
-
canonical_named_team_key(&target_workspace, &state, &team).unwrap_or(team);
|
|
585
|
-
Ok(Some((target_workspace, canonical)))
|
|
586
|
-
}
|
|
587
|
-
_ => Ok(None),
|
|
588
|
-
}
|
|
589
|
-
}
|
|
590
|
-
|
|
591
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
592
|
-
struct ParsedNamedAddress {
|
|
593
|
-
workspace: Option<PathBuf>,
|
|
594
|
-
target: ParsedTarget,
|
|
595
|
-
}
|
|
596
|
-
|
|
597
|
-
impl ParsedNamedAddress {
|
|
598
|
-
fn display_name(&self) -> String {
|
|
599
|
-
let target = match &self.target {
|
|
600
|
-
ParsedTarget::BareAgent(agent) => agent.clone(),
|
|
601
|
-
ParsedTarget::TeamEntity { team, entity } => format!("{team}/{entity}"),
|
|
602
|
-
ParsedTarget::SessionWindow { session, window } => format!("{session}:{window}"),
|
|
603
|
-
};
|
|
604
|
-
match &self.workspace {
|
|
605
|
-
Some(workspace) => format!("{}::{target}", workspace.display()),
|
|
606
|
-
None => target,
|
|
607
|
-
}
|
|
608
|
-
}
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
612
|
-
enum ParsedTarget {
|
|
613
|
-
BareAgent(String),
|
|
614
|
-
TeamEntity { team: String, entity: String },
|
|
615
|
-
SessionWindow { session: String, window: String },
|
|
616
|
-
}
|
|
617
|
-
|
|
618
|
-
fn parse_named_address(raw_name: &str) -> Result<ParsedNamedAddress, NamedAddressError> {
|
|
619
|
-
let parsed = crate::messaging::parse_logical_address(raw_name).map_err(name_invalid)?;
|
|
620
|
-
let target = match parsed.target {
|
|
621
|
-
crate::messaging::LogicalAddressTarget::Worker(agent) => ParsedTarget::BareAgent(agent),
|
|
622
|
-
crate::messaging::LogicalAddressTarget::TeamEntity { team, entity } => {
|
|
623
|
-
ParsedTarget::TeamEntity { team, entity }
|
|
624
|
-
}
|
|
625
|
-
crate::messaging::LogicalAddressTarget::SessionWindow { session, window } => {
|
|
626
|
-
ParsedTarget::SessionWindow { session, window }
|
|
627
|
-
}
|
|
628
|
-
};
|
|
629
|
-
Ok(ParsedNamedAddress {
|
|
630
|
-
workspace: parsed.workspace,
|
|
631
|
-
target,
|
|
632
|
-
})
|
|
633
|
-
}
|
|
634
|
-
|
|
635
|
-
fn resolve_workspace(
|
|
636
|
-
sender_workspace: &Path,
|
|
637
|
-
explicit: Option<&Path>,
|
|
638
|
-
) -> Result<PathBuf, NamedAddressError> {
|
|
639
|
-
let input = explicit.unwrap_or(sender_workspace);
|
|
640
|
-
if explicit.is_some() && !input.exists() {
|
|
641
|
-
return Err(workspace_not_found(input));
|
|
642
|
-
}
|
|
643
|
-
crate::model::paths::canonical_run_workspace(input).map_err(|error| {
|
|
644
|
-
let mut err = NamedAddressError::new(
|
|
645
|
-
NamedAddressErrorKind::WorkspaceNotFound,
|
|
646
|
-
format!("workspace cannot be resolved: {error}"),
|
|
647
|
-
);
|
|
648
|
-
err.action = "Use an existing Team Agent workspace path before `::`".to_string();
|
|
649
|
-
err.log = format!("workspace={}", input.display());
|
|
650
|
-
err
|
|
651
|
-
})
|
|
652
|
-
}
|
|
653
|
-
|
|
654
|
-
fn load_state_checked(workspace: &Path) -> Result<Value, NamedAddressError> {
|
|
655
|
-
let path = crate::state::persist::runtime_state_path(workspace);
|
|
656
|
-
if !path.exists() {
|
|
657
|
-
let mut err = NamedAddressError::new(
|
|
658
|
-
NamedAddressErrorKind::StateNotFound,
|
|
659
|
-
"target workspace has no Team Agent runtime state",
|
|
660
|
-
);
|
|
661
|
-
err.action = "Run team-agent quick-start/restart in the target workspace, or choose a workspace that has .team/runtime/state.json".to_string();
|
|
662
|
-
err.log = format!("state_path={}", path.display());
|
|
663
|
-
return Err(err);
|
|
664
|
-
}
|
|
665
|
-
crate::state::persist::load_runtime_state(workspace).map_err(|error| {
|
|
666
|
-
let mut err = NamedAddressError::new(
|
|
667
|
-
NamedAddressErrorKind::StateNotFound,
|
|
668
|
-
format!("target runtime state cannot be loaded: {error}"),
|
|
669
|
-
);
|
|
670
|
-
err.action = "Inspect or repair the target workspace runtime state".to_string();
|
|
671
|
-
err.log = format!("state_path={}", path.display());
|
|
672
|
-
err
|
|
673
|
-
})
|
|
674
|
-
}
|
|
675
|
-
|
|
676
|
-
fn resolve_in_workspace(
|
|
677
|
-
sender_workspace: &Path,
|
|
678
|
-
target_workspace: &Path,
|
|
679
|
-
state: &Value,
|
|
680
|
-
parsed: &ParsedNamedAddress,
|
|
681
|
-
transport: &dyn Transport,
|
|
682
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
683
|
-
match &parsed.target {
|
|
684
|
-
ParsedTarget::BareAgent(agent) => {
|
|
685
|
-
resolve_bare_agent(sender_workspace, target_workspace, state, agent, transport)
|
|
686
|
-
}
|
|
687
|
-
ParsedTarget::TeamEntity { team, entity } => {
|
|
688
|
-
let canonical = canonical_named_team_key(target_workspace, state, team)
|
|
689
|
-
.unwrap_or_else(|| team.clone());
|
|
690
|
-
let result = if entity == "leader" {
|
|
691
|
-
resolve_leader(
|
|
692
|
-
sender_workspace,
|
|
693
|
-
target_workspace,
|
|
694
|
-
state,
|
|
695
|
-
&canonical,
|
|
696
|
-
parsed,
|
|
697
|
-
transport,
|
|
698
|
-
)
|
|
699
|
-
} else {
|
|
700
|
-
resolve_worker(
|
|
701
|
-
sender_workspace,
|
|
702
|
-
target_workspace,
|
|
703
|
-
state,
|
|
704
|
-
&canonical,
|
|
705
|
-
entity,
|
|
706
|
-
parsed,
|
|
707
|
-
transport,
|
|
708
|
-
)
|
|
709
|
-
};
|
|
710
|
-
result.map_err(|mut error| {
|
|
711
|
-
error.human_team = Some(canonical);
|
|
712
|
-
error
|
|
713
|
-
})
|
|
714
|
-
}
|
|
715
|
-
ParsedTarget::SessionWindow { session, window } => resolve_session_window(
|
|
716
|
-
sender_workspace,
|
|
717
|
-
target_workspace,
|
|
718
|
-
session,
|
|
719
|
-
window,
|
|
720
|
-
parsed,
|
|
721
|
-
transport,
|
|
722
|
-
),
|
|
723
|
-
}
|
|
724
|
-
}
|
|
725
|
-
|
|
726
|
-
fn resolve_worker(
|
|
727
|
-
sender_workspace: &Path,
|
|
728
|
-
target_workspace: &Path,
|
|
729
|
-
state: &Value,
|
|
730
|
-
team: &str,
|
|
731
|
-
agent: &str,
|
|
732
|
-
parsed: &ParsedNamedAddress,
|
|
733
|
-
transport: &dyn Transport,
|
|
734
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
735
|
-
let team_entry = match team_entry(state, team) {
|
|
736
|
-
Some(entry) => entry,
|
|
737
|
-
None => {
|
|
738
|
-
// 0.5.45 naming-addressing (design §3.4, RED-2 named):
|
|
739
|
-
// typo in team scope. Candidates come from the target
|
|
740
|
-
// workspace's `teams.*.*` — scope-safe because we're
|
|
741
|
-
// already inside the requested workspace projection.
|
|
742
|
-
return Err(name_not_resolvable_team(team)
|
|
743
|
-
.with_scoped_suggestions_for_team(state, team, agent, parsed));
|
|
744
|
-
}
|
|
745
|
-
};
|
|
746
|
-
let agent_entry = match team_entry
|
|
747
|
-
.get("agents")
|
|
748
|
-
.and_then(Value::as_object)
|
|
749
|
-
.and_then(|agents| agents.get(agent))
|
|
750
|
-
{
|
|
751
|
-
Some(entry) => entry,
|
|
752
|
-
None => {
|
|
753
|
-
// 0.5.45 naming-addressing (design §3.4, RED-2 named):
|
|
754
|
-
// typo in agent within a legal team. Candidates come from
|
|
755
|
-
// `teams[team].agents` — scope stays in the requested
|
|
756
|
-
// team, so sibling teams cannot leak.
|
|
757
|
-
return Err(name_not_resolvable_agent(team, agent)
|
|
758
|
-
.with_scoped_suggestions_for_agent(team_entry, team, agent, parsed));
|
|
759
|
-
}
|
|
760
|
-
};
|
|
761
|
-
let Some(session) = string_field(team_entry, "session_name") else {
|
|
762
|
-
return Ok(resolved_worker_without_live(
|
|
763
|
-
sender_workspace,
|
|
764
|
-
target_workspace,
|
|
765
|
-
team,
|
|
766
|
-
agent,
|
|
767
|
-
parsed,
|
|
768
|
-
agent_entry,
|
|
769
|
-
None,
|
|
770
|
-
agent,
|
|
771
|
-
transport.tmux_endpoint(),
|
|
772
|
-
));
|
|
773
|
-
};
|
|
774
|
-
let window = string_field(agent_entry, "window")
|
|
775
|
-
.or_else(|| string_field(agent_entry, "window_name"))
|
|
776
|
-
.unwrap_or(agent);
|
|
777
|
-
let targets = match list_targets(transport) {
|
|
778
|
-
Ok(targets) => targets,
|
|
779
|
-
Err(_) => {
|
|
780
|
-
return Ok(resolved_worker_without_live(
|
|
781
|
-
sender_workspace,
|
|
782
|
-
target_workspace,
|
|
783
|
-
team,
|
|
784
|
-
agent,
|
|
785
|
-
parsed,
|
|
786
|
-
agent_entry,
|
|
787
|
-
Some(session),
|
|
788
|
-
window,
|
|
789
|
-
transport.tmux_endpoint(),
|
|
790
|
-
));
|
|
791
|
-
}
|
|
792
|
-
};
|
|
793
|
-
let matches = matching_session_window(&targets, session, window);
|
|
794
|
-
let selected_pane = match matches.len() {
|
|
795
|
-
1 => matches.first().copied(),
|
|
796
|
-
n if n > 1 => {
|
|
797
|
-
let state_pane_id =
|
|
798
|
-
string_field(agent_entry, "pane_id").filter(|pane_id| !pane_id.is_empty());
|
|
799
|
-
let mut state_matches = matches.iter().copied().filter(|pane| {
|
|
800
|
-
state_pane_id.is_some_and(|pane_id| pane.pane_id.as_str() == pane_id)
|
|
801
|
-
});
|
|
802
|
-
match (state_matches.next(), state_matches.next()) {
|
|
803
|
-
(Some(pane), None) => Some(pane),
|
|
804
|
-
_ => None,
|
|
805
|
-
}
|
|
806
|
-
}
|
|
807
|
-
_ => None,
|
|
808
|
-
};
|
|
809
|
-
match selected_pane {
|
|
810
|
-
Some(pane) => {
|
|
811
|
-
let state_pane_id = string_field(agent_entry, "pane_id").map(str::to_string);
|
|
812
|
-
let state_pane_stale = state_pane_id
|
|
813
|
-
.as_deref()
|
|
814
|
-
.is_some_and(|state_pane| state_pane != pane.pane_id.as_str());
|
|
815
|
-
let agent_status = string_field(agent_entry, "status").map(str::to_string);
|
|
816
|
-
let warning = agent_status
|
|
817
|
-
.as_deref()
|
|
818
|
-
.filter(|status| *status == "paused" || *status == "stopped")
|
|
819
|
-
.map(|status| {
|
|
820
|
-
format!("agent_status:{status}; pane is live, so delivery is allowed")
|
|
821
|
-
});
|
|
822
|
-
Ok(ResolvedNamedAddress {
|
|
823
|
-
raw_name: parsed.display_name(),
|
|
824
|
-
target_kind: NamedTargetKind::Worker,
|
|
825
|
-
sender_workspace: sender_workspace.to_path_buf(),
|
|
826
|
-
target_workspace: target_workspace.to_path_buf(),
|
|
827
|
-
team_key: Some(team.to_string()),
|
|
828
|
-
agent_id: Some(agent.to_string()),
|
|
829
|
-
pane_id: pane.pane_id.as_str().to_string(),
|
|
830
|
-
session_name: Some(session.to_string()),
|
|
831
|
-
window_name: Some(window.to_string()),
|
|
832
|
-
tmux_endpoint: transport.tmux_endpoint(),
|
|
833
|
-
transport_kind: Some("direct_tmux".to_string()),
|
|
834
|
-
app_server: None,
|
|
835
|
-
state_pane_id,
|
|
836
|
-
state_pane_stale,
|
|
837
|
-
agent_status,
|
|
838
|
-
warning,
|
|
839
|
-
})
|
|
840
|
-
}
|
|
841
|
-
None if matches.is_empty() => Ok(resolved_worker_without_live(
|
|
842
|
-
sender_workspace,
|
|
843
|
-
target_workspace,
|
|
844
|
-
team,
|
|
845
|
-
agent,
|
|
846
|
-
parsed,
|
|
847
|
-
agent_entry,
|
|
848
|
-
Some(session),
|
|
849
|
-
window,
|
|
850
|
-
transport.tmux_endpoint(),
|
|
851
|
-
)),
|
|
852
|
-
None => Err(name_ambiguous(
|
|
853
|
-
"multiple live panes match the same session/window",
|
|
854
|
-
matches
|
|
855
|
-
.into_iter()
|
|
856
|
-
.map(|pane| {
|
|
857
|
-
json!({
|
|
858
|
-
"name": format!("{team}/{agent}"),
|
|
859
|
-
"workspace": target_workspace.display().to_string(),
|
|
860
|
-
"team_key": team,
|
|
861
|
-
"agent_id": agent,
|
|
862
|
-
"session": session,
|
|
863
|
-
"window": window,
|
|
864
|
-
"pane_id": pane.pane_id.as_str(),
|
|
865
|
-
})
|
|
866
|
-
})
|
|
867
|
-
.collect(),
|
|
868
|
-
)),
|
|
869
|
-
}
|
|
870
|
-
}
|
|
871
|
-
|
|
872
|
-
#[allow(clippy::too_many_arguments)]
|
|
873
|
-
fn resolved_worker_without_live(
|
|
874
|
-
sender_workspace: &Path,
|
|
875
|
-
target_workspace: &Path,
|
|
876
|
-
team: &str,
|
|
877
|
-
agent: &str,
|
|
878
|
-
parsed: &ParsedNamedAddress,
|
|
879
|
-
agent_entry: &Value,
|
|
880
|
-
session: Option<&str>,
|
|
881
|
-
window: &str,
|
|
882
|
-
tmux_endpoint: Option<String>,
|
|
883
|
-
) -> ResolvedNamedAddress {
|
|
884
|
-
let state_pane_id = string_field(agent_entry, "pane_id").map(str::to_string);
|
|
885
|
-
ResolvedNamedAddress {
|
|
886
|
-
raw_name: parsed.display_name(),
|
|
887
|
-
target_kind: NamedTargetKind::Worker,
|
|
888
|
-
sender_workspace: sender_workspace.to_path_buf(),
|
|
889
|
-
target_workspace: target_workspace.to_path_buf(),
|
|
890
|
-
team_key: Some(team.to_string()),
|
|
891
|
-
agent_id: Some(agent.to_string()),
|
|
892
|
-
pane_id: state_pane_id.clone().unwrap_or_default(),
|
|
893
|
-
session_name: session.map(str::to_string),
|
|
894
|
-
window_name: Some(window.to_string()),
|
|
895
|
-
tmux_endpoint,
|
|
896
|
-
transport_kind: Some("direct_tmux".to_string()),
|
|
897
|
-
app_server: None,
|
|
898
|
-
state_pane_id,
|
|
899
|
-
state_pane_stale: true,
|
|
900
|
-
agent_status: string_field(agent_entry, "status").map(str::to_string),
|
|
901
|
-
warning: Some(
|
|
902
|
-
"agent has no live pane; message will be persisted for standard delivery recovery"
|
|
903
|
-
.to_string(),
|
|
904
|
-
),
|
|
905
|
-
}
|
|
906
|
-
}
|
|
907
|
-
|
|
908
|
-
fn resolve_bare_agent(
|
|
909
|
-
sender_workspace: &Path,
|
|
910
|
-
target_workspace: &Path,
|
|
911
|
-
state: &Value,
|
|
912
|
-
agent: &str,
|
|
913
|
-
transport: &dyn Transport,
|
|
914
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
915
|
-
let Some(teams) = state.get("teams").and_then(Value::as_object) else {
|
|
916
|
-
return Err(name_not_resolvable("state has no teams map"));
|
|
917
|
-
};
|
|
918
|
-
let mut live = Vec::new();
|
|
919
|
-
let mut state_matches = 0usize;
|
|
920
|
-
for (team, team_entry) in teams {
|
|
921
|
-
let Some(agents) = team_entry.get("agents").and_then(Value::as_object) else {
|
|
922
|
-
continue;
|
|
923
|
-
};
|
|
924
|
-
if agents.get(agent).is_none() {
|
|
925
|
-
continue;
|
|
926
|
-
}
|
|
927
|
-
state_matches += 1;
|
|
928
|
-
let parsed = ParsedNamedAddress {
|
|
929
|
-
workspace: None,
|
|
930
|
-
target: ParsedTarget::TeamEntity {
|
|
931
|
-
team: team.clone(),
|
|
932
|
-
entity: agent.to_string(),
|
|
933
|
-
},
|
|
934
|
-
};
|
|
935
|
-
if let Ok(resolved) = resolve_worker(
|
|
936
|
-
sender_workspace,
|
|
937
|
-
target_workspace,
|
|
938
|
-
state,
|
|
939
|
-
team,
|
|
940
|
-
agent,
|
|
941
|
-
&parsed,
|
|
942
|
-
transport,
|
|
943
|
-
) {
|
|
944
|
-
live.push(resolved);
|
|
945
|
-
}
|
|
946
|
-
}
|
|
947
|
-
match live.len() {
|
|
948
|
-
1 => live
|
|
949
|
-
.into_iter()
|
|
950
|
-
.next()
|
|
951
|
-
.ok_or_else(|| name_not_resolvable("named address resolved no live candidates")),
|
|
952
|
-
n if n > 1 => Err(name_ambiguous(
|
|
953
|
-
"bare agent name is live in multiple teams",
|
|
954
|
-
live.into_iter()
|
|
955
|
-
.map(|resolved| candidate_json(&resolved))
|
|
956
|
-
.collect(),
|
|
957
|
-
)),
|
|
958
|
-
_ if state_matches > 0 => {
|
|
959
|
-
let mut err = NamedAddressError::new(
|
|
960
|
-
NamedAddressErrorKind::NameNotLive,
|
|
961
|
-
"agent exists in state but no live pane matched",
|
|
962
|
-
);
|
|
963
|
-
err.action =
|
|
964
|
-
format!("Use an explicit team name or restart the target agent: <team>/{agent}");
|
|
965
|
-
err.log = format!("workspace={} agent_id={agent}", target_workspace.display());
|
|
966
|
-
Err(err)
|
|
967
|
-
}
|
|
968
|
-
_ => Err(name_not_resolvable(&format!(
|
|
969
|
-
"agent `{agent}` is not present in any team"
|
|
970
|
-
))),
|
|
971
|
-
}
|
|
972
|
-
}
|
|
973
|
-
|
|
974
|
-
/// Phase-DX E3 (plan §4 / CR supplements A/B/C, P0 red lines #1 & #6):
|
|
975
|
-
/// build advisory diagnostic candidates for a failed `--to-name leader`
|
|
976
|
-
/// resolution. The candidate list is deliberately shaped to be **read by
|
|
977
|
-
/// humans**, not consumed as route authority: every entry carries
|
|
978
|
-
/// `advisory: true` and a `source` tag identifying where it was observed.
|
|
979
|
-
///
|
|
980
|
-
/// Candidate source rules:
|
|
981
|
-
/// - The transport passed in is already scoped by [`transport_for_cli_target`]
|
|
982
|
-
/// to the team's recorded `leader_receiver.tmux_socket` (or the workspace
|
|
983
|
-
/// default when no socket was recorded), so `transport.list_targets()`
|
|
984
|
-
/// enumerates only that endpoint. We do NOT scan other tmux sockets or
|
|
985
|
-
/// fall back to reverse-authority tmux-session discovery.
|
|
986
|
-
/// - `pane_id` fields are copied verbatim from `list_targets`. `session` is
|
|
987
|
-
/// the tmux session, and `socket` records the tmux endpoint the candidate
|
|
988
|
-
/// was seen on (whichever the scoped transport reports).
|
|
989
|
-
///
|
|
990
|
-
/// Callers must never treat any candidate as authoritative; MUST-NOT-12 stays
|
|
991
|
-
/// intact — resolver refusal is still the outcome even when candidates fire.
|
|
992
|
-
fn leader_advisory_candidates(
|
|
993
|
-
state: &Value,
|
|
994
|
-
team: &str,
|
|
995
|
-
transport: &dyn Transport,
|
|
996
|
-
source: &str,
|
|
997
|
-
) -> Vec<Value> {
|
|
998
|
-
let team_scoped_socket = team_entry(state, team)
|
|
999
|
-
.and_then(|entry| entry.get("leader_receiver"))
|
|
1000
|
-
.and_then(|receiver| string_field(receiver, "tmux_socket"));
|
|
1001
|
-
let socket = match team_scoped_socket {
|
|
1002
|
-
Some(s) => Some(s.to_string()),
|
|
1003
|
-
None => state
|
|
1004
|
-
// ALLOWED-LEGACY-SINGLE-TEAM: diagnostic-only socket label for the advisory candidates; never fed back into routing.
|
|
1005
|
-
.get("leader_receiver")
|
|
1006
|
-
.and_then(|receiver| string_field(receiver, "tmux_socket"))
|
|
1007
|
-
.map(str::to_string)
|
|
1008
|
-
.or_else(|| transport.tmux_endpoint()),
|
|
1009
|
-
};
|
|
1010
|
-
let targets = match transport.list_targets() {
|
|
1011
|
-
Ok(targets) => targets,
|
|
1012
|
-
Err(_) => return Vec::new(),
|
|
1013
|
-
};
|
|
1014
|
-
targets
|
|
1015
|
-
.into_iter()
|
|
1016
|
-
.map(|pane| {
|
|
1017
|
-
json!({
|
|
1018
|
-
"pane_id": pane.pane_id.as_str(),
|
|
1019
|
-
"session": pane.session.as_str(),
|
|
1020
|
-
"window": pane.window_name.as_ref().map(|w| w.as_str()),
|
|
1021
|
-
"socket": socket,
|
|
1022
|
-
"source": source,
|
|
1023
|
-
"advisory": json!(true),
|
|
1024
|
-
})
|
|
1025
|
-
})
|
|
1026
|
-
.collect()
|
|
1027
|
-
}
|
|
1028
|
-
|
|
1029
|
-
fn resolve_leader(
|
|
1030
|
-
sender_workspace: &Path,
|
|
1031
|
-
target_workspace: &Path,
|
|
1032
|
-
state: &Value,
|
|
1033
|
-
team: &str,
|
|
1034
|
-
parsed: &ParsedNamedAddress,
|
|
1035
|
-
transport: &dyn Transport,
|
|
1036
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
1037
|
-
// E6 taxonomy split (0.5.9 offline-mailbox-toname-design §3.1): before
|
|
1038
|
-
// reading any leader_receiver, decide whether `<team>` is actually the
|
|
1039
|
-
// runtime team key. Wrong keys must not fall through to top-level
|
|
1040
|
-
// leader_receiver (that was the pre-fix bug where `twitter-autopub/leader`
|
|
1041
|
-
// silently reused the `current` team's receiver and reported a stale
|
|
1042
|
-
// pane_id). Legacy single-team compat is preserved only when the state
|
|
1043
|
-
// has no `teams` map yet and the requested key equals `active_team_key`.
|
|
1044
|
-
let receiver =
|
|
1045
|
-
resolve_team_scoped_leader_receiver(state, team, target_workspace)?.ok_or_else(|| {
|
|
1046
|
-
let mut err = leader_not_attached_third_party(
|
|
1047
|
-
target_workspace,
|
|
1048
|
-
team,
|
|
1049
|
-
None,
|
|
1050
|
-
None,
|
|
1051
|
-
None,
|
|
1052
|
-
transport.tmux_endpoint(),
|
|
1053
|
-
None,
|
|
1054
|
-
);
|
|
1055
|
-
err.candidates =
|
|
1056
|
-
leader_advisory_candidates(state, team, transport, "state_recorded_socket");
|
|
1057
|
-
err
|
|
1058
|
-
})?;
|
|
1059
|
-
if let Some((mode, transport_kind)) = receiver_transport_conflict(receiver) {
|
|
1060
|
-
let mut err = NamedAddressError::new(
|
|
1061
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1062
|
-
"leader_receiver mode/transport_kind conflict",
|
|
1063
|
-
);
|
|
1064
|
-
err.action =
|
|
1065
|
-
"Rebind the leader: team-agent claim-leader, takeover, or attach-app-server-leader"
|
|
1066
|
-
.to_string();
|
|
1067
|
-
err.log = format!(
|
|
1068
|
-
"name={team}/leader mode={mode} transport_kind={transport_kind} expected=single_transport_kind"
|
|
1069
|
-
);
|
|
1070
|
-
return Err(err);
|
|
1071
|
-
}
|
|
1072
|
-
let session = string_field(receiver, "session_name");
|
|
1073
|
-
let window = string_field(receiver, "window_name");
|
|
1074
|
-
let socket = string_field(receiver, "tmux_socket")
|
|
1075
|
-
.map(str::to_string)
|
|
1076
|
-
.or_else(|| transport.tmux_endpoint());
|
|
1077
|
-
match crate::messaging::resolve_live_leader_channel(target_workspace, receiver, transport) {
|
|
1078
|
-
crate::messaging::LeaderChannelResolution::Live(
|
|
1079
|
-
crate::messaging::LiveLeaderChannel::DirectTmux(channel),
|
|
1080
|
-
) => Ok(ResolvedNamedAddress {
|
|
1081
|
-
raw_name: parsed.display_name(),
|
|
1082
|
-
target_kind: NamedTargetKind::Leader,
|
|
1083
|
-
sender_workspace: sender_workspace.to_path_buf(),
|
|
1084
|
-
target_workspace: target_workspace.to_path_buf(),
|
|
1085
|
-
team_key: Some(team.to_string()),
|
|
1086
|
-
agent_id: None,
|
|
1087
|
-
pane_id: channel.pane_id.clone(),
|
|
1088
|
-
session_name: session.map(str::to_string),
|
|
1089
|
-
window_name: window.map(str::to_string),
|
|
1090
|
-
tmux_endpoint: socket,
|
|
1091
|
-
transport_kind: Some("direct_tmux".to_string()),
|
|
1092
|
-
app_server: None,
|
|
1093
|
-
state_pane_id: Some(channel.pane_id),
|
|
1094
|
-
state_pane_stale: false,
|
|
1095
|
-
agent_status: None,
|
|
1096
|
-
warning: (!channel.metadata_drift.is_empty()).then(|| {
|
|
1097
|
-
format!(
|
|
1098
|
-
"leader_channel_metadata_drift:{}",
|
|
1099
|
-
channel.metadata_drift.join(",")
|
|
1100
|
-
)
|
|
1101
|
-
}),
|
|
1102
|
-
}),
|
|
1103
|
-
crate::messaging::LeaderChannelResolution::Live(
|
|
1104
|
-
crate::messaging::LiveLeaderChannel::CodexAppServer(_),
|
|
1105
|
-
) => resolve_app_server_leader(sender_workspace, target_workspace, team, parsed, receiver),
|
|
1106
|
-
crate::messaging::LeaderChannelResolution::Unbound(reason) => {
|
|
1107
|
-
let pane_id = string_field(receiver, "pane_id");
|
|
1108
|
-
let mut err = leader_not_attached_third_party(
|
|
1109
|
-
target_workspace,
|
|
1110
|
-
team,
|
|
1111
|
-
pane_id,
|
|
1112
|
-
session,
|
|
1113
|
-
window,
|
|
1114
|
-
socket,
|
|
1115
|
-
string_field(receiver, "provider"),
|
|
1116
|
-
);
|
|
1117
|
-
if matches!(
|
|
1118
|
-
&reason,
|
|
1119
|
-
crate::messaging::LeaderChannelUnbound::PaneWorkspaceMismatch(_)
|
|
1120
|
-
) {
|
|
1121
|
-
err.channel_reason = Some(reason.reason_code().to_string());
|
|
1122
|
-
}
|
|
1123
|
-
err.log = format!("{} channel_unbound={}", err.log, reason.reason_code());
|
|
1124
|
-
err.candidates =
|
|
1125
|
-
leader_advisory_candidates(state, team, transport, "state_recorded_socket");
|
|
1126
|
-
Err(err)
|
|
1127
|
-
}
|
|
1128
|
-
crate::messaging::LeaderChannelResolution::ProbeFailed(error) => {
|
|
1129
|
-
let mut err = leader_not_attached_third_party(
|
|
1130
|
-
target_workspace,
|
|
1131
|
-
team,
|
|
1132
|
-
string_field(receiver, "pane_id"),
|
|
1133
|
-
session,
|
|
1134
|
-
window,
|
|
1135
|
-
socket,
|
|
1136
|
-
string_field(receiver, "provider"),
|
|
1137
|
-
);
|
|
1138
|
-
err.log = format!("{} channel_probe_failed={error}", err.log);
|
|
1139
|
-
Err(err)
|
|
1140
|
-
}
|
|
1141
|
-
}
|
|
1142
|
-
}
|
|
1143
|
-
|
|
1144
|
-
fn receiver_transport_conflict(receiver: &Value) -> Option<(String, String)> {
|
|
1145
|
-
let mode = receiver.get("mode").and_then(Value::as_str)?;
|
|
1146
|
-
let transport_kind = receiver.get("transport_kind").and_then(Value::as_str)?;
|
|
1147
|
-
if !mode.is_empty() && !transport_kind.is_empty() && mode != transport_kind {
|
|
1148
|
-
return Some((mode.to_string(), transport_kind.to_string()));
|
|
1149
|
-
}
|
|
1150
|
-
None
|
|
1151
|
-
}
|
|
1152
|
-
|
|
1153
|
-
fn resolve_app_server_leader(
|
|
1154
|
-
sender_workspace: &Path,
|
|
1155
|
-
target_workspace: &Path,
|
|
1156
|
-
team: &str,
|
|
1157
|
-
parsed: &ParsedNamedAddress,
|
|
1158
|
-
receiver: &Value,
|
|
1159
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
1160
|
-
let expected = crate::codex_app_server::binding_from_receiver(receiver).map_err(|error| {
|
|
1161
|
-
let mut err = NamedAddressError::new(
|
|
1162
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1163
|
-
format!("app-server leader receiver is incomplete: {error}"),
|
|
1164
|
-
);
|
|
1165
|
-
err.action = format!("Rebind the leader: team-agent attach-app-server-leader --team {team} --socket <socket> --thread-id <thread_id>");
|
|
1166
|
-
err.log = format!("name={team}/leader expected=leader_receiver.app_server");
|
|
1167
|
-
err
|
|
1168
|
-
})?;
|
|
1169
|
-
let actual = crate::codex_app_server::attach_probe(&expected.socket, &expected.thread_id)
|
|
1170
|
-
.map_err(|error| {
|
|
1171
|
-
let mut err = NamedAddressError::new(
|
|
1172
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1173
|
-
format!("app-server leader thread is not live: {error}"),
|
|
1174
|
-
);
|
|
1175
|
-
err.action = format!("Rebind the leader: team-agent attach-app-server-leader --team {team} --socket {} --thread-id {}", expected.socket, expected.thread_id);
|
|
1176
|
-
err.log = format!(
|
|
1177
|
-
"name={team}/leader socket={} thread_id={} reason={}",
|
|
1178
|
-
expected.socket,
|
|
1179
|
-
expected.thread_id,
|
|
1180
|
-
error
|
|
1181
|
-
);
|
|
1182
|
-
err
|
|
1183
|
-
})?;
|
|
1184
|
-
if actual.thread_id != expected.thread_id
|
|
1185
|
-
|| actual.session_id != expected.session_id
|
|
1186
|
-
|| actual.cwd != expected.cwd
|
|
1187
|
-
|| actual.cli_version != expected.cli_version
|
|
1188
|
-
{
|
|
1189
|
-
let mut err = NamedAddressError::new(
|
|
1190
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1191
|
-
"app-server leader thread identity tuple is stale",
|
|
1192
|
-
);
|
|
1193
|
-
err.action = format!("Rebind the leader: team-agent attach-app-server-leader --team {team} --socket {} --thread-id {}", expected.socket, expected.thread_id);
|
|
1194
|
-
err.log = format!(
|
|
1195
|
-
"name={team}/leader expected_thread={} actual_thread={} expected_session={} actual_session={} expected_cwd={} actual_cwd={}",
|
|
1196
|
-
expected.thread_id,
|
|
1197
|
-
actual.thread_id,
|
|
1198
|
-
expected.session_id,
|
|
1199
|
-
actual.session_id,
|
|
1200
|
-
expected.cwd,
|
|
1201
|
-
actual.cwd
|
|
1202
|
-
);
|
|
1203
|
-
return Err(err);
|
|
1204
|
-
}
|
|
1205
|
-
Ok(ResolvedNamedAddress {
|
|
1206
|
-
raw_name: parsed.display_name(),
|
|
1207
|
-
target_kind: NamedTargetKind::Leader,
|
|
1208
|
-
sender_workspace: sender_workspace.to_path_buf(),
|
|
1209
|
-
target_workspace: target_workspace.to_path_buf(),
|
|
1210
|
-
team_key: Some(team.to_string()),
|
|
1211
|
-
agent_id: None,
|
|
1212
|
-
pane_id: String::new(),
|
|
1213
|
-
session_name: None,
|
|
1214
|
-
window_name: None,
|
|
1215
|
-
tmux_endpoint: None,
|
|
1216
|
-
transport_kind: Some("codex_app_server".to_string()),
|
|
1217
|
-
app_server: receiver.get("app_server").cloned(),
|
|
1218
|
-
state_pane_id: None,
|
|
1219
|
-
state_pane_stale: false,
|
|
1220
|
-
agent_status: None,
|
|
1221
|
-
warning: None,
|
|
1222
|
-
})
|
|
1223
|
-
}
|
|
1224
|
-
|
|
1225
|
-
fn resolve_session_window(
|
|
1226
|
-
sender_workspace: &Path,
|
|
1227
|
-
target_workspace: &Path,
|
|
1228
|
-
session: &str,
|
|
1229
|
-
window: &str,
|
|
1230
|
-
parsed: &ParsedNamedAddress,
|
|
1231
|
-
transport: &dyn Transport,
|
|
1232
|
-
) -> Result<ResolvedNamedAddress, NamedAddressError> {
|
|
1233
|
-
let targets = list_targets(transport)?;
|
|
1234
|
-
let matches = matching_session_window(&targets, session, window);
|
|
1235
|
-
match matches.len() {
|
|
1236
|
-
1 => Ok(ResolvedNamedAddress {
|
|
1237
|
-
raw_name: parsed.display_name(),
|
|
1238
|
-
target_kind: NamedTargetKind::SessionWindow,
|
|
1239
|
-
sender_workspace: sender_workspace.to_path_buf(),
|
|
1240
|
-
target_workspace: target_workspace.to_path_buf(),
|
|
1241
|
-
team_key: None,
|
|
1242
|
-
agent_id: None,
|
|
1243
|
-
pane_id: matches[0].pane_id.as_str().to_string(),
|
|
1244
|
-
session_name: Some(session.to_string()),
|
|
1245
|
-
window_name: Some(window.to_string()),
|
|
1246
|
-
tmux_endpoint: transport.tmux_endpoint(),
|
|
1247
|
-
transport_kind: Some("direct_tmux".to_string()),
|
|
1248
|
-
app_server: None,
|
|
1249
|
-
state_pane_id: None,
|
|
1250
|
-
state_pane_stale: false,
|
|
1251
|
-
agent_status: None,
|
|
1252
|
-
warning: None,
|
|
1253
|
-
}),
|
|
1254
|
-
0 => {
|
|
1255
|
-
let mut err = NamedAddressError::new(
|
|
1256
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1257
|
-
"diagnostic session/window name is not live",
|
|
1258
|
-
);
|
|
1259
|
-
err.action = "Check tmux session/window names or use a canonical <workspace>::<team>/<agent> name".to_string();
|
|
1260
|
-
err.log = format!(
|
|
1261
|
-
"workspace={} session={session} window={window} tmux_endpoint={}",
|
|
1262
|
-
target_workspace.display(),
|
|
1263
|
-
transport
|
|
1264
|
-
.tmux_endpoint()
|
|
1265
|
-
.unwrap_or_else(|| "<unknown>".to_string())
|
|
1266
|
-
);
|
|
1267
|
-
Err(err)
|
|
1268
|
-
}
|
|
1269
|
-
_ => Err(name_ambiguous(
|
|
1270
|
-
"multiple live panes match diagnostic session/window",
|
|
1271
|
-
matches
|
|
1272
|
-
.into_iter()
|
|
1273
|
-
.map(|pane| {
|
|
1274
|
-
json!({
|
|
1275
|
-
"name": format!("{session}:{window}"),
|
|
1276
|
-
"workspace": target_workspace.display().to_string(),
|
|
1277
|
-
"session": session,
|
|
1278
|
-
"window": window,
|
|
1279
|
-
"pane_id": pane.pane_id.as_str(),
|
|
1280
|
-
})
|
|
1281
|
-
})
|
|
1282
|
-
.collect(),
|
|
1283
|
-
)),
|
|
1284
|
-
}
|
|
1285
|
-
}
|
|
1286
|
-
|
|
1287
|
-
fn transport_for_cli_target(
|
|
1288
|
-
target_workspace: &Path,
|
|
1289
|
-
state: &Value,
|
|
1290
|
-
parsed: &ParsedNamedAddress,
|
|
1291
|
-
) -> Box<dyn Transport> {
|
|
1292
|
-
if let ParsedTarget::TeamEntity { team, entity } = &parsed.target {
|
|
1293
|
-
let canonical =
|
|
1294
|
-
canonical_named_team_key(target_workspace, state, team).unwrap_or_else(|| team.clone());
|
|
1295
|
-
if entity == "leader" {
|
|
1296
|
-
let team_scoped_socket = team_entry(state, &canonical)
|
|
1297
|
-
.and_then(|entry| entry.get("leader_receiver"))
|
|
1298
|
-
.and_then(|receiver| string_field(receiver, "tmux_socket"));
|
|
1299
|
-
let socket = team_scoped_socket.map(str::to_string).or_else(|| {
|
|
1300
|
-
state
|
|
1301
|
-
// ALLOWED-LEGACY-SINGLE-TEAM: pre-teams-map compat probe endpoint; canonical taxonomy in `resolve_team_scoped_leader_receiver` still gates identity.
|
|
1302
|
-
.get("leader_receiver")
|
|
1303
|
-
.and_then(|receiver| string_field(receiver, "tmux_socket"))
|
|
1304
|
-
.map(str::to_string)
|
|
1305
|
-
});
|
|
1306
|
-
if let Some(socket) = socket {
|
|
1307
|
-
return Box::new(crate::tmux_backend::TmuxBackend::for_tmux_endpoint(&socket));
|
|
1308
|
-
}
|
|
1309
|
-
}
|
|
1310
|
-
if let Some(entry) = team_entry(state, &canonical) {
|
|
1311
|
-
let selected = crate::tmux_backend::tmux_backend_for_runtime_state_or_workspace(
|
|
1312
|
-
target_workspace,
|
|
1313
|
-
Some(entry),
|
|
1314
|
-
);
|
|
1315
|
-
return Box::new(selected.backend);
|
|
1316
|
-
}
|
|
1317
|
-
}
|
|
1318
|
-
|
|
1319
|
-
if let ParsedTarget::BareAgent(agent) = &parsed.target {
|
|
1320
|
-
if let Some((_, entry)) = unique_state_team_for_agent(state, agent) {
|
|
1321
|
-
let selected = crate::tmux_backend::tmux_backend_for_runtime_state_or_workspace(
|
|
1322
|
-
target_workspace,
|
|
1323
|
-
Some(entry),
|
|
1324
|
-
);
|
|
1325
|
-
return Box::new(selected.backend);
|
|
1326
|
-
}
|
|
1327
|
-
}
|
|
1328
|
-
|
|
1329
|
-
let selected = crate::tmux_backend::tmux_backend_for_runtime_state_or_workspace(
|
|
1330
|
-
target_workspace,
|
|
1331
|
-
Some(state),
|
|
1332
|
-
);
|
|
1333
|
-
Box::new(selected.backend)
|
|
1334
|
-
}
|
|
1335
|
-
|
|
1336
|
-
fn unique_state_team_for_agent<'a>(state: &'a Value, agent: &str) -> Option<(&'a str, &'a Value)> {
|
|
1337
|
-
let teams = state.get("teams")?.as_object()?;
|
|
1338
|
-
let mut matches = teams
|
|
1339
|
-
.iter()
|
|
1340
|
-
.filter(|(_, team)| {
|
|
1341
|
-
team.get("agents")
|
|
1342
|
-
.and_then(Value::as_object)
|
|
1343
|
-
.is_some_and(|agents| agents.contains_key(agent))
|
|
1344
|
-
})
|
|
1345
|
-
.map(|(team, entry)| (team.as_str(), entry));
|
|
1346
|
-
let first = matches.next()?;
|
|
1347
|
-
matches.next().is_none().then_some(first)
|
|
1348
|
-
}
|
|
1349
|
-
|
|
1350
|
-
fn matching_session_window<'a>(
|
|
1351
|
-
targets: &'a [PaneInfo],
|
|
1352
|
-
session: &str,
|
|
1353
|
-
window: &str,
|
|
1354
|
-
) -> Vec<&'a PaneInfo> {
|
|
1355
|
-
targets
|
|
1356
|
-
.iter()
|
|
1357
|
-
.filter(|target| {
|
|
1358
|
-
target.session.as_str() == session
|
|
1359
|
-
&& target
|
|
1360
|
-
.window_name
|
|
1361
|
-
.as_ref()
|
|
1362
|
-
.is_some_and(|name| name.as_str() == window)
|
|
1363
|
-
})
|
|
1364
|
-
.collect()
|
|
1365
|
-
}
|
|
1366
|
-
|
|
1367
|
-
fn list_targets(transport: &dyn Transport) -> Result<Vec<PaneInfo>, NamedAddressError> {
|
|
1368
|
-
transport.list_targets().map_err(|error| {
|
|
1369
|
-
let mut err = NamedAddressError::new(
|
|
1370
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1371
|
-
format!("target tmux endpoint could not be listed: {error}"),
|
|
1372
|
-
);
|
|
1373
|
-
err.action =
|
|
1374
|
-
"Verify the target tmux server is running, or reattach/restart the target team"
|
|
1375
|
-
.to_string();
|
|
1376
|
-
err.log = format!(
|
|
1377
|
-
"tmux_endpoint={} list_targets_error={error}",
|
|
1378
|
-
transport
|
|
1379
|
-
.tmux_endpoint()
|
|
1380
|
-
.unwrap_or_else(|| "<unknown>".to_string())
|
|
1381
|
-
);
|
|
1382
|
-
err
|
|
1383
|
-
})
|
|
1384
|
-
}
|
|
1385
|
-
|
|
1386
|
-
fn team_entry<'a>(state: &'a Value, team: &str) -> Option<&'a Value> {
|
|
1387
|
-
state
|
|
1388
|
-
.get("teams")
|
|
1389
|
-
.and_then(Value::as_object)
|
|
1390
|
-
.and_then(|teams| teams.get(team))
|
|
1391
|
-
}
|
|
1392
|
-
|
|
1393
|
-
fn canonical_named_team_key(
|
|
1394
|
-
target_workspace: &Path,
|
|
1395
|
-
state: &Value,
|
|
1396
|
-
requested: &str,
|
|
1397
|
-
) -> Option<String> {
|
|
1398
|
-
if team_entry(state, requested).is_some() || is_legacy_single_team_active(state, requested) {
|
|
1399
|
-
return Some(requested.to_string());
|
|
1400
|
-
}
|
|
1401
|
-
let selected =
|
|
1402
|
-
crate::state::projection::select_runtime_state(target_workspace, Some(requested)).ok()?;
|
|
1403
|
-
let canonical = selected
|
|
1404
|
-
.get("active_team_key")
|
|
1405
|
-
.and_then(Value::as_str)
|
|
1406
|
-
.filter(|team| !team.is_empty())?;
|
|
1407
|
-
state
|
|
1408
|
-
.get("teams")
|
|
1409
|
-
.and_then(Value::as_object)
|
|
1410
|
-
.is_some_and(|teams| teams.contains_key(canonical))
|
|
1411
|
-
.then(|| canonical.to_string())
|
|
1412
|
-
}
|
|
1413
|
-
|
|
1414
|
-
/// E6 (0.5.9 offline-mailbox-toname-design §3.1): decide which
|
|
1415
|
-
/// `leader_receiver` object, if any, applies to `<team>/leader` before any
|
|
1416
|
-
/// downstream code reads it. Wrong runtime keys are rejected here with
|
|
1417
|
-
/// `team_key_not_found` — the pre-fix behavior was to silently reuse the
|
|
1418
|
-
/// top-level `leader_receiver` (the `current` team's receiver in the gate
|
|
1419
|
-
/// evidence), producing misleading `expected_pane=<missing>` messages.
|
|
1420
|
-
///
|
|
1421
|
-
/// Legacy single-team compat is preserved only when the state has no
|
|
1422
|
-
/// `teams` map at all AND the requested team equals `active_team_key`.
|
|
1423
|
-
/// That branch is a documented exception to the E6 fallback grep guard;
|
|
1424
|
-
/// the exception is tagged inline with `ALLOWED-LEGACY-SINGLE-TEAM` so
|
|
1425
|
-
/// the guard admits it explicitly (see the R2 rework in
|
|
1426
|
-
/// `.team/artifacts/059-impl-cr-verdict.md §4`). The exception is
|
|
1427
|
-
/// scheduled to be removed when B1 canonical state layout lands
|
|
1428
|
-
/// (`.team/artifacts/next-version-staged-plan.md §5 Phase-Foundation-1`),
|
|
1429
|
-
/// at which point every runtime state carries a `teams` map and the
|
|
1430
|
-
/// legacy branch becomes unreachable dead code.
|
|
1431
|
-
fn resolve_team_scoped_leader_receiver<'a>(
|
|
1432
|
-
state: &'a Value,
|
|
1433
|
-
team: &str,
|
|
1434
|
-
target_workspace: &Path,
|
|
1435
|
-
) -> Result<Option<&'a Value>, NamedAddressError> {
|
|
1436
|
-
if let Some(entry) = team_entry(state, team) {
|
|
1437
|
-
return Ok(entry.get("leader_receiver"));
|
|
1438
|
-
}
|
|
1439
|
-
if is_legacy_single_team_active(state, team) {
|
|
1440
|
-
// ALLOWED-LEGACY-SINGLE-TEAM: pre-teams-map compat; state has no teams map AND request matches active_team_key.
|
|
1441
|
-
return Ok(state.get("leader_receiver"));
|
|
1442
|
-
}
|
|
1443
|
-
Err(team_key_not_found(target_workspace, state, team))
|
|
1444
|
-
}
|
|
1445
|
-
|
|
1446
|
-
fn is_legacy_single_team_active(state: &Value, team: &str) -> bool {
|
|
1447
|
-
state.get("teams").is_none()
|
|
1448
|
-
&& state
|
|
1449
|
-
.get("active_team_key")
|
|
1450
|
-
.and_then(Value::as_str)
|
|
1451
|
-
.is_some_and(|k| k == team)
|
|
1452
|
-
}
|
|
1453
|
-
|
|
1454
|
-
fn string_field<'a>(value: &'a Value, key: &str) -> Option<&'a str> {
|
|
1455
|
-
value
|
|
1456
|
-
.get(key)
|
|
1457
|
-
.and_then(Value::as_str)
|
|
1458
|
-
.filter(|s| !s.is_empty())
|
|
1459
|
-
}
|
|
1460
|
-
|
|
1461
|
-
fn candidate_json(resolved: &ResolvedNamedAddress) -> Value {
|
|
1462
|
-
json!({
|
|
1463
|
-
"name": resolved.raw_name,
|
|
1464
|
-
"workspace": resolved.target_workspace.display().to_string(),
|
|
1465
|
-
"team_key": resolved.team_key,
|
|
1466
|
-
"agent_id": resolved.agent_id,
|
|
1467
|
-
"session": resolved.session_name,
|
|
1468
|
-
"window": resolved.window_name,
|
|
1469
|
-
"pane_id": resolved.pane_id,
|
|
1470
|
-
"tmux_endpoint": resolved.tmux_endpoint,
|
|
1471
|
-
})
|
|
1472
|
-
}
|
|
1473
|
-
|
|
1474
|
-
fn name_invalid(message: &str) -> NamedAddressError {
|
|
1475
|
-
let mut err = NamedAddressError::new(NamedAddressErrorKind::NameInvalid, message);
|
|
1476
|
-
err.action =
|
|
1477
|
-
"Use <team>/<agent>, <workspace>::<team>/<agent>, <team>/leader, or <session>:<window>"
|
|
1478
|
-
.to_string();
|
|
1479
|
-
err.log = "name parser rejected the input before reading state".to_string();
|
|
1480
|
-
err
|
|
1481
|
-
}
|
|
1482
|
-
|
|
1483
|
-
fn workspace_not_found(path: &Path) -> NamedAddressError {
|
|
1484
|
-
let mut err = NamedAddressError::new(
|
|
1485
|
-
NamedAddressErrorKind::WorkspaceNotFound,
|
|
1486
|
-
"workspace path does not exist",
|
|
1487
|
-
);
|
|
1488
|
-
err.action = "Use an existing workspace path before `::`".to_string();
|
|
1489
|
-
err.log = format!("workspace={}", path.display());
|
|
1490
|
-
err
|
|
1491
|
-
}
|
|
1492
|
-
|
|
1493
|
-
fn name_not_resolvable(message: &str) -> NamedAddressError {
|
|
1494
|
-
let mut err = NamedAddressError::new(
|
|
1495
|
-
NamedAddressErrorKind::NameNotResolvable,
|
|
1496
|
-
message.to_string(),
|
|
1497
|
-
);
|
|
1498
|
-
err.action = "Use a canonical <workspace>::<team>/<agent> or <team>/<agent> name from team-agent status --json".to_string();
|
|
1499
|
-
err.log = "state did not contain the requested team/name tuple".to_string();
|
|
1500
|
-
err
|
|
1501
|
-
}
|
|
1502
|
-
|
|
1503
|
-
fn name_not_resolvable_team(team: &str) -> NamedAddressError {
|
|
1504
|
-
name_not_resolvable(&format!(
|
|
1505
|
-
"team `{team}` is not present in target workspace state"
|
|
1506
|
-
))
|
|
1507
|
-
}
|
|
1508
|
-
|
|
1509
|
-
fn name_not_resolvable_agent(team: &str, agent: &str) -> NamedAddressError {
|
|
1510
|
-
name_not_resolvable(&format!("agent `{agent}` is not present in team `{team}`"))
|
|
1511
|
-
}
|
|
1512
|
-
|
|
1513
|
-
fn name_not_live_worker(
|
|
1514
|
-
team: &str,
|
|
1515
|
-
agent: &str,
|
|
1516
|
-
session: &str,
|
|
1517
|
-
window: &str,
|
|
1518
|
-
endpoint: Option<String>,
|
|
1519
|
-
) -> NamedAddressError {
|
|
1520
|
-
let mut err = NamedAddressError::new(
|
|
1521
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1522
|
-
"state has the team/agent but no live pane matches its session/window",
|
|
1523
|
-
);
|
|
1524
|
-
err.action = format!("Restart the target agent or send to a live pane after checking `team-agent status --team {team} --json`");
|
|
1525
|
-
err.log = format!(
|
|
1526
|
-
"name={team}/{agent} expected_session={session} expected_window={window} tmux_endpoint={}",
|
|
1527
|
-
endpoint.unwrap_or_else(|| "<unknown>".to_string())
|
|
1528
|
-
);
|
|
1529
|
-
err
|
|
1530
|
-
}
|
|
1531
|
-
|
|
1532
|
-
/// E6 (0.5.9 offline-mailbox §3.1): requested `<team>` is not a runtime team_key.
|
|
1533
|
-
/// The refusal echoes the requested string plus the canonical alternatives so
|
|
1534
|
-
/// the caller can retry with `::<canonical_key>/leader`. The action copy is
|
|
1535
|
-
/// deliberately neutral — no `claim-leader` / `takeover` — because a third-party
|
|
1536
|
-
/// sender must never be told to seize the target team's leader.
|
|
1537
|
-
fn team_key_not_found(target_workspace: &Path, state: &Value, team: &str) -> NamedAddressError {
|
|
1538
|
-
let available = available_team_keys(state);
|
|
1539
|
-
let workspace = target_workspace.display();
|
|
1540
|
-
let mut err = NamedAddressError::new(
|
|
1541
|
-
NamedAddressErrorKind::TeamKeyNotFound,
|
|
1542
|
-
format!(
|
|
1543
|
-
"team key `{team}` is not a runtime key in target workspace `{workspace}` (spec/display name may differ from runtime key)"
|
|
1544
|
-
),
|
|
1545
|
-
);
|
|
1546
|
-
let suggested_key = available.first().cloned();
|
|
1547
|
-
err.action = match suggested_key.as_deref() {
|
|
1548
|
-
Some(k) => format!(
|
|
1549
|
-
"Retry with the canonical key, e.g. `{workspace}::{k}/leader`; check `team-agent status --workspace {workspace} --json` for team_key"
|
|
1550
|
-
),
|
|
1551
|
-
None => format!(
|
|
1552
|
-
"No runtime team keys are present; check `team-agent status --workspace {workspace} --json`"
|
|
1553
|
-
),
|
|
1554
|
-
};
|
|
1555
|
-
err.log = format!(
|
|
1556
|
-
"requested_team={team} available_team_keys={:?} workspace={workspace}",
|
|
1557
|
-
available
|
|
1558
|
-
);
|
|
1559
|
-
err.requested_team = Some(team.to_string());
|
|
1560
|
-
err.suggested_name = suggested_key
|
|
1561
|
-
.as_deref()
|
|
1562
|
-
.map(|k| format!("{workspace}::{k}/leader"));
|
|
1563
|
-
err.available_team_keys = available;
|
|
1564
|
-
err
|
|
1565
|
-
}
|
|
1566
|
-
|
|
1567
|
-
/// E6 (0.5.9 offline-mailbox §3.1): key hit but the leader receiver is either
|
|
1568
|
-
/// absent or not live. `leader_not_attached_third_party` is the neutral variant
|
|
1569
|
-
/// used by the resolver: it never suggests `claim-leader` / `takeover` so the
|
|
1570
|
-
/// caller (which may be a third-party sender) never sees ownership-seizing copy.
|
|
1571
|
-
/// The owner-facing action (attach-leader) belongs to `status_port`
|
|
1572
|
-
/// pending_leader_notifications and diagnose.
|
|
1573
|
-
fn leader_not_attached_third_party(
|
|
1574
|
-
target_workspace: &Path,
|
|
1575
|
-
team: &str,
|
|
1576
|
-
pane_id: Option<&str>,
|
|
1577
|
-
session: Option<&str>,
|
|
1578
|
-
window: Option<&str>,
|
|
1579
|
-
socket: Option<String>,
|
|
1580
|
-
provider: Option<&str>,
|
|
1581
|
-
) -> NamedAddressError {
|
|
1582
|
-
let workspace = target_workspace.display();
|
|
1583
|
-
let mut err = NamedAddressError::new(
|
|
1584
|
-
NamedAddressErrorKind::LeaderNotAttached,
|
|
1585
|
-
"target team leader is not attached on its recorded tmux endpoint",
|
|
1586
|
-
);
|
|
1587
|
-
let provider = provider.and_then(crate::provider::wire::parse_provider)
|
|
1588
|
-
.map(crate::provider::wire::provider_wire);
|
|
1589
|
-
let workspace_arg = super::adapters::shell_quote(&target_workspace.to_string_lossy());
|
|
1590
|
-
let team_arg = super::adapters::shell_quote(team);
|
|
1591
|
-
err.action = format!(
|
|
1592
|
-
"Ask the target team owner to select the actual Leader provider and run `team-agent attach-leader --workspace {workspace_arg} --team {team_arg} --provider {}`; the sender-side offline mailbox will requeue the message once attach succeeds",
|
|
1593
|
-
provider.unwrap_or("<provider>")
|
|
1594
|
-
);
|
|
1595
|
-
err.log = format!(
|
|
1596
|
-
"name={team}/leader expected_pane={} expected_session={} expected_window={} tmux_socket={}",
|
|
1597
|
-
pane_id.unwrap_or("<missing>"),
|
|
1598
|
-
session.unwrap_or("<unknown>"),
|
|
1599
|
-
window.unwrap_or("<unknown>"),
|
|
1600
|
-
socket.unwrap_or_else(|| "<unknown>".to_string())
|
|
1601
|
-
);
|
|
1602
|
-
err.requested_team = Some(team.to_string());
|
|
1603
|
-
err
|
|
1604
|
-
}
|
|
1605
|
-
|
|
1606
|
-
pub(crate) fn available_team_keys(state: &Value) -> Vec<String> {
|
|
1607
|
-
let mut keys: Vec<String> = state
|
|
1608
|
-
.get("teams")
|
|
1609
|
-
.and_then(Value::as_object)
|
|
1610
|
-
.map(|teams| teams.keys().cloned().collect())
|
|
1611
|
-
.unwrap_or_default();
|
|
1612
|
-
if keys.is_empty() {
|
|
1613
|
-
if let Some(active) = state.get("active_team_key").and_then(Value::as_str) {
|
|
1614
|
-
if !active.is_empty() {
|
|
1615
|
-
keys.push(active.to_string());
|
|
1616
|
-
}
|
|
1617
|
-
}
|
|
1618
|
-
}
|
|
1619
|
-
keys.sort();
|
|
1620
|
-
keys
|
|
1621
|
-
}
|
|
1622
|
-
|
|
1623
|
-
fn name_not_live_leader(
|
|
1624
|
-
team: &str,
|
|
1625
|
-
pane_id: Option<&str>,
|
|
1626
|
-
session: Option<&str>,
|
|
1627
|
-
window: Option<&str>,
|
|
1628
|
-
socket: Option<String>,
|
|
1629
|
-
) -> NamedAddressError {
|
|
1630
|
-
let mut err = NamedAddressError::new(
|
|
1631
|
-
NamedAddressErrorKind::NameNotLive,
|
|
1632
|
-
"leader_receiver is missing or not live on its recorded tmux socket",
|
|
1633
|
-
);
|
|
1634
|
-
err.action = "Run claim-leader, attach-leader, or takeover for the target team; resolver will not guess another leader pane".to_string();
|
|
1635
|
-
err.log = format!(
|
|
1636
|
-
"name={team}/leader expected_pane={} expected_session={} expected_window={} tmux_socket={}",
|
|
1637
|
-
pane_id.unwrap_or("<missing>"),
|
|
1638
|
-
session.unwrap_or("<unknown>"),
|
|
1639
|
-
window.unwrap_or("<unknown>"),
|
|
1640
|
-
socket.unwrap_or_else(|| "<unknown>".to_string())
|
|
1641
|
-
);
|
|
1642
|
-
err
|
|
1643
|
-
}
|
|
1644
|
-
|
|
1645
|
-
fn name_ambiguous(message: &str, candidates: Vec<Value>) -> NamedAddressError {
|
|
1646
|
-
let mut err = NamedAddressError::new(NamedAddressErrorKind::NameAmbiguous, message);
|
|
1647
|
-
err.action = "Use an explicit <workspace>::<team>/<agent> or <team>/<agent> name".to_string();
|
|
1648
|
-
err.log = format!("{} candidates matched", candidates.len());
|
|
1649
|
-
err.candidates = candidates;
|
|
1650
|
-
err
|
|
1651
|
-
}
|