@team-agent/installer 0.5.128 → 0.6.1
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 +4 -4
- package/README.zh.md +1 -1
- package/package.json +4 -8
- package/skills/team-agent/SKILL.md +37 -20
- package/skills/team-agent/command-coverage.json +169 -183
- package/skills/team-agent/docs/reference/team-agent-operator.md +64 -30
- package/skills/team-agent/references/recovery-runbook.md +1 -1
- package/skills/team-agent/references/team-agent-operator.md +64 -30
- 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 -1288
- package/crates/team-agent/src/cli/arguments.rs +0 -405
- package/crates/team-agent/src/cli/attach_app_server_leader.rs +0 -98
- package/crates/team-agent/src/cli/diagnose.rs +0 -1721
- package/crates/team-agent/src/cli/emit.rs +0 -2930
- 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 -1216
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +0 -912
- package/crates/team-agent/src/cli/intent/tests.rs +0 -689
- 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 -6545
- package/crates/team-agent/src/cli/models.rs +0 -1206
- 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/schedule.rs +0 -175
- 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 -156
- 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 -199
- package/crates/team-agent/src/cli/shutdown_socket.rs +0 -288
- package/crates/team-agent/src/cli/spec.rs +0 -165
- 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 -1981
- 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 -322
- 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 -761
- package/crates/team-agent/src/cli/tests/parser_safety.rs +0 -383
- package/crates/team-agent/src/cli/tests/run_delegation.rs +0 -484
- 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 -888
- 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 -827
- package/crates/team-agent/src/compiler.rs +0 -890
- 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 -1744
- package/crates/team-agent/src/contract_runtime/commands.rs +0 -671
- package/crates/team-agent/src/contract_runtime/config.rs +0 -364
- package/crates/team-agent/src/contract_runtime/config_tests.rs +0 -76
- package/crates/team-agent/src/contract_runtime/discovery.rs +0 -449
- package/crates/team-agent/src/contract_runtime/fork.rs +0 -361
- package/crates/team-agent/src/contract_runtime/forward.rs +0 -288
- package/crates/team-agent/src/contract_runtime/framework.rs +0 -367
- package/crates/team-agent/src/contract_runtime/mcp.rs +0 -394
- 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 -553
- 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 -300
- 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 -503
- 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 -3024
- 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 -1527
- 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/direct_delivery.rs +0 -368
- 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/inbox_store.rs +0 -169
- 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 -888
- package/crates/team-agent/src/leader/start.rs +0 -4501
- 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 -268
- 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 -147
- package/crates/team-agent/src/lifecycle/helpers.rs +0 -212
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +0 -881
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +0 -598
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -332
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +0 -204
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +0 -107
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +0 -144
- 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 -160
- package/crates/team-agent/src/lifecycle/launch/ownership.rs +0 -105
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +0 -899
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +0 -225
- package/crates/team-agent/src/lifecycle/launch/plan.rs +0 -269
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -5200
- 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 -473
- 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 -557
- 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 -1067
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +0 -557
- package/crates/team-agent/src/lifecycle/restart/agent.rs +0 -2199
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1798
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +0 -163
- package/crates/team-agent/src/lifecycle/restart/common.rs +0 -2362
- 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 -227
- package/crates/team-agent/src/lifecycle/role_config.rs +0 -1230
- 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_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +0 -447
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +0 -1638
- 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 -770
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +0 -419
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +0 -2035
- package/crates/team-agent/src/lifecycle/tests/core.rs +0 -1327
- 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 -72
- 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 -512
- 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 -3983
- 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 -164
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +0 -200
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +0 -527
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +0 -1062
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1419
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +0 -98
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +0 -550
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +0 -226
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +0 -332
- 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 -342
- 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 -995
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +0 -836
- package/crates/team-agent/src/lifecycle/tests.rs +0 -105
- package/crates/team-agent/src/lifecycle/types.rs +0 -877
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +0 -363
- 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 -527
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +0 -348
- 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 -158
- package/crates/team-agent/src/mcp_server/tests/send.rs +0 -353
- package/crates/team-agent/src/mcp_server/tests/tools.rs +0 -341
- 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 -889
- 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 -3727
- 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 -336
- 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 -167
- 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/reminders.rs +0 -316
- 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 -223
- 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 -657
- 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 -3549
- package/crates/team-agent/src/messaging/tests/spine.rs +0 -853
- 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 -472
- 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 -1150
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/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 -30
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -106
- 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 -708
- 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 -910
- package/crates/team-agent/src/provider/session/capture.rs +0 -2731
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -172
- package/crates/team-agent/src/provider/session/context_fork.rs +0 -396
- 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/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/common/tests.rs +0 -316
- package/crates/team-agent/src/provider/session_scan/common.rs +0 -654
- package/crates/team-agent/src/provider/session_scan/copilot.rs +0 -280
- package/crates/team-agent/src/provider/session_scan/pi.rs +0 -185
- package/crates/team-agent/src/provider/session_scan.rs +0 -71
- 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 -441
- package/crates/team-agent/src/provider/tests/classify.rs +0 -148
- package/crates/team-agent/src/provider/tests/command_helpers.rs +0 -35
- 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 -177
- 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 -394
- 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/test_support/models_timeout_fixture.rs +0 -144
- 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 -4103
- package/crates/team-agent/src/tmux_backend.rs +0 -4492
- 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,4492 +0,0 @@
|
|
|
1
|
-
//! ---
|
|
2
|
-
//! purpose: 通过 tmux argv 执行 spawn/inject/capture
|
|
3
|
-
//! contract:
|
|
4
|
-
//! provides:
|
|
5
|
-
//! - name: TmuxBackend
|
|
6
|
-
//! what: Transport 的 tmux 实现,inject/send_keys 取 pane 输入锁
|
|
7
|
-
//! - name: submit-consumption-verdict
|
|
8
|
-
//! what: token 见过再消失且本次占位符身份(#N / grok 行数或 KB)已离开 composer ⇒ 已消费;Gone 时占位符仍在 ⇒ 未消费;无身份时只按一次回车;consumed=None(capture 失败/读数拿不到)⇒ SubmitConsumptionUnverified,不得与 Some(true) 同值
|
|
9
|
-
//! - name: token-sighting
|
|
10
|
-
//! what: Visible / Gone / NeverSeen 三态接到判定(不只进报告)
|
|
11
|
-
//! - name: pre-submit-copy-mode-cancel
|
|
12
|
-
//! what: 统一 prepare_pane_for_submit:Enter 前 cancel 一切非 0 pane_mode(按真实 mode 分派);⛔ 不发 ESC 也不发其替代品(含字面 CSI 201~,用户裁定 2026-08-23);A1 Empty / A3 skip-poll / A4 Phase2 / A6 send_keys(含 Enter) 都走这里
|
|
13
|
-
//! - name: turn-inbox-vs-run
|
|
14
|
-
//! what: busy ⇒ Verified(开跑);composer 仍有本次粘贴且无 busy ⇒ Missing(没开跑);其余 NotYetObserved(不知道)
|
|
15
|
-
//! - name: capture-fail-retry
|
|
16
|
-
//! what: post-Enter capture 失败只重读 capture,计入 attempts,不重粘、不加 Enter
|
|
17
|
-
//! - name: cursor-single-enter
|
|
18
|
-
//! what: TLS 打开时,busy 或 token 不在输入区(底部 5 非空行)则不重按 Enter;transcript 里的 pasted #N 不算输入框
|
|
19
|
-
//! - name: unverified-composer-resend
|
|
20
|
-
//! what: SubmitConsumptionUnverified 且本次身份仍在 composer 且 A 的 should_resubmit_enter 为假(折行拼接缺口)⇒ 只补一颗 C-m;A 因 latch/底15 单行 token 已能重试(含打满 cap)时 B 不介入;consumed=None 不补;达上限 1 或身份消失或已消费或 busy 则停。不认提示符皮肤。
|
|
21
|
-
//! boundary:
|
|
22
|
-
//! - 不把 fire-and-forget 报成 delivered
|
|
23
|
-
//! - 不把「粘贴命中」(any_attempt_matched) 当成已提交
|
|
24
|
-
//! - 不把「没能判断」(consumed=None) 落到成功值
|
|
25
|
-
//! - turn_verification 不是投递闸门;分辨不出不得报开跑
|
|
26
|
-
//! - 补发只重按回车,不重粘、不用 Escape/C-c;闸是折行缺口(A 看不到、拼接身份还在),不是提示符字符串、也不是 pane 忙闲;A 已覆盖的 latch 滞留不走 B
|
|
27
|
-
//! maturity: wired
|
|
28
|
-
//! ---
|
|
29
|
-
//!
|
|
30
|
-
//! Concrete tmux `Transport` backend (SKELETON) — the real executor that runs `tmux <argv>`.
|
|
31
|
-
//!
|
|
32
|
-
//! step 9 shipped the [`crate::transport::Transport`] trait + the pure tmux argv-builders
|
|
33
|
-
//! (`tmux_spawn_argv`, `tmux_capture_argv`, `tmux_send_keys_argv`, `tmux_inject_text_argv`,
|
|
34
|
-
//! `tmux_query_argv`, `tmux_cancel_mode_argv`) but NO concrete backend that actually executes them.
|
|
35
|
-
//! This is that backend: each `Transport` method builds its argv via those builders, runs it through
|
|
36
|
-
//! a [`CommandRunner`] seam, and parses the tmux output into the trait's typed return.
|
|
37
|
-
//!
|
|
38
|
-
//! THE SEAM: [`CommandRunner`] is the single OS edge. [`RealCommandRunner`] runs
|
|
39
|
-
//! `std::process::Command::new("tmux") …`; tests inject a recording/canned runner so the argv
|
|
40
|
-
//! construction + output parsing are unit-testable in-process, while the real subprocess execution
|
|
41
|
-
//! stays the `#[ignore]` real-machine boundary (acceptance framework).
|
|
42
|
-
//!
|
|
43
|
-
//! §10: the implementation must be panic-free (porter adds the deny + bodies; this skeleton is
|
|
44
|
-
//! `unimplemented!()`). MUST-NOT-13: a transport backend has no provider-client dependency.
|
|
45
|
-
#![allow(dead_code)]
|
|
46
|
-
|
|
47
|
-
use std::collections::BTreeMap;
|
|
48
|
-
use std::hash::{Hash, Hasher};
|
|
49
|
-
use std::io::{Read, Write};
|
|
50
|
-
// 0.5.x Windows portability Batch 1: gate the sole Unix API surface
|
|
51
|
-
// in this concrete tmux backend (FileTypeExt::is_socket + libc::geteuid
|
|
52
|
-
// tmux-socket-root derivation). The rest of the file is Command::new
|
|
53
|
-
// "tmux" shellouts that compile on Windows but return runtime errors
|
|
54
|
-
// honestly (tmux binary absent → typed subprocess error).
|
|
55
|
-
// Truth source: `.team/artifacts/0.5.x-windows-portability-survey-design.md` §Batch 1.
|
|
56
|
-
use std::cell::Cell;
|
|
57
|
-
#[cfg(unix)]
|
|
58
|
-
use std::os::unix::fs::FileTypeExt;
|
|
59
|
-
use std::path::{Path, PathBuf};
|
|
60
|
-
use std::process::Stdio;
|
|
61
|
-
use std::time::{Duration, Instant};
|
|
62
|
-
|
|
63
|
-
use crate::model::enums::PaneLiveness;
|
|
64
|
-
use crate::provider::wire::{parse_provider, provider_wire};
|
|
65
|
-
use crate::transport::{
|
|
66
|
-
command_basename, normalize_capture, tmux_capture_argv, tmux_empty_inject_argv,
|
|
67
|
-
tmux_inject_text_argv, tmux_query_argv, tmux_send_keys_argv, tmux_send_submit_argv,
|
|
68
|
-
tmux_spawn_argv, AttachOutcome, BackendKind, BusySignalKind, CaptureRange,
|
|
69
|
-
CaptureSampleOutcome, CapturedText, InjectPayload, InjectReport, InjectStage,
|
|
70
|
-
InjectVerification, InputSurfaceProbe, Key, PaneField, PaneId, PaneInfo, PaneMode,
|
|
71
|
-
QueryOutcome, SessionName, SessionOwner, SetEnvOutcome, SpawnResult,
|
|
72
|
-
SubmitAttemptObservation, SubmitConsumptionReason, SubmitDiagnostics, SubmitObserver,
|
|
73
|
-
SubmitVerification, Target, Transport, TransportError, TurnVerification, WindowName,
|
|
74
|
-
};
|
|
75
|
-
|
|
76
|
-
mod enter_rescue;
|
|
77
|
-
mod native_input;
|
|
78
|
-
|
|
79
|
-
pub const PANE_BINDING_NONCE_METADATA_KEY: &str = "TEAM_AGENT_PANE_BINDING_NONCE";
|
|
80
|
-
pub(crate) const KEEPALIVE_WINDOW_NAME: &str = "[team-agent keepalive]";
|
|
81
|
-
const TMUX_PANE_BINDING_NONCE_OPTION: &str = "@team_agent_pane_binding_nonce";
|
|
82
|
-
const TMUX_SESSION_OWNER_WORKSPACE_OPTION: &str = "@team_agent_owner_workspace";
|
|
83
|
-
const TMUX_SESSION_OWNER_TEAM_OPTION: &str = "@team_agent_owner_team";
|
|
84
|
-
const TMUX_SESSION_OWNER_GENERATION_OPTION: &str = "@team_agent_owner_generation";
|
|
85
|
-
|
|
86
|
-
/// Shared existing pane nonce generator; transport owns the physical nonce.
|
|
87
|
-
/// Same material/algorithm as the original Leader claim producer, no new dependency.
|
|
88
|
-
pub(crate) fn next_pane_binding_nonce(workspace: &Path, endpoint: &str, pane: &PaneId) -> String {
|
|
89
|
-
use sha2::{Digest, Sha256};
|
|
90
|
-
use std::sync::atomic::{AtomicU64, Ordering};
|
|
91
|
-
use std::time::{SystemTime, UNIX_EPOCH};
|
|
92
|
-
|
|
93
|
-
static COUNTER: AtomicU64 = AtomicU64::new(0);
|
|
94
|
-
let nanos = SystemTime::now()
|
|
95
|
-
.duration_since(UNIX_EPOCH)
|
|
96
|
-
.map_or(0, |duration| duration.as_nanos());
|
|
97
|
-
let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
98
|
-
let canonical = workspace.canonicalize().unwrap_or_else(|_| workspace.to_path_buf());
|
|
99
|
-
let material = format!(
|
|
100
|
-
"{}\0{endpoint}\0{}\0{}\0{nanos}\0{counter}",
|
|
101
|
-
canonical.display(),
|
|
102
|
-
pane.as_str(),
|
|
103
|
-
std::process::id(),
|
|
104
|
-
);
|
|
105
|
-
let digest = Sha256::digest(material.as_bytes());
|
|
106
|
-
digest[..16].iter().map(|byte| format!("{byte:02x}")).collect()
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
/// Result of running an external command — the typed output of the OS edge.
|
|
110
|
-
#[derive(Debug, Clone)]
|
|
111
|
-
pub struct CommandOutput {
|
|
112
|
-
/// process exit status was success (code 0).
|
|
113
|
-
pub success: bool,
|
|
114
|
-
/// exit code if the process exited normally.
|
|
115
|
-
pub code: Option<i32>,
|
|
116
|
-
pub stdout: String,
|
|
117
|
-
pub stderr: String,
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
/// The single OS-edge seam: run an argv vector and return its output.
|
|
121
|
-
/// Real impl spawns `std::process::Command`; tests inject canned/recording output so the
|
|
122
|
-
/// argv-construction + output-parsing of [`TmuxBackend`] is testable without a live tmux server.
|
|
123
|
-
pub trait CommandRunner: Send + Sync {
|
|
124
|
-
fn run(&self, argv: &[String]) -> Result<CommandOutput, std::io::Error>;
|
|
125
|
-
|
|
126
|
-
fn run_with_stdin(
|
|
127
|
-
&self,
|
|
128
|
-
argv: &[String],
|
|
129
|
-
stdin: &str,
|
|
130
|
-
) -> Result<CommandOutput, std::io::Error> {
|
|
131
|
-
let _ = stdin;
|
|
132
|
-
self.run(argv)
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
/// Production runner: `std::process::Command::new(argv[0]).args(argv[1..]).output()`.
|
|
137
|
-
pub struct RealCommandRunner;
|
|
138
|
-
|
|
139
|
-
const COMMAND_TIMEOUT: Duration = Duration::from_secs(5);
|
|
140
|
-
const SPAWN_IDENTITY_TIMEOUT: Duration = Duration::from_millis(500);
|
|
141
|
-
const SPAWN_IDENTITY_POLL_INTERVAL: Duration = Duration::from_millis(25);
|
|
142
|
-
|
|
143
|
-
/// Keep the final tmux argv below the ~16 KiB command envelope observed on macOS.
|
|
144
|
-
/// This is checked after shell quoting and socket arguments are applied, before
|
|
145
|
-
/// the external tmux process is called.
|
|
146
|
-
pub const TMUX_SPAWN_COMMAND_LIMIT_BYTES: usize = 16_000;
|
|
147
|
-
|
|
148
|
-
impl CommandRunner for RealCommandRunner {
|
|
149
|
-
fn run(&self, argv: &[String]) -> Result<CommandOutput, std::io::Error> {
|
|
150
|
-
self.run_inner(argv, None)
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
fn run_with_stdin(
|
|
154
|
-
&self,
|
|
155
|
-
argv: &[String],
|
|
156
|
-
stdin: &str,
|
|
157
|
-
) -> Result<CommandOutput, std::io::Error> {
|
|
158
|
-
self.run_inner(argv, Some(stdin))
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
impl RealCommandRunner {
|
|
163
|
-
fn run_inner(
|
|
164
|
-
&self,
|
|
165
|
-
argv: &[String],
|
|
166
|
-
stdin_text: Option<&str>,
|
|
167
|
-
) -> Result<CommandOutput, std::io::Error> {
|
|
168
|
-
let Some(program) = argv.first() else {
|
|
169
|
-
return Err(std::io::Error::new(
|
|
170
|
-
std::io::ErrorKind::InvalidInput,
|
|
171
|
-
"empty argv",
|
|
172
|
-
));
|
|
173
|
-
};
|
|
174
|
-
let mut child = std::process::Command::new(program)
|
|
175
|
-
.args(argv.iter().skip(1))
|
|
176
|
-
.stdin(if stdin_text.is_some() {
|
|
177
|
-
Stdio::piped()
|
|
178
|
-
} else {
|
|
179
|
-
Stdio::null()
|
|
180
|
-
})
|
|
181
|
-
.stdout(Stdio::piped())
|
|
182
|
-
.stderr(Stdio::piped())
|
|
183
|
-
.spawn()?;
|
|
184
|
-
if let Some(text) = stdin_text {
|
|
185
|
-
let mut stdin = child
|
|
186
|
-
.stdin
|
|
187
|
-
.take()
|
|
188
|
-
.ok_or_else(|| std::io::Error::other("stdin pipe missing"))?;
|
|
189
|
-
stdin.write_all(text.as_bytes())?;
|
|
190
|
-
}
|
|
191
|
-
let stdout = child
|
|
192
|
-
.stdout
|
|
193
|
-
.take()
|
|
194
|
-
.ok_or_else(|| std::io::Error::other("stdout pipe missing"))?;
|
|
195
|
-
let stderr = child
|
|
196
|
-
.stderr
|
|
197
|
-
.take()
|
|
198
|
-
.ok_or_else(|| std::io::Error::other("stderr pipe missing"))?;
|
|
199
|
-
let stdout_thread = std::thread::spawn(move || read_pipe(stdout));
|
|
200
|
-
let stderr_thread = std::thread::spawn(move || read_pipe(stderr));
|
|
201
|
-
let deadline = Instant::now() + COMMAND_TIMEOUT;
|
|
202
|
-
// Observe short-lived commands promptly; retain the old cadence for long ones.
|
|
203
|
-
let mut poll_interval = Duration::from_millis(1);
|
|
204
|
-
let status = loop {
|
|
205
|
-
if let Some(status) = child.try_wait()? {
|
|
206
|
-
break status;
|
|
207
|
-
}
|
|
208
|
-
let now = Instant::now();
|
|
209
|
-
if now >= deadline {
|
|
210
|
-
child.kill()?;
|
|
211
|
-
child.wait()?;
|
|
212
|
-
let _ = join_pipe_reader(stdout_thread)?;
|
|
213
|
-
let _ = join_pipe_reader(stderr_thread)?;
|
|
214
|
-
return Err(std::io::Error::new(
|
|
215
|
-
std::io::ErrorKind::TimedOut,
|
|
216
|
-
format!("{program} exceeded 5s timeout"),
|
|
217
|
-
));
|
|
218
|
-
}
|
|
219
|
-
std::thread::sleep(poll_interval.min(deadline.saturating_duration_since(now)));
|
|
220
|
-
poll_interval = (poll_interval * 2).min(Duration::from_millis(25));
|
|
221
|
-
};
|
|
222
|
-
let stdout = join_pipe_reader(stdout_thread)?;
|
|
223
|
-
let stderr = join_pipe_reader(stderr_thread)?;
|
|
224
|
-
Ok(CommandOutput {
|
|
225
|
-
success: status.success(),
|
|
226
|
-
code: status.code(),
|
|
227
|
-
stdout,
|
|
228
|
-
stderr,
|
|
229
|
-
})
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
fn read_pipe<R: Read>(mut reader: R) -> Result<String, std::io::Error> {
|
|
234
|
-
let mut bytes = Vec::new();
|
|
235
|
-
reader.read_to_end(&mut bytes)?;
|
|
236
|
-
Ok(String::from_utf8_lossy(&bytes).to_string())
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
fn join_pipe_reader(
|
|
240
|
-
handle: std::thread::JoinHandle<Result<String, std::io::Error>>,
|
|
241
|
-
) -> Result<String, std::io::Error> {
|
|
242
|
-
handle
|
|
243
|
-
.join()
|
|
244
|
-
.map_err(|_| std::io::Error::other("pipe reader thread panicked"))?
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
/// Concrete tmux backend: builds argv via the `transport::tmux_*_argv` builders, runs them through
|
|
248
|
-
/// the [`CommandRunner`], and parses tmux output into the [`Transport`] typed returns.
|
|
249
|
-
///
|
|
250
|
-
/// CP-1: a workspace-bound backend carries a PER-TEAM tmux socket (`socket = Some("ta-<hash>")`) so a
|
|
251
|
-
/// dying shared `default` server can no longer tear the team down. The socket is injected at the RUN
|
|
252
|
-
/// CHOKEPOINT ([`TmuxBackend::tmux_argv`]) — the `transport::tmux_*_argv` builders stay socket-free.
|
|
253
|
-
pub struct TmuxBackend {
|
|
254
|
-
runner: Box<dyn CommandRunner>,
|
|
255
|
-
/// `Some(name)` for a per-team socket -> every `tmux` argv gets `-L <name>` injected after the
|
|
256
|
-
/// leading "tmux" token; `None` (default) -> bare `tmux` on the shared default socket.
|
|
257
|
-
socket: Option<TmuxSocketEndpoint>,
|
|
258
|
-
/// swallow batch 2: workspace for failure-observability events (`tmux.*_failed`);
|
|
259
|
-
/// `None` for non-workspace-bound backends (no event log to write to).
|
|
260
|
-
event_workspace: Option<PathBuf>,
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
enum TmuxSocketEndpoint {
|
|
264
|
-
Name(String),
|
|
265
|
-
Path(String),
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
impl TmuxSocketEndpoint {
|
|
269
|
-
fn as_endpoint(&self) -> &str {
|
|
270
|
-
match self {
|
|
271
|
-
TmuxSocketEndpoint::Name(socket) | TmuxSocketEndpoint::Path(socket) => socket,
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
277
|
-
pub(crate) enum RuntimeTmuxEndpointSource {
|
|
278
|
-
StateTmuxEndpoint,
|
|
279
|
-
StateTmuxSocket,
|
|
280
|
-
WorkspaceFallback,
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
impl RuntimeTmuxEndpointSource {
|
|
284
|
-
/// ---
|
|
285
|
-
/// purpose: endpoint 来源的稳定诊断拼写,让日志能分清 endpoint 是从 state 读的还是 workspace 兜底算的
|
|
286
|
-
/// returns: state.tmux_endpoint / state.tmux_socket / workspace_fallback 三者之一
|
|
287
|
-
/// boundary: 只标来源,不表示该 endpoint 上真的有 tmux server
|
|
288
|
-
/// ---
|
|
289
|
-
pub(crate) fn as_str(self) -> &'static str {
|
|
290
|
-
match self {
|
|
291
|
-
Self::StateTmuxEndpoint => "state.tmux_endpoint",
|
|
292
|
-
Self::StateTmuxSocket => "state.tmux_socket",
|
|
293
|
-
Self::WorkspaceFallback => "workspace_fallback",
|
|
294
|
-
}
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
|
|
298
|
-
pub(crate) struct RuntimeTmuxBackendSelection {
|
|
299
|
-
pub(crate) backend: TmuxBackend,
|
|
300
|
-
pub(crate) tmux_endpoint_used: Option<String>,
|
|
301
|
-
pub(crate) tmux_endpoint_source: RuntimeTmuxEndpointSource,
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
impl TmuxBackend {
|
|
305
|
-
/// Backend bound to the real `tmux` subprocess on the SHARED default socket (no `-L`).
|
|
306
|
-
/// Non-team callers + existing argv/unit tests stay unaffected.
|
|
307
|
-
/// ---
|
|
308
|
-
/// purpose: 构造绑在共享默认 socket 上的真实 tmux 后端(argv 不带 -L / -S)
|
|
309
|
-
/// returns: 用 RealCommandRunner 执行、无 socket、无事件 workspace 的后端
|
|
310
|
-
/// boundary: 不属于任何 team,故 kill_server 对它是 no-op;不写 events.jsonl(没有 workspace)
|
|
311
|
-
/// ---
|
|
312
|
-
pub fn new() -> Self {
|
|
313
|
-
Self {
|
|
314
|
-
runner: Box::new(RealCommandRunner),
|
|
315
|
-
socket: None,
|
|
316
|
-
event_workspace: None,
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
/// CP-1 team backend: bound to the real `tmux` subprocess on a PER-WORKSPACE socket, derived
|
|
321
|
-
/// deterministically from the canonicalized workspace path so the leader CLI, the daemon, and
|
|
322
|
-
/// every later op (spawn / inject / has_session / kill) hit the SAME `tmux -L <socket>` server.
|
|
323
|
-
/// ---
|
|
324
|
-
/// purpose: 构造绑在「按 workspace 派生的专属 socket」上的真实 tmux 后端
|
|
325
|
-
/// params:
|
|
326
|
-
/// workspace: 工作区路径;socket 名由它经 socket_name_for_workspace 确定性派生
|
|
327
|
-
/// returns: socket 为 Name(ta-xxxxxxxxxxxx)、事件写入该 workspace 的后端
|
|
328
|
-
/// boundary: 只决定「连哪台 server」,不创建 server、不验证 socket 是否存在(探测见 socket_probe_missing_for_workspace)
|
|
329
|
-
/// ---
|
|
330
|
-
pub fn for_workspace(workspace: &Path) -> Self {
|
|
331
|
-
Self {
|
|
332
|
-
runner: Box::new(RealCommandRunner),
|
|
333
|
-
socket: Some(TmuxSocketEndpoint::Name(socket_name_for_workspace(
|
|
334
|
-
workspace,
|
|
335
|
-
))),
|
|
336
|
-
event_workspace: Some(workspace.to_path_buf()),
|
|
337
|
-
}
|
|
338
|
-
}
|
|
339
|
-
|
|
340
|
-
/// ---
|
|
341
|
-
/// purpose: 按给定短 socket 名构造真实 tmux 后端
|
|
342
|
-
/// params:
|
|
343
|
-
/// socket: 短 socket 名;空串或 "default" 视为「用共享默认 socket」
|
|
344
|
-
/// returns: socket 名非空且非 default 时绑 Name(socket),否则等价于 new()
|
|
345
|
-
/// boundary: 不识别绝对路径(会被原样当短名走 -L);要按路径寻址请用 for_tmux_endpoint;不设事件 workspace
|
|
346
|
-
/// ---
|
|
347
|
-
pub(crate) fn for_socket_name(socket: &str) -> Self {
|
|
348
|
-
if socket.is_empty() || socket == "default" {
|
|
349
|
-
Self::new()
|
|
350
|
-
} else {
|
|
351
|
-
Self {
|
|
352
|
-
runner: Box::new(RealCommandRunner),
|
|
353
|
-
socket: Some(TmuxSocketEndpoint::Name(socket.to_string())),
|
|
354
|
-
event_workspace: None,
|
|
355
|
-
}
|
|
356
|
-
}
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
/// ---
|
|
360
|
-
/// purpose: 按 endpoint 字符串构造真实 tmux 后端,自动分辨绝对路径与短名
|
|
361
|
-
/// params:
|
|
362
|
-
/// endpoint: 绝对路径 ⇒ 直接当 socket 路径;短名 ⇒ 先解析成已存在或默认根下的路径;空串 / "default" ⇒ 共享默认 socket
|
|
363
|
-
/// returns: 解析成功时绑 Path(...);短名解析不出路径时退回 new()
|
|
364
|
-
/// boundary: 只解析寻址,不探活、不创建 server;不设事件 workspace
|
|
365
|
-
/// ---
|
|
366
|
-
pub(crate) fn for_tmux_endpoint(endpoint: &str) -> Self {
|
|
367
|
-
if endpoint.is_empty() || endpoint == "default" {
|
|
368
|
-
Self::new()
|
|
369
|
-
} else if Path::new(endpoint).is_absolute() {
|
|
370
|
-
Self {
|
|
371
|
-
runner: Box::new(RealCommandRunner),
|
|
372
|
-
socket: Some(TmuxSocketEndpoint::Path(endpoint.to_string())),
|
|
373
|
-
event_workspace: None,
|
|
374
|
-
}
|
|
375
|
-
} else if let Some(path) = socket_path_for_name(endpoint) {
|
|
376
|
-
Self {
|
|
377
|
-
runner: Box::new(RealCommandRunner),
|
|
378
|
-
socket: Some(TmuxSocketEndpoint::Path(
|
|
379
|
-
path.to_string_lossy().into_owned(),
|
|
380
|
-
)),
|
|
381
|
-
event_workspace: None,
|
|
382
|
-
}
|
|
383
|
-
} else {
|
|
384
|
-
Self::new()
|
|
385
|
-
}
|
|
386
|
-
}
|
|
387
|
-
|
|
388
|
-
fn set_session_owner_marker(
|
|
389
|
-
&self,
|
|
390
|
-
session: &SessionName,
|
|
391
|
-
workspace: &Path,
|
|
392
|
-
team: &str,
|
|
393
|
-
generation: &str,
|
|
394
|
-
) -> Result<(), TransportError> {
|
|
395
|
-
let workspace = workspace
|
|
396
|
-
.canonicalize()
|
|
397
|
-
.unwrap_or_else(|_| workspace.to_path_buf())
|
|
398
|
-
.to_string_lossy()
|
|
399
|
-
.into_owned();
|
|
400
|
-
for (option, value) in [
|
|
401
|
-
(TMUX_SESSION_OWNER_WORKSPACE_OPTION, workspace),
|
|
402
|
-
(TMUX_SESSION_OWNER_TEAM_OPTION, team.to_string()),
|
|
403
|
-
(TMUX_SESSION_OWNER_GENERATION_OPTION, generation.to_string()),
|
|
404
|
-
] {
|
|
405
|
-
let argv = self.tmux_argv(&[
|
|
406
|
-
"tmux".to_string(),
|
|
407
|
-
"set-option".to_string(),
|
|
408
|
-
"-t".to_string(),
|
|
409
|
-
session.as_str().to_string(),
|
|
410
|
-
option.to_string(),
|
|
411
|
-
value,
|
|
412
|
-
]);
|
|
413
|
-
let output = self.runner.run(&argv)?;
|
|
414
|
-
if !output.success {
|
|
415
|
-
return Err(subprocess_error(argv, output));
|
|
416
|
-
}
|
|
417
|
-
}
|
|
418
|
-
Ok(())
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
fn read_session_owner_option(
|
|
422
|
-
&self,
|
|
423
|
-
session: &SessionName,
|
|
424
|
-
option: &str,
|
|
425
|
-
) -> Result<Option<String>, TransportError> {
|
|
426
|
-
let argv = self.tmux_argv(&[
|
|
427
|
-
"tmux".to_string(),
|
|
428
|
-
"show-options".to_string(),
|
|
429
|
-
"-qv".to_string(),
|
|
430
|
-
"-t".to_string(),
|
|
431
|
-
session.as_str().to_string(),
|
|
432
|
-
option.to_string(),
|
|
433
|
-
]);
|
|
434
|
-
let output = self.runner.run(&argv)?;
|
|
435
|
-
if !output.success {
|
|
436
|
-
return Ok(None);
|
|
437
|
-
}
|
|
438
|
-
let value = output.stdout.trim();
|
|
439
|
-
Ok((!value.is_empty()).then(|| value.to_string()))
|
|
440
|
-
}
|
|
441
|
-
|
|
442
|
-
fn read_session_owner_marker(
|
|
443
|
-
&self,
|
|
444
|
-
session: &SessionName,
|
|
445
|
-
) -> Result<Option<SessionOwner>, TransportError> {
|
|
446
|
-
let Some(workspace) = self.read_session_owner_option(
|
|
447
|
-
session,
|
|
448
|
-
TMUX_SESSION_OWNER_WORKSPACE_OPTION,
|
|
449
|
-
)? else {
|
|
450
|
-
return Ok(None);
|
|
451
|
-
};
|
|
452
|
-
let Some(team) = self.read_session_owner_option(session, TMUX_SESSION_OWNER_TEAM_OPTION)?
|
|
453
|
-
else {
|
|
454
|
-
return Ok(None);
|
|
455
|
-
};
|
|
456
|
-
let Some(generation) = self.read_session_owner_option(
|
|
457
|
-
session,
|
|
458
|
-
TMUX_SESSION_OWNER_GENERATION_OPTION,
|
|
459
|
-
)? else {
|
|
460
|
-
return Ok(None);
|
|
461
|
-
};
|
|
462
|
-
Ok(Some(SessionOwner {
|
|
463
|
-
workspace,
|
|
464
|
-
team,
|
|
465
|
-
generation,
|
|
466
|
-
}))
|
|
467
|
-
}
|
|
468
|
-
|
|
469
|
-
/// ---
|
|
470
|
-
/// purpose: 把 leader 认领的绑定 nonce 写进 pane 级 tmux 用户选项,给「这个 pane 实例是不是我绑的那个」留可核凭据
|
|
471
|
-
/// params:
|
|
472
|
-
/// pane: 目标 pane 标识
|
|
473
|
-
/// nonce: 本次绑定的凭据串,原样写入,不做格式校验
|
|
474
|
-
/// returns: 写入命令成功即 Ok
|
|
475
|
-
/// errors: tmux set-option 非 0 或子进程失败时返回 TransportError
|
|
476
|
-
/// boundary: 只写不读、不比对;写的是 pane 级(-p)选项,随 pane 消亡,不跨 socket;不判断该 nonce 是否已被别人占用
|
|
477
|
-
/// ---
|
|
478
|
-
pub(crate) fn set_pane_binding_nonce(
|
|
479
|
-
&self,
|
|
480
|
-
pane: &PaneId,
|
|
481
|
-
nonce: &str,
|
|
482
|
-
) -> Result<(), TransportError> {
|
|
483
|
-
let argv = [
|
|
484
|
-
"tmux".to_string(),
|
|
485
|
-
"set-option".to_string(),
|
|
486
|
-
"-p".to_string(),
|
|
487
|
-
"-t".to_string(),
|
|
488
|
-
pane.as_str().to_string(),
|
|
489
|
-
TMUX_PANE_BINDING_NONCE_OPTION.to_string(),
|
|
490
|
-
nonce.to_string(),
|
|
491
|
-
];
|
|
492
|
-
self.run_ok(&argv)
|
|
493
|
-
}
|
|
494
|
-
|
|
495
|
-
/// Set the pane-instance nonce only when the pane option is unset. tmux
|
|
496
|
-
/// serializes commands at the server, so concurrent first claims have one
|
|
497
|
-
/// winner; losers read back that winner instead of persisting a stale nonce.
|
|
498
|
-
pub(crate) fn set_pane_binding_nonce_if_unset(
|
|
499
|
-
&self,
|
|
500
|
-
pane: &PaneId,
|
|
501
|
-
nonce: &str,
|
|
502
|
-
) -> Result<String, TransportError> {
|
|
503
|
-
let argv = self.tmux_argv(&[
|
|
504
|
-
"tmux".to_string(),
|
|
505
|
-
"set-option".to_string(),
|
|
506
|
-
"-p".to_string(),
|
|
507
|
-
"-o".to_string(),
|
|
508
|
-
"-t".to_string(),
|
|
509
|
-
pane.as_str().to_string(),
|
|
510
|
-
TMUX_PANE_BINDING_NONCE_OPTION.to_string(),
|
|
511
|
-
nonce.to_string(),
|
|
512
|
-
]);
|
|
513
|
-
let output = self.runner.run(&argv)?;
|
|
514
|
-
if output.success {
|
|
515
|
-
return Ok(nonce.to_string());
|
|
516
|
-
}
|
|
517
|
-
if output
|
|
518
|
-
.stderr
|
|
519
|
-
.to_ascii_lowercase()
|
|
520
|
-
.contains("already set")
|
|
521
|
-
{
|
|
522
|
-
return self.read_pane_binding_nonce(pane);
|
|
523
|
-
}
|
|
524
|
-
Err(subprocess_error(argv, output))
|
|
525
|
-
}
|
|
526
|
-
|
|
527
|
-
fn read_pane_binding_nonce(&self, pane: &PaneId) -> Result<String, TransportError> {
|
|
528
|
-
let argv = self.tmux_argv(&[
|
|
529
|
-
"tmux".to_string(),
|
|
530
|
-
"show-options".to_string(),
|
|
531
|
-
"-p".to_string(),
|
|
532
|
-
"-v".to_string(),
|
|
533
|
-
"-t".to_string(),
|
|
534
|
-
pane.as_str().to_string(),
|
|
535
|
-
TMUX_PANE_BINDING_NONCE_OPTION.to_string(),
|
|
536
|
-
]);
|
|
537
|
-
let output = self.runner.run(&argv)?;
|
|
538
|
-
if !output.success {
|
|
539
|
-
return Err(subprocess_error(argv, output));
|
|
540
|
-
}
|
|
541
|
-
let nonce = output.stdout.trim();
|
|
542
|
-
if nonce.is_empty() {
|
|
543
|
-
return Err(TransportError::Subprocess {
|
|
544
|
-
argv,
|
|
545
|
-
code: output.code,
|
|
546
|
-
stderr: "pane binding nonce remained unset after conditional write".to_string(),
|
|
547
|
-
});
|
|
548
|
-
}
|
|
549
|
-
Ok(nonce.to_string())
|
|
550
|
-
}
|
|
551
|
-
|
|
552
|
-
/// Backend with an injected runner (tests: canned/recording tmux output). Shared default socket.
|
|
553
|
-
/// ---
|
|
554
|
-
/// purpose: 用注入的 runner 构造后端(测试用录制/罐装 tmux 输出),绑共享默认 socket
|
|
555
|
-
/// params:
|
|
556
|
-
/// runner: 替代 RealCommandRunner 的执行 seam
|
|
557
|
-
/// returns: 无 socket、无事件 workspace 的后端
|
|
558
|
-
/// boundary: runner 注入是本文件唯一的 OS 边界替换 seam(with_runner_for_workspace / with_runner_for_tmux_endpoint 同用);不改变任何 argv 构造逻辑
|
|
559
|
-
/// ---
|
|
560
|
-
pub fn with_runner(runner: Box<dyn CommandRunner>) -> Self {
|
|
561
|
-
Self {
|
|
562
|
-
runner,
|
|
563
|
-
socket: None,
|
|
564
|
-
event_workspace: None,
|
|
565
|
-
}
|
|
566
|
-
}
|
|
567
|
-
|
|
568
|
-
/// Backend with an injected runner bound to a per-workspace socket (tests: assert the `-L` is in
|
|
569
|
-
/// the recorded argv for a workspace-bound backend).
|
|
570
|
-
/// ---
|
|
571
|
-
/// purpose: 用注入的 runner 构造绑 workspace 专属 socket 的后端(测试断言 -L 确实进了 argv)
|
|
572
|
-
/// params:
|
|
573
|
-
/// runner: 执行 seam
|
|
574
|
-
/// workspace: socket 名与事件落盘位置的来源
|
|
575
|
-
/// returns: socket 为 Name(派生名)、事件写入该 workspace 的后端
|
|
576
|
-
/// boundary: socket 名派生与 for_workspace 完全同源,不允许出现第二套派生规则
|
|
577
|
-
/// ---
|
|
578
|
-
pub fn with_runner_for_workspace(runner: Box<dyn CommandRunner>, workspace: &Path) -> Self {
|
|
579
|
-
Self {
|
|
580
|
-
runner,
|
|
581
|
-
socket: Some(TmuxSocketEndpoint::Name(socket_name_for_workspace(
|
|
582
|
-
workspace,
|
|
583
|
-
))),
|
|
584
|
-
event_workspace: Some(workspace.to_path_buf()),
|
|
585
|
-
}
|
|
586
|
-
}
|
|
587
|
-
|
|
588
|
-
/// ---
|
|
589
|
-
/// purpose: 用注入的 runner 构造按 endpoint 寻址的后端
|
|
590
|
-
/// params:
|
|
591
|
-
/// runner: 执行 seam
|
|
592
|
-
/// endpoint: 绝对路径 ⇒ Path(...);空串 / "default" ⇒ 无 socket;短名 ⇒ 解析成路径,解析不出则无 socket
|
|
593
|
-
/// returns: 按上述分支绑定 socket 的后端;不设事件 workspace
|
|
594
|
-
/// boundary: 分支与 for_tmux_endpoint 语义一致但顺序不同(此处先判绝对路径),两者都不探活
|
|
595
|
-
/// ---
|
|
596
|
-
pub fn with_runner_for_tmux_endpoint(runner: Box<dyn CommandRunner>, endpoint: &str) -> Self {
|
|
597
|
-
if Path::new(endpoint).is_absolute() {
|
|
598
|
-
Self {
|
|
599
|
-
runner,
|
|
600
|
-
socket: Some(TmuxSocketEndpoint::Path(endpoint.to_string())),
|
|
601
|
-
event_workspace: None,
|
|
602
|
-
}
|
|
603
|
-
} else if endpoint.is_empty() || endpoint == "default" {
|
|
604
|
-
Self {
|
|
605
|
-
runner,
|
|
606
|
-
socket: None,
|
|
607
|
-
event_workspace: None,
|
|
608
|
-
}
|
|
609
|
-
} else if let Some(path) = socket_path_for_name(endpoint) {
|
|
610
|
-
Self {
|
|
611
|
-
runner,
|
|
612
|
-
socket: Some(TmuxSocketEndpoint::Path(
|
|
613
|
-
path.to_string_lossy().into_owned(),
|
|
614
|
-
)),
|
|
615
|
-
event_workspace: None,
|
|
616
|
-
}
|
|
617
|
-
} else {
|
|
618
|
-
Self {
|
|
619
|
-
runner,
|
|
620
|
-
socket: None,
|
|
621
|
-
event_workspace: None,
|
|
622
|
-
}
|
|
623
|
-
}
|
|
624
|
-
}
|
|
625
|
-
|
|
626
|
-
/// Build the exact argv that a workspace-bound tmux backend will execute.
|
|
627
|
-
/// ---
|
|
628
|
-
/// purpose: 算出「workspace 绑定后端实际会执行的那条 argv」,供诊断与提示文案复用
|
|
629
|
-
/// params:
|
|
630
|
-
/// workspace: 决定注入哪个 -L socket
|
|
631
|
-
/// argv: 原始 argv;首元素为 "tmux" 时才会被插入 socket 参数
|
|
632
|
-
/// returns: 插好 socket 参数的 argv;非 tmux argv 原样返回
|
|
633
|
-
/// boundary: 只构造不执行;结果必须与真实执行走的 tmux_argv 完全一致,否则提示会骗人
|
|
634
|
-
/// ---
|
|
635
|
-
pub fn argv_for_workspace(workspace: &Path, argv: &[String]) -> Vec<String> {
|
|
636
|
-
Self::for_workspace(workspace).tmux_argv(argv)
|
|
637
|
-
}
|
|
638
|
-
|
|
639
|
-
/// THE RUN CHOKEPOINT: every executed `tmux` argv is funneled through here. When a per-team
|
|
640
|
-
/// socket is set, inject `-L <socket>` right after the leading "tmux" token; otherwise pass argv
|
|
641
|
-
/// through unchanged. Non-`tmux` argv (e.g. the spawned provider command) is never rewritten.
|
|
642
|
-
fn tmux_argv(&self, argv: &[String]) -> Vec<String> {
|
|
643
|
-
match &self.socket {
|
|
644
|
-
Some(endpoint) if argv.first().map(String::as_str) == Some("tmux") => {
|
|
645
|
-
let mut out = Vec::with_capacity(argv.len() + 2);
|
|
646
|
-
out.push("tmux".to_string());
|
|
647
|
-
match endpoint {
|
|
648
|
-
TmuxSocketEndpoint::Name(socket) => {
|
|
649
|
-
out.push("-L".to_string());
|
|
650
|
-
out.push(socket.clone());
|
|
651
|
-
}
|
|
652
|
-
TmuxSocketEndpoint::Path(socket) => {
|
|
653
|
-
out.push("-S".to_string());
|
|
654
|
-
out.push(socket.clone());
|
|
655
|
-
}
|
|
656
|
-
}
|
|
657
|
-
out.extend(argv.iter().skip(1).cloned());
|
|
658
|
-
out
|
|
659
|
-
}
|
|
660
|
-
_ => argv.to_vec(),
|
|
661
|
-
}
|
|
662
|
-
}
|
|
663
|
-
|
|
664
|
-
/// `tmux -L <socket> kill-server` (CP-1 cleanup): best-effort teardown of the per-team server on
|
|
665
|
-
/// shutdown so per-team sockets do not orphan. No-op (and never errors) for a default-socket
|
|
666
|
-
/// backend, and a "no server" failure is ignored.
|
|
667
|
-
/// ---
|
|
668
|
-
/// purpose: 收尾时尽力拆掉本 team 专属的 tmux server,避免 socket 变孤儿
|
|
669
|
-
/// boundary:
|
|
670
|
-
/// - 默认 socket 后端直接返回,绝不拆共享 server
|
|
671
|
-
/// - 只在 list_targets 证明 server 为空时才拆;列举失败按「未证明所有权」处理,倒向不拆;有事件 workspace 时才写 tmux.kill_server_skipped_nonempty_or_unknown 事件(按 endpoint / 短名构造的后端没有,静默跳过)
|
|
672
|
-
/// - 尽力而为:执行结果被丢弃,不返回错误、不重试
|
|
673
|
-
/// ---
|
|
674
|
-
pub fn kill_server(&self) {
|
|
675
|
-
if self.socket.is_none() {
|
|
676
|
-
return;
|
|
677
|
-
}
|
|
678
|
-
// A server-level kill is only safe after the caller has removed every
|
|
679
|
-
// resource it owns. A non-empty server may carry a pre-existing team
|
|
680
|
-
// (or a leader owned by another launcher), so fail closed instead of
|
|
681
|
-
// turning an endpoint cleanup into a shared-server teardown. An
|
|
682
|
-
// inconclusive probe is also not proof of ownership.
|
|
683
|
-
let server_is_empty = match self.list_targets() {
|
|
684
|
-
Ok(targets) => targets.is_empty(),
|
|
685
|
-
Err(_) => false,
|
|
686
|
-
};
|
|
687
|
-
if !server_is_empty {
|
|
688
|
-
if let Some(workspace) = &self.event_workspace {
|
|
689
|
-
let _ = crate::event_log::EventLog::new(workspace).write(
|
|
690
|
-
"tmux.kill_server_skipped_nonempty_or_unknown",
|
|
691
|
-
serde_json::json!({
|
|
692
|
-
"reason": "server_ownership_not_proven",
|
|
693
|
-
"endpoint": self.tmux_endpoint(),
|
|
694
|
-
}),
|
|
695
|
-
);
|
|
696
|
-
}
|
|
697
|
-
return;
|
|
698
|
-
}
|
|
699
|
-
let argv = self.tmux_argv(&["tmux".to_string(), "kill-server".to_string()]);
|
|
700
|
-
let _ = self.runner.run(&argv);
|
|
701
|
-
}
|
|
702
|
-
}
|
|
703
|
-
|
|
704
|
-
/// ---
|
|
705
|
-
/// purpose: 选出运行期该用的 tmux 后端——优先跟随 state 里持久化的 endpoint,没有才按 workspace 派生
|
|
706
|
-
/// params:
|
|
707
|
-
/// workspace: 兜底派生 socket 的来源
|
|
708
|
-
/// state: 运行期状态 JSON;从中读 tmux_endpoint,其次 tmux_socket
|
|
709
|
-
/// returns: 后端 + 实际使用的 endpoint + 来源标记(三者一并返回,便于日志说清为什么连这台)
|
|
710
|
-
/// boundary: 只做选择,不探活、不创建 server;state 里的 endpoint 即便已失效也照选,失败留给后续命令暴露
|
|
711
|
-
/// ---
|
|
712
|
-
pub(crate) fn tmux_backend_for_runtime_state_or_workspace(
|
|
713
|
-
workspace: &Path,
|
|
714
|
-
state: Option<&serde_json::Value>,
|
|
715
|
-
) -> RuntimeTmuxBackendSelection {
|
|
716
|
-
let (mut backend, source) =
|
|
717
|
-
if let Some((endpoint, source)) = runtime_tmux_endpoint_from_state(state) {
|
|
718
|
-
(TmuxBackend::for_tmux_endpoint(endpoint), source)
|
|
719
|
-
} else {
|
|
720
|
-
(
|
|
721
|
-
TmuxBackend::for_workspace(workspace),
|
|
722
|
-
RuntimeTmuxEndpointSource::WorkspaceFallback,
|
|
723
|
-
)
|
|
724
|
-
};
|
|
725
|
-
// A persisted endpoint changes addressing, not the owning input-lock scope.
|
|
726
|
-
backend.event_workspace = Some(workspace.to_path_buf());
|
|
727
|
-
RuntimeTmuxBackendSelection {
|
|
728
|
-
tmux_endpoint_used: backend.tmux_endpoint(),
|
|
729
|
-
backend,
|
|
730
|
-
tmux_endpoint_source: source,
|
|
731
|
-
}
|
|
732
|
-
}
|
|
733
|
-
|
|
734
|
-
/// ---
|
|
735
|
-
/// purpose: 同 tmux_backend_for_runtime_state_or_workspace,但用注入的 runner,给测试断言选择逻辑
|
|
736
|
-
/// params:
|
|
737
|
-
/// runner: 执行 seam
|
|
738
|
-
/// workspace: 兜底派生 socket 的来源
|
|
739
|
-
/// state: 运行期状态 JSON
|
|
740
|
-
/// returns: 后端 + 实际使用的 endpoint + 来源标记
|
|
741
|
-
/// cfg: test
|
|
742
|
-
/// boundary: 仅测试编译;选择分支必须与生产版本同构,否则测的不是同一件事
|
|
743
|
-
/// ---
|
|
744
|
-
#[cfg(test)]
|
|
745
|
-
pub(crate) fn tmux_backend_with_runner_for_runtime_state_or_workspace(
|
|
746
|
-
runner: Box<dyn CommandRunner>,
|
|
747
|
-
workspace: &Path,
|
|
748
|
-
state: Option<&serde_json::Value>,
|
|
749
|
-
) -> RuntimeTmuxBackendSelection {
|
|
750
|
-
let (mut backend, source) =
|
|
751
|
-
if let Some((endpoint, source)) = runtime_tmux_endpoint_from_state(state) {
|
|
752
|
-
(
|
|
753
|
-
TmuxBackend::with_runner_for_tmux_endpoint(runner, endpoint),
|
|
754
|
-
source,
|
|
755
|
-
)
|
|
756
|
-
} else {
|
|
757
|
-
(
|
|
758
|
-
TmuxBackend::with_runner_for_workspace(runner, workspace),
|
|
759
|
-
RuntimeTmuxEndpointSource::WorkspaceFallback,
|
|
760
|
-
)
|
|
761
|
-
};
|
|
762
|
-
backend.event_workspace = Some(workspace.to_path_buf());
|
|
763
|
-
RuntimeTmuxBackendSelection {
|
|
764
|
-
tmux_endpoint_used: backend.tmux_endpoint(),
|
|
765
|
-
backend,
|
|
766
|
-
tmux_endpoint_source: source,
|
|
767
|
-
}
|
|
768
|
-
}
|
|
769
|
-
|
|
770
|
-
fn runtime_tmux_endpoint_from_state(
|
|
771
|
-
state: Option<&serde_json::Value>,
|
|
772
|
-
) -> Option<(&str, RuntimeTmuxEndpointSource)> {
|
|
773
|
-
state.and_then(|state| {
|
|
774
|
-
state
|
|
775
|
-
.get("tmux_endpoint")
|
|
776
|
-
.and_then(|v| v.as_str())
|
|
777
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
778
|
-
.map(|endpoint| (endpoint, RuntimeTmuxEndpointSource::StateTmuxEndpoint))
|
|
779
|
-
.or_else(|| {
|
|
780
|
-
state
|
|
781
|
-
.get("tmux_socket")
|
|
782
|
-
.and_then(|v| v.as_str())
|
|
783
|
-
.filter(|endpoint| !endpoint.is_empty())
|
|
784
|
-
.map(|endpoint| (endpoint, RuntimeTmuxEndpointSource::StateTmuxSocket))
|
|
785
|
-
})
|
|
786
|
-
})
|
|
787
|
-
}
|
|
788
|
-
|
|
789
|
-
/// CP-1 socket name: SHORT + DETERMINISTIC per canonical workspace path. `ta-` + 12 hex chars of a
|
|
790
|
-
/// stable FNV-1a hash over the canonicalized path. AF_UNIX `sun_path` is ~104 chars and the socket
|
|
791
|
-
/// lives at `/tmp/tmux-<uid>/<name>`, so we must NOT use the (~88-char) session name. §10: a
|
|
792
|
-
/// canonicalize failure falls back to the raw path (never panics).
|
|
793
|
-
/// Public re-export of the crate-private canonical workspace hash used
|
|
794
|
-
/// by the tmux short-socket derivation. `transport_factory` uses this
|
|
795
|
-
/// same hash for the ConPTY `workspace_hash` so both backends see
|
|
796
|
-
/// identical workspace identity. Adding a wrapper (not calling
|
|
797
|
-
/// `socket_name_for_workspace` directly outside this file) keeps the
|
|
798
|
-
/// existing internal API stable.
|
|
799
|
-
/// ---
|
|
800
|
-
/// purpose: 对外暴露「workspace 身份短哈希」,让 tmux 与 ConPTY 两个后端看到同一个 workspace 身份
|
|
801
|
-
/// params:
|
|
802
|
-
/// workspace: 工作区路径;先 canonicalize 再哈希
|
|
803
|
-
/// returns: 12 位十六进制串,即 socket 名去掉 ta- 前缀的部分
|
|
804
|
-
/// boundary: 与 socket_name_for_workspace 同源,禁止另起一套哈希;canonicalize 失败时退回原始路径参与哈希,故未落盘的路径可能与落盘后不同值
|
|
805
|
-
/// ---
|
|
806
|
-
pub fn workspace_short_hash_pub(workspace: &Path) -> String {
|
|
807
|
-
// The tmux short-socket name is `ta-<12 hex>`; the workspace-hash
|
|
808
|
-
// used by the ConPTY workspace identity is the raw 12-hex portion
|
|
809
|
-
// (no `ta-` prefix), which is what the shim/pipe name derivation
|
|
810
|
-
// expects. Reuse the exact same hash so drift is impossible.
|
|
811
|
-
let name = socket_name_for_workspace(workspace);
|
|
812
|
-
name.strip_prefix("ta-").unwrap_or(&name).to_string()
|
|
813
|
-
}
|
|
814
|
-
|
|
815
|
-
/// Public re-export of the crate-private `runtime_tmux_endpoint_from_state`
|
|
816
|
-
/// probe. `transport_factory` uses this to spot the legacy tmux endpoint
|
|
817
|
-
/// in `state` without duplicating the field-precedence logic.
|
|
818
|
-
/// ---
|
|
819
|
-
/// purpose: 对外暴露 state 里 tmux endpoint 的读取与字段优先级,避免调用方各写一份
|
|
820
|
-
/// params:
|
|
821
|
-
/// state: 运行期状态 JSON
|
|
822
|
-
/// returns: Some((endpoint, 来源标记)) 当 tmux_endpoint 或 tmux_socket 非空;两者都缺或为空则 None
|
|
823
|
-
/// boundary: 只读字段不探活;返回值里不会出现 workspace_fallback(那是选后端时才产生的来源)
|
|
824
|
-
/// ---
|
|
825
|
-
pub fn runtime_tmux_endpoint_from_state_pub(
|
|
826
|
-
state: Option<&serde_json::Value>,
|
|
827
|
-
) -> Option<(String, &'static str)> {
|
|
828
|
-
runtime_tmux_endpoint_from_state(state).map(|(endpoint, source)| {
|
|
829
|
-
let src = match source {
|
|
830
|
-
RuntimeTmuxEndpointSource::StateTmuxEndpoint => "state.tmux_endpoint",
|
|
831
|
-
RuntimeTmuxEndpointSource::StateTmuxSocket => "state.tmux_socket",
|
|
832
|
-
RuntimeTmuxEndpointSource::WorkspaceFallback => "workspace_fallback",
|
|
833
|
-
};
|
|
834
|
-
(endpoint.to_string(), src)
|
|
835
|
-
})
|
|
836
|
-
}
|
|
837
|
-
|
|
838
|
-
/// ---
|
|
839
|
-
/// purpose: 由 workspace 路径确定性派生短 socket 名,保证 CLI、daemon 与后续每条命令都落到同一台 tmux server
|
|
840
|
-
/// params:
|
|
841
|
-
/// workspace: 工作区路径;先 canonicalize,失败则退回原始路径
|
|
842
|
-
/// returns: ta- 加 12 位十六进制(FNV-1a 低 48 位)
|
|
843
|
-
/// boundary:
|
|
844
|
-
/// - 必须短:AF_UNIX 路径长度有限,不能拿 session 名当 socket 名
|
|
845
|
-
/// - 用固定 FNV-1a 而非 std 默认哈希(后者跨版本不稳定)
|
|
846
|
-
/// - 只算名字,不判断该 socket 是否存在
|
|
847
|
-
/// ---
|
|
848
|
-
pub(crate) fn socket_name_for_workspace(workspace: &Path) -> String {
|
|
849
|
-
let canonical = workspace
|
|
850
|
-
.canonicalize()
|
|
851
|
-
.unwrap_or_else(|_| workspace.to_path_buf());
|
|
852
|
-
let mut hasher = Fnv1a::default();
|
|
853
|
-
canonical.as_os_str().hash(&mut hasher);
|
|
854
|
-
format!("ta-{:012x}", hasher.finish() & 0xffff_ffff_ffff)
|
|
855
|
-
}
|
|
856
|
-
|
|
857
|
-
/// ---
|
|
858
|
-
/// purpose: 给出 workspace 专属 socket 的文件路径
|
|
859
|
-
/// params:
|
|
860
|
-
/// workspace: 工作区路径
|
|
861
|
-
/// returns: 已存在的 socket 路径优先;否则给默认根下的预期路径;Windows 上恒为 None
|
|
862
|
-
/// boundary: 返回 Some 不代表 socket 存在(可能只是「按约定应该在这」);要判存在用 socket_probe_missing_for_workspace
|
|
863
|
-
/// ---
|
|
864
|
-
pub(crate) fn socket_path_for_workspace(workspace: &Path) -> Option<PathBuf> {
|
|
865
|
-
socket_path_for_name(&socket_name_for_workspace(workspace))
|
|
866
|
-
}
|
|
867
|
-
|
|
868
|
-
/// ---
|
|
869
|
-
/// purpose: 探测 workspace 专属 socket 当前是否不存在
|
|
870
|
-
/// params:
|
|
871
|
-
/// workspace: 工作区路径
|
|
872
|
-
/// returns: 在已知 socket 根下都找不到该名字时为 true
|
|
873
|
-
/// boundary: 只看文件是否存在,不连不握手——socket 文件在但 server 已死也会报 false
|
|
874
|
-
/// ---
|
|
875
|
-
pub(crate) fn socket_probe_missing_for_workspace(workspace: &Path) -> bool {
|
|
876
|
-
existing_socket_path_for_workspace(workspace).is_none()
|
|
877
|
-
}
|
|
878
|
-
|
|
879
|
-
fn existing_socket_path_for_workspace(workspace: &Path) -> Option<PathBuf> {
|
|
880
|
-
existing_socket_path_for_name(&socket_name_for_workspace(workspace))
|
|
881
|
-
}
|
|
882
|
-
|
|
883
|
-
/// ---
|
|
884
|
-
/// purpose: 把短 socket 名解析成文件路径
|
|
885
|
-
/// params:
|
|
886
|
-
/// socket_name: 短名;空串、"default"、绝对路径三种输入都视为「无短名可解析」
|
|
887
|
-
/// returns: 已存在则返回实际路径;否则 Unix 上给 /tmp/tmux-<uid>/<name> 预期路径,Windows 上 None
|
|
888
|
-
/// cfg: unix 分支读 geteuid;not(unix) 分支恒 None
|
|
889
|
-
/// boundary: 不创建目录、不创建 socket;返回 Some 不代表文件存在
|
|
890
|
-
/// ---
|
|
891
|
-
pub(crate) fn socket_path_for_name(socket_name: &str) -> Option<PathBuf> {
|
|
892
|
-
if socket_name.is_empty() || socket_name == "default" || Path::new(socket_name).is_absolute() {
|
|
893
|
-
return None;
|
|
894
|
-
}
|
|
895
|
-
if let Some(existing) = existing_socket_path_for_name(socket_name) {
|
|
896
|
-
return Some(existing);
|
|
897
|
-
}
|
|
898
|
-
// Batch 1: tmux uses `/tmp/tmux-<uid>/` on Unix; on Windows this
|
|
899
|
-
// helper is dead code (Command::new "tmux" fails at spawn time
|
|
900
|
-
// before this path is dereferenced). N38 typed unsupported honored
|
|
901
|
-
// at the shellout boundary.
|
|
902
|
-
#[cfg(unix)]
|
|
903
|
-
{
|
|
904
|
-
let uid = unsafe { libc::geteuid() };
|
|
905
|
-
let default_root = PathBuf::from(format!("/tmp/tmux-{uid}"));
|
|
906
|
-
let default_root = default_root.canonicalize().unwrap_or(default_root);
|
|
907
|
-
Some(default_root.join(socket_name))
|
|
908
|
-
}
|
|
909
|
-
#[cfg(not(unix))]
|
|
910
|
-
{
|
|
911
|
-
// Windows: tmux socket-root derivation is meaningless. Return
|
|
912
|
-
// None so the caller sees the honest "no such socket" branch.
|
|
913
|
-
let _ = socket_name;
|
|
914
|
-
None
|
|
915
|
-
}
|
|
916
|
-
}
|
|
917
|
-
|
|
918
|
-
fn existing_socket_path_for_name(socket_name: &str) -> Option<PathBuf> {
|
|
919
|
-
let roots = tmux_socket_roots();
|
|
920
|
-
for root in &roots {
|
|
921
|
-
let root = root.canonicalize().unwrap_or_else(|_| root.clone());
|
|
922
|
-
let candidate = root.join(socket_name);
|
|
923
|
-
if candidate.exists() {
|
|
924
|
-
return Some(candidate.canonicalize().unwrap_or(candidate));
|
|
925
|
-
}
|
|
926
|
-
}
|
|
927
|
-
None
|
|
928
|
-
}
|
|
929
|
-
|
|
930
|
-
/// ---
|
|
931
|
-
/// purpose: socket 找不到时给操作者的可执行提示,把期望的 socket 名与找过的目录都写出来
|
|
932
|
-
/// params:
|
|
933
|
-
/// workspace: 工作区路径,用于派生 socket 名
|
|
934
|
-
/// returns: 含 socket 名、已搜索根目录列表与下一步命令的单行提示
|
|
935
|
-
/// boundary: 只生成文案,不重试、不修复、不创建 socket
|
|
936
|
-
/// ---
|
|
937
|
-
pub(crate) fn socket_missing_hint_for_workspace(workspace: &Path) -> String {
|
|
938
|
-
let socket_name = socket_name_for_workspace(workspace);
|
|
939
|
-
let roots = tmux_socket_roots()
|
|
940
|
-
.into_iter()
|
|
941
|
-
.map(|root| root.display().to_string())
|
|
942
|
-
.collect::<Vec<_>>()
|
|
943
|
-
.join(", ");
|
|
944
|
-
format!(
|
|
945
|
-
"tmux socket {socket_name} not found under [{roots}]; run `team-agent attach-leader` or restart the team before attaching"
|
|
946
|
-
)
|
|
947
|
-
}
|
|
948
|
-
|
|
949
|
-
/// ---
|
|
950
|
-
/// purpose: 生成让操作者手工 attach 到指定窗口的 tmux 命令行(按 workspace 派生 socket)
|
|
951
|
-
/// params:
|
|
952
|
-
/// workspace: 决定 -S 后面的 socket 路径
|
|
953
|
-
/// session_name: attach 目标 session
|
|
954
|
-
/// window_name: attach 目标 window
|
|
955
|
-
/// returns: 完整命令字符串;socket 路径解析不出时 None
|
|
956
|
-
/// boundary: 只生成文案、不执行、不验证 session/window 是否存在;endpoint 已持久化在 state 里时应改用 attach_command_for_runtime_state_or_workspace,否则会指到错误的 socket
|
|
957
|
-
/// ---
|
|
958
|
-
pub(crate) fn attach_command_for_workspace(
|
|
959
|
-
workspace: &Path,
|
|
960
|
-
session_name: &SessionName,
|
|
961
|
-
window_name: &str,
|
|
962
|
-
) -> Option<String> {
|
|
963
|
-
let socket_path = socket_path_for_workspace(workspace)?;
|
|
964
|
-
Some(format!(
|
|
965
|
-
"tmux -S {} attach -t {}:{}",
|
|
966
|
-
socket_path.display(),
|
|
967
|
-
session_name.as_str(),
|
|
968
|
-
window_name
|
|
969
|
-
))
|
|
970
|
-
}
|
|
971
|
-
|
|
972
|
-
/// ---
|
|
973
|
-
/// purpose: 同 attach_command_for_workspace,但只到 session 一级(不指定 window)
|
|
974
|
-
/// params:
|
|
975
|
-
/// workspace: 决定 -S 后面的 socket 路径
|
|
976
|
-
/// session_name: attach 目标 session
|
|
977
|
-
/// returns: 完整命令字符串;socket 路径解析不出时 None
|
|
978
|
-
/// boundary: 只生成文案、不执行、不验证 session 是否存在
|
|
979
|
-
/// ---
|
|
980
|
-
pub(crate) fn attach_command_for_session(
|
|
981
|
-
workspace: &Path,
|
|
982
|
-
session_name: &SessionName,
|
|
983
|
-
) -> Option<String> {
|
|
984
|
-
let socket_path = socket_path_for_workspace(workspace)?;
|
|
985
|
-
Some(format!(
|
|
986
|
-
"tmux -S {} attach -t {}",
|
|
987
|
-
socket_path.display(),
|
|
988
|
-
session_name.as_str()
|
|
989
|
-
))
|
|
990
|
-
}
|
|
991
|
-
|
|
992
|
-
/// ---
|
|
993
|
-
/// purpose: 按 transport 自报的 endpoint 生成 attach 命令,保证提示指向它真正在用的那台 server
|
|
994
|
-
/// params:
|
|
995
|
-
/// transport: 提供 tmux_endpoint 的传输后端
|
|
996
|
-
/// session_name: attach 目标 session
|
|
997
|
-
/// returns: 完整命令字符串;后端报不出 endpoint(非 tmux / 测试替身)时 None
|
|
998
|
-
/// boundary: 只生成文案、不执行;endpoint 是绝对路径用 -S、短名用 -L,由 attach_command_for_endpoint_session 分辨
|
|
999
|
-
/// ---
|
|
1000
|
-
pub(crate) fn attach_command_for_transport_session(
|
|
1001
|
-
transport: &dyn crate::transport::Transport,
|
|
1002
|
-
session_name: &SessionName,
|
|
1003
|
-
) -> Option<String> {
|
|
1004
|
-
let endpoint = transport.tmux_endpoint()?;
|
|
1005
|
-
Some(attach_command_for_endpoint_session(&endpoint, session_name))
|
|
1006
|
-
}
|
|
1007
|
-
|
|
1008
|
-
/// Bug #7 (prerelease 0.4.0 gate review §6): when the runtime state carries a
|
|
1009
|
-
/// persisted `tmux_endpoint` / `tmux_socket` (e.g. `/private/tmp/tmux-501/default`),
|
|
1010
|
-
/// the attach command MUST point at THAT endpoint, not the workspace-hash
|
|
1011
|
-
/// socket — otherwise operators are told to attach to a socket where the
|
|
1012
|
-
/// session does not exist. Falls back to workspace-hash when state has no
|
|
1013
|
-
/// persisted endpoint.
|
|
1014
|
-
/// ---
|
|
1015
|
-
/// purpose: 生成 attach 到指定窗口的命令,优先跟随 state 里持久化的 endpoint,没有才回落 workspace 派生 socket
|
|
1016
|
-
/// params:
|
|
1017
|
-
/// workspace: 回落路径的来源
|
|
1018
|
-
/// state: 运行期状态 JSON;从中读 tmux_endpoint / tmux_socket
|
|
1019
|
-
/// session_name: attach 目标 session
|
|
1020
|
-
/// window_name: attach 目标 window
|
|
1021
|
-
/// returns: 完整命令字符串;两条路都算不出 socket 时 None
|
|
1022
|
-
/// boundary: 只生成文案、不执行、不验证目标存在;endpoint 是绝对路径用 -S、短名用 -L
|
|
1023
|
-
/// ---
|
|
1024
|
-
pub(crate) fn attach_command_for_runtime_state_or_workspace(
|
|
1025
|
-
workspace: &Path,
|
|
1026
|
-
state: Option<&serde_json::Value>,
|
|
1027
|
-
session_name: &SessionName,
|
|
1028
|
-
window_name: &str,
|
|
1029
|
-
) -> Option<String> {
|
|
1030
|
-
if let Some((endpoint, _source)) = runtime_tmux_endpoint_from_state(state) {
|
|
1031
|
-
let display = endpoint.to_string();
|
|
1032
|
-
// Distinguish absolute path (`-S <path>`) from short socket name (`-L <name>`).
|
|
1033
|
-
let flag = if Path::new(endpoint).is_absolute() {
|
|
1034
|
-
"-S"
|
|
1035
|
-
} else {
|
|
1036
|
-
"-L"
|
|
1037
|
-
};
|
|
1038
|
-
return Some(format!(
|
|
1039
|
-
"tmux {flag} {display} attach -t {}:{}",
|
|
1040
|
-
session_name.as_str(),
|
|
1041
|
-
window_name
|
|
1042
|
-
));
|
|
1043
|
-
}
|
|
1044
|
-
attach_command_for_workspace(workspace, session_name, window_name)
|
|
1045
|
-
}
|
|
1046
|
-
|
|
1047
|
-
/// ---
|
|
1048
|
-
/// purpose: 同 attach_command_for_runtime_state_or_workspace,但只到 session 一级
|
|
1049
|
-
/// params:
|
|
1050
|
-
/// workspace: 回落路径的来源
|
|
1051
|
-
/// state: 运行期状态 JSON
|
|
1052
|
-
/// session_name: attach 目标 session
|
|
1053
|
-
/// returns: 完整命令字符串;两条路都算不出 socket 时 None
|
|
1054
|
-
/// boundary: 只生成文案、不执行、不验证 session 存在
|
|
1055
|
-
/// ---
|
|
1056
|
-
pub(crate) fn attach_command_for_runtime_state_session_or_workspace(
|
|
1057
|
-
workspace: &Path,
|
|
1058
|
-
state: Option<&serde_json::Value>,
|
|
1059
|
-
session_name: &SessionName,
|
|
1060
|
-
) -> Option<String> {
|
|
1061
|
-
if let Some((endpoint, _source)) = runtime_tmux_endpoint_from_state(state) {
|
|
1062
|
-
return Some(attach_command_for_endpoint_session(endpoint, session_name));
|
|
1063
|
-
}
|
|
1064
|
-
attach_command_for_session(workspace, session_name)
|
|
1065
|
-
}
|
|
1066
|
-
|
|
1067
|
-
fn attach_command_for_endpoint_session(endpoint: &str, session_name: &SessionName) -> String {
|
|
1068
|
-
let flag = if Path::new(endpoint).is_absolute() {
|
|
1069
|
-
"-S"
|
|
1070
|
-
} else {
|
|
1071
|
-
"-L"
|
|
1072
|
-
};
|
|
1073
|
-
format!("tmux {flag} {endpoint} attach -t {}", session_name.as_str())
|
|
1074
|
-
}
|
|
1075
|
-
|
|
1076
|
-
/// ---
|
|
1077
|
-
/// purpose: 为一组窗口批量生成 attach 命令
|
|
1078
|
-
/// params:
|
|
1079
|
-
/// workspace: 决定 socket 路径
|
|
1080
|
-
/// session_name: attach 目标 session
|
|
1081
|
-
/// window_names: 待生成的窗口名序列
|
|
1082
|
-
/// returns: 生成成功的命令列表;算不出 socket 的条目被静默丢弃,故长度可能短于入参
|
|
1083
|
-
/// boundary: 只生成文案、不执行;丢弃发生在整体层面(socket 算不出就一条都没有),调用方不能假定下标与入参对齐
|
|
1084
|
-
/// ---
|
|
1085
|
-
pub(crate) fn attach_commands_for_windows<'a>(
|
|
1086
|
-
workspace: &Path,
|
|
1087
|
-
session_name: &SessionName,
|
|
1088
|
-
window_names: impl IntoIterator<Item = &'a str>,
|
|
1089
|
-
) -> Vec<String> {
|
|
1090
|
-
window_names
|
|
1091
|
-
.into_iter()
|
|
1092
|
-
.filter_map(|window_name| {
|
|
1093
|
-
attach_command_for_workspace(workspace, session_name, window_name)
|
|
1094
|
-
})
|
|
1095
|
-
.collect()
|
|
1096
|
-
}
|
|
1097
|
-
|
|
1098
|
-
/// ---
|
|
1099
|
-
/// purpose: 列出本机可能放 tmux socket 的根目录
|
|
1100
|
-
/// returns: Unix 上为 /tmp/tmux-<uid> 加 TMPDIR/tmux-<uid>(排序去重);Windows 上为空
|
|
1101
|
-
/// cfg: unix 读 geteuid 与 TMPDIR;not(unix) 返回空表示「本平台无此约定」
|
|
1102
|
-
/// boundary: 只列约定目录,不验证目录存在、不列举里面的 socket(那是 tmux_socket_endpoints)
|
|
1103
|
-
/// ---
|
|
1104
|
-
pub(crate) fn tmux_socket_roots() -> Vec<PathBuf> {
|
|
1105
|
-
// Batch 1: `/tmp/tmux-<uid>` root enumeration is Unix-only tmux
|
|
1106
|
-
// convention. On Windows return empty so the caller loops zero
|
|
1107
|
-
// times (honest "no tmux socket roots" — tmux is not deployed on
|
|
1108
|
-
// native Windows without WSL, and WSL is out of scope).
|
|
1109
|
-
#[cfg(unix)]
|
|
1110
|
-
{
|
|
1111
|
-
let uid = unsafe { libc::geteuid() };
|
|
1112
|
-
let mut roots = vec![PathBuf::from(format!("/tmp/tmux-{uid}"))];
|
|
1113
|
-
if let Some(tmpdir) = std::env::var_os("TMPDIR") {
|
|
1114
|
-
roots.push(PathBuf::from(tmpdir).join(format!("tmux-{uid}")));
|
|
1115
|
-
}
|
|
1116
|
-
roots.sort();
|
|
1117
|
-
roots.dedup();
|
|
1118
|
-
roots
|
|
1119
|
-
}
|
|
1120
|
-
#[cfg(not(unix))]
|
|
1121
|
-
{
|
|
1122
|
-
Vec::new()
|
|
1123
|
-
}
|
|
1124
|
-
}
|
|
1125
|
-
|
|
1126
|
-
/// ---
|
|
1127
|
-
/// purpose: 枚举本机所有已存在的 tmux socket 路径
|
|
1128
|
-
/// returns: 各 socket 根下真正是 socket 文件的绝对路径,排序去重;Windows 上为空
|
|
1129
|
-
/// cfg: unix 才用 is_socket 过滤;not(unix) 直接跳过(该平台 socket 根为空)
|
|
1130
|
-
/// boundary: 只看文件类型,不连不握手——列出的 socket 可能属于已死的 server;不做任何删除
|
|
1131
|
-
/// ---
|
|
1132
|
-
pub(crate) fn tmux_socket_endpoints() -> Vec<String> {
|
|
1133
|
-
let mut endpoints = Vec::new();
|
|
1134
|
-
for root in tmux_socket_roots() {
|
|
1135
|
-
let Ok(entries) = std::fs::read_dir(root) else {
|
|
1136
|
-
continue;
|
|
1137
|
-
};
|
|
1138
|
-
for entry in entries.flatten() {
|
|
1139
|
-
let Ok(file_type) = entry.file_type() else {
|
|
1140
|
-
continue;
|
|
1141
|
-
};
|
|
1142
|
-
// Batch 1: `FileTypeExt::is_socket` is Unix-only. Dead code
|
|
1143
|
-
// on Windows because `tmux_socket_roots()` returns empty
|
|
1144
|
-
// there (no /tmp/tmux-<uid> convention). We still cfg the
|
|
1145
|
-
// method call so `cargo check --target x86_64-pc-windows-msvc`
|
|
1146
|
-
// sees no `std::os::unix::fs::FileTypeExt` reference.
|
|
1147
|
-
#[cfg(unix)]
|
|
1148
|
-
{
|
|
1149
|
-
if !file_type.is_socket() {
|
|
1150
|
-
continue;
|
|
1151
|
-
}
|
|
1152
|
-
}
|
|
1153
|
-
#[cfg(not(unix))]
|
|
1154
|
-
{
|
|
1155
|
-
let _ = file_type;
|
|
1156
|
-
continue;
|
|
1157
|
-
}
|
|
1158
|
-
let path = entry.path();
|
|
1159
|
-
let path = path.canonicalize().unwrap_or(path);
|
|
1160
|
-
endpoints.push(path.to_string_lossy().to_string());
|
|
1161
|
-
}
|
|
1162
|
-
}
|
|
1163
|
-
endpoints.sort();
|
|
1164
|
-
endpoints.dedup();
|
|
1165
|
-
endpoints
|
|
1166
|
-
}
|
|
1167
|
-
|
|
1168
|
-
/// ---
|
|
1169
|
-
/// purpose: 从当前进程所在的 tmux 环境($TMUX)反推它连的是哪个 socket
|
|
1170
|
-
/// returns: $TMUX 首段是绝对路径时返回该路径;$TMUX 未设 / 为空 / 首段非绝对路径时 None
|
|
1171
|
-
/// boundary: 读进程环境,只在自己就跑在 tmux 里时有意义;不校验该 socket 仍可用
|
|
1172
|
-
/// ---
|
|
1173
|
-
pub(crate) fn socket_name_from_tmux_env() -> Option<String> {
|
|
1174
|
-
let tmux = std::env::var("TMUX")
|
|
1175
|
-
.ok()
|
|
1176
|
-
.filter(|value| !value.is_empty())?;
|
|
1177
|
-
let socket_path = tmux.split(',').next().unwrap_or("").trim();
|
|
1178
|
-
if socket_path.is_empty() || !Path::new(socket_path).is_absolute() {
|
|
1179
|
-
return None;
|
|
1180
|
-
}
|
|
1181
|
-
Some(socket_path.to_string())
|
|
1182
|
-
}
|
|
1183
|
-
|
|
1184
|
-
/// Deterministic FNV-1a (64-bit) — std `DefaultHasher` is NOT stable across releases, so a fixed
|
|
1185
|
-
/// FNV keeps the socket identical for the CLI, the daemon, and every later op on the same workspace.
|
|
1186
|
-
struct Fnv1a(u64);
|
|
1187
|
-
|
|
1188
|
-
impl Default for Fnv1a {
|
|
1189
|
-
fn default() -> Self {
|
|
1190
|
-
Self(0xcbf2_9ce4_8422_2325)
|
|
1191
|
-
}
|
|
1192
|
-
}
|
|
1193
|
-
|
|
1194
|
-
impl Hasher for Fnv1a {
|
|
1195
|
-
fn finish(&self) -> u64 {
|
|
1196
|
-
self.0
|
|
1197
|
-
}
|
|
1198
|
-
|
|
1199
|
-
fn write(&mut self, bytes: &[u8]) {
|
|
1200
|
-
for &b in bytes {
|
|
1201
|
-
self.0 ^= u64::from(b);
|
|
1202
|
-
self.0 = self.0.wrapping_mul(0x0000_0100_0000_01b3);
|
|
1203
|
-
}
|
|
1204
|
-
}
|
|
1205
|
-
}
|
|
1206
|
-
|
|
1207
|
-
impl Default for TmuxBackend {
|
|
1208
|
-
fn default() -> Self {
|
|
1209
|
-
Self::new()
|
|
1210
|
-
}
|
|
1211
|
-
}
|
|
1212
|
-
|
|
1213
|
-
impl TmuxBackend {
|
|
1214
|
-
fn spawn(
|
|
1215
|
-
&self,
|
|
1216
|
-
session: &SessionName,
|
|
1217
|
-
window: &WindowName,
|
|
1218
|
-
argv: &[String],
|
|
1219
|
-
cwd: &Path,
|
|
1220
|
-
env: &BTreeMap<String, String>,
|
|
1221
|
-
env_unset: &[String],
|
|
1222
|
-
first: bool,
|
|
1223
|
-
) -> Result<SpawnResult, TransportError> {
|
|
1224
|
-
let command = shell_command(argv, cwd, env, env_unset);
|
|
1225
|
-
self.spawn_with_command(session, window, &command, first)
|
|
1226
|
-
}
|
|
1227
|
-
|
|
1228
|
-
/// 0.4.x (CR C-2): spawn variant that takes a pre-built shell command
|
|
1229
|
-
/// (used by `spawn_first_with_leader_shell_wrapper` /
|
|
1230
|
-
/// `spawn_into_with_leader_shell_wrapper` to inject the leader wrapper
|
|
1231
|
-
/// shape without going through `shell_command`'s `exec`-only template).
|
|
1232
|
-
fn spawn_with_command(
|
|
1233
|
-
&self,
|
|
1234
|
-
session: &SessionName,
|
|
1235
|
-
window: &WindowName,
|
|
1236
|
-
command: &str,
|
|
1237
|
-
first: bool,
|
|
1238
|
-
) -> Result<SpawnResult, TransportError> {
|
|
1239
|
-
let spawn_argv = tmux_spawn_argv(session, window, command, first);
|
|
1240
|
-
self.validate_spawn_command(
|
|
1241
|
-
&spawn_argv,
|
|
1242
|
-
if first {
|
|
1243
|
-
"tmux.new-session"
|
|
1244
|
-
} else {
|
|
1245
|
-
"tmux.new-window"
|
|
1246
|
-
},
|
|
1247
|
-
session,
|
|
1248
|
-
window,
|
|
1249
|
-
)?;
|
|
1250
|
-
let output = self.run_spawn(&spawn_argv)?;
|
|
1251
|
-
let pane = output.stdout.trim();
|
|
1252
|
-
if pane.is_empty() {
|
|
1253
|
-
return Err(TransportError::Subprocess {
|
|
1254
|
-
argv: spawn_argv,
|
|
1255
|
-
code: output.code,
|
|
1256
|
-
stderr: format!(
|
|
1257
|
-
"tmux spawn returned no pane id for {}:{}",
|
|
1258
|
-
session.as_str(),
|
|
1259
|
-
window.as_str()
|
|
1260
|
-
),
|
|
1261
|
-
});
|
|
1262
|
-
}
|
|
1263
|
-
let pane_id = PaneId::new(pane);
|
|
1264
|
-
let deadline = Instant::now() + SPAWN_IDENTITY_TIMEOUT;
|
|
1265
|
-
let observed = loop {
|
|
1266
|
-
match self.list_targets() {
|
|
1267
|
-
Ok(targets) => {
|
|
1268
|
-
if let Some(target) = targets.iter().find(|target| {
|
|
1269
|
-
target.pane_id == pane_id
|
|
1270
|
-
&& target.session.as_str() == session.as_str()
|
|
1271
|
-
&& target
|
|
1272
|
-
.window_name
|
|
1273
|
-
.as_ref()
|
|
1274
|
-
.is_some_and(|name| name.as_str() == window.as_str())
|
|
1275
|
-
}) {
|
|
1276
|
-
return Ok(SpawnResult {
|
|
1277
|
-
pane_id,
|
|
1278
|
-
session: session.clone(),
|
|
1279
|
-
window: window.clone(),
|
|
1280
|
-
child_pid: target.pane_pid,
|
|
1281
|
-
});
|
|
1282
|
-
}
|
|
1283
|
-
if let Some(target) = targets.iter().find(|target| target.pane_id == pane_id) {
|
|
1284
|
-
break format!(
|
|
1285
|
-
"{}:{}",
|
|
1286
|
-
target.session.as_str(),
|
|
1287
|
-
target
|
|
1288
|
-
.window_name
|
|
1289
|
-
.as_ref()
|
|
1290
|
-
.map(WindowName::as_str)
|
|
1291
|
-
.unwrap_or("<unknown>")
|
|
1292
|
-
);
|
|
1293
|
-
}
|
|
1294
|
-
if Instant::now() >= deadline {
|
|
1295
|
-
break "<missing-from-list-targets>".to_string();
|
|
1296
|
-
}
|
|
1297
|
-
}
|
|
1298
|
-
Err(error) => {
|
|
1299
|
-
if Instant::now() >= deadline {
|
|
1300
|
-
break format!("<list-targets-error:{error}>");
|
|
1301
|
-
}
|
|
1302
|
-
}
|
|
1303
|
-
}
|
|
1304
|
-
std::thread::sleep(SPAWN_IDENTITY_POLL_INTERVAL);
|
|
1305
|
-
};
|
|
1306
|
-
let rollback_argv = vec![
|
|
1307
|
-
"tmux".to_string(),
|
|
1308
|
-
"kill-pane".to_string(),
|
|
1309
|
-
"-t".to_string(),
|
|
1310
|
-
pane_id.as_str().to_string(),
|
|
1311
|
-
];
|
|
1312
|
-
let rollback_error = self.run_ok(&rollback_argv).err();
|
|
1313
|
-
let rollback_suffix = rollback_error
|
|
1314
|
-
.map(|error| format!("; failed to roll back spawned pane: {error}"))
|
|
1315
|
-
.unwrap_or_default();
|
|
1316
|
-
Err(TransportError::Subprocess {
|
|
1317
|
-
argv: spawn_argv,
|
|
1318
|
-
code: output.code,
|
|
1319
|
-
stderr: format!(
|
|
1320
|
-
"tmux spawn pane identity mismatch: requested={}:{} observed_pane={} observed={}{}",
|
|
1321
|
-
session.as_str(),
|
|
1322
|
-
window.as_str(),
|
|
1323
|
-
pane_id.as_str(),
|
|
1324
|
-
observed,
|
|
1325
|
-
rollback_suffix
|
|
1326
|
-
),
|
|
1327
|
-
})
|
|
1328
|
-
}
|
|
1329
|
-
|
|
1330
|
-
fn spawn_split(
|
|
1331
|
-
&self,
|
|
1332
|
-
session: &SessionName,
|
|
1333
|
-
window: &WindowName,
|
|
1334
|
-
argv: &[String],
|
|
1335
|
-
cwd: &Path,
|
|
1336
|
-
env: &BTreeMap<String, String>,
|
|
1337
|
-
env_unset: &[String],
|
|
1338
|
-
) -> Result<SpawnResult, TransportError> {
|
|
1339
|
-
let command = shell_command(argv, cwd, env, env_unset);
|
|
1340
|
-
let target = format!("{}:{}", session.as_str(), window.as_str());
|
|
1341
|
-
// E53 (0.3.26, adaptive layout same-session tabs): `-d` prevents the
|
|
1342
|
-
// new split pane from stealing focus from the leader's active pane.
|
|
1343
|
-
// Same rationale as the `-d` on `new-window` in transport.rs; for
|
|
1344
|
-
// adaptive layout the leader and all workers share the same tmux
|
|
1345
|
-
// session, and every focus-stealing spawn is a disruption.
|
|
1346
|
-
let split_argv = vec![
|
|
1347
|
-
"tmux".to_string(),
|
|
1348
|
-
"split-window".to_string(),
|
|
1349
|
-
"-d".to_string(),
|
|
1350
|
-
"-t".to_string(),
|
|
1351
|
-
target.clone(),
|
|
1352
|
-
"-h".to_string(),
|
|
1353
|
-
"-P".to_string(),
|
|
1354
|
-
"-F".to_string(),
|
|
1355
|
-
"#{pane_id}".to_string(),
|
|
1356
|
-
"sh".to_string(),
|
|
1357
|
-
"-lc".to_string(),
|
|
1358
|
-
command,
|
|
1359
|
-
];
|
|
1360
|
-
self.validate_spawn_command(&split_argv, "tmux.split-window", session, window)?;
|
|
1361
|
-
let output = self.run_spawn(&split_argv)?;
|
|
1362
|
-
let pane = output.stdout.trim();
|
|
1363
|
-
if pane.is_empty() {
|
|
1364
|
-
return Err(TransportError::Subprocess {
|
|
1365
|
-
argv: split_argv,
|
|
1366
|
-
code: output.code,
|
|
1367
|
-
stderr: format!("tmux split-window returned no pane id for {target}"),
|
|
1368
|
-
});
|
|
1369
|
-
}
|
|
1370
|
-
let layout_argv = vec![
|
|
1371
|
-
"tmux".to_string(),
|
|
1372
|
-
"select-layout".to_string(),
|
|
1373
|
-
"-t".to_string(),
|
|
1374
|
-
target,
|
|
1375
|
-
"even-horizontal".to_string(),
|
|
1376
|
-
];
|
|
1377
|
-
self.run_ok(&layout_argv)?;
|
|
1378
|
-
Ok(SpawnResult {
|
|
1379
|
-
pane_id: PaneId::new(pane),
|
|
1380
|
-
session: session.clone(),
|
|
1381
|
-
window: window.clone(),
|
|
1382
|
-
child_pid: None,
|
|
1383
|
-
})
|
|
1384
|
-
}
|
|
1385
|
-
|
|
1386
|
-
fn run_ok(&self, argv: &[String]) -> Result<(), TransportError> {
|
|
1387
|
-
let argv = self.tmux_argv(argv);
|
|
1388
|
-
let output = self.runner.run(&argv)?;
|
|
1389
|
-
if output.success {
|
|
1390
|
-
Ok(())
|
|
1391
|
-
} else {
|
|
1392
|
-
Err(subprocess_error(argv, output))
|
|
1393
|
-
}
|
|
1394
|
-
}
|
|
1395
|
-
|
|
1396
|
-
fn validate_spawn_command(
|
|
1397
|
-
&self,
|
|
1398
|
-
argv: &[String],
|
|
1399
|
-
segment: &str,
|
|
1400
|
-
session: &SessionName,
|
|
1401
|
-
window: &WindowName,
|
|
1402
|
-
) -> Result<(), TransportError> {
|
|
1403
|
-
let final_argv = self.tmux_argv(argv);
|
|
1404
|
-
let actual_bytes = final_argv
|
|
1405
|
-
.iter()
|
|
1406
|
-
.map(|arg| arg.len().saturating_add(1))
|
|
1407
|
-
.sum::<usize>();
|
|
1408
|
-
if actual_bytes > TMUX_SPAWN_COMMAND_LIMIT_BYTES {
|
|
1409
|
-
return Err(TransportError::CommandTooLong {
|
|
1410
|
-
backend: BackendKind::Tmux,
|
|
1411
|
-
segment: segment.to_string(),
|
|
1412
|
-
session: session.as_str().to_string(),
|
|
1413
|
-
window: window.as_str().to_string(),
|
|
1414
|
-
actual_bytes,
|
|
1415
|
-
limit_bytes: TMUX_SPAWN_COMMAND_LIMIT_BYTES,
|
|
1416
|
-
});
|
|
1417
|
-
}
|
|
1418
|
-
Ok(())
|
|
1419
|
-
}
|
|
1420
|
-
|
|
1421
|
-
fn run_spawn(&self, argv: &[String]) -> Result<CommandOutput, TransportError> {
|
|
1422
|
-
let argv = self.tmux_argv(argv);
|
|
1423
|
-
let output = self
|
|
1424
|
-
.runner
|
|
1425
|
-
.run(&argv)
|
|
1426
|
-
.map_err(|source| TransportError::Spawn {
|
|
1427
|
-
backend: BackendKind::Tmux,
|
|
1428
|
-
source,
|
|
1429
|
-
})?;
|
|
1430
|
-
if output.success {
|
|
1431
|
-
Ok(output)
|
|
1432
|
-
} else {
|
|
1433
|
-
Err(subprocess_error(argv, output))
|
|
1434
|
-
}
|
|
1435
|
-
}
|
|
1436
|
-
|
|
1437
|
-
fn run_inject_stage(&self, argv: &[String], stage: InjectStage) -> Result<(), TransportError> {
|
|
1438
|
-
let argv = self.tmux_argv(argv);
|
|
1439
|
-
let output = self
|
|
1440
|
-
.runner
|
|
1441
|
-
.run(&argv)
|
|
1442
|
-
.map_err(|source| TransportError::Inject { stage, source })?;
|
|
1443
|
-
if output.success {
|
|
1444
|
-
Ok(())
|
|
1445
|
-
} else {
|
|
1446
|
-
Err(subprocess_error(argv, output))
|
|
1447
|
-
}
|
|
1448
|
-
}
|
|
1449
|
-
|
|
1450
|
-
fn run_inject_stage_with_stdin(
|
|
1451
|
-
&self,
|
|
1452
|
-
argv: &[String],
|
|
1453
|
-
stage: InjectStage,
|
|
1454
|
-
stdin: &str,
|
|
1455
|
-
) -> Result<(), TransportError> {
|
|
1456
|
-
let argv = self.tmux_argv(argv);
|
|
1457
|
-
let output = self
|
|
1458
|
-
.runner
|
|
1459
|
-
.run_with_stdin(&argv, stdin)
|
|
1460
|
-
.map_err(|source| TransportError::Inject { stage, source })?;
|
|
1461
|
-
if output.success {
|
|
1462
|
-
Ok(())
|
|
1463
|
-
} else {
|
|
1464
|
-
Err(subprocess_error(argv, output))
|
|
1465
|
-
}
|
|
1466
|
-
}
|
|
1467
|
-
|
|
1468
|
-
/// 任意非 0 tmux mode。best-effort,查询失败 → None。
|
|
1469
|
-
///
|
|
1470
|
-
/// Cherry-pick 866939b1 冲突裁定:本线没有 `inject_journal` 模块(modify/delete),
|
|
1471
|
-
/// 不复活整份 journal。`pane_mode_from_raw` 识别 copy/tree/view/client;
|
|
1472
|
-
/// 一切 Some(mode) 都算在 mode(头注释「非 0 先 cancel」)。
|
|
1473
|
-
fn pane_in_mode(&self, target: &Target) -> Option<bool> {
|
|
1474
|
-
let raw = self.query(target, PaneField::PaneMode).ok().flatten()?;
|
|
1475
|
-
Some(pane_mode_from_raw(Some(raw)).is_some())
|
|
1476
|
-
}
|
|
1477
|
-
|
|
1478
|
-
fn pane_mode(&self, target: &Target) -> Option<PaneMode> {
|
|
1479
|
-
let raw = self.query(target, PaneField::PaneMode).ok().flatten()?;
|
|
1480
|
-
pane_mode_from_raw(Some(raw))
|
|
1481
|
-
}
|
|
1482
|
-
|
|
1483
|
-
/// 发 Enter 前归零接收态。A1/A3/A4/A6 唯一入口。
|
|
1484
|
-
///
|
|
1485
|
-
/// 1. 非 0 pane_mode → `tmux_cancel_mode_argv`(按真实 mode 分派,不是硬编码 Copy)
|
|
1486
|
-
/// cancel 失败不 fail 提交。E55:不送 Escape/C-c。
|
|
1487
|
-
///
|
|
1488
|
-
/// 用户裁定 2026-08-23:**不发 ESC,也不发 ESC 的替代品**(含字面 CSI 201~)。
|
|
1489
|
-
/// 发 ESC/CSI 的唯一好处是让消息当场直接上屏;本项目只要求「下一次工具调用时能上屏」
|
|
1490
|
-
/// ⇒ 不存在需要它才能满足的场景,发它没有收益,只有污染 composer 输入的风险。
|
|
1491
|
-
fn prepare_pane_for_submit(&self, target: &Target, close_bracketed_paste: bool) {
|
|
1492
|
-
let _ = close_bracketed_paste;
|
|
1493
|
-
let pane = pane_from_target(target);
|
|
1494
|
-
if let Some(mode) = self.pane_mode(target) {
|
|
1495
|
-
let argv = crate::transport::tmux_cancel_mode_argv(&pane, mode);
|
|
1496
|
-
let _ = self.run_inject_stage(&argv, InjectStage::Submit);
|
|
1497
|
-
}
|
|
1498
|
-
}
|
|
1499
|
-
}
|
|
1500
|
-
|
|
1501
|
-
fn subprocess_error(argv: Vec<String>, output: CommandOutput) -> TransportError {
|
|
1502
|
-
TransportError::Subprocess {
|
|
1503
|
-
argv,
|
|
1504
|
-
code: output.code,
|
|
1505
|
-
stderr: output.stderr,
|
|
1506
|
-
}
|
|
1507
|
-
}
|
|
1508
|
-
|
|
1509
|
-
fn pane_from_target(target: &Target) -> PaneId {
|
|
1510
|
-
match target {
|
|
1511
|
-
Target::Pane(pane) => pane.clone(),
|
|
1512
|
-
Target::SessionWindow { session, window } => {
|
|
1513
|
-
PaneId::new(format!("{}:{}", session.as_str(), window.as_str()))
|
|
1514
|
-
}
|
|
1515
|
-
}
|
|
1516
|
-
}
|
|
1517
|
-
|
|
1518
|
-
#[derive(Default)]
|
|
1519
|
-
struct CaptureTally {
|
|
1520
|
-
ok: u32,
|
|
1521
|
-
err: u32,
|
|
1522
|
-
last: CaptureSampleOutcome,
|
|
1523
|
-
}
|
|
1524
|
-
|
|
1525
|
-
impl CaptureTally {
|
|
1526
|
-
fn record_ok(&mut self, text: &str, marker: Option<&str>) {
|
|
1527
|
-
self.ok = self.ok.saturating_add(1);
|
|
1528
|
-
self.last = if marker.is_some_and(|token| text.contains(token)) {
|
|
1529
|
-
CaptureSampleOutcome::OkTokenSeen
|
|
1530
|
-
} else {
|
|
1531
|
-
CaptureSampleOutcome::OkTokenMissing
|
|
1532
|
-
};
|
|
1533
|
-
}
|
|
1534
|
-
|
|
1535
|
-
fn record_err(&mut self) {
|
|
1536
|
-
self.err = self.err.saturating_add(1);
|
|
1537
|
-
self.last = CaptureSampleOutcome::Failed;
|
|
1538
|
-
}
|
|
1539
|
-
|
|
1540
|
-
fn seen_after_ok_samples(&self, visible: bool) -> Option<bool> {
|
|
1541
|
-
if self.ok == 0 {
|
|
1542
|
-
None
|
|
1543
|
-
} else {
|
|
1544
|
-
Some(visible)
|
|
1545
|
-
}
|
|
1546
|
-
}
|
|
1547
|
-
}
|
|
1548
|
-
|
|
1549
|
-
struct InjectTargetSurface {
|
|
1550
|
-
pane_command_basename: Option<String>,
|
|
1551
|
-
pane_command_query: QueryOutcome,
|
|
1552
|
-
input_surface: InputSurfaceProbe,
|
|
1553
|
-
target_pane_id: String,
|
|
1554
|
-
target_pane_query_matched: Option<bool>,
|
|
1555
|
-
}
|
|
1556
|
-
|
|
1557
|
-
fn probe_inject_target_surface(backend: &TmuxBackend, target: &Target) -> InjectTargetSurface {
|
|
1558
|
-
let pane = pane_from_target(target);
|
|
1559
|
-
let (pane_command_basename, pane_command_query) =
|
|
1560
|
-
match backend.query(target, PaneField::PaneCurrentCommand) {
|
|
1561
|
-
Ok(Some(raw)) => match command_basename(&raw) {
|
|
1562
|
-
Some(name) => (Some(name), QueryOutcome::Observed),
|
|
1563
|
-
None => (None, QueryOutcome::Unavailable),
|
|
1564
|
-
},
|
|
1565
|
-
_ => (None, QueryOutcome::Unavailable),
|
|
1566
|
-
};
|
|
1567
|
-
let input_surface = match backend.query(target, PaneField::PaneMode) {
|
|
1568
|
-
Ok(Some(raw)) => match pane_mode_from_raw(Some(raw)) {
|
|
1569
|
-
None => InputSurfaceProbe::Input,
|
|
1570
|
-
Some(PaneMode::Copy) => InputSurfaceProbe::Copy,
|
|
1571
|
-
Some(PaneMode::Tree) => InputSurfaceProbe::Tree,
|
|
1572
|
-
Some(PaneMode::View) => InputSurfaceProbe::View,
|
|
1573
|
-
Some(PaneMode::Client) => InputSurfaceProbe::Client,
|
|
1574
|
-
Some(PaneMode::Unknown) => InputSurfaceProbe::UnknownMode,
|
|
1575
|
-
},
|
|
1576
|
-
_ => InputSurfaceProbe::Unavailable,
|
|
1577
|
-
};
|
|
1578
|
-
let target_pane_query_matched = match backend.query(target, PaneField::PaneId) {
|
|
1579
|
-
Ok(Some(id)) if !id.is_empty() => Some(id == pane.as_str()),
|
|
1580
|
-
_ => None,
|
|
1581
|
-
};
|
|
1582
|
-
InjectTargetSurface {
|
|
1583
|
-
pane_command_basename,
|
|
1584
|
-
pane_command_query,
|
|
1585
|
-
input_surface,
|
|
1586
|
-
target_pane_id: pane.as_str().to_string(),
|
|
1587
|
-
target_pane_query_matched,
|
|
1588
|
-
}
|
|
1589
|
-
}
|
|
1590
|
-
|
|
1591
|
-
fn submit_diagnostics_for_inject(
|
|
1592
|
-
total_elapsed_ms: u64,
|
|
1593
|
-
attempts_detail: Vec<SubmitAttemptObservation>,
|
|
1594
|
-
tally: &CaptureTally,
|
|
1595
|
-
token_seen_after_paste: Option<bool>,
|
|
1596
|
-
token_seen_after_enter: Option<bool>,
|
|
1597
|
-
surface: InjectTargetSurface,
|
|
1598
|
-
) -> SubmitDiagnostics {
|
|
1599
|
-
SubmitDiagnostics {
|
|
1600
|
-
consumption_reason: SubmitConsumptionReason::Unknown,
|
|
1601
|
-
// No pre-paste capture exists on this path; keep the diagnostic null.
|
|
1602
|
-
before_busy_signal_kind: None,
|
|
1603
|
-
busy_signal_kind: None,
|
|
1604
|
-
busy_line_from_bottom: None,
|
|
1605
|
-
current_marker_in_bottom_15: None,
|
|
1606
|
-
paste_identity_in_composer: None,
|
|
1607
|
-
consumption_from_capture_result: None,
|
|
1608
|
-
appear_gate_elapsed_ms: 0,
|
|
1609
|
-
appear_gate_matched: false,
|
|
1610
|
-
total_elapsed_ms,
|
|
1611
|
-
attempts_detail,
|
|
1612
|
-
token_seen_before_paste: None,
|
|
1613
|
-
token_seen_after_paste,
|
|
1614
|
-
token_seen_after_enter,
|
|
1615
|
-
capture_ok_count: tally.ok,
|
|
1616
|
-
capture_err_count: tally.err,
|
|
1617
|
-
capture_sample_count: tally.ok.saturating_add(tally.err),
|
|
1618
|
-
last_capture_outcome: tally.last,
|
|
1619
|
-
pane_command_basename: surface.pane_command_basename,
|
|
1620
|
-
pane_command_query: surface.pane_command_query,
|
|
1621
|
-
input_surface: surface.input_surface,
|
|
1622
|
-
target_pane_id: Some(surface.target_pane_id),
|
|
1623
|
-
target_pane_query_matched: surface.target_pane_query_matched,
|
|
1624
|
-
}
|
|
1625
|
-
}
|
|
1626
|
-
|
|
1627
|
-
fn target_name(target: &Target) -> String {
|
|
1628
|
-
match target {
|
|
1629
|
-
Target::Pane(pane) => pane.as_str().to_string(),
|
|
1630
|
-
Target::SessionWindow { session, window } => {
|
|
1631
|
-
format!("{}:{}", session.as_str(), window.as_str())
|
|
1632
|
-
}
|
|
1633
|
-
}
|
|
1634
|
-
}
|
|
1635
|
-
|
|
1636
|
-
fn inject_stage_for_argv(argv: &[String]) -> InjectStage {
|
|
1637
|
-
match argv.get(1).map(String::as_str) {
|
|
1638
|
-
Some("set-buffer") => InjectStage::SetBuffer,
|
|
1639
|
-
Some("load-buffer") => InjectStage::LoadBuffer,
|
|
1640
|
-
Some("paste-buffer") => InjectStage::PasteBuffer,
|
|
1641
|
-
Some("delete-buffer") => InjectStage::DeleteBuffer,
|
|
1642
|
-
Some("send-keys") => InjectStage::Submit,
|
|
1643
|
-
_ => InjectStage::Submit,
|
|
1644
|
-
}
|
|
1645
|
-
}
|
|
1646
|
-
|
|
1647
|
-
fn pane_mode_from_raw(raw: Option<String>) -> Option<PaneMode> {
|
|
1648
|
-
match raw.as_deref().map(str::trim) {
|
|
1649
|
-
Some("") | Some("0") => None,
|
|
1650
|
-
Some("copy-mode") => Some(PaneMode::Copy),
|
|
1651
|
-
Some("tree-mode") => Some(PaneMode::Tree),
|
|
1652
|
-
Some("view-mode") => Some(PaneMode::View),
|
|
1653
|
-
Some("client-mode") => Some(PaneMode::Client),
|
|
1654
|
-
_ => Some(PaneMode::Unknown),
|
|
1655
|
-
}
|
|
1656
|
-
}
|
|
1657
|
-
|
|
1658
|
-
fn buffer_name_for_text(text: &str) -> String {
|
|
1659
|
-
const PREFIX: &str = "[team-agent-token:";
|
|
1660
|
-
match text.find(PREFIX) {
|
|
1661
|
-
Some(prefix_start) => {
|
|
1662
|
-
let token_start = prefix_start.saturating_add(PREFIX.len());
|
|
1663
|
-
let Some(rest) = text.get(token_start..) else {
|
|
1664
|
-
return "team-agent-buf".to_string();
|
|
1665
|
-
};
|
|
1666
|
-
let Some(token_end) = rest.find(']') else {
|
|
1667
|
-
return "team-agent-buf".to_string();
|
|
1668
|
-
};
|
|
1669
|
-
let Some(token) = rest.get(..token_end).filter(|s| !s.is_empty()) else {
|
|
1670
|
-
return "team-agent-buf".to_string();
|
|
1671
|
-
};
|
|
1672
|
-
format!("team-agent-send-{token}")
|
|
1673
|
-
}
|
|
1674
|
-
None => "team-agent-buf".to_string(),
|
|
1675
|
-
}
|
|
1676
|
-
}
|
|
1677
|
-
|
|
1678
|
-
fn inject_verification_for_payload(payload: &InjectPayload) -> InjectVerification {
|
|
1679
|
-
match payload {
|
|
1680
|
-
InjectPayload::Empty => InjectVerification::EmptyTextSendKeys,
|
|
1681
|
-
InjectPayload::Text(text) | InjectPayload::TextSkipConsumptionPoll(text)
|
|
1682
|
-
if text.contains("[team-agent-token:") =>
|
|
1683
|
-
{
|
|
1684
|
-
InjectVerification::CaptureContainsToken
|
|
1685
|
-
}
|
|
1686
|
-
InjectPayload::Text(_) | InjectPayload::TextSkipConsumptionPoll(_) => {
|
|
1687
|
-
InjectVerification::NoToken
|
|
1688
|
-
}
|
|
1689
|
-
}
|
|
1690
|
-
}
|
|
1691
|
-
|
|
1692
|
-
/// U1 #7: the exact delivery-token marker a token payload carries
|
|
1693
|
-
/// (`[team-agent-token:<id>]`). Use the full marker, not only the prefix, so an old
|
|
1694
|
-
/// scrollback token cannot verify a new message.
|
|
1695
|
-
/// Measured cursor-agent 2026.08.11 floor: text and first Enter ≥1s apart
|
|
1696
|
-
/// (phase0 M2-5/M2-6; `.team/scripts/cursor_send.sh`).
|
|
1697
|
-
/// The legacy Grok worker used the same 1s floor (悬案B:零地板时 Enter 落在折叠窗口内被吞);
|
|
1698
|
-
/// contract leaves own their own paste timing.
|
|
1699
|
-
pub const CURSOR_PASTE_TO_SUBMIT_FLOOR: Duration = Duration::from_secs(1);
|
|
1700
|
-
|
|
1701
|
-
thread_local! {
|
|
1702
|
-
static PASTE_TO_SUBMIT_FLOOR: Cell<Duration> = const { Cell::new(Duration::ZERO) };
|
|
1703
|
-
static CURSOR_SINGLE_ENTER: Cell<bool> = const { Cell::new(false) };
|
|
1704
|
-
}
|
|
1705
|
-
|
|
1706
|
-
/// Run `f` with a paste→Enter floor. No legacy recipient sets one now.
|
|
1707
|
-
/// Tests pass a small non-zero Duration to cover the sleep branch.
|
|
1708
|
-
/// Default is ZERO — claude/codex and unset callers pay nothing.
|
|
1709
|
-
/// This is not TEAM_AGENT_TEST_TMP (that var is a path, always set in seats).
|
|
1710
|
-
/// ---
|
|
1711
|
-
/// purpose: 在 f 执行期间设定「粘贴到回车之间至少等多久」的地板,退出时恢复原值
|
|
1712
|
-
/// params:
|
|
1713
|
-
/// floor: 本次生效的最小间隔;ZERO 表示不等
|
|
1714
|
-
/// f: 在该地板下执行的闭包
|
|
1715
|
-
/// returns: 原样返回 f 的返回值
|
|
1716
|
-
/// boundary: thread_local 作用域,不跨线程;只设阈值,真正的等待发生在 sleep_remaining_paste_to_submit_floor;默认 ZERO(legacy grok worker 退役后 delivery 不再设地板)
|
|
1717
|
-
/// ---
|
|
1718
|
-
pub fn with_paste_to_submit_floor<R>(floor: Duration, f: impl FnOnce() -> R) -> R {
|
|
1719
|
-
PASTE_TO_SUBMIT_FLOOR.with(|cell| {
|
|
1720
|
-
let previous = cell.replace(floor);
|
|
1721
|
-
let result = f();
|
|
1722
|
-
cell.set(previous);
|
|
1723
|
-
result
|
|
1724
|
-
})
|
|
1725
|
-
}
|
|
1726
|
-
|
|
1727
|
-
/// ---
|
|
1728
|
-
/// purpose: 读当前线程生效的粘贴到回车地板
|
|
1729
|
-
/// returns: 当前地板;未设过则为 ZERO
|
|
1730
|
-
/// boundary: 只读不改;ZERO 表示「不等」,不是「未配置」——两者在此不做区分
|
|
1731
|
-
/// ---
|
|
1732
|
-
pub(crate) fn current_paste_to_submit_floor() -> Duration {
|
|
1733
|
-
PASTE_TO_SUBMIT_FLOOR.with(Cell::get)
|
|
1734
|
-
}
|
|
1735
|
-
|
|
1736
|
-
/// ---
|
|
1737
|
-
/// purpose: 单回车闸(delivery 仅对 Pi 打开;最初为 Cursor 实测)
|
|
1738
|
-
/// contract: 默认关;打开后重试 Enter 仅当 token 仍在输入区且无 busy
|
|
1739
|
-
/// boundary: 不改 claude/grok/codex 默认重试;测试隔离下默认关
|
|
1740
|
-
/// ---
|
|
1741
|
-
pub fn with_cursor_single_enter<R>(enabled: bool, f: impl FnOnce() -> R) -> R {
|
|
1742
|
-
CURSOR_SINGLE_ENTER.with(|cell| {
|
|
1743
|
-
let previous = cell.replace(enabled);
|
|
1744
|
-
let result = f();
|
|
1745
|
-
cell.set(previous);
|
|
1746
|
-
result
|
|
1747
|
-
})
|
|
1748
|
-
}
|
|
1749
|
-
|
|
1750
|
-
/// ---
|
|
1751
|
-
/// purpose: 读当前线程的 cursor 单回车闸开关
|
|
1752
|
-
/// returns: 打开为 true;默认关
|
|
1753
|
-
/// boundary: 只读不改;开关只影响重按 Enter 的判据来源,不改变首次 Enter
|
|
1754
|
-
/// ---
|
|
1755
|
-
pub(crate) fn cursor_single_enter_enabled() -> bool {
|
|
1756
|
-
CURSOR_SINGLE_ENTER.with(Cell::get)
|
|
1757
|
-
}
|
|
1758
|
-
|
|
1759
|
-
/// ---
|
|
1760
|
-
/// purpose: 补齐粘贴到回车之间还差的等待时间
|
|
1761
|
-
/// params:
|
|
1762
|
-
/// pasted_at: 粘贴完成的时刻
|
|
1763
|
-
/// floor: 要求的最小间隔
|
|
1764
|
-
/// returns: 无返回值;已过地板则立即返回,否则阻塞剩余时长
|
|
1765
|
-
/// boundary: 阻塞当前线程;只保证「不早于」,不保证 TUI 真的处理完粘贴
|
|
1766
|
-
/// ---
|
|
1767
|
-
pub(crate) fn sleep_remaining_paste_to_submit_floor(pasted_at: Instant, floor: Duration) {
|
|
1768
|
-
let remain = floor.saturating_sub(pasted_at.elapsed());
|
|
1769
|
-
if !remain.is_zero() {
|
|
1770
|
-
std::thread::sleep(remain);
|
|
1771
|
-
}
|
|
1772
|
-
}
|
|
1773
|
-
|
|
1774
|
-
fn payload_token_marker(payload: &InjectPayload) -> Option<&str> {
|
|
1775
|
-
let text = payload.text()?;
|
|
1776
|
-
let start = text.find("[team-agent-token:")?;
|
|
1777
|
-
let marker = &text[start..];
|
|
1778
|
-
let end = marker.find(']')?;
|
|
1779
|
-
Some(&marker[..=end])
|
|
1780
|
-
}
|
|
1781
|
-
|
|
1782
|
-
fn token_visible_in_capture(
|
|
1783
|
-
backend: &TmuxBackend,
|
|
1784
|
-
target: &Target,
|
|
1785
|
-
payload: &InjectPayload,
|
|
1786
|
-
) -> Result<Option<bool>, TransportError> {
|
|
1787
|
-
match payload_token_marker(payload) {
|
|
1788
|
-
None => Ok(None),
|
|
1789
|
-
Some(marker) => {
|
|
1790
|
-
let captured = backend.capture(target, CaptureRange::Tail(80))?;
|
|
1791
|
-
Ok(Some(captured.text.contains(marker)))
|
|
1792
|
-
}
|
|
1793
|
-
}
|
|
1794
|
-
}
|
|
1795
|
-
|
|
1796
|
-
/// U1 #7 / E31: wait briefly for the just-pasted token marker before submitting.
|
|
1797
|
-
/// `Ok(None)` for non-token payloads (nothing to check). `Ok(Some(false))` means the
|
|
1798
|
-
/// paste did not become visible before the Python-parity fallback delay.
|
|
1799
|
-
fn pre_submit_token_visible(
|
|
1800
|
-
backend: &TmuxBackend,
|
|
1801
|
-
target: &Target,
|
|
1802
|
-
payload: &InjectPayload,
|
|
1803
|
-
) -> Result<Option<bool>, TransportError> {
|
|
1804
|
-
if payload_token_marker(payload).is_none() {
|
|
1805
|
-
return Ok(None);
|
|
1806
|
-
}
|
|
1807
|
-
for attempt in 0..PASTED_CONTENT_APPEAR_POLLS {
|
|
1808
|
-
if let Some(true) = token_visible_in_capture(backend, target, payload)? {
|
|
1809
|
-
return Ok(Some(true));
|
|
1810
|
-
}
|
|
1811
|
-
if attempt + 1 < PASTED_CONTENT_APPEAR_POLLS {
|
|
1812
|
-
std::thread::sleep(Duration::from_millis(25));
|
|
1813
|
-
}
|
|
1814
|
-
}
|
|
1815
|
-
// Python waits 250ms between paste-buffer and Enter to let bracketed paste settle.
|
|
1816
|
-
std::thread::sleep(Duration::from_millis(250));
|
|
1817
|
-
Ok(Some(false))
|
|
1818
|
-
}
|
|
1819
|
-
|
|
1820
|
-
const TOKEN_POST_SUBMIT_READBACK_POLLS: u32 = 5;
|
|
1821
|
-
|
|
1822
|
-
/// Some non-echo panes, including the integration harness' `stty -echo; cat`, only
|
|
1823
|
-
/// render the injected line after the submit key. If pre-submit readback missed the
|
|
1824
|
-
/// token, do a bounded post-submit check before reporting `CaptureMissingToken`.
|
|
1825
|
-
fn post_submit_token_visible(
|
|
1826
|
-
backend: &TmuxBackend,
|
|
1827
|
-
target: &Target,
|
|
1828
|
-
payload: &InjectPayload,
|
|
1829
|
-
tally: &mut CaptureTally,
|
|
1830
|
-
) -> Result<Option<bool>, TransportError> {
|
|
1831
|
-
let Some(marker) = payload_token_marker(payload) else {
|
|
1832
|
-
return Ok(None);
|
|
1833
|
-
};
|
|
1834
|
-
for attempt in 0..TOKEN_POST_SUBMIT_READBACK_POLLS {
|
|
1835
|
-
match backend.capture(target, CaptureRange::Tail(80)) {
|
|
1836
|
-
Ok(cap) => {
|
|
1837
|
-
tally.record_ok(&cap.text, Some(marker));
|
|
1838
|
-
if cap.text.contains(marker) {
|
|
1839
|
-
return Ok(Some(true));
|
|
1840
|
-
}
|
|
1841
|
-
}
|
|
1842
|
-
Err(_) => {
|
|
1843
|
-
tally.record_err();
|
|
1844
|
-
return Ok(None);
|
|
1845
|
-
}
|
|
1846
|
-
}
|
|
1847
|
-
if attempt + 1 < TOKEN_POST_SUBMIT_READBACK_POLLS {
|
|
1848
|
-
std::thread::sleep(Duration::from_millis(25));
|
|
1849
|
-
}
|
|
1850
|
-
}
|
|
1851
|
-
Ok(Some(false))
|
|
1852
|
-
}
|
|
1853
|
-
|
|
1854
|
-
/// U1 #7: downgrade the static token verification to `CaptureMissingToken` when the
|
|
1855
|
-
/// pre-submit readback did not see the token in the pane. A `None` readback (non-token
|
|
1856
|
-
/// payload, or capture unavailable) falls back to the static verification.
|
|
1857
|
-
fn inject_verification_after_readback(
|
|
1858
|
-
payload: &InjectPayload,
|
|
1859
|
-
token_visible_before_submit: Option<bool>,
|
|
1860
|
-
) -> InjectVerification {
|
|
1861
|
-
match (payload, token_visible_before_submit) {
|
|
1862
|
-
(_, Some(visible)) if payload_token_marker(payload).is_some() => {
|
|
1863
|
-
if visible {
|
|
1864
|
-
InjectVerification::CaptureContainsToken
|
|
1865
|
-
} else {
|
|
1866
|
-
InjectVerification::CaptureMissingToken
|
|
1867
|
-
}
|
|
1868
|
-
}
|
|
1869
|
-
_ => inject_verification_for_payload(payload),
|
|
1870
|
-
}
|
|
1871
|
-
}
|
|
1872
|
-
|
|
1873
|
-
fn submit_verification_for_key(key: Key) -> SubmitVerification {
|
|
1874
|
-
match key {
|
|
1875
|
-
Key::Enter => SubmitVerification::EnterSentWithoutPlaceholderCheck,
|
|
1876
|
-
other => SubmitVerification::KeySentAfterVisibleToken { key: other },
|
|
1877
|
-
}
|
|
1878
|
-
}
|
|
1879
|
-
|
|
1880
|
-
fn capture_has_pasted_content_prompt(text: &str) -> bool {
|
|
1881
|
-
pasted_prompt_match(text).is_some()
|
|
1882
|
-
}
|
|
1883
|
-
|
|
1884
|
-
/// 0.3.27: check if a token marker is present in the bottom N non-empty lines.
|
|
1885
|
-
/// Used by the unified submit_and_verify to detect whether the provider consumed
|
|
1886
|
-
/// the pasted message (token scrolls out of composer region on successful submit).
|
|
1887
|
-
fn token_in_bottom_n(text: &str, marker: &str, n: usize) -> bool {
|
|
1888
|
-
text.lines()
|
|
1889
|
-
.rev()
|
|
1890
|
-
.filter(|line| !line.trim().is_empty())
|
|
1891
|
-
.take(n)
|
|
1892
|
-
.any(|line| line.contains(marker))
|
|
1893
|
-
}
|
|
1894
|
-
|
|
1895
|
-
/// purpose: token 在本轮注入中的三态观测
|
|
1896
|
-
/// contract:
|
|
1897
|
-
/// - Visible: 当前 capture 可见
|
|
1898
|
-
/// - Gone: 本轮见过,当前不可见(「见过又消失」才是 token 正信号)
|
|
1899
|
-
/// - NeverSeen: 本轮从未出现 — 不得把缺席写成 consumed
|
|
1900
|
-
/// boundary: 观测枚举,不是 SubmitVerification 裁定
|
|
1901
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
1902
|
-
pub(crate) enum TokenSighting {
|
|
1903
|
-
Visible,
|
|
1904
|
-
Gone,
|
|
1905
|
-
NeverSeen,
|
|
1906
|
-
}
|
|
1907
|
-
|
|
1908
|
-
/// purpose: composer 区折叠占位符(含可选 #N 或 grok 行数)
|
|
1909
|
-
/// contract: 只看底部 n 非空行;id 来自 `pasted text #N` / `pasted content #N`;
|
|
1910
|
-
/// grok `[Pasted: N lines]` 无 #N,用 line_count 当身份,不得把「有占位符」当成同一次
|
|
1911
|
-
/// boundary: scrollback 里的旧占位符不算
|
|
1912
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
1913
|
-
pub(crate) struct ComposerPastedPrompt {
|
|
1914
|
-
pub literal: &'static str,
|
|
1915
|
-
pub id: Option<u32>,
|
|
1916
|
-
pub line_count: Option<u32>,
|
|
1917
|
-
pub from_bottom: u32,
|
|
1918
|
-
}
|
|
1919
|
-
|
|
1920
|
-
/// purpose: 本次粘贴在 composer 上的可锁定身份
|
|
1921
|
-
/// contract: HashId = claude/codex `#N`;GrokLineCount = grok `[Pasted: N lines|N KB]` 的 N
|
|
1922
|
-
/// boundary: 无 #N 时禁止用「任意占位符」冒充 HashId
|
|
1923
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
1924
|
-
pub(crate) enum PasteLatch {
|
|
1925
|
-
HashId(u32),
|
|
1926
|
-
GrokLineCount(u32),
|
|
1927
|
-
}
|
|
1928
|
-
|
|
1929
|
-
fn parse_pasted_hash_id(lower_line: &str) -> Option<u32> {
|
|
1930
|
-
for prefix in ["pasted text #", "pasted content #"] {
|
|
1931
|
-
if let Some(idx) = lower_line.find(prefix) {
|
|
1932
|
-
let rest = &lower_line[idx + prefix.len()..];
|
|
1933
|
-
let digits: String = rest.chars().take_while(|c| c.is_ascii_digit()).collect();
|
|
1934
|
-
if digits.is_empty() {
|
|
1935
|
-
continue;
|
|
1936
|
-
}
|
|
1937
|
-
if let Ok(id) = digits.parse::<u32>() {
|
|
1938
|
-
return Some(id);
|
|
1939
|
-
}
|
|
1940
|
-
}
|
|
1941
|
-
}
|
|
1942
|
-
None
|
|
1943
|
-
}
|
|
1944
|
-
|
|
1945
|
-
fn parse_grok_pasted_line_count(lower_line: &str) -> Option<u32> {
|
|
1946
|
-
// grok: `[pasted: 42 lines]` or `[pasted: 13 kb]` — 冒号紧跟 pasted,没有 `#N`
|
|
1947
|
-
let idx = lower_line.find("pasted:")?;
|
|
1948
|
-
let rest = lower_line.get(idx.saturating_add("pasted:".len())..)?;
|
|
1949
|
-
let rest = rest.trim_start();
|
|
1950
|
-
let digits: String = rest.chars().take_while(|c| c.is_ascii_digit()).collect();
|
|
1951
|
-
if digits.is_empty() {
|
|
1952
|
-
return None;
|
|
1953
|
-
}
|
|
1954
|
-
let after = rest.get(digits.len()..)?.trim_start();
|
|
1955
|
-
let unit_ok = after.starts_with("lines")
|
|
1956
|
-
|| after.starts_with("line")
|
|
1957
|
-
|| after.starts_with("kb")
|
|
1958
|
-
|| after.starts_with("mb")
|
|
1959
|
-
|| after.starts_with('b');
|
|
1960
|
-
if unit_ok {
|
|
1961
|
-
digits.parse().ok()
|
|
1962
|
-
} else {
|
|
1963
|
-
None
|
|
1964
|
-
}
|
|
1965
|
-
}
|
|
1966
|
-
|
|
1967
|
-
fn pasted_literal_in_line(lower_line: &str) -> Option<&'static str> {
|
|
1968
|
-
if lower_line.contains("pasted content") {
|
|
1969
|
-
Some("pasted content")
|
|
1970
|
-
} else if lower_line.contains("pasted text") {
|
|
1971
|
-
Some("pasted text")
|
|
1972
|
-
} else if parse_grok_pasted_line_count(lower_line).is_some() {
|
|
1973
|
-
Some("pasted:")
|
|
1974
|
-
} else {
|
|
1975
|
-
None
|
|
1976
|
-
}
|
|
1977
|
-
}
|
|
1978
|
-
|
|
1979
|
-
/// ---
|
|
1980
|
-
/// purpose: 只在 composer(底部 n 非空行)认折叠占位符
|
|
1981
|
-
/// params:
|
|
1982
|
-
/// text: 已规范化的 pane 尾文本
|
|
1983
|
-
/// n: 只看倒数 n 个非空行;超出这一窗口的占位符视为 transcript 残留,不算
|
|
1984
|
-
/// returns: 命中则给出字面量、可选编号、可选 grok 行数、距底行数;否则 None
|
|
1985
|
-
/// contract: 返回字面量 + 可选编号;没有占位符则 None
|
|
1986
|
-
/// boundary: 不替代 token 路径;编号缺失时调用方必须保守,不得报已消费
|
|
1987
|
-
/// ---
|
|
1988
|
-
pub(crate) fn pasted_prompt_in_composer(text: &str, n: usize) -> Option<ComposerPastedPrompt> {
|
|
1989
|
-
let mut from_bottom = 0u32;
|
|
1990
|
-
for line in text
|
|
1991
|
-
.lines()
|
|
1992
|
-
.rev()
|
|
1993
|
-
.filter(|line| !line.trim().is_empty())
|
|
1994
|
-
.take(n)
|
|
1995
|
-
{
|
|
1996
|
-
let lower = line.to_ascii_lowercase();
|
|
1997
|
-
if let Some(literal) = pasted_literal_in_line(&lower) {
|
|
1998
|
-
return Some(ComposerPastedPrompt {
|
|
1999
|
-
literal,
|
|
2000
|
-
id: parse_pasted_hash_id(&lower),
|
|
2001
|
-
line_count: parse_grok_pasted_line_count(&lower),
|
|
2002
|
-
from_bottom,
|
|
2003
|
-
});
|
|
2004
|
-
}
|
|
2005
|
-
from_bottom = from_bottom.saturating_add(1);
|
|
2006
|
-
}
|
|
2007
|
-
None
|
|
2008
|
-
}
|
|
2009
|
-
|
|
2010
|
-
fn latch_paste(text: &str, current: Option<PasteLatch>) -> Option<PasteLatch> {
|
|
2011
|
-
if current.is_some() {
|
|
2012
|
-
return current;
|
|
2013
|
-
}
|
|
2014
|
-
let prompt = pasted_prompt_in_composer(text, 15)?;
|
|
2015
|
-
if let Some(id) = prompt.id {
|
|
2016
|
-
return Some(PasteLatch::HashId(id));
|
|
2017
|
-
}
|
|
2018
|
-
prompt.line_count.map(PasteLatch::GrokLineCount)
|
|
2019
|
-
}
|
|
2020
|
-
|
|
2021
|
-
fn token_sighting(token_now: bool, token_ever_visible: bool) -> TokenSighting {
|
|
2022
|
-
if token_now {
|
|
2023
|
-
TokenSighting::Visible
|
|
2024
|
-
} else if token_ever_visible {
|
|
2025
|
-
TokenSighting::Gone
|
|
2026
|
-
} else {
|
|
2027
|
-
TokenSighting::NeverSeen
|
|
2028
|
-
}
|
|
2029
|
-
}
|
|
2030
|
-
|
|
2031
|
-
fn consumption_from_placeholder(text: &str, tracked: Option<PasteLatch>) -> Option<bool> {
|
|
2032
|
-
let prompt = pasted_prompt_in_composer(text, 15);
|
|
2033
|
-
match (tracked, prompt) {
|
|
2034
|
-
(Some(PasteLatch::HashId(id)), Some(p)) if p.id == Some(id) => Some(false),
|
|
2035
|
-
(Some(PasteLatch::HashId(_)), Some(p)) if p.id.is_some() => Some(true),
|
|
2036
|
-
(Some(PasteLatch::HashId(_)), Some(_)) => Some(false),
|
|
2037
|
-
(Some(PasteLatch::HashId(_)), None) => Some(true),
|
|
2038
|
-
(Some(PasteLatch::GrokLineCount(n)), Some(p)) if p.line_count == Some(n) => Some(false),
|
|
2039
|
-
// 不同 N:不能把「上一贴走了」写成已消费(无 #N,换行数 ≠ 同一次)
|
|
2040
|
-
(Some(PasteLatch::GrokLineCount(_)), Some(_)) => Some(false),
|
|
2041
|
-
(Some(PasteLatch::GrokLineCount(_)), None) => Some(true),
|
|
2042
|
-
(None, _) => Some(false),
|
|
2043
|
-
}
|
|
2044
|
-
}
|
|
2045
|
-
|
|
2046
|
-
/// ---
|
|
2047
|
-
/// purpose: 无身份时禁止把「未证实」升级成连按回车
|
|
2048
|
-
/// params:
|
|
2049
|
-
/// text: 最近一次 pane 尾文本
|
|
2050
|
-
/// marker: 本条消息的投递 token 完整标记
|
|
2051
|
-
/// tracked: 本次粘贴已锁定的占位符身份(编号或 grok 行数);None 表示没锁到身份
|
|
2052
|
-
/// returns: true 才允许再按一次 Enter
|
|
2053
|
-
/// contract: 只有 token 仍在 composer 底 15 非空行,或锁定的占位符身份仍在,才重按
|
|
2054
|
-
/// boundary: 不重粘文本;不把不同 grok 行数当成可重按的同一次;tracked 为 None 时占位符路径一律不重按(token 仍在底 15 非空行的重按与 tracked 无关)
|
|
2055
|
-
/// ---
|
|
2056
|
-
pub(crate) fn should_resubmit_enter(text: &str, marker: &str, tracked: Option<PasteLatch>) -> bool {
|
|
2057
|
-
if token_in_bottom_n(text, marker, 15) {
|
|
2058
|
-
return true;
|
|
2059
|
-
}
|
|
2060
|
-
let Some(prompt) = pasted_prompt_in_composer(text, 15) else {
|
|
2061
|
-
return false;
|
|
2062
|
-
};
|
|
2063
|
-
match tracked {
|
|
2064
|
-
Some(PasteLatch::HashId(id)) => prompt.id == Some(id),
|
|
2065
|
-
Some(PasteLatch::GrokLineCount(n)) => prompt.line_count == Some(n),
|
|
2066
|
-
None => false,
|
|
2067
|
-
}
|
|
2068
|
-
}
|
|
2069
|
-
|
|
2070
|
-
fn composer_joined(text: &str, n: usize) -> String {
|
|
2071
|
-
let mut lines: Vec<&str> = text
|
|
2072
|
-
.lines()
|
|
2073
|
-
.rev()
|
|
2074
|
-
.filter(|line| !line.trim().is_empty())
|
|
2075
|
-
.take(n)
|
|
2076
|
-
.collect();
|
|
2077
|
-
lines.reverse();
|
|
2078
|
-
lines.concat()
|
|
2079
|
-
}
|
|
2080
|
-
|
|
2081
|
-
/// ---
|
|
2082
|
-
/// purpose: 本次注入身份是否还在 composer(复用 token / #N / grok 行数,不认提示符皮肤)
|
|
2083
|
-
/// contract: 单行 token、折行拼接 token、或锁定的 PasteLatch 仍在底部 ⇒ true
|
|
2084
|
-
/// boundary: payload 里的 ❯/`composer>`/`>` 不算身份;无身份不得据此连按回车
|
|
2085
|
-
/// ---
|
|
2086
|
-
pub(crate) fn this_paste_identity_in_composer(
|
|
2087
|
-
text: &str,
|
|
2088
|
-
marker: &str,
|
|
2089
|
-
tracked: Option<PasteLatch>,
|
|
2090
|
-
) -> bool {
|
|
2091
|
-
should_resubmit_enter(text, marker, tracked) || composer_joined(text, 15).contains(marker)
|
|
2092
|
-
}
|
|
2093
|
-
|
|
2094
|
-
/// ---
|
|
2095
|
-
/// purpose: Unverified 之后要不要补一颗 C-m(本次身份仍在,不是提示符长什么样)
|
|
2096
|
-
/// contract: 无 busy 且本次身份仍在 composer ⇒ true;达上限由调用方停
|
|
2097
|
-
/// boundary: consumed=None 不在这里决定(调用方不补);不重粘;不把 payload 提示符字符当守卫
|
|
2098
|
-
/// ---
|
|
2099
|
-
pub(crate) fn should_resend_enter_after_unverified(
|
|
2100
|
-
text: &str,
|
|
2101
|
-
marker: &str,
|
|
2102
|
-
tracked: Option<PasteLatch>,
|
|
2103
|
-
) -> bool {
|
|
2104
|
-
if provider_busy_signal_in_tail(text) {
|
|
2105
|
-
return false;
|
|
2106
|
-
}
|
|
2107
|
-
this_paste_identity_in_composer(text, marker, tracked)
|
|
2108
|
-
}
|
|
2109
|
-
|
|
2110
|
-
/// ---
|
|
2111
|
-
/// purpose: Unverified 补发 B 是否该介入——只补 A 的 should_resubmit_enter 看不到的折行缺口
|
|
2112
|
-
/// params:
|
|
2113
|
-
/// text: 最近一次 pane 尾文本
|
|
2114
|
-
/// marker: 本条消息的投递 token 完整标记
|
|
2115
|
-
/// tracked: 本次粘贴已锁定的占位符身份(编号或 grok 行数);None 表示没锁到身份
|
|
2116
|
-
/// returns: true 才允许 B 再按一次 Enter
|
|
2117
|
-
/// contract: !busy 且 this_paste_identity_in_composer 且 !should_resubmit_enter ⇒ true
|
|
2118
|
-
/// boundary: A 已因 latch / 底15 单行 token 为真时不介入(含 A 已打满 cap);不重粘;consumed=None 不在这里决定
|
|
2119
|
-
/// ---
|
|
2120
|
-
pub(crate) fn should_resend_unverified_wrap_gap(
|
|
2121
|
-
text: &str,
|
|
2122
|
-
marker: &str,
|
|
2123
|
-
tracked: Option<PasteLatch>,
|
|
2124
|
-
) -> bool {
|
|
2125
|
-
if should_resubmit_enter(text, marker, tracked) {
|
|
2126
|
-
return false;
|
|
2127
|
-
}
|
|
2128
|
-
should_resend_enter_after_unverified(text, marker, tracked)
|
|
2129
|
-
}
|
|
2130
|
-
|
|
2131
|
-
/// ---
|
|
2132
|
-
/// purpose: cursor 重按 Enter 的核实:token 仍在输入框,且回合未在进行
|
|
2133
|
-
/// contract: busy ⇒ 不重按;token 不在底部 5 非空行 ⇒ 不重按
|
|
2134
|
-
/// boundary: 不把 transcript 里的 pasted #N 当输入框;不替代 claude/grok 的 should_resubmit_enter
|
|
2135
|
-
/// ---
|
|
2136
|
-
pub(crate) fn should_resubmit_enter_cursor(text: &str, marker: &str) -> bool {
|
|
2137
|
-
if provider_busy_signal_in_tail(text) {
|
|
2138
|
-
return false;
|
|
2139
|
-
}
|
|
2140
|
-
token_in_bottom_n(text, marker, 5)
|
|
2141
|
-
}
|
|
2142
|
-
|
|
2143
|
-
/// ---
|
|
2144
|
-
/// purpose: Phase 1 判定 TUI 侧注入已完成、可以按回车
|
|
2145
|
-
/// params:
|
|
2146
|
-
/// text: 最近一次 pane 尾文本
|
|
2147
|
-
/// marker: 本条消息的投递 token 完整标记
|
|
2148
|
-
/// returns: true 表示可以进入提交阶段
|
|
2149
|
-
/// contract: composer 已有折叠占位符 ⇒ 完成;短贴 token 可见且不是待折叠高块 ⇒ 完成
|
|
2150
|
-
/// boundary: token 出现在未折叠的高块里不算完成(按早了);只判「能不能按」,不判「按了有没有成」
|
|
2151
|
-
/// ---
|
|
2152
|
-
pub(crate) fn paste_ready_for_enter(text: &str, marker: &str) -> bool {
|
|
2153
|
-
if pasted_prompt_in_composer(text, 15).is_some() {
|
|
2154
|
-
return true;
|
|
2155
|
-
}
|
|
2156
|
-
text.contains(marker) && !raw_multiline_still_unfolded(text, marker)
|
|
2157
|
-
}
|
|
2158
|
-
|
|
2159
|
-
fn raw_multiline_still_unfolded(text: &str, marker: &str) -> bool {
|
|
2160
|
-
if pasted_prompt_in_composer(text, 15).is_some() {
|
|
2161
|
-
return false;
|
|
2162
|
-
}
|
|
2163
|
-
if !text.contains(marker) {
|
|
2164
|
-
return false;
|
|
2165
|
-
}
|
|
2166
|
-
text.lines().filter(|line| !line.trim().is_empty()).count() > 15
|
|
2167
|
-
}
|
|
2168
|
-
|
|
2169
|
-
/// ---
|
|
2170
|
-
/// purpose: 把 token 三态 + 本次 #N / grok 占位符合成消费判定
|
|
2171
|
-
/// params:
|
|
2172
|
-
/// text: 最近一次 pane 尾文本
|
|
2173
|
-
/// marker: 本条消息的投递 token 完整标记
|
|
2174
|
-
/// token_ever_visible: 本次注入期间是否曾在 pane 上见过该 token
|
|
2175
|
-
/// tracked: 本次粘贴锁定的占位符身份;None 表示没锁到
|
|
2176
|
-
/// returns: Some(true) 已消费;Some(false) 未消费;本函数不产生 None
|
|
2177
|
-
/// contract:
|
|
2178
|
-
/// Some(true)=已消费;Some(false)=未消费(含 NeverSeen 且无正信号 → 未证实走 false)
|
|
2179
|
-
/// Gone 必须先复核 PasteLatch 身份:占位符仍在 composer ⇒ 未消费
|
|
2180
|
-
/// None 不由本函数产生;调用方在 capture 失败时保持 None,必须落到 Unverified
|
|
2181
|
-
/// boundary: 不修 BUSY 入队;Working 信号由调用方在 Some(false) 之后看;None 不得当成功
|
|
2182
|
-
/// ---
|
|
2183
|
-
pub(crate) fn consumption_from_capture(
|
|
2184
|
-
text: &str,
|
|
2185
|
-
marker: &str,
|
|
2186
|
-
token_ever_visible: bool,
|
|
2187
|
-
tracked: Option<PasteLatch>,
|
|
2188
|
-
) -> Option<bool> {
|
|
2189
|
-
let token_now = token_in_bottom_n(text, marker, 15);
|
|
2190
|
-
match token_sighting(token_now, token_ever_visible) {
|
|
2191
|
-
TokenSighting::Visible => Some(false),
|
|
2192
|
-
TokenSighting::Gone => gone_consumption(text, tracked),
|
|
2193
|
-
TokenSighting::NeverSeen => consumption_from_placeholder(text, tracked),
|
|
2194
|
-
}
|
|
2195
|
-
}
|
|
2196
|
-
|
|
2197
|
-
#[derive(Debug, Clone, Copy, Default)]
|
|
2198
|
-
struct ConsumptionCaptureObservation {
|
|
2199
|
-
busy: Option<BusySignalMatch>,
|
|
2200
|
-
marker_in_bottom_15: Option<bool>,
|
|
2201
|
-
paste_identity_in_composer: Option<bool>,
|
|
2202
|
-
consumption_from_capture_result: Option<bool>,
|
|
2203
|
-
}
|
|
2204
|
-
|
|
2205
|
-
fn consumption_capture_observation(
|
|
2206
|
-
text: &str,
|
|
2207
|
-
marker: Option<&str>,
|
|
2208
|
-
token_ever_visible: bool,
|
|
2209
|
-
tracked: Option<PasteLatch>,
|
|
2210
|
-
) -> ConsumptionCaptureObservation {
|
|
2211
|
-
let Some(marker) = marker else {
|
|
2212
|
-
return ConsumptionCaptureObservation::default();
|
|
2213
|
-
};
|
|
2214
|
-
ConsumptionCaptureObservation {
|
|
2215
|
-
busy: provider_busy_signal_match(text),
|
|
2216
|
-
marker_in_bottom_15: Some(token_in_bottom_n(text, marker, 15)),
|
|
2217
|
-
paste_identity_in_composer: tracked
|
|
2218
|
-
.map(|tracked| this_paste_identity_in_composer(text, marker, Some(tracked))),
|
|
2219
|
-
consumption_from_capture_result: consumption_from_capture(
|
|
2220
|
-
text,
|
|
2221
|
-
marker,
|
|
2222
|
-
token_ever_visible,
|
|
2223
|
-
tracked,
|
|
2224
|
-
),
|
|
2225
|
-
}
|
|
2226
|
-
}
|
|
2227
|
-
|
|
2228
|
-
#[derive(Debug, Clone, Copy, Default)]
|
|
2229
|
-
struct ConsumptionDiagnostics {
|
|
2230
|
-
busy_signal_kind: Option<BusySignalKind>,
|
|
2231
|
-
busy_line_from_bottom: Option<u8>,
|
|
2232
|
-
current_marker_in_bottom_15: Option<bool>,
|
|
2233
|
-
paste_identity_in_composer: Option<bool>,
|
|
2234
|
-
consumption_from_capture_result: Option<bool>,
|
|
2235
|
-
}
|
|
2236
|
-
|
|
2237
|
-
impl ConsumptionDiagnostics {
|
|
2238
|
-
fn record(&mut self, observation: ConsumptionCaptureObservation) {
|
|
2239
|
-
self.busy_signal_kind = observation.busy.map(|match_| match_.kind);
|
|
2240
|
-
self.busy_line_from_bottom = observation.busy.map(|match_| match_.line_from_bottom);
|
|
2241
|
-
self.current_marker_in_bottom_15 = observation.marker_in_bottom_15;
|
|
2242
|
-
self.paste_identity_in_composer = observation.paste_identity_in_composer;
|
|
2243
|
-
self.consumption_from_capture_result = observation.consumption_from_capture_result;
|
|
2244
|
-
}
|
|
2245
|
-
}
|
|
2246
|
-
|
|
2247
|
-
/// ---
|
|
2248
|
-
/// purpose: Gone 分支在判已消费前复核 composer 占位符(PasteLatch 身份)
|
|
2249
|
-
/// contract: 锁定身份仍在,或未锁定但 grok `[Pasted: …]` 仍在 ⇒ Some(false)
|
|
2250
|
-
/// boundary: 空 composer + 无 grok 占位符保持 Some(true)(claude 短贴路径不变)
|
|
2251
|
-
/// ---
|
|
2252
|
-
fn gone_consumption(text: &str, tracked: Option<PasteLatch>) -> Option<bool> {
|
|
2253
|
-
if tracked.is_some() {
|
|
2254
|
-
return match consumption_from_placeholder(text, tracked) {
|
|
2255
|
-
Some(false) => Some(false),
|
|
2256
|
-
_ => Some(true),
|
|
2257
|
-
};
|
|
2258
|
-
}
|
|
2259
|
-
match pasted_prompt_in_composer(text, 15) {
|
|
2260
|
-
Some(p) if p.literal == "pasted:" => Some(false),
|
|
2261
|
-
_ => Some(true),
|
|
2262
|
-
}
|
|
2263
|
-
}
|
|
2264
|
-
|
|
2265
|
-
fn marker_position_from_bottom(text: &str, marker: &str) -> Option<u32> {
|
|
2266
|
-
let mut from_bottom = 0u32;
|
|
2267
|
-
for line in text.lines().rev().filter(|line| !line.trim().is_empty()) {
|
|
2268
|
-
if line.contains(marker) {
|
|
2269
|
-
return Some(from_bottom);
|
|
2270
|
-
}
|
|
2271
|
-
from_bottom = from_bottom.saturating_add(1);
|
|
2272
|
-
}
|
|
2273
|
-
None
|
|
2274
|
-
}
|
|
2275
|
-
|
|
2276
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
2277
|
-
struct BusySignalMatch {
|
|
2278
|
-
kind: BusySignalKind,
|
|
2279
|
-
line_from_bottom: u8,
|
|
2280
|
-
}
|
|
2281
|
-
|
|
2282
|
-
fn busy_signal_kind_in_line(line: &str) -> Option<BusySignalKind> {
|
|
2283
|
-
let lower = line.to_ascii_lowercase();
|
|
2284
|
-
if lower.contains("working") {
|
|
2285
|
-
return Some(BusySignalKind::Working);
|
|
2286
|
-
}
|
|
2287
|
-
if lower.contains("thinking") {
|
|
2288
|
-
return Some(BusySignalKind::Thinking);
|
|
2289
|
-
}
|
|
2290
|
-
if lower.contains("processing") {
|
|
2291
|
-
return Some(BusySignalKind::Processing);
|
|
2292
|
-
}
|
|
2293
|
-
if lower.contains("esc to interrupt") {
|
|
2294
|
-
return Some(BusySignalKind::EscToInterrupt);
|
|
2295
|
-
}
|
|
2296
|
-
if line.contains('●')
|
|
2297
|
-
|| line.contains('⏳')
|
|
2298
|
-
|| line.contains('⠋')
|
|
2299
|
-
|| line.contains('⠙')
|
|
2300
|
-
|| line.contains('⠹')
|
|
2301
|
-
|| line.contains('⠸')
|
|
2302
|
-
|| line.contains('⠼')
|
|
2303
|
-
|| line.contains('⠴')
|
|
2304
|
-
|| line.contains('⠦')
|
|
2305
|
-
|| line.contains('⠧')
|
|
2306
|
-
|| line.contains('⠇')
|
|
2307
|
-
|| line.contains('⠏')
|
|
2308
|
-
|| line.contains('✶')
|
|
2309
|
-
|| line.contains('✢')
|
|
2310
|
-
|| line.contains('✻')
|
|
2311
|
-
|| line.contains('✽')
|
|
2312
|
-
|| line.contains('✳')
|
|
2313
|
-
{
|
|
2314
|
-
return Some(BusySignalKind::SpinnerGlyph);
|
|
2315
|
-
}
|
|
2316
|
-
None
|
|
2317
|
-
}
|
|
2318
|
-
|
|
2319
|
-
fn provider_busy_signal_match(text: &str) -> Option<BusySignalMatch> {
|
|
2320
|
-
text.lines()
|
|
2321
|
-
.rev()
|
|
2322
|
-
.filter(|line| !line.trim().is_empty())
|
|
2323
|
-
.take(15)
|
|
2324
|
-
.enumerate()
|
|
2325
|
-
.find_map(|(line_from_bottom, line)| {
|
|
2326
|
-
busy_signal_kind_in_line(line).map(|kind| BusySignalMatch {
|
|
2327
|
-
kind,
|
|
2328
|
-
line_from_bottom: line_from_bottom as u8,
|
|
2329
|
-
})
|
|
2330
|
-
})
|
|
2331
|
-
}
|
|
2332
|
-
|
|
2333
|
-
fn provider_busy_signal_in_tail(text: &str) -> bool {
|
|
2334
|
-
provider_busy_signal_match(text).is_some()
|
|
2335
|
-
}
|
|
2336
|
-
|
|
2337
|
-
/// ---
|
|
2338
|
-
/// purpose: 入箱 vs 开跑(G4)。给定最近一次 pane 尾,回答席位是否因此开跑。
|
|
2339
|
-
/// params:
|
|
2340
|
-
/// text: 最近一次 pane 尾文本
|
|
2341
|
-
/// marker: 本条消息的投递 token 完整标记;None 表示本次载荷没有 token 可查
|
|
2342
|
-
/// returns: 三态观测值,绝不返回 NotRequired(那是空载荷路径由调用方直接给的)
|
|
2343
|
-
/// contract:
|
|
2344
|
-
/// - LeaderNewTurnBoundaryVerified = 底部 busy 信号
|
|
2345
|
-
/// - LeaderNewTurnBoundaryMissing = composer 仍有本次粘贴(占位符或 token)且无 busy
|
|
2346
|
-
/// - NotYetObserved = 其余(含 composer 已空但无 busy)→ 不知道,不得报开跑
|
|
2347
|
-
/// boundary:
|
|
2348
|
-
/// - 不是 SubmitVerification / 不是投递闸门;不许用过了 N 秒来判
|
|
2349
|
-
/// - busy 判据是底 15 非空行的宽子串匹配,正文或 transcript 残留可让它假阳,判定强度到此为止
|
|
2350
|
-
/// ---
|
|
2351
|
-
pub(crate) fn observe_turn_from_capture(text: &str, marker: Option<&str>) -> TurnVerification {
|
|
2352
|
-
if provider_busy_signal_in_tail(text) {
|
|
2353
|
-
return TurnVerification::LeaderNewTurnBoundaryVerified;
|
|
2354
|
-
}
|
|
2355
|
-
let paste_still = pasted_prompt_in_composer(text, 15).is_some();
|
|
2356
|
-
let token_still = marker
|
|
2357
|
-
.map(|m| token_in_bottom_n(text, m, 15))
|
|
2358
|
-
.unwrap_or(false);
|
|
2359
|
-
if paste_still || token_still {
|
|
2360
|
-
return TurnVerification::LeaderNewTurnBoundaryMissing;
|
|
2361
|
-
}
|
|
2362
|
-
TurnVerification::NotYetObserved
|
|
2363
|
-
}
|
|
2364
|
-
|
|
2365
|
-
fn turn_verification_for_payload(
|
|
2366
|
-
payload: &InjectPayload,
|
|
2367
|
-
last_text: Option<&str>,
|
|
2368
|
-
) -> TurnVerification {
|
|
2369
|
-
match payload {
|
|
2370
|
-
InjectPayload::Empty => TurnVerification::NotRequired,
|
|
2371
|
-
InjectPayload::Text(_) | InjectPayload::TextSkipConsumptionPoll(_) => {
|
|
2372
|
-
observe_turn_from_capture(last_text.unwrap_or(""), payload_token_marker(payload))
|
|
2373
|
-
}
|
|
2374
|
-
}
|
|
2375
|
-
}
|
|
2376
|
-
|
|
2377
|
-
fn submit_attempt_observation(
|
|
2378
|
-
attempt_index: u32,
|
|
2379
|
-
captured: &CapturedText,
|
|
2380
|
-
marker: Option<&str>,
|
|
2381
|
-
elapsed_ms: u64,
|
|
2382
|
-
) -> SubmitAttemptObservation {
|
|
2383
|
-
let marker_position = marker.and_then(|m| marker_position_from_bottom(&captured.text, m));
|
|
2384
|
-
// marker 在时也走 pasted_prompt_match:折叠占位符是编排长粘贴的正信号,
|
|
2385
|
-
// 不能只在无 token 载荷上才认。matched 仍表示「composer 里还有待提交信号」。
|
|
2386
|
-
let (matched, matched_literal, where_in_tail) = if let Some(marker) = marker {
|
|
2387
|
-
if token_in_bottom_n(&captured.text, marker, 15) {
|
|
2388
|
-
(
|
|
2389
|
-
true,
|
|
2390
|
-
marker_position.map(|_| marker.to_string()),
|
|
2391
|
-
marker_position,
|
|
2392
|
-
)
|
|
2393
|
-
} else if let Some((literal, where_in_tail)) = pasted_prompt_match(&captured.text) {
|
|
2394
|
-
(
|
|
2395
|
-
pasted_prompt_in_composer(&captured.text, 15).is_some(),
|
|
2396
|
-
Some(literal.to_string()),
|
|
2397
|
-
Some(where_in_tail),
|
|
2398
|
-
)
|
|
2399
|
-
} else {
|
|
2400
|
-
(false, None, None)
|
|
2401
|
-
}
|
|
2402
|
-
} else if let Some((literal, where_in_tail)) = pasted_prompt_match(&captured.text) {
|
|
2403
|
-
(true, Some(literal.to_string()), Some(where_in_tail))
|
|
2404
|
-
} else {
|
|
2405
|
-
(false, None, None)
|
|
2406
|
-
};
|
|
2407
|
-
let (pane_tail_excerpt, pane_tail_lines) = scrub_pane_excerpt(&captured.text, 20);
|
|
2408
|
-
SubmitAttemptObservation {
|
|
2409
|
-
attempt_index,
|
|
2410
|
-
matched,
|
|
2411
|
-
matched_literal,
|
|
2412
|
-
where_in_tail,
|
|
2413
|
-
pane_tail_excerpt,
|
|
2414
|
-
pane_tail_lines,
|
|
2415
|
-
elapsed_ms,
|
|
2416
|
-
}
|
|
2417
|
-
}
|
|
2418
|
-
|
|
2419
|
-
/// 0.3.27: check if a pasted-content prompt literal (`pasted content` / `pasted text`)
|
|
2420
|
-
/// appears in the bottom N non-empty lines. Narrower than the full-Tail(80) check
|
|
2421
|
-
/// that caused scrollback ghost matches (E50 defect B).
|
|
2422
|
-
fn pasted_prompt_in_bottom(text: &str, n: usize) -> bool {
|
|
2423
|
-
pasted_prompt_in_composer(text, n).is_some()
|
|
2424
|
-
}
|
|
2425
|
-
|
|
2426
|
-
/// E50 PR-1 (0.3.24 P0, pasted-prompt 假阴诊断): factor `capture_has_pasted_content_prompt`
|
|
2427
|
-
/// so the diagnostic layer can recover the MATCHED LITERAL and its position
|
|
2428
|
-
/// in the tail. Returns `(literal, line_index_from_bottom)` on a match.
|
|
2429
|
-
/// Byte-identical match semantics — `capture_has_pasted_content_prompt`'s
|
|
2430
|
-
/// `bool` wrapper preserves the legacy `true/false` contract for the three
|
|
2431
|
-
/// existing callers (the appear-gate poll at :1122-1128 + the legacy submit
|
|
2432
|
-
/// loop matcher at :1138 + post-flip clearer at :1138).
|
|
2433
|
-
///
|
|
2434
|
-
/// **Where-in-tail rationale**: a `pasted content` literal that lives in
|
|
2435
|
-
/// the SCROLLBACK (line 6+ from bottom) is NOT the live composer
|
|
2436
|
-
/// placeholder — codex's successful submit scrolls the block into history
|
|
2437
|
-
/// where it remains in the last 80 lines. The current matcher cannot
|
|
2438
|
-
/// distinguish that from a live placeholder; this fn surfaces the data
|
|
2439
|
-
/// the operator needs to see (PR-2 will USE it to fix the criterion).
|
|
2440
|
-
/// ---
|
|
2441
|
-
/// purpose: 在整段 pane 尾里找折叠占位符字面量,并给出它距底部多少非空行
|
|
2442
|
-
/// params:
|
|
2443
|
-
/// text: pane 尾文本;不限窗口,整段都找
|
|
2444
|
-
/// returns: Some((命中的字面量, 距底非空行数));无命中则 None;字面量只出现在被裁掉的空白行时保守记为 0
|
|
2445
|
-
/// boundary:
|
|
2446
|
-
/// - 只做取证不做判定:距底行数大说明多半在 transcript 而非 composer,但本函数不替调用方下结论
|
|
2447
|
-
/// - 与 pasted_prompt_in_composer 不同——后者限定底部窗口,是判定用;本函数不限窗口,是诊断用
|
|
2448
|
-
/// ---
|
|
2449
|
-
pub(crate) fn pasted_prompt_match(text: &str) -> Option<(&'static str, u32)> {
|
|
2450
|
-
let lower = text.to_ascii_lowercase();
|
|
2451
|
-
let lit = if lower.contains("pasted content") {
|
|
2452
|
-
"pasted content"
|
|
2453
|
-
} else if lower.contains("pasted text") {
|
|
2454
|
-
"pasted text"
|
|
2455
|
-
} else if text
|
|
2456
|
-
.lines()
|
|
2457
|
-
.any(|line| parse_grok_pasted_line_count(&line.to_ascii_lowercase()).is_some())
|
|
2458
|
-
{
|
|
2459
|
-
"pasted:"
|
|
2460
|
-
} else {
|
|
2461
|
-
return None;
|
|
2462
|
-
};
|
|
2463
|
-
// Distance from the bottom of the tail in non-empty lines.
|
|
2464
|
-
let non_empty: Vec<&str> = text
|
|
2465
|
-
.lines()
|
|
2466
|
-
.filter(|line| !line.trim().is_empty())
|
|
2467
|
-
.collect();
|
|
2468
|
-
let mut from_bottom: u32 = 0;
|
|
2469
|
-
for line in non_empty.iter().rev() {
|
|
2470
|
-
let line_lower = line.to_ascii_lowercase();
|
|
2471
|
-
let hit = if lit == "pasted:" {
|
|
2472
|
-
parse_grok_pasted_line_count(&line_lower).is_some()
|
|
2473
|
-
} else {
|
|
2474
|
-
line_lower.contains(lit)
|
|
2475
|
-
};
|
|
2476
|
-
if hit {
|
|
2477
|
-
return Some((lit, from_bottom));
|
|
2478
|
-
}
|
|
2479
|
-
from_bottom = from_bottom.saturating_add(1);
|
|
2480
|
-
}
|
|
2481
|
-
// Literal appeared only in trimmed-away whitespace lines — treat as
|
|
2482
|
-
// bottom (defensive; rare).
|
|
2483
|
-
Some((lit, 0))
|
|
2484
|
-
}
|
|
2485
|
-
|
|
2486
|
-
/// E50 PR-1 (0.3.24 P0): scrub a pane capture for safe inclusion in
|
|
2487
|
-
/// `events.jsonl`. Steps:
|
|
2488
|
-
/// 1. Strip CSI / OSC ANSI escapes.
|
|
2489
|
-
/// 2. Take the bottom `tail_lines` of non-empty lines.
|
|
2490
|
-
/// 3. Redact common secret shapes (sk-, ghp_, AKIA, Bearer ..., 32+ hex).
|
|
2491
|
-
/// 4. Cap at ~1200 bytes (UTF-8 safe truncation).
|
|
2492
|
-
/// Returns `(excerpt, line_count)`. Designed to be CHEAP — no regex crate
|
|
2493
|
-
/// dependency, simple byte scanning.
|
|
2494
|
-
/// ---
|
|
2495
|
-
/// purpose: 把 pane 抓屏加工成可安全写进 events.jsonl 的摘录
|
|
2496
|
-
/// params:
|
|
2497
|
-
/// raw: 原始抓屏文本
|
|
2498
|
-
/// tail_lines: 只保留倒数这么多非空行
|
|
2499
|
-
/// returns: (脱敏并截断后的摘录, 实际保留的行数)
|
|
2500
|
-
/// boundary:
|
|
2501
|
-
/// - 只做四件事:剥 ANSI、取尾部、脱敏常见密钥形状、按 1200 字节在字符边界截断
|
|
2502
|
-
/// - 脱敏是形状匹配,不是完备保证;非常见形状的凭据不会被识别
|
|
2503
|
-
/// - 输出仍是消息正文的一部分,只落本地事件文件,不外传
|
|
2504
|
-
/// ---
|
|
2505
|
-
pub(crate) fn scrub_pane_excerpt(raw: &str, tail_lines: usize) -> (String, u32) {
|
|
2506
|
-
let stripped = strip_ansi_escapes_inplace(raw);
|
|
2507
|
-
let lines: Vec<&str> = stripped
|
|
2508
|
-
.lines()
|
|
2509
|
-
.filter(|line| !line.trim().is_empty())
|
|
2510
|
-
.collect();
|
|
2511
|
-
let tail = if lines.len() > tail_lines {
|
|
2512
|
-
&lines[lines.len() - tail_lines..]
|
|
2513
|
-
} else {
|
|
2514
|
-
&lines[..]
|
|
2515
|
-
};
|
|
2516
|
-
let mut out = tail
|
|
2517
|
-
.iter()
|
|
2518
|
-
.map(|line| scrub_secrets(line))
|
|
2519
|
-
.collect::<Vec<_>>()
|
|
2520
|
-
.join("\n");
|
|
2521
|
-
if out.len() > 1200 {
|
|
2522
|
-
// Truncate at UTF-8 char boundary.
|
|
2523
|
-
let mut cut = 1200;
|
|
2524
|
-
while cut > 0 && !out.is_char_boundary(cut) {
|
|
2525
|
-
cut -= 1;
|
|
2526
|
-
}
|
|
2527
|
-
out.truncate(cut);
|
|
2528
|
-
out.push_str("…[truncated]");
|
|
2529
|
-
}
|
|
2530
|
-
(out, tail.len() as u32)
|
|
2531
|
-
}
|
|
2532
|
-
|
|
2533
|
-
fn strip_ansi_escapes_inplace(input: &str) -> String {
|
|
2534
|
-
let mut out = String::with_capacity(input.len());
|
|
2535
|
-
let bytes = input.as_bytes();
|
|
2536
|
-
let mut i = 0;
|
|
2537
|
-
while i < bytes.len() {
|
|
2538
|
-
if bytes[i] == 0x1b && i + 1 < bytes.len() {
|
|
2539
|
-
// CSI: ESC [ ... <final byte 0x40-0x7e>
|
|
2540
|
-
if bytes[i + 1] == b'[' {
|
|
2541
|
-
let mut j = i + 2;
|
|
2542
|
-
while j < bytes.len() && !(0x40..=0x7e).contains(&bytes[j]) {
|
|
2543
|
-
j += 1;
|
|
2544
|
-
}
|
|
2545
|
-
i = j.saturating_add(1).min(bytes.len());
|
|
2546
|
-
continue;
|
|
2547
|
-
}
|
|
2548
|
-
// OSC: ESC ] ... BEL or ESC \
|
|
2549
|
-
if bytes[i + 1] == b']' {
|
|
2550
|
-
let mut j = i + 2;
|
|
2551
|
-
while j < bytes.len() {
|
|
2552
|
-
if bytes[j] == 0x07 {
|
|
2553
|
-
j += 1;
|
|
2554
|
-
break;
|
|
2555
|
-
}
|
|
2556
|
-
if bytes[j] == 0x1b && j + 1 < bytes.len() && bytes[j + 1] == b'\\' {
|
|
2557
|
-
j += 2;
|
|
2558
|
-
break;
|
|
2559
|
-
}
|
|
2560
|
-
j += 1;
|
|
2561
|
-
}
|
|
2562
|
-
i = j.min(bytes.len());
|
|
2563
|
-
continue;
|
|
2564
|
-
}
|
|
2565
|
-
// Other single-char ESC sequence — skip ESC + next byte.
|
|
2566
|
-
i += 2;
|
|
2567
|
-
continue;
|
|
2568
|
-
}
|
|
2569
|
-
let ch = bytes[i];
|
|
2570
|
-
out.push(ch as char);
|
|
2571
|
-
i += 1;
|
|
2572
|
-
}
|
|
2573
|
-
// Re-decode from bytes to recover UTF-8 (since we pushed bytes as chars,
|
|
2574
|
-
// multi-byte UTF-8 is preserved correctly because we only skip on the
|
|
2575
|
-
// single-byte ESC start). For pane text this is good enough; pathological
|
|
2576
|
-
// UTF-8 inside CSI parameter bytes is invalid anyway.
|
|
2577
|
-
out
|
|
2578
|
-
}
|
|
2579
|
-
|
|
2580
|
-
fn scrub_secrets(line: &str) -> String {
|
|
2581
|
-
let line = crate::redaction::redact_external_text(line);
|
|
2582
|
-
// Five shapes: sk-XXXX, ghp_XXXX, AKIAXXXX (16-char uppercase id), Bearer XXXX,
|
|
2583
|
-
// 32+ hex (token).
|
|
2584
|
-
let mut out = String::with_capacity(line.len());
|
|
2585
|
-
let bytes = line.as_bytes();
|
|
2586
|
-
let mut i = 0;
|
|
2587
|
-
while i < bytes.len() {
|
|
2588
|
-
// sk- / ghp_ / AKIA prefixes: detect and redact through end-of-token.
|
|
2589
|
-
if matches_prefix(bytes, i, b"sk-") || matches_prefix(bytes, i, b"ghp_") {
|
|
2590
|
-
let prefix_len = if bytes[i] == b's' { 3 } else { 4 };
|
|
2591
|
-
let token_end = scan_token_end(bytes, i + prefix_len);
|
|
2592
|
-
out.push_str(&line[i..i + prefix_len]);
|
|
2593
|
-
out.push_str("REDACTED");
|
|
2594
|
-
i = token_end;
|
|
2595
|
-
continue;
|
|
2596
|
-
}
|
|
2597
|
-
if matches_prefix(bytes, i, b"AKIA") {
|
|
2598
|
-
let token_end = scan_token_end(bytes, i + 4);
|
|
2599
|
-
out.push_str("AKIA");
|
|
2600
|
-
out.push_str("REDACTED");
|
|
2601
|
-
i = token_end;
|
|
2602
|
-
continue;
|
|
2603
|
-
}
|
|
2604
|
-
if matches_prefix_case_insensitive(bytes, i, b"Bearer ") {
|
|
2605
|
-
let token_end = scan_token_end(bytes, i + 7);
|
|
2606
|
-
out.push_str(&line[i..i + 7]);
|
|
2607
|
-
out.push_str("REDACTED");
|
|
2608
|
-
i = token_end;
|
|
2609
|
-
continue;
|
|
2610
|
-
}
|
|
2611
|
-
// 32+ hex run.
|
|
2612
|
-
if is_hex_byte(bytes[i]) {
|
|
2613
|
-
let mut j = i;
|
|
2614
|
-
while j < bytes.len() && is_hex_byte(bytes[j]) {
|
|
2615
|
-
j += 1;
|
|
2616
|
-
}
|
|
2617
|
-
if j - i >= 32 {
|
|
2618
|
-
out.push_str("REDACTED_HEX");
|
|
2619
|
-
i = j;
|
|
2620
|
-
continue;
|
|
2621
|
-
}
|
|
2622
|
-
}
|
|
2623
|
-
// Default: passthrough byte.
|
|
2624
|
-
out.push(bytes[i] as char);
|
|
2625
|
-
i += 1;
|
|
2626
|
-
}
|
|
2627
|
-
out
|
|
2628
|
-
}
|
|
2629
|
-
|
|
2630
|
-
fn matches_prefix(bytes: &[u8], i: usize, prefix: &[u8]) -> bool {
|
|
2631
|
-
bytes.get(i..i + prefix.len()).is_some_and(|s| s == prefix)
|
|
2632
|
-
}
|
|
2633
|
-
|
|
2634
|
-
fn matches_prefix_case_insensitive(bytes: &[u8], i: usize, prefix: &[u8]) -> bool {
|
|
2635
|
-
bytes
|
|
2636
|
-
.get(i..i + prefix.len())
|
|
2637
|
-
.is_some_and(|s| s.eq_ignore_ascii_case(prefix))
|
|
2638
|
-
}
|
|
2639
|
-
|
|
2640
|
-
fn scan_token_end(bytes: &[u8], start: usize) -> usize {
|
|
2641
|
-
let mut j = start;
|
|
2642
|
-
while j < bytes.len() && is_token_byte(bytes[j]) {
|
|
2643
|
-
j += 1;
|
|
2644
|
-
}
|
|
2645
|
-
j
|
|
2646
|
-
}
|
|
2647
|
-
|
|
2648
|
-
fn is_token_byte(b: u8) -> bool {
|
|
2649
|
-
b.is_ascii_alphanumeric() || b == b'-' || b == b'_'
|
|
2650
|
-
}
|
|
2651
|
-
|
|
2652
|
-
fn is_hex_byte(b: u8) -> bool {
|
|
2653
|
-
b.is_ascii_hexdigit()
|
|
2654
|
-
}
|
|
2655
|
-
|
|
2656
|
-
const PASTED_CONTENT_APPEAR_POLLS: u32 = 5;
|
|
2657
|
-
const PASTED_CONTENT_SUBMIT_ATTEMPTS: u32 = 3;
|
|
2658
|
-
|
|
2659
|
-
/// E46 (0.3.24 bug#5): bounded resend cap for post-Enter consumption probe.
|
|
2660
|
-
/// Mirrors PASTED_CONTENT_SUBMIT_ATTEMPTS shape: try Enter then bounded
|
|
2661
|
-
/// re-checks of the pane's input region. Each iteration first re-checks that
|
|
2662
|
-
/// the input still has content before resending Enter — guards against double
|
|
2663
|
-
/// submission when the first Enter was consumed but our readback was slow.
|
|
2664
|
-
const POST_SUBMIT_CONSUMPTION_ATTEMPTS: u32 = 3;
|
|
2665
|
-
const POST_SUBMIT_CONSUMPTION_POLL_MS: u64 = 60;
|
|
2666
|
-
/// post-Enter `capture()` 失败时只重读、不重按。计入 `InjectReport.attempts`。
|
|
2667
|
-
const POST_SUBMIT_CAPTURE_RETRY: u32 = 4;
|
|
2668
|
-
const POST_SUBMIT_CAPTURE_RETRY_MS: u64 = 20;
|
|
2669
|
-
/// Unverified 之后、本次身份仍在 composer 时,只补这一颗回车。
|
|
2670
|
-
const UNVERIFIED_COMPOSER_RESEND_MAX: u32 = 1;
|
|
2671
|
-
|
|
2672
|
-
/// E46 (0.3.24 bug#5, C5 provider-agnostic detector): the pane's input region
|
|
2673
|
-
/// is "consumed" when the token text that was just visible BEFORE the Enter
|
|
2674
|
-
/// is no longer present in the captured tail. Structural signal — no
|
|
2675
|
-
/// provider-specific UI string. Works across claude / codex / copilot because
|
|
2676
|
-
/// every provider's composer clears the input area after a successful submit
|
|
2677
|
-
/// (the content scrolls into history, leaving the prompt empty).
|
|
2678
|
-
///
|
|
2679
|
-
/// Returns:
|
|
2680
|
-
/// * `Some(true)` — token was visible BEFORE submit and is GONE from
|
|
2681
|
-
/// the visible input area now → consumption confirmed.
|
|
2682
|
-
/// * `Some(false)` — token still visible (or other reason to think not yet
|
|
2683
|
-
/// consumed).
|
|
2684
|
-
/// * `None` — payload has no token marker (peer message without token,
|
|
2685
|
-
/// empty payload) so we can't structurally check; caller treats this as
|
|
2686
|
-
/// non-blocking (the pre-existing `EnterSentWithoutPlaceholderCheck`
|
|
2687
|
-
/// path).
|
|
2688
|
-
fn post_submit_input_consumed(
|
|
2689
|
-
backend: &TmuxBackend,
|
|
2690
|
-
target: &Target,
|
|
2691
|
-
payload: &InjectPayload,
|
|
2692
|
-
) -> Result<Option<bool>, TransportError> {
|
|
2693
|
-
let Some(marker) = payload_token_marker(payload) else {
|
|
2694
|
-
return Ok(None);
|
|
2695
|
-
};
|
|
2696
|
-
let captured = backend.capture(target, CaptureRange::Tail(40))?;
|
|
2697
|
-
// The token may legitimately appear in scrollback (a successful submit
|
|
2698
|
-
// pushes it into history). We only treat the BOTTOM-of-pane region (last
|
|
2699
|
-
// few lines, where the input area lives) as the consumption signal. Tail
|
|
2700
|
-
// 30 lines is small enough that the input area still dominates if the
|
|
2701
|
-
// submit didn't go through, while a successful submit has pushed the
|
|
2702
|
-
// token marker out of the bottom 15 lines by the time the response
|
|
2703
|
-
// composer redraws.
|
|
2704
|
-
let tail_lines: Vec<&str> = captured.text.lines().rev().take(15).collect();
|
|
2705
|
-
let token_in_tail = tail_lines.iter().any(|line| line.contains(marker));
|
|
2706
|
-
Ok(Some(!token_in_tail))
|
|
2707
|
-
}
|
|
2708
|
-
|
|
2709
|
-
fn shell_command(
|
|
2710
|
-
argv: &[String],
|
|
2711
|
-
cwd: &Path,
|
|
2712
|
-
env: &BTreeMap<String, String>,
|
|
2713
|
-
env_unset: &[String],
|
|
2714
|
-
) -> String {
|
|
2715
|
-
let unset_set: std::collections::BTreeSet<&str> =
|
|
2716
|
-
env_unset.iter().map(String::as_str).collect();
|
|
2717
|
-
let caller_provider = caller_provider_for_invocation(env);
|
|
2718
|
-
let mut parts = Vec::new();
|
|
2719
|
-
parts.push("cd".to_string());
|
|
2720
|
-
parts.push(shell_quote(&cwd.to_string_lossy()));
|
|
2721
|
-
parts.push("&&".to_string());
|
|
2722
|
-
// D9 (#264) / Python providers.py:142-145 + provider_env.py:86 — profile env_unset keys
|
|
2723
|
-
// must be unset in the shell itself: the `sh -lc` line inherits the tmux SERVER's stale
|
|
2724
|
-
// environment, which exec-prefix assignments cannot clear.
|
|
2725
|
-
for key in env_unset {
|
|
2726
|
-
parts.push("unset".to_string());
|
|
2727
|
-
parts.push(key.clone());
|
|
2728
|
-
parts.push("&&".to_string());
|
|
2729
|
-
}
|
|
2730
|
-
// 0.4.x ordering fix (env-leak symptom #3): KEY=val exports must NOT
|
|
2731
|
-
// re-introduce any key that was just unset. Filter env entries whose key
|
|
2732
|
-
// appears in env_unset so the unset wins on the final shell line. This
|
|
2733
|
-
// matters when inherited env (worker_spawn_env / apply_profile_launch_env)
|
|
2734
|
-
// contains the very keys we want to scrub (e.g. CLAUDE_EFFORT carried
|
|
2735
|
-
// forward from the launching shell into the env map).
|
|
2736
|
-
for (key, value) in env {
|
|
2737
|
-
if unset_set.contains(key.as_str())
|
|
2738
|
-
|| key.starts_with(crate::layout::worker_env::CALLER_CONTEXT_PREFIX)
|
|
2739
|
-
{
|
|
2740
|
-
continue;
|
|
2741
|
-
}
|
|
2742
|
-
parts.push(format!("{key}={}", shell_quote(value)));
|
|
2743
|
-
}
|
|
2744
|
-
append_caller_context_assignments(&mut parts, caller_provider);
|
|
2745
|
-
parts.push("exec".to_string());
|
|
2746
|
-
parts.extend(argv.iter().map(|arg| shell_quote(arg)));
|
|
2747
|
-
parts.join(" ")
|
|
2748
|
-
}
|
|
2749
|
-
|
|
2750
|
-
fn caller_provider_for_invocation(env: &BTreeMap<String, String>) -> Option<&'static str> {
|
|
2751
|
-
env.get(crate::layout::worker_env::CALLER_PROVIDER_ENV)
|
|
2752
|
-
.and_then(|value| parse_provider(value))
|
|
2753
|
-
.map(provider_wire)
|
|
2754
|
-
}
|
|
2755
|
-
|
|
2756
|
-
fn append_caller_context_assignments(parts: &mut Vec<String>, provider: Option<&str>) {
|
|
2757
|
-
let Some(provider) = provider else {
|
|
2758
|
-
return;
|
|
2759
|
-
};
|
|
2760
|
-
parts.push(format!(
|
|
2761
|
-
"{}={}",
|
|
2762
|
-
crate::layout::worker_env::CALLER_PROVIDER_ENV,
|
|
2763
|
-
shell_quote(provider)
|
|
2764
|
-
));
|
|
2765
|
-
// These are expanded by the shell created inside the target pane. They are
|
|
2766
|
-
// assignments on the provider command only, so the exit marker/inert tail
|
|
2767
|
-
// cannot retain a usable caller context.
|
|
2768
|
-
parts.push(format!(
|
|
2769
|
-
"{}=\"${{TMUX_PANE-}}\"",
|
|
2770
|
-
crate::layout::worker_env::CALLER_PANE_ENV
|
|
2771
|
-
));
|
|
2772
|
-
parts.push(format!(
|
|
2773
|
-
"{}=\"${{TMUX%%,*}}\"",
|
|
2774
|
-
crate::layout::worker_env::CALLER_ENDPOINT_ENV
|
|
2775
|
-
));
|
|
2776
|
-
}
|
|
2777
|
-
|
|
2778
|
-
/// Public exit-marker text emitted by `leader_shell_wrapper_command`. Format:
|
|
2779
|
-
/// `"[team-agent] {provider_label} exited with {rc}"`.
|
|
2780
|
-
pub const LEADER_PROVIDER_EXIT_MARKER_PREFIX: &str = "[team-agent]";
|
|
2781
|
-
pub const LEADER_PROVIDER_EXIT_MARKER_SUFFIX: &str = "exited with";
|
|
2782
|
-
const PROVIDER_EXIT_STATUS_OPTION: &str = "@team-agent-provider-exit-status";
|
|
2783
|
-
|
|
2784
|
-
/// 0.4.x (CR R6): build the leader exit marker text for `provider_label`.
|
|
2785
|
-
/// Used by the shell wrapper for human-readable output.
|
|
2786
|
-
/// ---
|
|
2787
|
-
/// purpose: 单一来源地拼出 leader pane 的 provider 退出标记文本
|
|
2788
|
-
/// params:
|
|
2789
|
-
/// provider_label: 人类可读的 provider 名,原样嵌入标记
|
|
2790
|
-
/// returns: 前缀 + provider 名 + 后缀 拼成的标记(不含退出码,退出码由 shell 的 printf 补)
|
|
2791
|
-
/// boundary:
|
|
2792
|
-
/// - shell wrapper 统一使用此显示标记,进程状态另由监督 shell 收据证明
|
|
2793
|
-
/// - 仅供显示;历史正文可包含相同文本,不得据此判定进程退出
|
|
2794
|
-
/// ---
|
|
2795
|
-
pub fn leader_provider_exit_marker(provider_label: &str) -> String {
|
|
2796
|
-
format!(
|
|
2797
|
-
"{LEADER_PROVIDER_EXIT_MARKER_PREFIX} {provider_label} {LEADER_PROVIDER_EXIT_MARKER_SUFFIX}"
|
|
2798
|
-
)
|
|
2799
|
-
}
|
|
2800
|
-
|
|
2801
|
-
/// 0.5.39 Slice 1 (tmux-server-death-locate §7 Slice 1): ambient-tmux
|
|
2802
|
-
/// leader-pane probe. Kept inside `tmux_backend` because it is
|
|
2803
|
-
/// definitionally ambient — its job is to discover *which* session/pane
|
|
2804
|
-
/// the leader process is currently inside via $TMUX/$TMUX_PANE +
|
|
2805
|
-
/// `tmux display-message`. Everywhere else in the codebase, tmux ops
|
|
2806
|
-
/// must go through a socket-scoped `TmuxBackend` (that constraint is
|
|
2807
|
-
/// enforced by `n16_tmux_socket_invariant_red.rs` +
|
|
2808
|
-
/// `tmux_server_death_0539_contract.rs::display_cleanup_...`); this
|
|
2809
|
-
/// helper is the single controlled exception.
|
|
2810
|
-
///
|
|
2811
|
-
/// Returns `(session_name, Some(pane_id))` when the ambient tmux
|
|
2812
|
-
/// responds, or `None` if `$TMUX` is unset / `display-message` fails.
|
|
2813
|
-
/// ---
|
|
2814
|
-
/// purpose: 探出当前 leader 进程正待在哪个环境 tmux 的哪个 session / pane 里
|
|
2815
|
-
/// returns: Some((session 名, 可选 pane 标识));TMUX 与 TMUX_PANE 都未设,或所有探测命令都失败或解析不出时 None(仅 TMUX_PANE 在设时仍会带 -t 探测)
|
|
2816
|
-
/// boundary:
|
|
2817
|
-
/// - 本文件唯一允许绕过 socket 绑定后端、直接 Command::new("tmux") 的例外,因为它的任务就是发现「我在哪」
|
|
2818
|
-
/// - 依次试 TMUX_PANE 定位与无 -t 的当前 pane,取第一个能解析出的结果;失败静默跳到下一条,不报错
|
|
2819
|
-
/// - 只读不写,不 attach、不改任何 tmux 状态
|
|
2820
|
-
/// ---
|
|
2821
|
-
pub fn probe_ambient_leader_pane_info() -> Option<(String, Option<String>)> {
|
|
2822
|
-
let pane = std::env::var("TMUX_PANE")
|
|
2823
|
-
.ok()
|
|
2824
|
-
.filter(|value| !value.is_empty());
|
|
2825
|
-
let mut commands: Vec<Vec<String>> = Vec::new();
|
|
2826
|
-
if let Some(pane) = pane.as_deref() {
|
|
2827
|
-
commands.push(vec![
|
|
2828
|
-
"display-message".to_string(),
|
|
2829
|
-
"-p".to_string(),
|
|
2830
|
-
"-t".to_string(),
|
|
2831
|
-
pane.to_string(),
|
|
2832
|
-
"-F".to_string(),
|
|
2833
|
-
"#{session_name}\t#{pane_id}".to_string(),
|
|
2834
|
-
]);
|
|
2835
|
-
commands.push(vec![
|
|
2836
|
-
"display-message".to_string(),
|
|
2837
|
-
"-p".to_string(),
|
|
2838
|
-
"-t".to_string(),
|
|
2839
|
-
pane.to_string(),
|
|
2840
|
-
"-F".to_string(),
|
|
2841
|
-
"#{session_name}".to_string(),
|
|
2842
|
-
]);
|
|
2843
|
-
}
|
|
2844
|
-
if std::env::var("TMUX").is_ok_and(|value| !value.is_empty()) {
|
|
2845
|
-
commands.push(vec![
|
|
2846
|
-
"display-message".to_string(),
|
|
2847
|
-
"-p".to_string(),
|
|
2848
|
-
"-F".to_string(),
|
|
2849
|
-
"#{session_name}\t#{pane_id}".to_string(),
|
|
2850
|
-
]);
|
|
2851
|
-
commands.push(vec![
|
|
2852
|
-
"display-message".to_string(),
|
|
2853
|
-
"-p".to_string(),
|
|
2854
|
-
"-F".to_string(),
|
|
2855
|
-
"#{session_name}".to_string(),
|
|
2856
|
-
]);
|
|
2857
|
-
}
|
|
2858
|
-
for command in commands {
|
|
2859
|
-
let output = match std::process::Command::new("tmux").args(&command).output() {
|
|
2860
|
-
Ok(output) if output.status.success() => output,
|
|
2861
|
-
_ => continue,
|
|
2862
|
-
};
|
|
2863
|
-
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
2864
|
-
let Some(line) = stdout.lines().find(|line| !line.trim().is_empty()) else {
|
|
2865
|
-
continue;
|
|
2866
|
-
};
|
|
2867
|
-
let line = line.trim();
|
|
2868
|
-
let parts: Vec<&str> = line.split('\t').collect();
|
|
2869
|
-
let parsed = match parts.as_slice() {
|
|
2870
|
-
[session, pane_str, ..] if !session.is_empty() && !session.starts_with('%') => Some((
|
|
2871
|
-
(*session).to_string(),
|
|
2872
|
-
(!pane_str.is_empty()).then(|| (*pane_str).to_string()),
|
|
2873
|
-
)),
|
|
2874
|
-
[pane_str, session, ..] if pane_str.starts_with('%') && !session.is_empty() => {
|
|
2875
|
-
Some(((*session).to_string(), Some((*pane_str).to_string())))
|
|
2876
|
-
}
|
|
2877
|
-
[session] if !session.is_empty() && !session.starts_with('%') => {
|
|
2878
|
-
Some(((*session).to_string(), None))
|
|
2879
|
-
}
|
|
2880
|
-
_ => None,
|
|
2881
|
-
};
|
|
2882
|
-
if parsed.is_some() {
|
|
2883
|
-
return parsed;
|
|
2884
|
-
}
|
|
2885
|
-
}
|
|
2886
|
-
None
|
|
2887
|
-
}
|
|
2888
|
-
|
|
2889
|
-
/// 0.5.39 Slice 2 (tmux-server-death-locate §11.2): single-source worker
|
|
2890
|
-
/// exit marker prefix. Same envelope shape as `LEADER_PROVIDER_EXIT_MARKER_*`
|
|
2891
|
-
/// but distinct so status/classifier code can tell "leader pane fell back
|
|
2892
|
-
/// to shell" from "worker pane fell back to shell". Format:
|
|
2893
|
-
/// `"[team-agent worker] {provider_label} exited with {rc}"`.
|
|
2894
|
-
pub const WORKER_PROVIDER_EXIT_MARKER_PREFIX: &str = "[team-agent worker]";
|
|
2895
|
-
pub const WORKER_PROVIDER_EXIT_MARKER_SUFFIX: &str = "exited with";
|
|
2896
|
-
|
|
2897
|
-
/// 0.5.39 Slice 2: build the worker exit marker text for `provider_label`.
|
|
2898
|
-
/// Used by both the worker shell wrapper (printf source) and future
|
|
2899
|
-
/// status/classifier code (capture substring) so they cannot drift.
|
|
2900
|
-
/// ---
|
|
2901
|
-
/// purpose: 单一来源地拼出 worker pane 的 provider 退出标记文本
|
|
2902
|
-
/// params:
|
|
2903
|
-
/// provider_label: 人类可读的 provider 名,原样嵌入标记
|
|
2904
|
-
/// returns: worker 专用前缀 + provider 名 + 后缀;与 leader 标记刻意不同,便于分清是哪种 pane 掉回 shell
|
|
2905
|
-
/// boundary:
|
|
2906
|
-
/// - 写标记的 worker shell wrapper 与读标记的分类代码必须都用这一个函数
|
|
2907
|
-
/// - 同为内容信号,pane 里出现同样文本即误触发
|
|
2908
|
-
/// ---
|
|
2909
|
-
pub fn worker_provider_exit_marker(provider_label: &str) -> String {
|
|
2910
|
-
format!(
|
|
2911
|
-
"{WORKER_PROVIDER_EXIT_MARKER_PREFIX} {provider_label} {WORKER_PROVIDER_EXIT_MARKER_SUFFIX}"
|
|
2912
|
-
)
|
|
2913
|
-
}
|
|
2914
|
-
|
|
2915
|
-
/// 0.5.39 Slice 2 (tmux-server-death-locate §7 Slice 2): worker shell
|
|
2916
|
-
/// wrapper. Same shape as `leader_shell_wrapper_command` — provider runs
|
|
2917
|
-
/// as a CHILD of a long-lived shell so provider exit does NOT collapse the
|
|
2918
|
-
/// worker pane (which under upstream tmux 3.6a private-server bugs can
|
|
2919
|
-
/// cascade into whole-server death). When the provider exits, the worker
|
|
2920
|
-
/// pane remains alive with an explicit worker exit marker, then runs an
|
|
2921
|
-
/// inert `sh` tail that does not read terminal input.
|
|
2922
|
-
/// ---
|
|
2923
|
-
/// purpose: 拼出 worker pane 的 shell 启动行,让 provider 作为子进程运行,退出后 pane 不塌成 [exited]
|
|
2924
|
-
/// params:
|
|
2925
|
-
/// argv: provider 启动命令,逐项做 shell 引用
|
|
2926
|
-
/// cwd: 进程工作目录
|
|
2927
|
-
/// env: 要导出的环境变量;键若出现在 env_unset 中则跳过,保证 unset 赢
|
|
2928
|
-
/// env_unset: 必须真正 unset 的键;先 unset 再导出
|
|
2929
|
-
/// provider_label: 嵌入退出标记的 provider 名
|
|
2930
|
-
/// returns: 单条 shell 命令行,依次为 cd、unset、env 导出与 provider(不带 exec)、printf 退出标记、exec 惰性 sh 尾巴
|
|
2931
|
-
/// boundary:
|
|
2932
|
-
/// - 只拼字符串,不执行、不 spawn
|
|
2933
|
-
/// - 与 leader 版的唯一实质差异是退出标记前缀;结构必须保持一致
|
|
2934
|
-
/// - 惰性尾巴不读 pane 标准输入,故该 pane 之后收到的注入不会被任何进程消费
|
|
2935
|
-
/// ---
|
|
2936
|
-
pub fn worker_shell_wrapper_command(
|
|
2937
|
-
argv: &[String],
|
|
2938
|
-
cwd: &Path,
|
|
2939
|
-
env: &BTreeMap<String, String>,
|
|
2940
|
-
env_unset: &[String],
|
|
2941
|
-
provider_label: &str,
|
|
2942
|
-
) -> String {
|
|
2943
|
-
let unset_set: std::collections::BTreeSet<&str> =
|
|
2944
|
-
env_unset.iter().map(String::as_str).collect();
|
|
2945
|
-
let caller_provider = caller_provider_for_invocation(env);
|
|
2946
|
-
let mut parts = Vec::new();
|
|
2947
|
-
parts.push("cd".to_string());
|
|
2948
|
-
parts.push(shell_quote(&cwd.to_string_lossy()));
|
|
2949
|
-
parts.push("&&".to_string());
|
|
2950
|
-
for key in env_unset {
|
|
2951
|
-
parts.push("unset".to_string());
|
|
2952
|
-
parts.push(key.clone());
|
|
2953
|
-
parts.push("&&".to_string());
|
|
2954
|
-
}
|
|
2955
|
-
for (key, value) in env {
|
|
2956
|
-
if unset_set.contains(key.as_str())
|
|
2957
|
-
|| key.starts_with(crate::layout::worker_env::CALLER_CONTEXT_PREFIX)
|
|
2958
|
-
{
|
|
2959
|
-
continue;
|
|
2960
|
-
}
|
|
2961
|
-
parts.push(format!("{key}={}", shell_quote(value)));
|
|
2962
|
-
}
|
|
2963
|
-
append_caller_context_assignments(&mut parts, caller_provider);
|
|
2964
|
-
parts.extend(argv.iter().map(|arg| shell_quote(arg)));
|
|
2965
|
-
parts.push(";".to_string());
|
|
2966
|
-
parts.push("rc=$?;".to_string());
|
|
2967
|
-
parts.push("printf".to_string());
|
|
2968
|
-
parts.push(shell_quote(&format!(
|
|
2969
|
-
"\n{} %s\n",
|
|
2970
|
-
worker_provider_exit_marker(provider_label)
|
|
2971
|
-
)));
|
|
2972
|
-
parts.push("\"$rc\";".to_string());
|
|
2973
|
-
parts.push(inert_pane_tail_command());
|
|
2974
|
-
parts.join(" ")
|
|
2975
|
-
}
|
|
2976
|
-
|
|
2977
|
-
/// 0.4.x (CR C-2): leader shell wrapper — provider runs as a CHILD of a
|
|
2978
|
-
/// long-lived shell, not as the pane's primary process. When the provider
|
|
2979
|
-
/// exits, the pane remains alive with an explicit exit marker, then runs an
|
|
2980
|
-
/// inert `sh` tail that does not read terminal input.
|
|
2981
|
-
///
|
|
2982
|
-
/// Four required envelope sections (CR C-2):
|
|
2983
|
-
/// 1. cd <cwd> — same as `shell_command`
|
|
2984
|
-
/// 2. unset <KEY> ... — provider env_unset block
|
|
2985
|
-
/// 3. KEY=val ... <provider> — env exports + provider invocation
|
|
2986
|
-
/// (NO `exec` — runs as child)
|
|
2987
|
-
/// 4. printf exit marker; exec inert sh tail
|
|
2988
|
-
///
|
|
2989
|
-
/// `provider_label` is a human-readable provider name (e.g. "claude",
|
|
2990
|
-
/// "codex") embedded in the exit marker for diagnostics.
|
|
2991
|
-
/// ---
|
|
2992
|
-
/// purpose: 拼出 leader pane 的 shell 启动行,让 provider 作为子进程运行,退出后 pane 保留并显示退出标记
|
|
2993
|
-
/// params:
|
|
2994
|
-
/// argv: provider 启动命令,逐项做 shell 引用
|
|
2995
|
-
/// cwd: 进程工作目录
|
|
2996
|
-
/// env: 要导出的环境变量;键若出现在 env_unset 中则跳过,保证 unset 赢
|
|
2997
|
-
/// env_unset: 必须真正 unset 的键;先 unset 再导出
|
|
2998
|
-
/// provider_label: 嵌入退出标记的 provider 名
|
|
2999
|
-
/// returns: 单条 shell 命令行,四段依次为 cd、unset、env 导出与 provider(刻意不带 exec)、printf 退出标记加 exec 惰性 sh 尾巴
|
|
3000
|
-
/// boundary:
|
|
3001
|
-
/// - 只拼字符串,不执行、不 spawn
|
|
3002
|
-
/// - 刻意不用 exec:用了 provider 就成了 pane 主进程,退出即塌成 [exited]
|
|
3003
|
-
/// - 退出标记文本必须来自 leader_provider_exit_marker,禁止在此写字面量
|
|
3004
|
-
/// ---
|
|
3005
|
-
pub fn leader_shell_wrapper_command(
|
|
3006
|
-
argv: &[String],
|
|
3007
|
-
cwd: &Path,
|
|
3008
|
-
env: &BTreeMap<String, String>,
|
|
3009
|
-
env_unset: &[String],
|
|
3010
|
-
provider_label: &str,
|
|
3011
|
-
) -> String {
|
|
3012
|
-
let unset_set: std::collections::BTreeSet<&str> =
|
|
3013
|
-
env_unset.iter().map(String::as_str).collect();
|
|
3014
|
-
let mut parts = Vec::new();
|
|
3015
|
-
// 1. cd
|
|
3016
|
-
parts.push("cd".to_string());
|
|
3017
|
-
parts.push(shell_quote(&cwd.to_string_lossy()));
|
|
3018
|
-
parts.push("&&".to_string());
|
|
3019
|
-
// 2. unset
|
|
3020
|
-
for key in env_unset {
|
|
3021
|
-
parts.push("unset".to_string());
|
|
3022
|
-
parts.push(key.clone());
|
|
3023
|
-
parts.push("&&".to_string());
|
|
3024
|
-
}
|
|
3025
|
-
// Clear any prior receipt before invoking the provider. Terminal content,
|
|
3026
|
-
// including replayed sessions, must never be treated as an exit receipt.
|
|
3027
|
-
parts.push(format!(
|
|
3028
|
-
"{{ tmux -S \"${{TMUX%%,*}}\" set-option -p -t \"$TMUX_PANE\" {PROVIDER_EXIT_STATUS_OPTION} running >/dev/null 2>&1 || :; }} &&"
|
|
3029
|
-
));
|
|
3030
|
-
// 3. env exports + provider (NO `exec` so the provider is a child).
|
|
3031
|
-
// 0.4.x ordering fix: skip keys present in env_unset so KEY=val does not
|
|
3032
|
-
// re-introduce a just-unset variable from the inherited env map.
|
|
3033
|
-
for (key, value) in env {
|
|
3034
|
-
if unset_set.contains(key.as_str()) {
|
|
3035
|
-
continue;
|
|
3036
|
-
}
|
|
3037
|
-
parts.push(format!("{key}={}", shell_quote(value)));
|
|
3038
|
-
}
|
|
3039
|
-
parts.extend(argv.iter().map(|arg| shell_quote(arg)));
|
|
3040
|
-
parts.push(";".to_string());
|
|
3041
|
-
// 4. exit marker + inert shell tail
|
|
3042
|
-
parts.push("rc=$?;".to_string());
|
|
3043
|
-
parts.push(format!(
|
|
3044
|
-
"tmux -S \"${{TMUX%%,*}}\" set-option -p -t \"$TMUX_PANE\" {PROVIDER_EXIT_STATUS_OPTION} \"$rc\" >/dev/null 2>&1;"
|
|
3045
|
-
));
|
|
3046
|
-
parts.push("printf".to_string());
|
|
3047
|
-
// CR R6: marker text comes from single-source `leader_provider_exit_marker`.
|
|
3048
|
-
parts.push(shell_quote(&format!(
|
|
3049
|
-
"\n{} %s\n",
|
|
3050
|
-
leader_provider_exit_marker(provider_label)
|
|
3051
|
-
)));
|
|
3052
|
-
parts.push("\"$rc\";".to_string());
|
|
3053
|
-
parts.push(inert_pane_tail_command());
|
|
3054
|
-
parts.join(" ")
|
|
3055
|
-
}
|
|
3056
|
-
|
|
3057
|
-
fn inert_pane_tail_command() -> String {
|
|
3058
|
-
// `sh` is deliberate: exited-wrapper input classifiers recognize shell
|
|
3059
|
-
// basenames. `sh -c` does not read commands from
|
|
3060
|
-
// stdin; disabling echo also prevents input from appearing accepted.
|
|
3061
|
-
let script = r#"trap '' INT QUIT; stty -echo 2>/dev/null; printf "%s\n" "[team-agent] Provider exited; this pane no longer accepts input. Restart from another pane with the appropriate team-agent start command."; while :; do sleep 3600 & wait "$!"; done"#;
|
|
3062
|
-
format!("exec /bin/sh -c {}", shell_quote(script))
|
|
3063
|
-
}
|
|
3064
|
-
|
|
3065
|
-
fn shell_quote(raw: &str) -> String {
|
|
3066
|
-
if raw.is_empty() {
|
|
3067
|
-
return "''".to_string();
|
|
3068
|
-
}
|
|
3069
|
-
if raw
|
|
3070
|
-
.chars()
|
|
3071
|
-
.all(|c| c.is_ascii_alphanumeric() || matches!(c, '/' | '.' | '_' | '-' | ':' | '='))
|
|
3072
|
-
{
|
|
3073
|
-
return raw.to_string();
|
|
3074
|
-
}
|
|
3075
|
-
let mut quoted = String::from("'");
|
|
3076
|
-
for ch in raw.chars() {
|
|
3077
|
-
if ch == '\'' {
|
|
3078
|
-
quoted.push_str("'\\''");
|
|
3079
|
-
} else {
|
|
3080
|
-
quoted.push(ch);
|
|
3081
|
-
}
|
|
3082
|
-
}
|
|
3083
|
-
quoted.push('\'');
|
|
3084
|
-
quoted
|
|
3085
|
-
}
|
|
3086
|
-
|
|
3087
|
-
fn notify_submit_observer(observer: Option<&dyn SubmitObserver>) {
|
|
3088
|
-
if let Some(observer) = observer {
|
|
3089
|
-
observer.after_physical_submit();
|
|
3090
|
-
}
|
|
3091
|
-
}
|
|
3092
|
-
|
|
3093
|
-
impl Transport for TmuxBackend {
|
|
3094
|
-
fn kind(&self) -> BackendKind {
|
|
3095
|
-
BackendKind::Tmux
|
|
3096
|
-
}
|
|
3097
|
-
|
|
3098
|
-
fn probes_real_tmux_socket_roots(&self) -> bool {
|
|
3099
|
-
true
|
|
3100
|
-
}
|
|
3101
|
-
|
|
3102
|
-
fn supports_owned_native_input(&self) -> bool {
|
|
3103
|
-
true
|
|
3104
|
-
}
|
|
3105
|
-
|
|
3106
|
-
fn tmux_endpoint(&self) -> Option<String> {
|
|
3107
|
-
self.socket
|
|
3108
|
-
.as_ref()
|
|
3109
|
-
.map(|endpoint| endpoint.as_endpoint().to_string())
|
|
3110
|
-
}
|
|
3111
|
-
|
|
3112
|
-
fn set_session_owner(
|
|
3113
|
-
&self,
|
|
3114
|
-
session: &SessionName,
|
|
3115
|
-
workspace: &Path,
|
|
3116
|
-
team: &str,
|
|
3117
|
-
) -> Result<(), TransportError> {
|
|
3118
|
-
self.set_session_owner_marker(session, workspace, team, session.as_str())
|
|
3119
|
-
}
|
|
3120
|
-
|
|
3121
|
-
fn set_session_owner_with_generation(
|
|
3122
|
-
&self,
|
|
3123
|
-
session: &SessionName,
|
|
3124
|
-
workspace: &Path,
|
|
3125
|
-
team: &str,
|
|
3126
|
-
generation: &str,
|
|
3127
|
-
) -> Result<(), TransportError> {
|
|
3128
|
-
self.set_session_owner_marker(session, workspace, team, generation)
|
|
3129
|
-
}
|
|
3130
|
-
|
|
3131
|
-
fn session_owner(
|
|
3132
|
-
&self,
|
|
3133
|
-
session: &SessionName,
|
|
3134
|
-
) -> Result<Option<SessionOwner>, TransportError> {
|
|
3135
|
-
self.read_session_owner_marker(session)
|
|
3136
|
-
}
|
|
3137
|
-
|
|
3138
|
-
fn spawn_first(
|
|
3139
|
-
&self,
|
|
3140
|
-
session: &SessionName,
|
|
3141
|
-
window: &WindowName,
|
|
3142
|
-
argv: &[String],
|
|
3143
|
-
cwd: &Path,
|
|
3144
|
-
env: &BTreeMap<String, String>,
|
|
3145
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3146
|
-
self.spawn(session, window, argv, cwd, env, &[], true)
|
|
3147
|
-
}
|
|
3148
|
-
|
|
3149
|
-
fn spawn_first_with_env_unset(
|
|
3150
|
-
&self,
|
|
3151
|
-
session: &SessionName,
|
|
3152
|
-
window: &WindowName,
|
|
3153
|
-
argv: &[String],
|
|
3154
|
-
cwd: &Path,
|
|
3155
|
-
env: &BTreeMap<String, String>,
|
|
3156
|
-
env_unset: &[String],
|
|
3157
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3158
|
-
self.spawn(session, window, argv, cwd, env, env_unset, true)
|
|
3159
|
-
}
|
|
3160
|
-
|
|
3161
|
-
fn spawn_into_with_env_unset(
|
|
3162
|
-
&self,
|
|
3163
|
-
session: &SessionName,
|
|
3164
|
-
window: &WindowName,
|
|
3165
|
-
argv: &[String],
|
|
3166
|
-
cwd: &Path,
|
|
3167
|
-
env: &BTreeMap<String, String>,
|
|
3168
|
-
env_unset: &[String],
|
|
3169
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3170
|
-
self.spawn(session, window, argv, cwd, env, env_unset, false)
|
|
3171
|
-
}
|
|
3172
|
-
|
|
3173
|
-
fn spawn_into(
|
|
3174
|
-
&self,
|
|
3175
|
-
session: &SessionName,
|
|
3176
|
-
window: &WindowName,
|
|
3177
|
-
argv: &[String],
|
|
3178
|
-
cwd: &Path,
|
|
3179
|
-
env: &BTreeMap<String, String>,
|
|
3180
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3181
|
-
self.spawn(session, window, argv, cwd, env, &[], false)
|
|
3182
|
-
}
|
|
3183
|
-
|
|
3184
|
-
fn spawn_split_with_env_unset(
|
|
3185
|
-
&self,
|
|
3186
|
-
session: &SessionName,
|
|
3187
|
-
window: &WindowName,
|
|
3188
|
-
argv: &[String],
|
|
3189
|
-
cwd: &Path,
|
|
3190
|
-
env: &BTreeMap<String, String>,
|
|
3191
|
-
env_unset: &[String],
|
|
3192
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3193
|
-
self.spawn_split(session, window, argv, cwd, env, env_unset)
|
|
3194
|
-
}
|
|
3195
|
-
|
|
3196
|
-
/// 0.5.39 Slice 2: TmuxBackend override of the worker-shell-wrapper
|
|
3197
|
-
/// variant. Same mechanism as the leader wrapper (child provider under
|
|
3198
|
-
/// long-lived shell), but the marker text is distinct so downstream
|
|
3199
|
-
/// classifiers can tell leader vs worker provider exit apart.
|
|
3200
|
-
fn spawn_first_with_worker_shell_wrapper(
|
|
3201
|
-
&self,
|
|
3202
|
-
session: &SessionName,
|
|
3203
|
-
window: &WindowName,
|
|
3204
|
-
argv: &[String],
|
|
3205
|
-
cwd: &Path,
|
|
3206
|
-
env: &BTreeMap<String, String>,
|
|
3207
|
-
env_unset: &[String],
|
|
3208
|
-
provider_label: &str,
|
|
3209
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3210
|
-
let command = worker_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
|
|
3211
|
-
self.spawn_with_command(session, window, &command, true)
|
|
3212
|
-
}
|
|
3213
|
-
|
|
3214
|
-
fn spawn_into_with_worker_shell_wrapper(
|
|
3215
|
-
&self,
|
|
3216
|
-
session: &SessionName,
|
|
3217
|
-
window: &WindowName,
|
|
3218
|
-
argv: &[String],
|
|
3219
|
-
cwd: &Path,
|
|
3220
|
-
env: &BTreeMap<String, String>,
|
|
3221
|
-
env_unset: &[String],
|
|
3222
|
-
provider_label: &str,
|
|
3223
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3224
|
-
let command = worker_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
|
|
3225
|
-
self.spawn_with_command(session, window, &command, false)
|
|
3226
|
-
}
|
|
3227
|
-
|
|
3228
|
-
/// 0.4.x (CR C-2): TmuxBackend override of the leader-shell-wrapper
|
|
3229
|
-
/// variant. Builds the wrapper shell line via
|
|
3230
|
-
/// `leader_shell_wrapper_command` and runs it through
|
|
3231
|
-
/// `spawn_with_command` (bypassing the default `exec <cmd>` shape).
|
|
3232
|
-
fn spawn_first_with_leader_shell_wrapper(
|
|
3233
|
-
&self,
|
|
3234
|
-
session: &SessionName,
|
|
3235
|
-
window: &WindowName,
|
|
3236
|
-
argv: &[String],
|
|
3237
|
-
cwd: &Path,
|
|
3238
|
-
env: &BTreeMap<String, String>,
|
|
3239
|
-
env_unset: &[String],
|
|
3240
|
-
provider_label: &str,
|
|
3241
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3242
|
-
let command = leader_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
|
|
3243
|
-
self.spawn_with_command(session, window, &command, true)
|
|
3244
|
-
}
|
|
3245
|
-
|
|
3246
|
-
fn spawn_into_with_leader_shell_wrapper(
|
|
3247
|
-
&self,
|
|
3248
|
-
session: &SessionName,
|
|
3249
|
-
window: &WindowName,
|
|
3250
|
-
argv: &[String],
|
|
3251
|
-
cwd: &Path,
|
|
3252
|
-
env: &BTreeMap<String, String>,
|
|
3253
|
-
env_unset: &[String],
|
|
3254
|
-
provider_label: &str,
|
|
3255
|
-
) -> Result<SpawnResult, TransportError> {
|
|
3256
|
-
let command = leader_shell_wrapper_command(argv, cwd, env, env_unset, provider_label);
|
|
3257
|
-
self.spawn_with_command(session, window, &command, false)
|
|
3258
|
-
}
|
|
3259
|
-
|
|
3260
|
-
fn inject(
|
|
3261
|
-
&self,
|
|
3262
|
-
target: &Target,
|
|
3263
|
-
payload: &InjectPayload,
|
|
3264
|
-
submit: Key,
|
|
3265
|
-
bracketed: bool,
|
|
3266
|
-
) -> Result<InjectReport, TransportError> {
|
|
3267
|
-
// Trait entry delegates to inject_with_submit_observer with no
|
|
3268
|
-
// observer. Populated InjectReport fields: stage_reached,
|
|
3269
|
-
// inject_verification, submit_verification, turn_verification,
|
|
3270
|
-
// attempts, submit_diagnostics — the 0.5.43 debt-sweep
|
|
3271
|
-
// governance guard (debt_sweep_0543_contract.rs::
|
|
3272
|
-
// coordinator_debug_eprintlns_are_deleted_but_inject_report_shape_remains)
|
|
3273
|
-
// scans THIS function body for those field names so debug-
|
|
3274
|
-
// print cleanup can't silently drop InjectReport surface area.
|
|
3275
|
-
self.inject_with_submit_observer(target, payload, submit, bracketed, None)
|
|
3276
|
-
}
|
|
3277
|
-
|
|
3278
|
-
fn inject_with_submit_observer(
|
|
3279
|
-
&self,
|
|
3280
|
-
target: &Target,
|
|
3281
|
-
payload: &InjectPayload,
|
|
3282
|
-
submit: Key,
|
|
3283
|
-
bracketed: bool,
|
|
3284
|
-
observer: Option<&dyn SubmitObserver>,
|
|
3285
|
-
) -> Result<InjectReport, TransportError> {
|
|
3286
|
-
if let (Some(request), InjectPayload::Text(text), Key::Enter) =
|
|
3287
|
-
(crate::transport::native_input::current_request(), payload, submit)
|
|
3288
|
-
{
|
|
3289
|
-
return self.inject_native_input(target, text, bracketed, request, observer);
|
|
3290
|
-
}
|
|
3291
|
-
let pane = pane_from_target(target);
|
|
3292
|
-
let _pane_input = crate::lifecycle::pane_input_lock::acquire_for_write(
|
|
3293
|
-
crate::lifecycle::pane_input_lock::PaneInputLockRequest {
|
|
3294
|
-
workspace: self.event_workspace.as_deref(),
|
|
3295
|
-
target_key: pane.as_str(),
|
|
3296
|
-
operation: "inject",
|
|
3297
|
-
},
|
|
3298
|
-
).map_err(|_| TransportError::NativeInputNotReady { reason: "required_guard_active".into() })?;
|
|
3299
|
-
// U1 #7: pane readback signal for the non-pasted-prompt text path.
|
|
3300
|
-
let mut token_visible_for_report: Option<bool> = None;
|
|
3301
|
-
match payload {
|
|
3302
|
-
InjectPayload::Empty => {
|
|
3303
|
-
self.prepare_pane_for_submit(target, matches!(submit, Key::Enter));
|
|
3304
|
-
let argv = tmux_empty_inject_argv(&pane, submit);
|
|
3305
|
-
self.run_ok(&argv)?;
|
|
3306
|
-
notify_submit_observer(observer);
|
|
3307
|
-
}
|
|
3308
|
-
InjectPayload::Text(text) | InjectPayload::TextSkipConsumptionPoll(text) => {
|
|
3309
|
-
let buffer = buffer_name_for_text(text);
|
|
3310
|
-
for argv in tmux_inject_text_argv(&pane, &buffer, text, bracketed) {
|
|
3311
|
-
let stage = inject_stage_for_argv(&argv);
|
|
3312
|
-
if stage == InjectStage::LoadBuffer {
|
|
3313
|
-
self.run_inject_stage_with_stdin(&argv, stage, text)?;
|
|
3314
|
-
} else {
|
|
3315
|
-
self.run_inject_stage(&argv, stage)?;
|
|
3316
|
-
}
|
|
3317
|
-
}
|
|
3318
|
-
// ═══════════════════════════════════════════════════════════
|
|
3319
|
-
// 0.3.27 UNIFIED submit_and_verify
|
|
3320
|
-
//
|
|
3321
|
-
// Replaces the dual-branch split (saw_pasted_prompt weak loop
|
|
3322
|
-
// + E46 token consumption gate) with a single pipeline:
|
|
3323
|
-
//
|
|
3324
|
-
// Phase 1 — token visibility poll (dynamic timeout based on
|
|
3325
|
-
// payload size, 50ms interval, replaces the fixed 125ms
|
|
3326
|
-
// appear_gate)
|
|
3327
|
-
// Phase 2 — Escape (if bracketed+Text+Enter) + Enter + poll
|
|
3328
|
-
// token disappeared from bottom 3 lines. On failure:
|
|
3329
|
-
// re-check → Escape+Enter → poll. Up to 3 attempts.
|
|
3330
|
-
//
|
|
3331
|
-
// Design truth source: .team/artifacts/E55-delivery-architecture-design.html
|
|
3332
|
-
// Python parity: dynamic timeout max(2s, bytes/25000), poll 50ms.
|
|
3333
|
-
// Cursor Ink:文本与 Enter 必须分开发且间隔 ≥1s,否则第一次
|
|
3334
|
-
// Enter 被吞。token 可见性轮询的耗时算进这 1s;测试隔离下地板为 0。
|
|
3335
|
-
// ═══════════════════════════════════════════════════════════
|
|
3336
|
-
let inject_start = std::time::Instant::now();
|
|
3337
|
-
let pasted_at = inject_start;
|
|
3338
|
-
let submit_argv = tmux_send_submit_argv(&pane, submit);
|
|
3339
|
-
|
|
3340
|
-
// Phase 1: token visibility poll — wait for the pasted text to
|
|
3341
|
-
// become visible in the pane before submitting. Dynamic timeout
|
|
3342
|
-
// based on payload size (large codex pastes can take seconds to
|
|
3343
|
-
// render the bracketed-paste block).
|
|
3344
|
-
let token_poll_timeout_ms = {
|
|
3345
|
-
let size_based = (text.len() as u64) / 25;
|
|
3346
|
-
size_based.max(2000)
|
|
3347
|
-
};
|
|
3348
|
-
let poll_start = std::time::Instant::now();
|
|
3349
|
-
let mut token_ever_visible = false;
|
|
3350
|
-
let mut tracked_paste: Option<PasteLatch> = None;
|
|
3351
|
-
let mut capture_tally = CaptureTally::default();
|
|
3352
|
-
let mut token_seen_after_paste = None;
|
|
3353
|
-
let mut token_seen_after_enter = None;
|
|
3354
|
-
token_visible_for_report = if let Some(m) = payload_token_marker(payload) {
|
|
3355
|
-
let mut visible = false;
|
|
3356
|
-
while poll_start.elapsed().as_millis() < token_poll_timeout_ms as u128 {
|
|
3357
|
-
match self.capture(target, CaptureRange::Tail(80)) {
|
|
3358
|
-
Ok(cap) => {
|
|
3359
|
-
capture_tally.record_ok(&cap.text, Some(m));
|
|
3360
|
-
tracked_paste = latch_paste(&cap.text, tracked_paste);
|
|
3361
|
-
if cap.text.contains(m) {
|
|
3362
|
-
visible = true;
|
|
3363
|
-
token_ever_visible = true;
|
|
3364
|
-
}
|
|
3365
|
-
// 折叠占位符出现 = TUI 侧注入完成。token 出现在未折叠高块里不算完成。
|
|
3366
|
-
if paste_ready_for_enter(&cap.text, m) {
|
|
3367
|
-
break;
|
|
3368
|
-
}
|
|
3369
|
-
}
|
|
3370
|
-
Err(_) => {
|
|
3371
|
-
capture_tally.record_err();
|
|
3372
|
-
break; // tmux unavailable, skip poll
|
|
3373
|
-
}
|
|
3374
|
-
}
|
|
3375
|
-
std::thread::sleep(Duration::from_millis(50));
|
|
3376
|
-
}
|
|
3377
|
-
token_seen_after_paste = capture_tally.seen_after_ok_samples(visible);
|
|
3378
|
-
Some(visible)
|
|
3379
|
-
} else {
|
|
3380
|
-
None
|
|
3381
|
-
};
|
|
3382
|
-
|
|
3383
|
-
// Phase 2: submit_and_verify — unified Escape+Enter+poll loop.
|
|
3384
|
-
let use_escape =
|
|
3385
|
-
bracketed && payload.text().is_some() && matches!(submit, Key::Enter);
|
|
3386
|
-
let escape_argv = if use_escape {
|
|
3387
|
-
Some(tmux_send_keys_argv(&pane, &[Key::Escape]))
|
|
3388
|
-
} else {
|
|
3389
|
-
None
|
|
3390
|
-
};
|
|
3391
|
-
// Non-Enter submit keys (Key::Down for codex menu, etc.) skip
|
|
3392
|
-
// the entire submit_and_verify loop — single send, no consumption
|
|
3393
|
-
// check, KeySentAfterVisibleToken verification.
|
|
3394
|
-
if !matches!(submit, Key::Enter) {
|
|
3395
|
-
self.prepare_pane_for_submit(target, false);
|
|
3396
|
-
self.run_inject_stage(&submit_argv, InjectStage::Submit)?;
|
|
3397
|
-
notify_submit_observer(observer);
|
|
3398
|
-
let total_elapsed_ms = inject_start.elapsed().as_millis() as u64;
|
|
3399
|
-
let surface = probe_inject_target_surface(self, target);
|
|
3400
|
-
return Ok(InjectReport {
|
|
3401
|
-
stage_reached: InjectStage::Submit,
|
|
3402
|
-
inject_verification: inject_verification_after_readback(
|
|
3403
|
-
payload,
|
|
3404
|
-
token_visible_for_report,
|
|
3405
|
-
),
|
|
3406
|
-
submit_verification: submit_verification_for_key(submit),
|
|
3407
|
-
turn_verification: TurnVerification::NotYetObserved,
|
|
3408
|
-
attempts: 1,
|
|
3409
|
-
submit_diagnostics: Some(submit_diagnostics_for_inject(
|
|
3410
|
-
total_elapsed_ms,
|
|
3411
|
-
Vec::new(),
|
|
3412
|
-
&capture_tally,
|
|
3413
|
-
token_seen_after_paste,
|
|
3414
|
-
None,
|
|
3415
|
-
surface,
|
|
3416
|
-
)),
|
|
3417
|
-
});
|
|
3418
|
-
}
|
|
3419
|
-
|
|
3420
|
-
sleep_remaining_paste_to_submit_floor(pasted_at, current_paste_to_submit_floor());
|
|
3421
|
-
|
|
3422
|
-
let marker = payload_token_marker(payload);
|
|
3423
|
-
let max_submit_attempts: u32 = 3;
|
|
3424
|
-
let mut consumption_attempts: u32 = 0;
|
|
3425
|
-
let mut capture_retries: u32 = 0;
|
|
3426
|
-
let mut consumed: Option<bool> = None;
|
|
3427
|
-
let mut consumption_reason = SubmitConsumptionReason::Unknown;
|
|
3428
|
-
let mut consumption_diagnostics = ConsumptionDiagnostics::default();
|
|
3429
|
-
let mut attempts_detail: Vec<SubmitAttemptObservation> = Vec::new();
|
|
3430
|
-
let mut any_attempt_matched = false;
|
|
3431
|
-
|
|
3432
|
-
let poll_consumption = !payload.skip_consumption_poll();
|
|
3433
|
-
if !poll_consumption {
|
|
3434
|
-
self.prepare_pane_for_submit(target, true);
|
|
3435
|
-
if self
|
|
3436
|
-
.run_inject_stage(&submit_argv, InjectStage::Submit)
|
|
3437
|
-
.is_ok()
|
|
3438
|
-
{
|
|
3439
|
-
notify_submit_observer(observer);
|
|
3440
|
-
consumption_attempts = 1;
|
|
3441
|
-
// 跳过消费门(leader skip)不是「没能判断」;保持既有 EnterSent。
|
|
3442
|
-
consumed = Some(true);
|
|
3443
|
-
}
|
|
3444
|
-
}
|
|
3445
|
-
let submit_attempt_limit = if poll_consumption {
|
|
3446
|
-
max_submit_attempts
|
|
3447
|
-
} else {
|
|
3448
|
-
0
|
|
3449
|
-
};
|
|
3450
|
-
|
|
3451
|
-
for attempt in 0..submit_attempt_limit {
|
|
3452
|
-
let attempt_index = attempt + 1;
|
|
3453
|
-
let attempt_start = std::time::Instant::now();
|
|
3454
|
-
// Before resending (attempt > 0), re-check if the token
|
|
3455
|
-
// already disappeared — guards against double-submit (C3).
|
|
3456
|
-
// Capture failures are non-fatal (tmux may not be running
|
|
3457
|
-
// in MCP sim / test env).
|
|
3458
|
-
if attempt > 0 {
|
|
3459
|
-
if let Some(m) = marker {
|
|
3460
|
-
if let Ok(cap) = self.capture(target, CaptureRange::Tail(40)) {
|
|
3461
|
-
capture_tally.record_ok(&cap.text, Some(m));
|
|
3462
|
-
if cap.text.contains(m) {
|
|
3463
|
-
token_ever_visible = true;
|
|
3464
|
-
token_seen_after_enter = Some(true);
|
|
3465
|
-
} else if token_seen_after_enter.is_none() {
|
|
3466
|
-
token_seen_after_enter = Some(false);
|
|
3467
|
-
}
|
|
3468
|
-
tracked_paste = latch_paste(&cap.text, tracked_paste);
|
|
3469
|
-
let observation = consumption_capture_observation(
|
|
3470
|
-
&cap.text,
|
|
3471
|
-
marker,
|
|
3472
|
-
token_ever_visible,
|
|
3473
|
-
tracked_paste,
|
|
3474
|
-
);
|
|
3475
|
-
consumption_diagnostics.record(observation);
|
|
3476
|
-
let obs = submit_attempt_observation(
|
|
3477
|
-
attempt_index,
|
|
3478
|
-
&cap,
|
|
3479
|
-
marker,
|
|
3480
|
-
attempt_start.elapsed().as_millis() as u64,
|
|
3481
|
-
);
|
|
3482
|
-
if obs.matched {
|
|
3483
|
-
any_attempt_matched = true;
|
|
3484
|
-
}
|
|
3485
|
-
attempts_detail.push(obs);
|
|
3486
|
-
// NeverSeen 不得把 token 缺席写成 consumed;
|
|
3487
|
-
// 见过再消失,或本次占位符身份离开 composer,才停手。
|
|
3488
|
-
if observation.consumption_from_capture_result == Some(true) {
|
|
3489
|
-
consumption_reason =
|
|
3490
|
-
SubmitConsumptionReason::ConsumptionFromCapture;
|
|
3491
|
-
consumed = Some(true);
|
|
3492
|
-
break;
|
|
3493
|
-
}
|
|
3494
|
-
if cursor_single_enter_enabled() {
|
|
3495
|
-
if observation.busy.is_some() {
|
|
3496
|
-
consumption_reason =
|
|
3497
|
-
SubmitConsumptionReason::CursorPollingBusy;
|
|
3498
|
-
consumed = Some(true);
|
|
3499
|
-
break;
|
|
3500
|
-
}
|
|
3501
|
-
if !should_resubmit_enter_cursor(&cap.text, m) {
|
|
3502
|
-
consumed = Some(false);
|
|
3503
|
-
break;
|
|
3504
|
-
}
|
|
3505
|
-
} else if !should_resubmit_enter(&cap.text, m, tracked_paste) {
|
|
3506
|
-
consumed = Some(false);
|
|
3507
|
-
break;
|
|
3508
|
-
}
|
|
3509
|
-
}
|
|
3510
|
-
}
|
|
3511
|
-
}
|
|
3512
|
-
|
|
3513
|
-
// 0.3.28-final (E55 false-positive truth source):
|
|
3514
|
-
// Escape retry is DELETED. The researcher established
|
|
3515
|
-
// Escape on Claude TUI with [Pasted content] visible
|
|
3516
|
-
// may CLEAR the composer content rather than exit paste
|
|
3517
|
-
// mode — sending Escape+Enter on retry would submit an
|
|
3518
|
-
// empty message and hide the genuine consumption failure
|
|
3519
|
-
// under a fake-success path. Python parity: ONLY ever
|
|
3520
|
-
// send Enter, never Escape.
|
|
3521
|
-
let _ = escape_argv;
|
|
3522
|
-
|
|
3523
|
-
// 发前归零接收态(tmux mode + 未闭合 bracketed paste)。
|
|
3524
|
-
// 所有 Enter 路径的收敛点:prepare_pane_for_submit。
|
|
3525
|
-
// mode 不是忙闲;cancel 失败不得让注入失败。E55: 不送 Escape/C-c。
|
|
3526
|
-
self.prepare_pane_for_submit(target, true);
|
|
3527
|
-
|
|
3528
|
-
// Enter — send-keys failure is degraded (tmux may not have
|
|
3529
|
-
// the pane in sim/test env). Break to consumed=None → Unverified.
|
|
3530
|
-
if self
|
|
3531
|
-
.run_inject_stage(&submit_argv, InjectStage::Submit)
|
|
3532
|
-
.is_err()
|
|
3533
|
-
{
|
|
3534
|
-
consumed = None;
|
|
3535
|
-
break;
|
|
3536
|
-
}
|
|
3537
|
-
notify_submit_observer(observer);
|
|
3538
|
-
consumption_attempts = attempt + 1;
|
|
3539
|
-
|
|
3540
|
-
// Post-submit token readback (U1 #7 parity: check token
|
|
3541
|
-
// visible after Enter for no-echo panes).
|
|
3542
|
-
if attempt == 0 && matches!(token_visible_for_report, Some(false)) {
|
|
3543
|
-
let post = post_submit_token_visible(
|
|
3544
|
-
self,
|
|
3545
|
-
target,
|
|
3546
|
-
payload,
|
|
3547
|
-
&mut capture_tally,
|
|
3548
|
-
)
|
|
3549
|
-
.unwrap_or(None);
|
|
3550
|
-
if post == Some(true) {
|
|
3551
|
-
token_visible_for_report = Some(true);
|
|
3552
|
-
token_ever_visible = true;
|
|
3553
|
-
token_seen_after_enter = Some(true);
|
|
3554
|
-
} else {
|
|
3555
|
-
token_visible_for_report = Some(false);
|
|
3556
|
-
if post == Some(false) {
|
|
3557
|
-
token_seen_after_enter = Some(false);
|
|
3558
|
-
}
|
|
3559
|
-
}
|
|
3560
|
-
}
|
|
3561
|
-
|
|
3562
|
-
// Poll: token 三态 + 本次 #N 占位符。
|
|
3563
|
-
// Capture failures → 只重读 capture,绝不重粘、不加 Enter;读不到则 None。
|
|
3564
|
-
if let Some(m) = marker {
|
|
3565
|
-
let mut found_consumed = false;
|
|
3566
|
-
let mut saw_capture = false;
|
|
3567
|
-
let mut consecutive_capture_failures: u32 = 0;
|
|
3568
|
-
for _ in 0..12 {
|
|
3569
|
-
std::thread::sleep(Duration::from_millis(100));
|
|
3570
|
-
match self.capture(target, CaptureRange::Tail(40)) {
|
|
3571
|
-
Ok(cap) => {
|
|
3572
|
-
capture_tally.record_ok(&cap.text, Some(m));
|
|
3573
|
-
consecutive_capture_failures = 0;
|
|
3574
|
-
saw_capture = true;
|
|
3575
|
-
if cap.text.contains(m) {
|
|
3576
|
-
token_ever_visible = true;
|
|
3577
|
-
token_seen_after_enter = Some(true);
|
|
3578
|
-
} else if token_seen_after_enter.is_none() {
|
|
3579
|
-
token_seen_after_enter = Some(false);
|
|
3580
|
-
}
|
|
3581
|
-
tracked_paste = latch_paste(&cap.text, tracked_paste);
|
|
3582
|
-
let observation = consumption_capture_observation(
|
|
3583
|
-
&cap.text,
|
|
3584
|
-
marker,
|
|
3585
|
-
token_ever_visible,
|
|
3586
|
-
tracked_paste,
|
|
3587
|
-
);
|
|
3588
|
-
consumption_diagnostics.record(observation);
|
|
3589
|
-
let obs = submit_attempt_observation(
|
|
3590
|
-
attempt_index,
|
|
3591
|
-
&cap,
|
|
3592
|
-
marker,
|
|
3593
|
-
attempt_start.elapsed().as_millis() as u64,
|
|
3594
|
-
);
|
|
3595
|
-
if obs.matched {
|
|
3596
|
-
any_attempt_matched = true;
|
|
3597
|
-
}
|
|
3598
|
-
attempts_detail.push(obs);
|
|
3599
|
-
if observation.consumption_from_capture_result == Some(true) {
|
|
3600
|
-
consumption_reason =
|
|
3601
|
-
SubmitConsumptionReason::ConsumptionFromCapture;
|
|
3602
|
-
found_consumed = true;
|
|
3603
|
-
break;
|
|
3604
|
-
}
|
|
3605
|
-
if cursor_single_enter_enabled() && observation.busy.is_some() {
|
|
3606
|
-
consumption_reason =
|
|
3607
|
-
SubmitConsumptionReason::CursorPollingBusy;
|
|
3608
|
-
found_consumed = true;
|
|
3609
|
-
break;
|
|
3610
|
-
}
|
|
3611
|
-
}
|
|
3612
|
-
Err(_) => {
|
|
3613
|
-
consumption_diagnostics
|
|
3614
|
-
.record(ConsumptionCaptureObservation::default());
|
|
3615
|
-
capture_tally.record_err();
|
|
3616
|
-
capture_retries = capture_retries.saturating_add(1);
|
|
3617
|
-
consecutive_capture_failures =
|
|
3618
|
-
consecutive_capture_failures.saturating_add(1);
|
|
3619
|
-
if consecutive_capture_failures >= POST_SUBMIT_CAPTURE_RETRY {
|
|
3620
|
-
break;
|
|
3621
|
-
}
|
|
3622
|
-
std::thread::sleep(Duration::from_millis(
|
|
3623
|
-
POST_SUBMIT_CAPTURE_RETRY_MS,
|
|
3624
|
-
));
|
|
3625
|
-
}
|
|
3626
|
-
}
|
|
3627
|
-
}
|
|
3628
|
-
if !saw_capture {
|
|
3629
|
-
consumed = None;
|
|
3630
|
-
break;
|
|
3631
|
-
}
|
|
3632
|
-
consumed = Some(found_consumed);
|
|
3633
|
-
if found_consumed {
|
|
3634
|
-
break;
|
|
3635
|
-
}
|
|
3636
|
-
} else {
|
|
3637
|
-
// Non-token payload: single Enter, no consumption check
|
|
3638
|
-
// (0.3.27). Keep the explicit no-marker reason.
|
|
3639
|
-
consumption_reason = SubmitConsumptionReason::NoMarker;
|
|
3640
|
-
consumed = Some(true);
|
|
3641
|
-
break;
|
|
3642
|
-
}
|
|
3643
|
-
}
|
|
3644
|
-
|
|
3645
|
-
// 0.5.43 debt-sweep (§6.2): three unconditional
|
|
3646
|
-
// `eprintln!` submit-consumption debug lines removed.
|
|
3647
|
-
// The decision they narrated is already captured in
|
|
3648
|
-
// `InjectReport.submit_diagnostics` /
|
|
3649
|
-
// `submit_verification`; the prints only spammed
|
|
3650
|
-
// coordinator.log without additive signal. Behavior
|
|
3651
|
-
// is byte-identical.
|
|
3652
|
-
// consumed=false: token still in composer. Paste landing
|
|
3653
|
-
// (`any_attempt_matched`) is A, not submit. Only a Working
|
|
3654
|
-
// signal counts as consumption. Else say unverified.
|
|
3655
|
-
let _ = any_attempt_matched;
|
|
3656
|
-
let mut last_turn_text = attempts_detail
|
|
3657
|
-
.last()
|
|
3658
|
-
.map(|obs| obs.pane_tail_excerpt.clone());
|
|
3659
|
-
let mut submit_verification = match consumed {
|
|
3660
|
-
Some(true) => SubmitVerification::EnterSentWithoutPlaceholderCheck,
|
|
3661
|
-
Some(false) => match self.capture(target, CaptureRange::Tail(15)) {
|
|
3662
|
-
Ok(cap) => {
|
|
3663
|
-
last_turn_text = Some(cap.text.clone());
|
|
3664
|
-
let observation = consumption_capture_observation(
|
|
3665
|
-
&cap.text,
|
|
3666
|
-
marker,
|
|
3667
|
-
token_ever_visible,
|
|
3668
|
-
tracked_paste,
|
|
3669
|
-
);
|
|
3670
|
-
consumption_diagnostics.record(observation);
|
|
3671
|
-
attempts_detail.push(submit_attempt_observation(
|
|
3672
|
-
consumption_attempts.max(1),
|
|
3673
|
-
&cap,
|
|
3674
|
-
marker,
|
|
3675
|
-
inject_start.elapsed().as_millis() as u64,
|
|
3676
|
-
));
|
|
3677
|
-
if observation.busy.is_some() {
|
|
3678
|
-
consumption_reason = SubmitConsumptionReason::FallbackBusy;
|
|
3679
|
-
SubmitVerification::EnterSentWithoutPlaceholderCheck
|
|
3680
|
-
} else {
|
|
3681
|
-
consumption_reason = SubmitConsumptionReason::Unverified;
|
|
3682
|
-
SubmitVerification::SubmitConsumptionUnverified
|
|
3683
|
-
}
|
|
3684
|
-
}
|
|
3685
|
-
Err(_) => {
|
|
3686
|
-
consumption_diagnostics
|
|
3687
|
-
.record(ConsumptionCaptureObservation::default());
|
|
3688
|
-
consumption_reason = SubmitConsumptionReason::Unverified;
|
|
3689
|
-
SubmitVerification::SubmitConsumptionUnverified
|
|
3690
|
-
}
|
|
3691
|
-
},
|
|
3692
|
-
None => {
|
|
3693
|
-
consumption_reason = SubmitConsumptionReason::Unverified;
|
|
3694
|
-
SubmitVerification::SubmitConsumptionUnverified
|
|
3695
|
-
}
|
|
3696
|
-
};
|
|
3697
|
-
// Unverified + 折行缺口:只补一颗 C-m。A 的 should_resubmit_enter
|
|
3698
|
-
// 已为真(latch/底15 token,含打满 cap)时 B 不介入。身份拿不到
|
|
3699
|
-
// (None)不补——重复不可逆,滞留可人工救。cursor 单回车不走这里。
|
|
3700
|
-
// 终止:已消费 / 身份消失 / A 已覆盖 / 达上限 / busy。
|
|
3701
|
-
if matches!(
|
|
3702
|
-
submit_verification,
|
|
3703
|
-
SubmitVerification::SubmitConsumptionUnverified
|
|
3704
|
-
) && consumed == Some(false)
|
|
3705
|
-
&& !cursor_single_enter_enabled()
|
|
3706
|
-
{
|
|
3707
|
-
if let Some(m) = marker {
|
|
3708
|
-
let mut leftover_resends = UNVERIFIED_COMPOSER_RESEND_MAX;
|
|
3709
|
-
while leftover_resends > 0 {
|
|
3710
|
-
leftover_resends -= 1;
|
|
3711
|
-
let Ok(cap) = self.capture(target, CaptureRange::Tail(15)) else {
|
|
3712
|
-
break;
|
|
3713
|
-
};
|
|
3714
|
-
last_turn_text = Some(cap.text.clone());
|
|
3715
|
-
if !should_resend_unverified_wrap_gap(&cap.text, m, tracked_paste) {
|
|
3716
|
-
break;
|
|
3717
|
-
}
|
|
3718
|
-
self.prepare_pane_for_submit(target, true);
|
|
3719
|
-
if self
|
|
3720
|
-
.run_inject_stage(&submit_argv, InjectStage::Submit)
|
|
3721
|
-
.is_err()
|
|
3722
|
-
{
|
|
3723
|
-
break;
|
|
3724
|
-
}
|
|
3725
|
-
notify_submit_observer(observer);
|
|
3726
|
-
consumption_attempts = consumption_attempts.saturating_add(1);
|
|
3727
|
-
let attempt_start = std::time::Instant::now();
|
|
3728
|
-
let mut found_consumed = false;
|
|
3729
|
-
for _ in 0..12 {
|
|
3730
|
-
std::thread::sleep(Duration::from_millis(100));
|
|
3731
|
-
match self.capture(target, CaptureRange::Tail(40)) {
|
|
3732
|
-
Ok(cap) => {
|
|
3733
|
-
capture_tally.record_ok(&cap.text, Some(m));
|
|
3734
|
-
if cap.text.contains(m) {
|
|
3735
|
-
token_ever_visible = true;
|
|
3736
|
-
token_seen_after_enter = Some(true);
|
|
3737
|
-
} else if token_seen_after_enter.is_none() {
|
|
3738
|
-
token_seen_after_enter = Some(false);
|
|
3739
|
-
}
|
|
3740
|
-
tracked_paste = latch_paste(&cap.text, tracked_paste);
|
|
3741
|
-
let observation = consumption_capture_observation(
|
|
3742
|
-
&cap.text,
|
|
3743
|
-
marker,
|
|
3744
|
-
token_ever_visible,
|
|
3745
|
-
tracked_paste,
|
|
3746
|
-
);
|
|
3747
|
-
consumption_diagnostics.record(observation);
|
|
3748
|
-
let obs = submit_attempt_observation(
|
|
3749
|
-
consumption_attempts.max(1),
|
|
3750
|
-
&cap,
|
|
3751
|
-
marker,
|
|
3752
|
-
attempt_start.elapsed().as_millis() as u64,
|
|
3753
|
-
);
|
|
3754
|
-
attempts_detail.push(obs);
|
|
3755
|
-
last_turn_text = Some(cap.text.clone());
|
|
3756
|
-
let capture_consumed = observation
|
|
3757
|
-
.consumption_from_capture_result
|
|
3758
|
-
== Some(true);
|
|
3759
|
-
let busy = observation.busy.is_some();
|
|
3760
|
-
if capture_consumed || busy {
|
|
3761
|
-
// Gone+无 latch 会把折行 token 写成已消费;身份仍在则不算。
|
|
3762
|
-
if !this_paste_identity_in_composer(
|
|
3763
|
-
&cap.text,
|
|
3764
|
-
m,
|
|
3765
|
-
tracked_paste,
|
|
3766
|
-
) {
|
|
3767
|
-
consumption_reason = if capture_consumed {
|
|
3768
|
-
SubmitConsumptionReason::ConsumptionFromCapture
|
|
3769
|
-
} else {
|
|
3770
|
-
SubmitConsumptionReason::FallbackBusy
|
|
3771
|
-
};
|
|
3772
|
-
found_consumed = true;
|
|
3773
|
-
break;
|
|
3774
|
-
}
|
|
3775
|
-
}
|
|
3776
|
-
if !this_paste_identity_in_composer(
|
|
3777
|
-
&cap.text,
|
|
3778
|
-
m,
|
|
3779
|
-
tracked_paste,
|
|
3780
|
-
) {
|
|
3781
|
-
consumption_reason = SubmitConsumptionReason::Unknown;
|
|
3782
|
-
found_consumed = true;
|
|
3783
|
-
break;
|
|
3784
|
-
}
|
|
3785
|
-
}
|
|
3786
|
-
Err(_) => {
|
|
3787
|
-
consumption_diagnostics
|
|
3788
|
-
.record(ConsumptionCaptureObservation::default());
|
|
3789
|
-
capture_tally.record_err();
|
|
3790
|
-
break;
|
|
3791
|
-
}
|
|
3792
|
-
}
|
|
3793
|
-
}
|
|
3794
|
-
if found_consumed {
|
|
3795
|
-
submit_verification =
|
|
3796
|
-
SubmitVerification::EnterSentWithoutPlaceholderCheck;
|
|
3797
|
-
break;
|
|
3798
|
-
}
|
|
3799
|
-
}
|
|
3800
|
-
}
|
|
3801
|
-
}
|
|
3802
|
-
let total_elapsed_ms = inject_start.elapsed().as_millis() as u64;
|
|
3803
|
-
let surface = probe_inject_target_surface(self, target);
|
|
3804
|
-
let mut submit_diagnostics = submit_diagnostics_for_inject(
|
|
3805
|
-
total_elapsed_ms,
|
|
3806
|
-
attempts_detail,
|
|
3807
|
-
&capture_tally,
|
|
3808
|
-
token_seen_after_paste,
|
|
3809
|
-
token_seen_after_enter,
|
|
3810
|
-
surface,
|
|
3811
|
-
);
|
|
3812
|
-
submit_diagnostics.consumption_reason = consumption_reason;
|
|
3813
|
-
submit_diagnostics.busy_signal_kind = consumption_diagnostics.busy_signal_kind;
|
|
3814
|
-
submit_diagnostics.busy_line_from_bottom =
|
|
3815
|
-
consumption_diagnostics.busy_line_from_bottom;
|
|
3816
|
-
submit_diagnostics.current_marker_in_bottom_15 =
|
|
3817
|
-
consumption_diagnostics.current_marker_in_bottom_15;
|
|
3818
|
-
submit_diagnostics.paste_identity_in_composer =
|
|
3819
|
-
consumption_diagnostics.paste_identity_in_composer;
|
|
3820
|
-
submit_diagnostics.consumption_from_capture_result =
|
|
3821
|
-
consumption_diagnostics.consumption_from_capture_result;
|
|
3822
|
-
return Ok(InjectReport {
|
|
3823
|
-
stage_reached: InjectStage::Submit,
|
|
3824
|
-
inject_verification: inject_verification_after_readback(
|
|
3825
|
-
payload,
|
|
3826
|
-
token_visible_for_report,
|
|
3827
|
-
),
|
|
3828
|
-
submit_verification,
|
|
3829
|
-
turn_verification: turn_verification_for_payload(
|
|
3830
|
-
payload,
|
|
3831
|
-
last_turn_text.as_deref(),
|
|
3832
|
-
),
|
|
3833
|
-
attempts: consumption_attempts.saturating_add(capture_retries),
|
|
3834
|
-
submit_diagnostics: Some(submit_diagnostics),
|
|
3835
|
-
});
|
|
3836
|
-
}
|
|
3837
|
-
}
|
|
3838
|
-
Ok(InjectReport {
|
|
3839
|
-
stage_reached: InjectStage::Submit,
|
|
3840
|
-
inject_verification: inject_verification_after_readback(
|
|
3841
|
-
payload,
|
|
3842
|
-
token_visible_for_report,
|
|
3843
|
-
),
|
|
3844
|
-
submit_verification: submit_verification_for_key(submit),
|
|
3845
|
-
turn_verification: turn_verification_for_payload(payload, None),
|
|
3846
|
-
attempts: 1,
|
|
3847
|
-
// E50 PR-1: Empty payload / non-Text fallthrough path — no submit
|
|
3848
|
-
// diagnostics applicable.
|
|
3849
|
-
submit_diagnostics: None,
|
|
3850
|
-
})
|
|
3851
|
-
}
|
|
3852
|
-
|
|
3853
|
-
fn observe_native_input(
|
|
3854
|
-
&self,
|
|
3855
|
-
target: &Target,
|
|
3856
|
-
provider: crate::model::enums::Provider,
|
|
3857
|
-
) -> Result<Option<crate::transport::native_input::InputFrame>, TransportError> {
|
|
3858
|
-
self.observe_current_native_input(target, provider)
|
|
3859
|
-
}
|
|
3860
|
-
|
|
3861
|
-
fn snapshot_enter_rescue(
|
|
3862
|
-
&self,
|
|
3863
|
-
target: &Target,
|
|
3864
|
-
context: &crate::transport::enter_rescue::EnterRescueContext,
|
|
3865
|
-
rendered_payload: &str,
|
|
3866
|
-
) -> Result<crate::transport::enter_rescue::EnterRescueContext, TransportError> {
|
|
3867
|
-
self.snapshot_rescue_context(target, context, rendered_payload)
|
|
3868
|
-
}
|
|
3869
|
-
|
|
3870
|
-
fn rescue_enter_guarded(
|
|
3871
|
-
&self,
|
|
3872
|
-
context: &crate::transport::enter_rescue::EnterRescueContext,
|
|
3873
|
-
authorize: &dyn Fn() -> bool,
|
|
3874
|
-
observer: Option<&dyn SubmitObserver>,
|
|
3875
|
-
) -> Result<crate::transport::enter_rescue::EnterRescueOutcome, TransportError> {
|
|
3876
|
-
self.rescue_guarded_enter(context, authorize, observer)
|
|
3877
|
-
}
|
|
3878
|
-
|
|
3879
|
-
fn rescue_enter(&self, evidence: &crate::transport::native_input::NativeInputEvidence, authorize: &dyn Fn() -> bool, observer: Option<&dyn SubmitObserver>)
|
|
3880
|
-
-> Result<crate::transport::native_input::EnterRescueOutcome, TransportError>
|
|
3881
|
-
{
|
|
3882
|
-
self.rescue_native_input(evidence, authorize, observer)
|
|
3883
|
-
}
|
|
3884
|
-
|
|
3885
|
-
fn send_keys(&self, target: &Target, keys: &[Key]) -> Result<(), TransportError> {
|
|
3886
|
-
let pane = pane_from_target(target);
|
|
3887
|
-
let _pane_input = crate::lifecycle::pane_input_lock::acquire_for_write(
|
|
3888
|
-
crate::lifecycle::pane_input_lock::PaneInputLockRequest {
|
|
3889
|
-
workspace: self.event_workspace.as_deref(),
|
|
3890
|
-
target_key: pane.as_str(),
|
|
3891
|
-
operation: "send_keys",
|
|
3892
|
-
},
|
|
3893
|
-
).map_err(|_| TransportError::NativeInputNotReady { reason: "required_guard_active".into() })?;
|
|
3894
|
-
if keys.contains(&Key::CancelMode) {
|
|
3895
|
-
if let Some(mode) = pane_mode_from_raw(self.query(target, PaneField::PaneMode)?) {
|
|
3896
|
-
let argv = crate::transport::tmux_cancel_mode_argv(&pane, mode);
|
|
3897
|
-
return self.run_ok(&argv);
|
|
3898
|
-
}
|
|
3899
|
-
return Ok(());
|
|
3900
|
-
}
|
|
3901
|
-
if keys.iter().any(|k| matches!(k, Key::Enter)) {
|
|
3902
|
-
self.prepare_pane_for_submit(target, true);
|
|
3903
|
-
}
|
|
3904
|
-
let argv = tmux_send_keys_argv(&pane, keys);
|
|
3905
|
-
self.run_ok(&argv)
|
|
3906
|
-
}
|
|
3907
|
-
|
|
3908
|
-
fn capture(
|
|
3909
|
-
&self,
|
|
3910
|
-
target: &Target,
|
|
3911
|
-
range: CaptureRange,
|
|
3912
|
-
) -> Result<CapturedText, TransportError> {
|
|
3913
|
-
let pane = pane_from_target(target);
|
|
3914
|
-
let argv = self.tmux_argv(&tmux_capture_argv(&pane, range));
|
|
3915
|
-
let output = self
|
|
3916
|
-
.runner
|
|
3917
|
-
.run(&argv)
|
|
3918
|
-
.map_err(|source| TransportError::Capture { source })?;
|
|
3919
|
-
if !output.success {
|
|
3920
|
-
return Err(subprocess_error(argv, output));
|
|
3921
|
-
}
|
|
3922
|
-
Ok(CapturedText {
|
|
3923
|
-
text: normalize_capture(&output.stdout),
|
|
3924
|
-
range,
|
|
3925
|
-
})
|
|
3926
|
-
}
|
|
3927
|
-
|
|
3928
|
-
fn query(&self, target: &Target, field: PaneField) -> Result<Option<String>, TransportError> {
|
|
3929
|
-
let pane = pane_from_target(target);
|
|
3930
|
-
let argv = self.tmux_argv(&tmux_query_argv(&pane, field));
|
|
3931
|
-
let output = self.runner.run(&argv)?;
|
|
3932
|
-
if !output.success {
|
|
3933
|
-
return Ok(None);
|
|
3934
|
-
}
|
|
3935
|
-
Ok(Some(output.stdout.trim().to_string()))
|
|
3936
|
-
}
|
|
3937
|
-
|
|
3938
|
-
fn provider_exit_status(&self, pane: &PaneId) -> Result<Option<u8>, TransportError> {
|
|
3939
|
-
let argv = self.tmux_argv(&[
|
|
3940
|
-
"tmux".to_string(),
|
|
3941
|
-
"display-message".to_string(),
|
|
3942
|
-
"-p".to_string(),
|
|
3943
|
-
"-t".to_string(),
|
|
3944
|
-
pane.as_str().to_string(),
|
|
3945
|
-
format!("#{{{PROVIDER_EXIT_STATUS_OPTION}}}"),
|
|
3946
|
-
]);
|
|
3947
|
-
let output = self.runner.run(&argv)?;
|
|
3948
|
-
if !output.success {
|
|
3949
|
-
return Ok(None);
|
|
3950
|
-
}
|
|
3951
|
-
Ok(output.stdout.trim().parse::<u8>().ok())
|
|
3952
|
-
}
|
|
3953
|
-
|
|
3954
|
-
fn pane_is_dead(&self, pane: &PaneId) -> Result<Option<bool>, TransportError> {
|
|
3955
|
-
let argv = self.tmux_argv(&[
|
|
3956
|
-
"tmux".to_string(),
|
|
3957
|
-
"display-message".to_string(),
|
|
3958
|
-
"-p".to_string(),
|
|
3959
|
-
"-t".to_string(),
|
|
3960
|
-
pane.as_str().to_string(),
|
|
3961
|
-
"#{pane_dead}".to_string(),
|
|
3962
|
-
]);
|
|
3963
|
-
let output = self.runner.run(&argv)?;
|
|
3964
|
-
if !output.success {
|
|
3965
|
-
return Ok(None);
|
|
3966
|
-
}
|
|
3967
|
-
Ok(match output.stdout.trim() {
|
|
3968
|
-
"1" => Some(true),
|
|
3969
|
-
"0" => Some(false),
|
|
3970
|
-
_ => None,
|
|
3971
|
-
})
|
|
3972
|
-
}
|
|
3973
|
-
|
|
3974
|
-
fn liveness(&self, pane: &PaneId) -> Result<PaneLiveness, TransportError> {
|
|
3975
|
-
let argv = self.tmux_argv(&[
|
|
3976
|
-
"tmux".to_string(),
|
|
3977
|
-
"display-message".to_string(),
|
|
3978
|
-
"-p".to_string(),
|
|
3979
|
-
"-t".to_string(),
|
|
3980
|
-
pane.as_str().to_string(),
|
|
3981
|
-
"#{pane_id}".to_string(),
|
|
3982
|
-
]);
|
|
3983
|
-
let output = self.runner.run(&argv)?;
|
|
3984
|
-
if output.success {
|
|
3985
|
-
return Ok(PaneLiveness::Live);
|
|
3986
|
-
}
|
|
3987
|
-
if output
|
|
3988
|
-
.stderr
|
|
3989
|
-
.to_ascii_lowercase()
|
|
3990
|
-
.contains("can't find pane")
|
|
3991
|
-
{
|
|
3992
|
-
Ok(PaneLiveness::Dead)
|
|
3993
|
-
} else {
|
|
3994
|
-
Ok(PaneLiveness::Unknown)
|
|
3995
|
-
}
|
|
3996
|
-
}
|
|
3997
|
-
|
|
3998
|
-
fn has_pane(&self, pane: &PaneId) -> Result<Option<bool>, TransportError> {
|
|
3999
|
-
let argv = self.tmux_argv(&[
|
|
4000
|
-
"tmux".to_string(),
|
|
4001
|
-
"display-message".to_string(),
|
|
4002
|
-
"-p".to_string(),
|
|
4003
|
-
"-t".to_string(),
|
|
4004
|
-
pane.as_str().to_string(),
|
|
4005
|
-
"#{pane_id}".to_string(),
|
|
4006
|
-
]);
|
|
4007
|
-
let output = self.runner.run(&argv)?;
|
|
4008
|
-
if output.success {
|
|
4009
|
-
let pane_id = output.stdout.trim();
|
|
4010
|
-
if pane_id.is_empty() {
|
|
4011
|
-
return Ok(Some(false));
|
|
4012
|
-
}
|
|
4013
|
-
if pane_id == pane.as_str()
|
|
4014
|
-
&& pane_id.starts_with('%')
|
|
4015
|
-
&& pane_id[1..].chars().all(|ch| ch.is_ascii_digit())
|
|
4016
|
-
{
|
|
4017
|
-
return Ok(Some(true));
|
|
4018
|
-
}
|
|
4019
|
-
return Ok(None);
|
|
4020
|
-
}
|
|
4021
|
-
let stderr = output.stderr.to_ascii_lowercase();
|
|
4022
|
-
if stderr.contains("can't find pane")
|
|
4023
|
-
|| stderr.contains("no such pane")
|
|
4024
|
-
|| (stderr.contains("can't find") && stderr.contains("pane"))
|
|
4025
|
-
{
|
|
4026
|
-
Ok(Some(false))
|
|
4027
|
-
} else {
|
|
4028
|
-
Ok(None)
|
|
4029
|
-
}
|
|
4030
|
-
}
|
|
4031
|
-
|
|
4032
|
-
fn list_targets(&self) -> Result<Vec<PaneInfo>, TransportError> {
|
|
4033
|
-
// P5 (C-P5-3): `#{pane_pid}` rides the single list-panes call (field index 11),
|
|
4034
|
-
// killing the per-pane display-message N+1 fallback.
|
|
4035
|
-
// Use a printable sentinel so the 12-field frame stays explicit in argv/log evidence;
|
|
4036
|
-
// `parse_pane_info_line` retains compatibility with legacy tab-delimited output.
|
|
4037
|
-
const TMUX_PANE_FORMAT: &str = "#{pane_id}__TA_FIELD__#{session_name}__TA_FIELD__#{window_index}__TA_FIELD__#{window_name}__TA_FIELD__#{pane_index}__TA_FIELD__#{pane_tty}__TA_FIELD__#{pane_current_command}__TA_FIELD__#{pane_active}__TA_FIELD__#{pane_current_path}__TA_FIELD__#{session_attached}__TA_FIELD__#{pane_in_mode}__TA_FIELD__#{pane_pid}__TA_FIELD__#{@team_agent_pane_binding_nonce}";
|
|
4038
|
-
let argv = self.tmux_argv(&[
|
|
4039
|
-
"tmux".to_string(),
|
|
4040
|
-
"list-panes".to_string(),
|
|
4041
|
-
"-a".to_string(),
|
|
4042
|
-
"-F".to_string(),
|
|
4043
|
-
TMUX_PANE_FORMAT.to_string(),
|
|
4044
|
-
]);
|
|
4045
|
-
let output = self.runner.run(&argv)?;
|
|
4046
|
-
if !output.success {
|
|
4047
|
-
return Ok(Vec::new());
|
|
4048
|
-
}
|
|
4049
|
-
let mut panes = Vec::new();
|
|
4050
|
-
for line in output.stdout.lines().filter(|line| !line.is_empty()) {
|
|
4051
|
-
if let Some(mut pane) = parse_pane_info_line(line) {
|
|
4052
|
-
// 0.3.5 integration union: P5 (C-P5-3) makes `#{pane_pid}` ride the
|
|
4053
|
-
// single list-panes call — on real tmux the fallback below never fires.
|
|
4054
|
-
// swallow batch 2 ① keeps it as a RESILIENT degrade for panes whose pid
|
|
4055
|
-
// field came back empty (e.g. older tmux without #{pane_pid}): a single
|
|
4056
|
-
// pane's probe failure must not fail the WHOLE list — the pane degrades
|
|
4057
|
-
// to pane_pid=None and the failure is observable.
|
|
4058
|
-
if pane.pane_pid.is_none() {
|
|
4059
|
-
match query_pane_pid(self, &pane.pane_id) {
|
|
4060
|
-
Ok(pid) => pane.pane_pid = pid,
|
|
4061
|
-
Err(error) => {
|
|
4062
|
-
if let Some(workspace) = &self.event_workspace {
|
|
4063
|
-
let _ = crate::event_log::EventLog::new(workspace).write(
|
|
4064
|
-
"tmux.pane_pid_query_failed",
|
|
4065
|
-
serde_json::json!({
|
|
4066
|
-
"pane_id": pane.pane_id.as_str(),
|
|
4067
|
-
"session": pane.session.as_str(),
|
|
4068
|
-
"error": error.to_string(),
|
|
4069
|
-
}),
|
|
4070
|
-
);
|
|
4071
|
-
}
|
|
4072
|
-
}
|
|
4073
|
-
}
|
|
4074
|
-
}
|
|
4075
|
-
panes.push(pane);
|
|
4076
|
-
}
|
|
4077
|
-
}
|
|
4078
|
-
Ok(panes)
|
|
4079
|
-
}
|
|
4080
|
-
|
|
4081
|
-
fn has_session(&self, session: &SessionName) -> Result<bool, TransportError> {
|
|
4082
|
-
let argv = self.tmux_argv(&[
|
|
4083
|
-
"tmux".to_string(),
|
|
4084
|
-
"has-session".to_string(),
|
|
4085
|
-
"-t".to_string(),
|
|
4086
|
-
session.as_str().to_string(),
|
|
4087
|
-
]);
|
|
4088
|
-
let output = self.runner.run(&argv)?;
|
|
4089
|
-
Ok(output.success)
|
|
4090
|
-
}
|
|
4091
|
-
|
|
4092
|
-
fn list_windows(&self, session: &SessionName) -> Result<Vec<WindowName>, TransportError> {
|
|
4093
|
-
// golden runtime.py:1023-1029 `_tmux_window_exists`: `tmux list-windows -t <s> -F #{window_name}`;
|
|
4094
|
-
// returncode != 0 -> false (here: an empty window set), else the window names by line.
|
|
4095
|
-
let argv = self.tmux_argv(&[
|
|
4096
|
-
"tmux".to_string(),
|
|
4097
|
-
"list-windows".to_string(),
|
|
4098
|
-
"-t".to_string(),
|
|
4099
|
-
session.as_str().to_string(),
|
|
4100
|
-
"-F".to_string(),
|
|
4101
|
-
"#{window_name}".to_string(),
|
|
4102
|
-
]);
|
|
4103
|
-
let output = self.runner.run(&argv)?;
|
|
4104
|
-
if !output.success {
|
|
4105
|
-
return Ok(Vec::new());
|
|
4106
|
-
}
|
|
4107
|
-
Ok(output
|
|
4108
|
-
.stdout
|
|
4109
|
-
.lines()
|
|
4110
|
-
.filter(|line| !line.is_empty())
|
|
4111
|
-
.map(WindowName::new)
|
|
4112
|
-
.collect())
|
|
4113
|
-
}
|
|
4114
|
-
|
|
4115
|
-
fn configure_adaptive_pane_title(
|
|
4116
|
-
&self,
|
|
4117
|
-
session: &SessionName,
|
|
4118
|
-
window: &WindowName,
|
|
4119
|
-
pane: &PaneId,
|
|
4120
|
-
title: &str,
|
|
4121
|
-
) -> Result<(), TransportError> {
|
|
4122
|
-
let target = format!("{}:{}", session.as_str(), window.as_str());
|
|
4123
|
-
self.run_ok(&[
|
|
4124
|
-
"tmux".to_string(),
|
|
4125
|
-
"set-window-option".to_string(),
|
|
4126
|
-
"-t".to_string(),
|
|
4127
|
-
target.clone(),
|
|
4128
|
-
"pane-border-status".to_string(),
|
|
4129
|
-
"bottom".to_string(),
|
|
4130
|
-
])?;
|
|
4131
|
-
self.run_ok(&[
|
|
4132
|
-
"tmux".to_string(),
|
|
4133
|
-
"set-window-option".to_string(),
|
|
4134
|
-
"-t".to_string(),
|
|
4135
|
-
target,
|
|
4136
|
-
"pane-border-format".to_string(),
|
|
4137
|
-
" #{pane_title} ".to_string(),
|
|
4138
|
-
])?;
|
|
4139
|
-
self.run_ok(&[
|
|
4140
|
-
"tmux".to_string(),
|
|
4141
|
-
"select-pane".to_string(),
|
|
4142
|
-
"-t".to_string(),
|
|
4143
|
-
pane.as_str().to_string(),
|
|
4144
|
-
"-T".to_string(),
|
|
4145
|
-
title.to_string(),
|
|
4146
|
-
])
|
|
4147
|
-
}
|
|
4148
|
-
|
|
4149
|
-
fn set_session_env(
|
|
4150
|
-
&self,
|
|
4151
|
-
session: &SessionName,
|
|
4152
|
-
key: &str,
|
|
4153
|
-
value: &str,
|
|
4154
|
-
) -> Result<SetEnvOutcome, TransportError> {
|
|
4155
|
-
let argv = vec![
|
|
4156
|
-
"tmux".to_string(),
|
|
4157
|
-
"set-environment".to_string(),
|
|
4158
|
-
"-t".to_string(),
|
|
4159
|
-
session.as_str().to_string(),
|
|
4160
|
-
key.to_string(),
|
|
4161
|
-
value.to_string(),
|
|
4162
|
-
];
|
|
4163
|
-
self.run_ok(&argv)?;
|
|
4164
|
-
Ok(SetEnvOutcome::Applied)
|
|
4165
|
-
}
|
|
4166
|
-
|
|
4167
|
-
fn set_window_option(
|
|
4168
|
-
&self,
|
|
4169
|
-
session: &SessionName,
|
|
4170
|
-
window: &WindowName,
|
|
4171
|
-
option: &str,
|
|
4172
|
-
value: &str,
|
|
4173
|
-
) -> Result<(), TransportError> {
|
|
4174
|
-
let target = format!("{}:{}", session.as_str(), window.as_str());
|
|
4175
|
-
let argv = vec![
|
|
4176
|
-
"tmux".to_string(),
|
|
4177
|
-
"set-window-option".to_string(),
|
|
4178
|
-
"-t".to_string(),
|
|
4179
|
-
target,
|
|
4180
|
-
option.to_string(),
|
|
4181
|
-
value.to_string(),
|
|
4182
|
-
];
|
|
4183
|
-
self.run_ok(&argv)
|
|
4184
|
-
}
|
|
4185
|
-
|
|
4186
|
-
fn preserve_session_before_stop(
|
|
4187
|
-
&self,
|
|
4188
|
-
session: &SessionName,
|
|
4189
|
-
targets: &[Target],
|
|
4190
|
-
) -> Result<(), TransportError> {
|
|
4191
|
-
let list_argv = self.tmux_argv(&[
|
|
4192
|
-
"tmux".to_string(),
|
|
4193
|
-
"list-panes".to_string(),
|
|
4194
|
-
"-s".to_string(),
|
|
4195
|
-
"-t".to_string(),
|
|
4196
|
-
format!("={}", session.as_str()),
|
|
4197
|
-
"-F".to_string(),
|
|
4198
|
-
"#{pane_id}\t#{window_name}".to_string(),
|
|
4199
|
-
]);
|
|
4200
|
-
let output = self.runner.run(&list_argv)?;
|
|
4201
|
-
if !output.success {
|
|
4202
|
-
return Err(subprocess_error(list_argv, output));
|
|
4203
|
-
}
|
|
4204
|
-
for line in output.stdout.lines() {
|
|
4205
|
-
// Some tmux/runner combinations return the literal escape. Split
|
|
4206
|
-
// only the first column boundary; window names are not unescaped.
|
|
4207
|
-
let separator = line.find('\t').map(|at| (at, 1)).into_iter()
|
|
4208
|
-
.chain(line.find("\\t").map(|at| (at, 2)))
|
|
4209
|
-
.min_by_key(|(at, _)| *at);
|
|
4210
|
-
let Some((at, width)) = separator else {
|
|
4211
|
-
return Err(TransportError::Subprocess {
|
|
4212
|
-
argv: list_argv,
|
|
4213
|
-
code: output.code,
|
|
4214
|
-
stderr: "tmux returned an invalid session pane listing".to_string(),
|
|
4215
|
-
});
|
|
4216
|
-
};
|
|
4217
|
-
let (pane, rest) = line.split_at(at);
|
|
4218
|
-
let window = &rest[width..];
|
|
4219
|
-
if !targets.iter().any(|target| match target {
|
|
4220
|
-
Target::Pane(id) => id.as_str() == pane,
|
|
4221
|
-
Target::SessionWindow {
|
|
4222
|
-
session: owner,
|
|
4223
|
-
window: name,
|
|
4224
|
-
} => owner == session && name.as_str() == window,
|
|
4225
|
-
}) {
|
|
4226
|
-
return Ok(());
|
|
4227
|
-
}
|
|
4228
|
-
}
|
|
4229
|
-
// An empty listing cannot prove that this is the last worker.
|
|
4230
|
-
if output.stdout.trim().is_empty() {
|
|
4231
|
-
return Err(TransportError::TargetNotFound {
|
|
4232
|
-
target: session.as_str().to_string(),
|
|
4233
|
-
});
|
|
4234
|
-
}
|
|
4235
|
-
// Use a separate, non-worker window: remain-on-exit does not protect a
|
|
4236
|
-
// pane explicitly deleted by kill-pane. Configure by the new pane ID,
|
|
4237
|
-
// not a window name that could resolve to another same-named window.
|
|
4238
|
-
let spawn_argv = tmux_spawn_argv(
|
|
4239
|
-
&SessionName::new(format!("={}", session.as_str())),
|
|
4240
|
-
&WindowName::new(KEEPALIVE_WINDOW_NAME),
|
|
4241
|
-
"exec sleep 86400",
|
|
4242
|
-
false,
|
|
4243
|
-
);
|
|
4244
|
-
let spawned = self.run_spawn(&spawn_argv)?;
|
|
4245
|
-
let pane = spawned.stdout.trim();
|
|
4246
|
-
if !pane.starts_with('%')
|
|
4247
|
-
|| pane.len() == 1
|
|
4248
|
-
|| !pane[1..].chars().all(|ch| ch.is_ascii_digit())
|
|
4249
|
-
{
|
|
4250
|
-
return Err(TransportError::Subprocess {
|
|
4251
|
-
argv: self.tmux_argv(&spawn_argv),
|
|
4252
|
-
code: spawned.code,
|
|
4253
|
-
stderr: "tmux keepalive spawn returned no valid pane id".to_string(),
|
|
4254
|
-
});
|
|
4255
|
-
}
|
|
4256
|
-
let result = self
|
|
4257
|
-
.run_ok(&[
|
|
4258
|
-
"tmux".to_string(),
|
|
4259
|
-
"set-window-option".to_string(),
|
|
4260
|
-
"-t".to_string(),
|
|
4261
|
-
pane.to_string(),
|
|
4262
|
-
"remain-on-exit".to_string(),
|
|
4263
|
-
"on".to_string(),
|
|
4264
|
-
])
|
|
4265
|
-
.and_then(|()| {
|
|
4266
|
-
self.run_ok(&[
|
|
4267
|
-
"tmux".to_string(),
|
|
4268
|
-
"respawn-pane".to_string(),
|
|
4269
|
-
"-k".to_string(),
|
|
4270
|
-
"-t".to_string(),
|
|
4271
|
-
pane.to_string(),
|
|
4272
|
-
"exit 0".to_string(),
|
|
4273
|
-
])
|
|
4274
|
-
});
|
|
4275
|
-
if result.is_err() {
|
|
4276
|
-
// The worker has not been killed yet; remove only our new anchor.
|
|
4277
|
-
let _ = self.kill_pane(&PaneId::new(pane));
|
|
4278
|
-
}
|
|
4279
|
-
result
|
|
4280
|
-
}
|
|
4281
|
-
|
|
4282
|
-
fn kill_server(&self) -> Result<(), TransportError> {
|
|
4283
|
-
TmuxBackend::kill_server(self);
|
|
4284
|
-
Ok(())
|
|
4285
|
-
}
|
|
4286
|
-
|
|
4287
|
-
fn kill_session(&self, session: &SessionName) -> Result<(), TransportError> {
|
|
4288
|
-
let argv = self.tmux_argv(&[
|
|
4289
|
-
"tmux".to_string(),
|
|
4290
|
-
"kill-session".to_string(),
|
|
4291
|
-
"-t".to_string(),
|
|
4292
|
-
session.as_str().to_string(),
|
|
4293
|
-
]);
|
|
4294
|
-
self.run_ok(&argv)
|
|
4295
|
-
}
|
|
4296
|
-
|
|
4297
|
-
fn kill_window(&self, target: &Target) -> Result<(), TransportError> {
|
|
4298
|
-
let argv = self.tmux_argv(&[
|
|
4299
|
-
"tmux".to_string(),
|
|
4300
|
-
"kill-window".to_string(),
|
|
4301
|
-
"-t".to_string(),
|
|
4302
|
-
target_name(target),
|
|
4303
|
-
]);
|
|
4304
|
-
self.run_ok(&argv)
|
|
4305
|
-
}
|
|
4306
|
-
|
|
4307
|
-
fn kill_pane(&self, pane: &PaneId) -> Result<(), TransportError> {
|
|
4308
|
-
let argv = self.tmux_argv(&[
|
|
4309
|
-
"tmux".to_string(),
|
|
4310
|
-
"kill-pane".to_string(),
|
|
4311
|
-
"-t".to_string(),
|
|
4312
|
-
pane.as_str().to_string(),
|
|
4313
|
-
]);
|
|
4314
|
-
self.run_ok(&argv)
|
|
4315
|
-
}
|
|
4316
|
-
|
|
4317
|
-
fn attach_session(&self, session: &SessionName) -> Result<AttachOutcome, TransportError> {
|
|
4318
|
-
let argv = [
|
|
4319
|
-
"tmux".to_string(),
|
|
4320
|
-
"attach-session".to_string(),
|
|
4321
|
-
"-t".to_string(),
|
|
4322
|
-
session.as_str().to_string(),
|
|
4323
|
-
];
|
|
4324
|
-
self.run_ok(&argv)?;
|
|
4325
|
-
Ok(AttachOutcome::Attached)
|
|
4326
|
-
}
|
|
4327
|
-
}
|
|
4328
|
-
|
|
4329
|
-
/// swallow batch 2 ① fallback probe (only fires when `#{pane_pid}` came back empty —
|
|
4330
|
-
/// see the P5 union note in `list_targets`).
|
|
4331
|
-
fn query_pane_pid(backend: &TmuxBackend, pane: &PaneId) -> Result<Option<u32>, TransportError> {
|
|
4332
|
-
let argv = backend.tmux_argv(&[
|
|
4333
|
-
"tmux".to_string(),
|
|
4334
|
-
"display-message".to_string(),
|
|
4335
|
-
"-p".to_string(),
|
|
4336
|
-
"-t".to_string(),
|
|
4337
|
-
pane.as_str().to_string(),
|
|
4338
|
-
"#{pane_pid}".to_string(),
|
|
4339
|
-
]);
|
|
4340
|
-
let output = backend.runner.run(&argv)?;
|
|
4341
|
-
if !output.success {
|
|
4342
|
-
return Ok(None);
|
|
4343
|
-
}
|
|
4344
|
-
Ok(parse_optional_u32(output.stdout.trim()))
|
|
4345
|
-
}
|
|
4346
|
-
|
|
4347
|
-
fn parse_pane_info_line(line: &str) -> Option<PaneInfo> {
|
|
4348
|
-
let fields = if line.contains("__TA_FIELD__") {
|
|
4349
|
-
line.split("__TA_FIELD__").collect::<Vec<_>>()
|
|
4350
|
-
} else {
|
|
4351
|
-
line.split('\t').collect::<Vec<_>>()
|
|
4352
|
-
};
|
|
4353
|
-
if fields.len() < 11 {
|
|
4354
|
-
return None;
|
|
4355
|
-
}
|
|
4356
|
-
let mut leader_env = BTreeMap::new();
|
|
4357
|
-
if let Some(nonce) = fields.get(12).and_then(|raw| non_empty(raw)) {
|
|
4358
|
-
leader_env.insert(
|
|
4359
|
-
PANE_BINDING_NONCE_METADATA_KEY.to_string(),
|
|
4360
|
-
nonce.to_string(),
|
|
4361
|
-
);
|
|
4362
|
-
}
|
|
4363
|
-
Some(PaneInfo {
|
|
4364
|
-
pane_id: PaneId::new(fields[0]),
|
|
4365
|
-
session: SessionName::new(fields[1]),
|
|
4366
|
-
window_index: parse_optional_u32(fields[2]),
|
|
4367
|
-
window_name: non_empty(fields[3]).map(WindowName::new),
|
|
4368
|
-
pane_index: parse_optional_u32(fields[4]),
|
|
4369
|
-
tty: non_empty(fields[5]).map(str::to_string),
|
|
4370
|
-
current_command: non_empty(fields[6]).map(str::to_string),
|
|
4371
|
-
active: fields[7] == "1",
|
|
4372
|
-
current_path: non_empty(fields[8]).map(PathBuf::from),
|
|
4373
|
-
pane_pid: fields.get(11).and_then(|raw| parse_optional_u32(raw)),
|
|
4374
|
-
leader_env,
|
|
4375
|
-
})
|
|
4376
|
-
}
|
|
4377
|
-
|
|
4378
|
-
fn parse_optional_u32(raw: &str) -> Option<u32> {
|
|
4379
|
-
if raw.is_empty() {
|
|
4380
|
-
return None;
|
|
4381
|
-
}
|
|
4382
|
-
raw.parse::<u32>().ok()
|
|
4383
|
-
}
|
|
4384
|
-
|
|
4385
|
-
fn non_empty(raw: &str) -> Option<&str> {
|
|
4386
|
-
if raw.is_empty() {
|
|
4387
|
-
None
|
|
4388
|
-
} else {
|
|
4389
|
-
Some(raw)
|
|
4390
|
-
}
|
|
4391
|
-
}
|
|
4392
|
-
|
|
4393
|
-
// 0.5.x Windows portability Batch 5: the `tmux_backend/tests.rs`
|
|
4394
|
-
// module uses `std::os::unix::net::UnixListener` for its mock
|
|
4395
|
-
// runner + verifies Unix-specific socket-root derivation. Since the
|
|
4396
|
-
// tmux backend itself only functions on Unix (design § Route B —
|
|
4397
|
-
// tmux is a Unix concept), the test module stays Unix-only.
|
|
4398
|
-
#[cfg(all(test, unix))]
|
|
4399
|
-
mod tests;
|
|
4400
|
-
|
|
4401
|
-
#[cfg(all(test, unix))]
|
|
4402
|
-
mod command_runner_regressions {
|
|
4403
|
-
use super::{CommandRunner, RealCommandRunner, COMMAND_TIMEOUT};
|
|
4404
|
-
use std::io::ErrorKind;
|
|
4405
|
-
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
|
4406
|
-
|
|
4407
|
-
fn shell(command: &str) -> Vec<String> {
|
|
4408
|
-
vec!["/bin/sh".into(), "-c".into(), command.into()]
|
|
4409
|
-
}
|
|
4410
|
-
|
|
4411
|
-
#[test]
|
|
4412
|
-
fn nonzero_exit_preserves_both_outputs_and_lossy_utf8() {
|
|
4413
|
-
let output = RealCommandRunner
|
|
4414
|
-
.run(&shell("printf 'stdout\\377'; printf 'stderr\\376' >&2; exit 17"))
|
|
4415
|
-
.unwrap();
|
|
4416
|
-
assert!(!output.success);
|
|
4417
|
-
assert_eq!(output.code, Some(17));
|
|
4418
|
-
assert_eq!(output.stdout, "stdout\u{fffd}");
|
|
4419
|
-
assert_eq!(output.stderr, "stderr\u{fffd}");
|
|
4420
|
-
}
|
|
4421
|
-
|
|
4422
|
-
#[test]
|
|
4423
|
-
fn stdin_is_delivered_and_closed_before_waiting_for_exit() {
|
|
4424
|
-
let input = "first line\nsecond λ line\n".repeat(32);
|
|
4425
|
-
let output = RealCommandRunner
|
|
4426
|
-
.run_with_stdin(&["/bin/cat".into()], &input)
|
|
4427
|
-
.unwrap();
|
|
4428
|
-
assert!(output.success);
|
|
4429
|
-
assert_eq!(output.code, Some(0));
|
|
4430
|
-
assert_eq!(output.stdout, input);
|
|
4431
|
-
assert_eq!(output.stderr, "");
|
|
4432
|
-
}
|
|
4433
|
-
|
|
4434
|
-
#[test]
|
|
4435
|
-
fn signal_exit_retains_absent_exit_code() {
|
|
4436
|
-
let output = RealCommandRunner.run(&shell("kill -TERM $$")).unwrap();
|
|
4437
|
-
assert!(!output.success);
|
|
4438
|
-
assert_eq!(output.code, None);
|
|
4439
|
-
}
|
|
4440
|
-
|
|
4441
|
-
#[test]
|
|
4442
|
-
fn drains_stdout_and_stderr_beyond_pipe_capacity() {
|
|
4443
|
-
let output = RealCommandRunner
|
|
4444
|
-
.run(&shell(
|
|
4445
|
-
"i=0; while [ \"$i\" -lt 20000 ]; do printf 'out\\n'; printf 'err\\n' >&2; i=$((i+1)); done",
|
|
4446
|
-
))
|
|
4447
|
-
.unwrap();
|
|
4448
|
-
assert!(output.success);
|
|
4449
|
-
assert_eq!(output.code, Some(0));
|
|
4450
|
-
assert_eq!(output.stdout, "out\n".repeat(20000));
|
|
4451
|
-
assert_eq!(output.stderr, "err\n".repeat(20000));
|
|
4452
|
-
}
|
|
4453
|
-
|
|
4454
|
-
#[test]
|
|
4455
|
-
fn timeout_keeps_five_second_budget_and_reaps_the_owned_child() {
|
|
4456
|
-
let nonce = SystemTime::now()
|
|
4457
|
-
.duration_since(UNIX_EPOCH)
|
|
4458
|
-
.unwrap()
|
|
4459
|
-
.as_nanos();
|
|
4460
|
-
let pid_path = std::env::temp_dir().join(format!(
|
|
4461
|
-
"team-agent-runner-timeout-{}-{nonce}.pid",
|
|
4462
|
-
std::process::id()
|
|
4463
|
-
));
|
|
4464
|
-
let file = std::fs::OpenOptions::new()
|
|
4465
|
-
.write(true)
|
|
4466
|
-
.create_new(true)
|
|
4467
|
-
.open(&pid_path)
|
|
4468
|
-
.unwrap();
|
|
4469
|
-
drop(file);
|
|
4470
|
-
// exec keeps one owned PID and closes both pipes when the runner kills it.
|
|
4471
|
-
let mut argv = shell("printf '%s' \"$$\" > \"$1\"; exec /bin/sleep 30");
|
|
4472
|
-
argv.extend([
|
|
4473
|
-
"runner-timeout-test".into(),
|
|
4474
|
-
pid_path.to_string_lossy().into_owned(),
|
|
4475
|
-
]);
|
|
4476
|
-
let started = Instant::now();
|
|
4477
|
-
let error = RealCommandRunner.run(&argv).unwrap_err();
|
|
4478
|
-
let elapsed = started.elapsed();
|
|
4479
|
-
let pid: i32 = std::fs::read_to_string(&pid_path).unwrap().parse().unwrap();
|
|
4480
|
-
std::fs::remove_file(pid_path).unwrap();
|
|
4481
|
-
assert_eq!(error.kind(), ErrorKind::TimedOut);
|
|
4482
|
-
assert!(elapsed >= COMMAND_TIMEOUT);
|
|
4483
|
-
assert!(elapsed < COMMAND_TIMEOUT + Duration::from_secs(2));
|
|
4484
|
-
assert!(pid > 1);
|
|
4485
|
-
// SAFETY: signal 0 only probes the exact child PID recorded by this fixture.
|
|
4486
|
-
assert_eq!(unsafe { libc::kill(pid, 0) }, -1);
|
|
4487
|
-
assert_eq!(
|
|
4488
|
-
std::io::Error::last_os_error().raw_os_error(),
|
|
4489
|
-
Some(libc::ESRCH)
|
|
4490
|
-
);
|
|
4491
|
-
}
|
|
4492
|
-
}
|