@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,3727 +0,0 @@
|
|
|
1
|
-
//! ---
|
|
2
|
-
//! purpose: 把已认领消息注入目标 pane 并记录投递阶段
|
|
3
|
-
//! contract:
|
|
4
|
-
//! provides:
|
|
5
|
-
//! - name: deliver_stored_message
|
|
6
|
-
//! what: 单次物理注入;grok 队列默认再按回车顶出
|
|
7
|
-
//! boundary:
|
|
8
|
-
//! - 不把物理 success 写成 delivered
|
|
9
|
-
//! - 不重粘文本
|
|
10
|
-
//! - error-bypass(target_resolved+error)只经 claim 原子闸,禁止旁路双投
|
|
11
|
-
//! - 物理 Enter 已出(pane/转录已有 token)后 observer/state 落盘失败不得返 Err 重投
|
|
12
|
-
//! - 提交前持久化失败仍返 Err,由 batch 记 item_blocked 隔离
|
|
13
|
-
//! - 同 message_id 的 token 已在 pane/转录则拒绝二次注入
|
|
14
|
-
//! maturity: wired
|
|
15
|
-
//! ---
|
|
16
|
-
//!
|
|
17
|
-
//! internal_delivery.py + delivery.py — coordinator/调度器侧 thin wrapper + 单条 tmux 注入投递
|
|
18
|
-
//! + trust 有界重试 + turn-open arm (card §16/§65)。
|
|
19
|
-
|
|
20
|
-
use std::cell::{Cell, RefCell};
|
|
21
|
-
use std::path::Path;
|
|
22
|
-
|
|
23
|
-
use rusqlite::{params, OptionalExtension};
|
|
24
|
-
|
|
25
|
-
use crate::event_log::EventLog;
|
|
26
|
-
use crate::message_store::MessageStore;
|
|
27
|
-
use crate::model::enums::{PaneLiveness, Provider};
|
|
28
|
-
use crate::model::ids::TeamKey;
|
|
29
|
-
use crate::provider::wire::{
|
|
30
|
-
is_claude_family, parse_canonical_provider, parse_provider, provider_wire,
|
|
31
|
-
};
|
|
32
|
-
use crate::transport::{
|
|
33
|
-
submit_verification_wire, turn_verification_wire, BusySignalKind, CaptureRange,
|
|
34
|
-
CaptureSampleOutcome, InjectPayload, InjectReport, InjectVerification, InputSurfaceProbe, Key,
|
|
35
|
-
PaneId, PaneInfo, QueryOutcome, SessionName, SubmitConsumptionReason, SubmitObserver,
|
|
36
|
-
SubmitVerification, Target, Transport, WindowName,
|
|
37
|
-
};
|
|
38
|
-
|
|
39
|
-
use super::helpers::{message_exists, MessageStatusShadow};
|
|
40
|
-
use super::{
|
|
41
|
-
DeliveryOutcome, DeliveryRefusal, DeliveryStage, DeliveryStatus, MessagingError,
|
|
42
|
-
PaneWidthQuery, TrustRetryPayload, SEND_RETRY_MAX_ATTEMPTS,
|
|
43
|
-
};
|
|
44
|
-
use crate::state::projection::OwnerTeamResolution;
|
|
45
|
-
|
|
46
|
-
// ===========================================================================
|
|
47
|
-
// internal_delivery.py — coordinator/调度器侧 thin wrapper (card §65)
|
|
48
|
-
// ===========================================================================
|
|
49
|
-
|
|
50
|
-
/// `deliver_stored_message` (`internal_delivery.py:16`):coordinator/调度器侧 team-scoped 单发
|
|
51
|
-
/// (不重路由)。加 `_runtime_lock("send")`,直走 `_send_single_message_unlocked`。
|
|
52
|
-
#[allow(clippy::too_many_arguments)]
|
|
53
|
-
pub fn deliver_stored_message(
|
|
54
|
-
workspace: &Path,
|
|
55
|
-
target: Option<&str>,
|
|
56
|
-
content: &str,
|
|
57
|
-
task_id: Option<&crate::model::ids::TaskId>,
|
|
58
|
-
sender: &str,
|
|
59
|
-
requires_ack: bool,
|
|
60
|
-
wait_visible: bool,
|
|
61
|
-
timeout: f64,
|
|
62
|
-
team: Option<&TeamKey>,
|
|
63
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
64
|
-
let _ = (wait_visible, timeout);
|
|
65
|
-
let recipient = target.unwrap_or("leader");
|
|
66
|
-
let super::PersistResolution::Persisted(persisted) = super::persist::persist_internal_send(
|
|
67
|
-
workspace,
|
|
68
|
-
super::InternalSendKind::Delivery,
|
|
69
|
-
team.map(TeamKey::as_str),
|
|
70
|
-
task_id.map(crate::model::ids::TaskId::as_str),
|
|
71
|
-
sender,
|
|
72
|
-
recipient,
|
|
73
|
-
content,
|
|
74
|
-
None,
|
|
75
|
-
requires_ack,
|
|
76
|
-
None,
|
|
77
|
-
super::InitialDisposition::Accepted,
|
|
78
|
-
None,
|
|
79
|
-
)?
|
|
80
|
-
else {
|
|
81
|
-
unreachable!("internal delivery does not accept caller-supplied ids")
|
|
82
|
-
};
|
|
83
|
-
let message_status = persisted.row_status.as_str().to_string();
|
|
84
|
-
let message_id = persisted.message_id;
|
|
85
|
-
Ok(DeliveryOutcome {
|
|
86
|
-
ok: true,
|
|
87
|
-
status: DeliveryStatus::Queued,
|
|
88
|
-
message_status: MessageStatusShadow(message_status),
|
|
89
|
-
message_id: Some(message_id),
|
|
90
|
-
verification: None,
|
|
91
|
-
stage: None,
|
|
92
|
-
reason: None,
|
|
93
|
-
channel: None,
|
|
94
|
-
ack_forced_off: false,
|
|
95
|
-
turn_verification: None,
|
|
96
|
-
})
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
pub fn deliver_persisted_message(
|
|
100
|
-
workspace: &Path,
|
|
101
|
-
transport: &dyn Transport,
|
|
102
|
-
message_id: &str,
|
|
103
|
-
event_log: &EventLog,
|
|
104
|
-
state: &serde_json::Value,
|
|
105
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
106
|
-
let store = MessageStore::open(workspace)?;
|
|
107
|
-
deliver_pending_message(workspace, &store, transport, message_id, event_log, state)
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
// ===========================================================================
|
|
111
|
-
// delivery.py — 单条 tmux 注入投递 + trust 有界重试 + turn-open arm (card §16)
|
|
112
|
-
// ===========================================================================
|
|
113
|
-
|
|
114
|
-
/// `_tmux_pane_width` (`delivery.py:20`):查询 pane 列宽。**fail-safe** (bug-064/082):失败
|
|
115
|
-
/// 返回 [`PaneWidthQuery::Failed`],**绝不**给默认宽度。借 step 9 transport 的 query。
|
|
116
|
-
pub(crate) fn tmux_pane_width(transport: &dyn Transport, target: &Target) -> PaneWidthQuery {
|
|
117
|
-
let queried = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
|
118
|
-
transport.query(target, crate::transport::PaneField::PaneWidth)
|
|
119
|
-
}));
|
|
120
|
-
let result = match queried {
|
|
121
|
-
Ok(result) => result,
|
|
122
|
-
Err(_) => {
|
|
123
|
-
return PaneWidthQuery::Failed {
|
|
124
|
-
error: "tmux_query_failed:panic".to_string(),
|
|
125
|
-
};
|
|
126
|
-
}
|
|
127
|
-
};
|
|
128
|
-
match result {
|
|
129
|
-
Ok(Some(raw)) => match raw.trim().parse::<u32>() {
|
|
130
|
-
Ok(pane_width) if pane_width > 0 => PaneWidthQuery::Ok { pane_width },
|
|
131
|
-
Ok(_) => PaneWidthQuery::Failed {
|
|
132
|
-
error: "non_positive_width".to_string(),
|
|
133
|
-
},
|
|
134
|
-
Err(_) => PaneWidthQuery::Failed {
|
|
135
|
-
error: "unparseable_output".to_string(),
|
|
136
|
-
},
|
|
137
|
-
},
|
|
138
|
-
Ok(None) => PaneWidthQuery::Failed {
|
|
139
|
-
error: "empty_output".to_string(),
|
|
140
|
-
},
|
|
141
|
-
Err(err) => PaneWidthQuery::Failed {
|
|
142
|
-
error: format!("tmux_query_failed:{err}"),
|
|
143
|
-
},
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
pub(crate) fn worker_target_missing_due_to_stale_binding(
|
|
148
|
-
state: &serde_json::Value,
|
|
149
|
-
recipient: &str,
|
|
150
|
-
transport: &dyn Transport,
|
|
151
|
-
) -> bool {
|
|
152
|
-
let Some(agent) = state.get("agents").and_then(|agents| agents.get(recipient)) else {
|
|
153
|
-
return false;
|
|
154
|
-
};
|
|
155
|
-
let session = state
|
|
156
|
-
.get("session_name")
|
|
157
|
-
.and_then(serde_json::Value::as_str)
|
|
158
|
-
.unwrap_or_default();
|
|
159
|
-
let window = agent
|
|
160
|
-
.get("window")
|
|
161
|
-
.and_then(serde_json::Value::as_str)
|
|
162
|
-
.filter(|s| !s.is_empty())
|
|
163
|
-
.unwrap_or(recipient);
|
|
164
|
-
let Some(cached_pane) = agent
|
|
165
|
-
.get("pane_id")
|
|
166
|
-
.and_then(serde_json::Value::as_str)
|
|
167
|
-
.filter(|s| !s.is_empty())
|
|
168
|
-
else {
|
|
169
|
-
return false;
|
|
170
|
-
};
|
|
171
|
-
let Ok(live_targets) = transport.list_targets() else {
|
|
172
|
-
return false;
|
|
173
|
-
};
|
|
174
|
-
if live_pane_for_session_window(&live_targets, session, window).is_some() {
|
|
175
|
-
return false;
|
|
176
|
-
}
|
|
177
|
-
live_targets.iter().any(|target| {
|
|
178
|
-
target.pane_id.as_str() == cached_pane
|
|
179
|
-
&& stale_worker_pane_binding(target, session, window).is_some()
|
|
180
|
-
})
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
/// `_deliver_pending_message` (`delivery.py:63`):对一条消息做 tmux 注入投递 (含 trust 提示
|
|
184
|
-
/// 自动应答 + turn-open arm + first_send_at 戳)。daemon-path → Result。
|
|
185
|
-
pub fn deliver_pending_message(
|
|
186
|
-
workspace: &Path,
|
|
187
|
-
store: &MessageStore,
|
|
188
|
-
transport: &dyn Transport,
|
|
189
|
-
message_id: &str,
|
|
190
|
-
event_log: &EventLog,
|
|
191
|
-
state: &serde_json::Value,
|
|
192
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
193
|
-
if !message_exists(store, message_id)? {
|
|
194
|
-
return Ok(DeliveryOutcome {
|
|
195
|
-
ok: false,
|
|
196
|
-
status: DeliveryStatus::Failed,
|
|
197
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
198
|
-
message_id: Some(message_id.to_string()),
|
|
199
|
-
verification: None,
|
|
200
|
-
stage: None,
|
|
201
|
-
reason: None,
|
|
202
|
-
channel: None,
|
|
203
|
-
ack_forced_off: false,
|
|
204
|
-
turn_verification: None,
|
|
205
|
-
});
|
|
206
|
-
}
|
|
207
|
-
let message = message_for_delivery(store, message_id)?;
|
|
208
|
-
let Some(message) = message else {
|
|
209
|
-
return Ok(DeliveryOutcome {
|
|
210
|
-
ok: false,
|
|
211
|
-
status: DeliveryStatus::Failed,
|
|
212
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
213
|
-
message_id: Some(message_id.to_string()),
|
|
214
|
-
verification: None,
|
|
215
|
-
stage: None,
|
|
216
|
-
reason: Some(DeliveryRefusal::UnknownRecipient),
|
|
217
|
-
channel: None,
|
|
218
|
-
ack_forced_off: false,
|
|
219
|
-
turn_verification: None,
|
|
220
|
-
});
|
|
221
|
-
};
|
|
222
|
-
match prepare_message_state(
|
|
223
|
-
workspace, store, message_id, event_log, state, &message, false,
|
|
224
|
-
)? {
|
|
225
|
-
Ok(prepared) => deliver_prepared_message(
|
|
226
|
-
workspace, store, transport, message_id, event_log, state, message, prepared,
|
|
227
|
-
),
|
|
228
|
-
Err(outcome) => Ok(outcome),
|
|
229
|
-
}
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
// Thread-local observation only; no production cache or scheduling hook.
|
|
233
|
-
#[cfg(test)]
|
|
234
|
-
pub(super) mod preparation_probe {
|
|
235
|
-
std::thread_local! {
|
|
236
|
-
pub static COUNTS: std::cell::Cell<(usize, usize, usize)> = const { std::cell::Cell::new((0, 0, 0)) };
|
|
237
|
-
pub static BEFORE_CLAIM: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
struct PreparedMessageState {
|
|
242
|
-
scoped: Option<serde_json::Value>,
|
|
243
|
-
canonical_owner_team_id: Option<String>,
|
|
244
|
-
}
|
|
245
|
-
|
|
246
|
-
fn prepare_message_state(
|
|
247
|
-
workspace: &Path,
|
|
248
|
-
store: &MessageStore,
|
|
249
|
-
message_id: &str,
|
|
250
|
-
event_log: &EventLog,
|
|
251
|
-
state: &serde_json::Value,
|
|
252
|
-
message: &PendingMessage,
|
|
253
|
-
batch: bool,
|
|
254
|
-
) -> Result<Result<PreparedMessageState, DeliveryOutcome>, MessagingError> {
|
|
255
|
-
#[cfg(test)]
|
|
256
|
-
preparation_probe::COUNTS.with(|counts| {
|
|
257
|
-
let (prepare, project, claim) = counts.get();
|
|
258
|
-
counts.set((prepare + 1, project, claim));
|
|
259
|
-
});
|
|
260
|
-
let mut prepared = PreparedMessageState {
|
|
261
|
-
scoped: None,
|
|
262
|
-
canonical_owner_team_id: message.owner_team_id.clone(),
|
|
263
|
-
};
|
|
264
|
-
if let Some(team) = message
|
|
265
|
-
.owner_team_id
|
|
266
|
-
.as_deref()
|
|
267
|
-
.filter(|team| !team.is_empty())
|
|
268
|
-
{
|
|
269
|
-
match project_state_for_owner_team(
|
|
270
|
-
workspace,
|
|
271
|
-
team,
|
|
272
|
-
state,
|
|
273
|
-
Some(store),
|
|
274
|
-
Some(message_id),
|
|
275
|
-
Some(event_log),
|
|
276
|
-
)? {
|
|
277
|
-
OwnerTeamProjection::Projected {
|
|
278
|
-
state,
|
|
279
|
-
canonical_team,
|
|
280
|
-
} => {
|
|
281
|
-
prepared.scoped = Some(state);
|
|
282
|
-
prepared.canonical_owner_team_id = Some(canonical_team);
|
|
283
|
-
}
|
|
284
|
-
OwnerTeamProjection::Refused(outcome) => {
|
|
285
|
-
if batch {
|
|
286
|
-
let _ = event_log.write(
|
|
287
|
-
"delivery.projection_refused",
|
|
288
|
-
serde_json::json!({
|
|
289
|
-
"message_id": message_id,
|
|
290
|
-
"owner_team_id": team,
|
|
291
|
-
"status": super::helpers::status_wire(outcome.status),
|
|
292
|
-
"verification": outcome.verification,
|
|
293
|
-
"reason": format!("{:?}", outcome.reason),
|
|
294
|
-
}),
|
|
295
|
-
);
|
|
296
|
-
}
|
|
297
|
-
return Ok(Err(outcome));
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
|
-
Ok(Ok(prepared))
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
fn deliver_prepared_message(
|
|
305
|
-
workspace: &Path,
|
|
306
|
-
store: &MessageStore,
|
|
307
|
-
transport: &dyn Transport,
|
|
308
|
-
message_id: &str,
|
|
309
|
-
event_log: &EventLog,
|
|
310
|
-
fallback: &serde_json::Value,
|
|
311
|
-
message: PendingMessage,
|
|
312
|
-
prepared: PreparedMessageState,
|
|
313
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
314
|
-
let canonical_owner_team_id = prepared.canonical_owner_team_id;
|
|
315
|
-
let state = prepared.scoped.as_ref().unwrap_or(fallback);
|
|
316
|
-
crate::provider::wire::require_active_state_providers(state, Some(&message.recipient))
|
|
317
|
-
.map_err(|error| MessagingError::Provider(error.into()))?;
|
|
318
|
-
if message.recipient == "leader"
|
|
319
|
-
&& matches!(
|
|
320
|
-
message.status.as_str(),
|
|
321
|
-
"submitted_pending_acceptance" | "injected_awaiting_receipt"
|
|
322
|
-
)
|
|
323
|
-
{
|
|
324
|
-
return observe_pending_leader_acceptance(store, event_log, state, message_id);
|
|
325
|
-
}
|
|
326
|
-
if message.recipient == "leader" && message.status == "queued_until_leader_attach" {
|
|
327
|
-
let Some(receiver) = leader_receiver_value(state) else {
|
|
328
|
-
return Ok(leader_acceptance_pending_outcome(
|
|
329
|
-
message_id,
|
|
330
|
-
"queued_until_leader_attach",
|
|
331
|
-
));
|
|
332
|
-
};
|
|
333
|
-
let channel_transport =
|
|
334
|
-
delivery_transport_for_recipient(workspace, transport, state, "leader");
|
|
335
|
-
let resolution = crate::messaging::resolve_live_leader_channel(
|
|
336
|
-
workspace,
|
|
337
|
-
receiver,
|
|
338
|
-
channel_transport.as_transport(),
|
|
339
|
-
);
|
|
340
|
-
let crate::messaging::LeaderChannelResolution::Live(channel) = resolution else {
|
|
341
|
-
return Ok(leader_acceptance_pending_outcome(
|
|
342
|
-
message_id,
|
|
343
|
-
"queued_until_leader_attach",
|
|
344
|
-
));
|
|
345
|
-
};
|
|
346
|
-
let metadata_drift = match &channel {
|
|
347
|
-
crate::messaging::LiveLeaderChannel::DirectTmux(channel) => {
|
|
348
|
-
channel.metadata_drift.clone()
|
|
349
|
-
}
|
|
350
|
-
crate::messaging::LiveLeaderChannel::CodexAppServer(_) => Vec::new(),
|
|
351
|
-
};
|
|
352
|
-
store.mark(message_id, "accepted", None)?;
|
|
353
|
-
event_log.write(
|
|
354
|
-
"leader_receiver.mailbox_requeued",
|
|
355
|
-
serde_json::json!({
|
|
356
|
-
"message_id": message_id,
|
|
357
|
-
"channel_live": true,
|
|
358
|
-
"metadata_drift": metadata_drift,
|
|
359
|
-
"requeue_trigger": "delivery_revalidation",
|
|
360
|
-
"revalidated_at": chrono::Utc::now().to_rfc3339(),
|
|
361
|
-
}),
|
|
362
|
-
)?;
|
|
363
|
-
}
|
|
364
|
-
#[cfg(test)]
|
|
365
|
-
{
|
|
366
|
-
preparation_probe::BEFORE_CLAIM.with(|hook| {
|
|
367
|
-
if let Some(hook) = hook.borrow_mut().take() {
|
|
368
|
-
hook();
|
|
369
|
-
}
|
|
370
|
-
});
|
|
371
|
-
preparation_probe::COUNTS.with(|counts| {
|
|
372
|
-
let (prepare, project, claim) = counts.get();
|
|
373
|
-
counts.set((prepare, project, claim + 1));
|
|
374
|
-
});
|
|
375
|
-
}
|
|
376
|
-
let attempt = if store.claim_for_delivery(message_id)? {
|
|
377
|
-
message.delivery_attempts.saturating_add(1)
|
|
378
|
-
} else {
|
|
379
|
-
return Ok(DeliveryOutcome {
|
|
380
|
-
ok: false,
|
|
381
|
-
status: DeliveryStatus::Refused,
|
|
382
|
-
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
383
|
-
message_id: Some(message_id.to_string()),
|
|
384
|
-
verification: None,
|
|
385
|
-
stage: None,
|
|
386
|
-
reason: Some(DeliveryRefusal::MessageAlreadyClaimed),
|
|
387
|
-
channel: None,
|
|
388
|
-
ack_forced_off: false,
|
|
389
|
-
turn_verification: None,
|
|
390
|
-
});
|
|
391
|
-
};
|
|
392
|
-
// Attach may requeue this row after the coordinator captured `state` but
|
|
393
|
-
// before this claim. Revalidate through the same owner-team projection
|
|
394
|
-
// that carries a canonical top-level leader binding into the scoped view.
|
|
395
|
-
let fresh_leader_state = if message.recipient == "leader" {
|
|
396
|
-
Some(match canonical_owner_team_id.as_deref() {
|
|
397
|
-
Some(team) => match project_state_for_owner_team(
|
|
398
|
-
workspace,
|
|
399
|
-
team,
|
|
400
|
-
&serde_json::Value::Null,
|
|
401
|
-
Some(store),
|
|
402
|
-
Some(message_id),
|
|
403
|
-
Some(event_log),
|
|
404
|
-
)? {
|
|
405
|
-
OwnerTeamProjection::Projected { state, .. } => state,
|
|
406
|
-
OwnerTeamProjection::Refused(outcome) => return Ok(outcome),
|
|
407
|
-
},
|
|
408
|
-
None => crate::state::persist::load_runtime_state(workspace)?,
|
|
409
|
-
})
|
|
410
|
-
} else {
|
|
411
|
-
None
|
|
412
|
-
};
|
|
413
|
-
let state = fresh_leader_state.as_ref().unwrap_or(state);
|
|
414
|
-
if message.recipient == "leader" {
|
|
415
|
-
let Some(receiver) = leader_receiver_value(state) else {
|
|
416
|
-
store.mark(message_id, "failed", Some("leader_not_attached"))?;
|
|
417
|
-
event_log.write(
|
|
418
|
-
"leader_receiver.delivery_blocked",
|
|
419
|
-
serde_json::json!({
|
|
420
|
-
"message_id": message_id,
|
|
421
|
-
"sender": message.sender,
|
|
422
|
-
"reason": "leader_receiver_not_attached",
|
|
423
|
-
"error": "leader_not_attached",
|
|
424
|
-
"channel_reason": "receiver_missing",
|
|
425
|
-
"channel": "rebind_required",
|
|
426
|
-
"action": "run team-agent attach-leader or team-agent takeover",
|
|
427
|
-
"status": "unbound",
|
|
428
|
-
}),
|
|
429
|
-
)?;
|
|
430
|
-
return Ok(DeliveryOutcome {
|
|
431
|
-
ok: false,
|
|
432
|
-
status: DeliveryStatus::Refused,
|
|
433
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
434
|
-
message_id: Some(message_id.to_string()),
|
|
435
|
-
verification: Some(
|
|
436
|
-
"run team-agent attach-leader or team-agent takeover".to_string(),
|
|
437
|
-
),
|
|
438
|
-
stage: None,
|
|
439
|
-
reason: Some(DeliveryRefusal::LeaderNotAttached),
|
|
440
|
-
channel: Some("rebind_required".to_string()),
|
|
441
|
-
ack_forced_off: false,
|
|
442
|
-
turn_verification: None,
|
|
443
|
-
});
|
|
444
|
-
};
|
|
445
|
-
if let Some(outcome) = leader_receiver_transport_conflict_outcome(
|
|
446
|
-
store,
|
|
447
|
-
event_log,
|
|
448
|
-
message_id,
|
|
449
|
-
receiver,
|
|
450
|
-
&message.sender,
|
|
451
|
-
)? {
|
|
452
|
-
return Ok(outcome);
|
|
453
|
-
}
|
|
454
|
-
let channel_transport =
|
|
455
|
-
delivery_transport_for_recipient(workspace, transport, state, "leader");
|
|
456
|
-
match crate::messaging::resolve_live_leader_channel(
|
|
457
|
-
workspace,
|
|
458
|
-
receiver,
|
|
459
|
-
channel_transport.as_transport(),
|
|
460
|
-
) {
|
|
461
|
-
crate::messaging::LeaderChannelResolution::Live(_) => {}
|
|
462
|
-
crate::messaging::LeaderChannelResolution::ProbeFailed(error) => {
|
|
463
|
-
store.mark(message_id, "target_resolved", Some(&error))?;
|
|
464
|
-
return Ok(DeliveryOutcome {
|
|
465
|
-
ok: false,
|
|
466
|
-
status: DeliveryStatus::Degraded,
|
|
467
|
-
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
468
|
-
message_id: Some(message_id.to_string()),
|
|
469
|
-
verification: Some(error),
|
|
470
|
-
stage: None,
|
|
471
|
-
reason: None,
|
|
472
|
-
channel: Some("rebind_required".to_string()),
|
|
473
|
-
ack_forced_off: false,
|
|
474
|
-
turn_verification: None,
|
|
475
|
-
});
|
|
476
|
-
}
|
|
477
|
-
crate::messaging::LeaderChannelResolution::Unbound(reason) => {
|
|
478
|
-
let receiver_status = receiver
|
|
479
|
-
.get("status")
|
|
480
|
-
.and_then(serde_json::Value::as_str)
|
|
481
|
-
.unwrap_or("unbound");
|
|
482
|
-
let refusal = match &reason {
|
|
483
|
-
crate::messaging::LeaderChannelUnbound::PaneWorkspaceMismatch(_) => {
|
|
484
|
-
DeliveryRefusal::PaneWorkspaceMismatch
|
|
485
|
-
}
|
|
486
|
-
_ => DeliveryRefusal::LeaderNotAttached,
|
|
487
|
-
};
|
|
488
|
-
store.mark(message_id, "failed", Some("leader_not_attached"))?;
|
|
489
|
-
event_log.write(
|
|
490
|
-
"leader_receiver.delivery_blocked",
|
|
491
|
-
serde_json::json!({
|
|
492
|
-
"message_id": message_id,
|
|
493
|
-
"sender": message.sender,
|
|
494
|
-
"reason": "leader_receiver_not_attached",
|
|
495
|
-
"error": "leader_not_attached",
|
|
496
|
-
"channel_reason": reason.reason_code(),
|
|
497
|
-
"channel": "rebind_required",
|
|
498
|
-
"action": "run team-agent attach-leader or team-agent takeover",
|
|
499
|
-
"status": receiver_status,
|
|
500
|
-
}),
|
|
501
|
-
)?;
|
|
502
|
-
return Ok(DeliveryOutcome {
|
|
503
|
-
ok: false,
|
|
504
|
-
status: DeliveryStatus::Refused,
|
|
505
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
506
|
-
message_id: Some(message_id.to_string()),
|
|
507
|
-
verification: Some(
|
|
508
|
-
"run team-agent attach-leader or team-agent takeover".to_string(),
|
|
509
|
-
),
|
|
510
|
-
stage: None,
|
|
511
|
-
reason: Some(refusal),
|
|
512
|
-
channel: Some("rebind_required".to_string()),
|
|
513
|
-
ack_forced_off: false,
|
|
514
|
-
turn_verification: None,
|
|
515
|
-
});
|
|
516
|
-
}
|
|
517
|
-
}
|
|
518
|
-
if crate::codex_app_server::receiver_is_app_server(receiver) {
|
|
519
|
-
return deliver_leader_via_app_server(
|
|
520
|
-
store,
|
|
521
|
-
event_log,
|
|
522
|
-
state,
|
|
523
|
-
message_id,
|
|
524
|
-
&message,
|
|
525
|
-
canonical_owner_team_id.as_deref(),
|
|
526
|
-
);
|
|
527
|
-
}
|
|
528
|
-
}
|
|
529
|
-
let delivery_transport =
|
|
530
|
-
delivery_transport_for_recipient(workspace, transport, state, &message.recipient);
|
|
531
|
-
let transport = delivery_transport.as_transport();
|
|
532
|
-
// U1-B: probe `list_targets()` ONCE per delivery and DEFER on Err. The prior
|
|
533
|
-
// `.unwrap_or_default()` coerced server jitter (Err = subprocess fork failed)
|
|
534
|
-
// to an empty vec, and the downstream cache-reuse branch
|
|
535
|
-
// (`live_targets.is_empty() && !known_dead`) would then inject into a
|
|
536
|
-
// never-validated cached pane on every tmux hiccup. Err is OBSERVED here as
|
|
537
|
-
// jitter and the delivery is deferred (status stays `target_resolved`, no
|
|
538
|
-
// inject attempted) so the next tick gets a fresh probe.
|
|
539
|
-
let live_targets = match transport.list_targets() {
|
|
540
|
-
Ok(targets) => targets,
|
|
541
|
-
Err(err) => {
|
|
542
|
-
let reason = format!("list_targets_server_jitter:{err}");
|
|
543
|
-
event_log.write(
|
|
544
|
-
"delivery.deferred_list_targets_jitter",
|
|
545
|
-
serde_json::json!({
|
|
546
|
-
"message_id": message_id,
|
|
547
|
-
"recipient": message.recipient,
|
|
548
|
-
"reason": reason,
|
|
549
|
-
}),
|
|
550
|
-
)?;
|
|
551
|
-
store.mark(message_id, "target_resolved", Some(&reason))?;
|
|
552
|
-
return Ok(DeliveryOutcome {
|
|
553
|
-
ok: false,
|
|
554
|
-
status: DeliveryStatus::Degraded,
|
|
555
|
-
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
556
|
-
message_id: Some(message_id.to_string()),
|
|
557
|
-
verification: Some(reason),
|
|
558
|
-
stage: None,
|
|
559
|
-
reason: None,
|
|
560
|
-
channel: None,
|
|
561
|
-
ack_forced_off: false,
|
|
562
|
-
turn_verification: None,
|
|
563
|
-
});
|
|
564
|
-
}
|
|
565
|
-
};
|
|
566
|
-
let resolved = resolve_inject_target(state, &message.recipient, transport, &live_targets);
|
|
567
|
-
if let Some(stale) = resolved.stale_binding.as_ref() {
|
|
568
|
-
event_log.write(
|
|
569
|
-
"worker_pane_binding_stale",
|
|
570
|
-
stale.as_event_payload(message_id, &message.recipient),
|
|
571
|
-
)?;
|
|
572
|
-
}
|
|
573
|
-
let target = resolved.target.clone();
|
|
574
|
-
if let Some(outcome) = block_missing_worker_target(
|
|
575
|
-
store,
|
|
576
|
-
event_log,
|
|
577
|
-
message_id,
|
|
578
|
-
&message.recipient,
|
|
579
|
-
&target,
|
|
580
|
-
&live_targets,
|
|
581
|
-
)? {
|
|
582
|
-
return Ok(outcome);
|
|
583
|
-
}
|
|
584
|
-
// Contract B / MUST-10 / N31/N32: physical paste+Enter into a startup trust/update
|
|
585
|
-
// menu is NOT provider delivery — the menu consumes the Enter and the task text
|
|
586
|
-
// is lost (PROBE-2 root-cause). Before injection, peek at the recipient's pane for
|
|
587
|
-
// a Codex actionable startup prompt; if present, mark the row `queued_until_trust`
|
|
588
|
-
// and DO NOT inject the task. The coordinator's startup-prompt phase will dismiss
|
|
589
|
-
// the trust prompt, and the SAME message_id is later replayed through this same
|
|
590
|
-
// delivery pipeline (no parallel side channel).
|
|
591
|
-
if recipient_pane_has_actionable_startup_prompt(transport, state, &message.recipient, &target) {
|
|
592
|
-
store.mark(message_id, "queued_until_trust", None)?;
|
|
593
|
-
event_log.write(
|
|
594
|
-
"delivery.deferred_startup_prompt",
|
|
595
|
-
serde_json::json!({
|
|
596
|
-
"message_id": message_id,
|
|
597
|
-
"recipient": message.recipient,
|
|
598
|
-
"reason": "actionable_startup_prompt",
|
|
599
|
-
}),
|
|
600
|
-
)?;
|
|
601
|
-
return Ok(DeliveryOutcome {
|
|
602
|
-
ok: false,
|
|
603
|
-
status: DeliveryStatus::RetryScheduled,
|
|
604
|
-
message_status: MessageStatusShadow("queued_until_trust".to_string()),
|
|
605
|
-
message_id: Some(message_id.to_string()),
|
|
606
|
-
verification: None,
|
|
607
|
-
stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
|
|
608
|
-
reason: None,
|
|
609
|
-
channel: None,
|
|
610
|
-
ack_forced_off: false,
|
|
611
|
-
turn_verification: None,
|
|
612
|
-
});
|
|
613
|
-
}
|
|
614
|
-
if token_already_visible(transport, state, &message.recipient, &target, message_id) {
|
|
615
|
-
// Visibility prevents a second paste; it does not prove consumption.
|
|
616
|
-
let consumed = existing_token_consumed(transport, state, &message.recipient, &target, message_id);
|
|
617
|
-
let status = if consumed { "delivered" } else { "submitted_unverified" };
|
|
618
|
-
let reason = if consumed { "message_token_consumed" } else { "message_token_visible_without_consumption" };
|
|
619
|
-
event_log.write(
|
|
620
|
-
"delivery.duplicate_token_refused",
|
|
621
|
-
serde_json::json!({
|
|
622
|
-
"message_id": message_id,
|
|
623
|
-
"recipient": message.recipient,
|
|
624
|
-
"reason": reason,
|
|
625
|
-
"consumed": consumed,
|
|
626
|
-
}),
|
|
627
|
-
)?;
|
|
628
|
-
store.mark(message_id, status, (!consumed).then_some(reason))?;
|
|
629
|
-
if !consumed {
|
|
630
|
-
bind_enter_watchdog(store, transport, state, &target, message_id, &message,
|
|
631
|
-
canonical_owner_team_id.as_deref(), event_log)?;
|
|
632
|
-
}
|
|
633
|
-
return Ok(DeliveryOutcome {
|
|
634
|
-
ok: consumed,
|
|
635
|
-
status: if consumed { DeliveryStatus::AlreadyDelivered } else { DeliveryStatus::Failed },
|
|
636
|
-
message_status: MessageStatusShadow(status.to_string()),
|
|
637
|
-
message_id: Some(message_id.to_string()),
|
|
638
|
-
verification: Some(reason.to_string()),
|
|
639
|
-
stage: Some(DeliveryStage::Submit),
|
|
640
|
-
reason: None,
|
|
641
|
-
channel: None,
|
|
642
|
-
ack_forced_off: false,
|
|
643
|
-
turn_verification: None,
|
|
644
|
-
});
|
|
645
|
-
}
|
|
646
|
-
// MCP readiness is diagnostic, not permission to type into a live pane.
|
|
647
|
-
// Missing/foreign evidence never releases the claim or parks this message.
|
|
648
|
-
#[cfg(unix)]
|
|
649
|
-
{
|
|
650
|
-
let admission = crate::mcp_server::readiness::preflight(
|
|
651
|
-
workspace, canonical_owner_team_id.as_deref(), &message.recipient, state,
|
|
652
|
-
).and_then(|admission| {
|
|
653
|
-
if let Some(admission) = admission.as_ref() {
|
|
654
|
-
crate::mcp_server::readiness::revalidate(admission, &target, &live_targets)?;
|
|
655
|
-
}
|
|
656
|
-
Ok(())
|
|
657
|
-
});
|
|
658
|
-
if let Err(reason) = admission {
|
|
659
|
-
let _ = event_log.write("delivery.mcp_handshake_warning", serde_json::json!({
|
|
660
|
-
"message_id": message_id,
|
|
661
|
-
"reason": reason,
|
|
662
|
-
"delivery_blocked": false,
|
|
663
|
-
}));
|
|
664
|
-
}
|
|
665
|
-
}
|
|
666
|
-
let rendered = render_message(
|
|
667
|
-
&message.sender,
|
|
668
|
-
message.task_id.as_deref(),
|
|
669
|
-
&message.content,
|
|
670
|
-
message_id,
|
|
671
|
-
);
|
|
672
|
-
let is_leader_recipient = message.recipient == "leader";
|
|
673
|
-
let payload = if is_leader_recipient {
|
|
674
|
-
InjectPayload::TextSkipConsumptionPoll(rendered)
|
|
675
|
-
} else {
|
|
676
|
-
InjectPayload::Text(rendered)
|
|
677
|
-
};
|
|
678
|
-
let submit_observer = CurrentTurnSubmitObserver::new(
|
|
679
|
-
workspace,
|
|
680
|
-
&message.sender,
|
|
681
|
-
&message.recipient,
|
|
682
|
-
message_id,
|
|
683
|
-
event_log,
|
|
684
|
-
canonical_owner_team_id.as_deref(),
|
|
685
|
-
resolved.metadata.as_ref(),
|
|
686
|
-
);
|
|
687
|
-
// v0.5.113 delivery: address/owner and pane serialization are authoritative;
|
|
688
|
-
// composer appearance is not admission. Native CLIs buffer/queue input.
|
|
689
|
-
let inject_attempt = crate::tmux_backend::with_cursor_single_enter(
|
|
690
|
-
recipient_requires_single_enter(state, &message.recipient),
|
|
691
|
-
|| {
|
|
692
|
-
transport.inject_with_submit_observer(
|
|
693
|
-
&target,
|
|
694
|
-
&payload,
|
|
695
|
-
Key::Enter,
|
|
696
|
-
true,
|
|
697
|
-
Some(&submit_observer),
|
|
698
|
-
)
|
|
699
|
-
},
|
|
700
|
-
);
|
|
701
|
-
let inject_report = match inject_attempt {
|
|
702
|
-
Ok(report) => {
|
|
703
|
-
// grok 忙时第一次回车只入显式队列。默认 send-now:只重按回车顶出去。
|
|
704
|
-
// 无 `Enter:send now` 时零次额外按键,claude/codex 行为不变。
|
|
705
|
-
if !crate::provider::submit_now::keep_provider_queue_requested()
|
|
706
|
-
&& recipient_allows_explicit_queue_flush(state, &message.recipient)
|
|
707
|
-
{
|
|
708
|
-
match crate::provider::submit_now::flush_explicit_queue(transport, &target) {
|
|
709
|
-
Ok(flush) if flush.extra_enters > 0 => {
|
|
710
|
-
let _ = event_log.write(
|
|
711
|
-
"send.grok_send_now",
|
|
712
|
-
serde_json::json!({
|
|
713
|
-
"message_id": message_id,
|
|
714
|
-
"recipient": message.recipient,
|
|
715
|
-
"extra_enters": flush.extra_enters,
|
|
716
|
-
"mark_cleared": flush.mark_cleared,
|
|
717
|
-
}),
|
|
718
|
-
);
|
|
719
|
-
}
|
|
720
|
-
Ok(_) => {}
|
|
721
|
-
Err(error) => {
|
|
722
|
-
let _ = event_log.write(
|
|
723
|
-
"send.grok_send_now_failed",
|
|
724
|
-
serde_json::json!({
|
|
725
|
-
"message_id": message_id,
|
|
726
|
-
"recipient": message.recipient,
|
|
727
|
-
"error": error.to_string(),
|
|
728
|
-
}),
|
|
729
|
-
);
|
|
730
|
-
}
|
|
731
|
-
}
|
|
732
|
-
}
|
|
733
|
-
report
|
|
734
|
-
}
|
|
735
|
-
Err(error) => {
|
|
736
|
-
let reason = format!("inject_failed:{error}");
|
|
737
|
-
if message.recipient == "leader" {
|
|
738
|
-
store.mark(message_id, "failed", Some("leader_not_attached"))?;
|
|
739
|
-
event_log.write(
|
|
740
|
-
"leader_receiver.delivery_blocked",
|
|
741
|
-
serde_json::json!({
|
|
742
|
-
"message_id": message_id,
|
|
743
|
-
"sender": message.sender,
|
|
744
|
-
"reason": "leader_not_attached",
|
|
745
|
-
"channel": "rebind_required",
|
|
746
|
-
"action": "run team-agent claim-leader or team-agent takeover",
|
|
747
|
-
"error": error.to_string(),
|
|
748
|
-
}),
|
|
749
|
-
)?;
|
|
750
|
-
return Ok(DeliveryOutcome {
|
|
751
|
-
ok: false,
|
|
752
|
-
status: DeliveryStatus::Refused,
|
|
753
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
754
|
-
message_id: Some(message_id.to_string()),
|
|
755
|
-
verification: Some(
|
|
756
|
-
"run team-agent claim-leader or team-agent takeover".to_string(),
|
|
757
|
-
),
|
|
758
|
-
stage: None,
|
|
759
|
-
reason: Some(DeliveryRefusal::LeaderNotAttached),
|
|
760
|
-
channel: Some("rebind_required".to_string()),
|
|
761
|
-
ack_forced_off: false,
|
|
762
|
-
turn_verification: None,
|
|
763
|
-
});
|
|
764
|
-
}
|
|
765
|
-
if transport_error_is_target_missing(&error) {
|
|
766
|
-
return mark_worker_target_missing(
|
|
767
|
-
store,
|
|
768
|
-
event_log,
|
|
769
|
-
message_id,
|
|
770
|
-
&message.recipient,
|
|
771
|
-
Some(reason),
|
|
772
|
-
);
|
|
773
|
-
}
|
|
774
|
-
event_log.write(
|
|
775
|
-
"send.inject_failed",
|
|
776
|
-
serde_json::json!({
|
|
777
|
-
"message_id": message_id,
|
|
778
|
-
"recipient": message.recipient,
|
|
779
|
-
"attempts": attempt,
|
|
780
|
-
"max_attempts": SEND_RETRY_MAX_ATTEMPTS,
|
|
781
|
-
"error": error.to_string(),
|
|
782
|
-
}),
|
|
783
|
-
)?;
|
|
784
|
-
if attempt >= u32::from(SEND_RETRY_MAX_ATTEMPTS) {
|
|
785
|
-
store.mark(message_id, "failed", Some("send_inject_exhausted"))?;
|
|
786
|
-
emit_send_failed_exhausted(
|
|
787
|
-
workspace,
|
|
788
|
-
state,
|
|
789
|
-
event_log,
|
|
790
|
-
message_id,
|
|
791
|
-
&message.recipient,
|
|
792
|
-
attempt,
|
|
793
|
-
"send_inject_exhausted",
|
|
794
|
-
&reason,
|
|
795
|
-
None,
|
|
796
|
-
)?;
|
|
797
|
-
return Ok(DeliveryOutcome {
|
|
798
|
-
ok: false,
|
|
799
|
-
status: DeliveryStatus::Failed,
|
|
800
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
801
|
-
message_id: Some(message_id.to_string()),
|
|
802
|
-
verification: Some(reason),
|
|
803
|
-
stage: Some(DeliveryStage::Inject),
|
|
804
|
-
reason: None,
|
|
805
|
-
channel: None,
|
|
806
|
-
ack_forced_off: false,
|
|
807
|
-
turn_verification: None,
|
|
808
|
-
});
|
|
809
|
-
}
|
|
810
|
-
store.mark(message_id, "target_resolved", Some(&reason))?;
|
|
811
|
-
return Ok(DeliveryOutcome {
|
|
812
|
-
ok: false,
|
|
813
|
-
status: DeliveryStatus::Degraded,
|
|
814
|
-
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
815
|
-
message_id: Some(message_id.to_string()),
|
|
816
|
-
verification: Some(reason),
|
|
817
|
-
stage: Some(DeliveryStage::Inject),
|
|
818
|
-
reason: None,
|
|
819
|
-
channel: None,
|
|
820
|
-
ack_forced_off: false,
|
|
821
|
-
turn_verification: None,
|
|
822
|
-
});
|
|
823
|
-
}
|
|
824
|
-
};
|
|
825
|
-
if let Some(error) = submit_observer.take_error() {
|
|
826
|
-
// Token on pane/transcript = physical Enter already out → degrade.
|
|
827
|
-
// Poison before submit (no token) still returns Err → item_blocked.
|
|
828
|
-
absorb_state_error_only_after_physical_submit(
|
|
829
|
-
transport,
|
|
830
|
-
state,
|
|
831
|
-
&message.recipient,
|
|
832
|
-
&target,
|
|
833
|
-
message_id,
|
|
834
|
-
event_log,
|
|
835
|
-
"submit_observer",
|
|
836
|
-
error,
|
|
837
|
-
)?;
|
|
838
|
-
}
|
|
839
|
-
persist_submit_verification(workspace, message_id, &inject_report);
|
|
840
|
-
let turn_verification = inject_report.turn_verification;
|
|
841
|
-
let submit_verified = inject_submit_verified(&inject_report);
|
|
842
|
-
let readback_verified = pane_readback_verified(&inject_report);
|
|
843
|
-
// A successful tmux command is never provider-acceptance proof. Leader and
|
|
844
|
-
// worker delivery both require post-submit evidence; leader additionally
|
|
845
|
-
// waits for its authoritative provider transcript below.
|
|
846
|
-
let native_consumed = observed_token_consumed(transport, state, &message.recipient, &target, message_id);
|
|
847
|
-
let verified = submit_verified && native_consumed != Some(false);
|
|
848
|
-
if !verified {
|
|
849
|
-
let reason = if native_consumed == Some(false) {
|
|
850
|
-
"submit_unverified:current_composer_or_consumption_unknown".to_string()
|
|
851
|
-
} else if !readback_verified {
|
|
852
|
-
"pane_readback_unverified:capture_missing_token".to_string()
|
|
853
|
-
} else {
|
|
854
|
-
format!(
|
|
855
|
-
"submit_unverified:{}",
|
|
856
|
-
submit_verification_wire(inject_report.submit_verification)
|
|
857
|
-
)
|
|
858
|
-
};
|
|
859
|
-
// E50 PR-1 (0.3.24 P0): render forensic submit_diagnostics into the
|
|
860
|
-
// event so operators see per-attempt pane state without grepping. The
|
|
861
|
-
// legacy keys (`message_id` / `recipient` / `reason` / `attempts`)
|
|
862
|
-
// are preserved byte-for-byte for grep compatibility; new keys are
|
|
863
|
-
// ADDITIONAL.
|
|
864
|
-
let submit_attempts_detail = render_submit_diagnostics(&inject_report);
|
|
865
|
-
let mut unverified = serde_json::json!({
|
|
866
|
-
"message_id": message_id,
|
|
867
|
-
"recipient": message.recipient,
|
|
868
|
-
"reason": reason,
|
|
869
|
-
"attempts": inject_report.attempts,
|
|
870
|
-
"submit_attempts_detail": submit_attempts_detail,
|
|
871
|
-
});
|
|
872
|
-
merge_inject_readback_fields(
|
|
873
|
-
&mut unverified,
|
|
874
|
-
&inject_report,
|
|
875
|
-
Some(&target),
|
|
876
|
-
resolved.metadata.as_ref(),
|
|
877
|
-
);
|
|
878
|
-
event_log.write("send.unverified", unverified)?;
|
|
879
|
-
if inject_report.attempts >= u32::from(SEND_RETRY_MAX_ATTEMPTS) {
|
|
880
|
-
store.mark(message_id, "failed", Some("send_unverified_exhausted"))?;
|
|
881
|
-
emit_send_failed_exhausted(
|
|
882
|
-
workspace,
|
|
883
|
-
state,
|
|
884
|
-
event_log,
|
|
885
|
-
message_id,
|
|
886
|
-
&message.recipient,
|
|
887
|
-
inject_report.attempts,
|
|
888
|
-
"send_unverified_exhausted",
|
|
889
|
-
&reason,
|
|
890
|
-
Some(&inject_report),
|
|
891
|
-
)?;
|
|
892
|
-
return Ok(DeliveryOutcome {
|
|
893
|
-
ok: false,
|
|
894
|
-
status: DeliveryStatus::Failed,
|
|
895
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
896
|
-
message_id: Some(message_id.to_string()),
|
|
897
|
-
verification: Some(reason),
|
|
898
|
-
stage: Some(DeliveryStage::Submit),
|
|
899
|
-
reason: None,
|
|
900
|
-
channel: None,
|
|
901
|
-
ack_forced_off: false,
|
|
902
|
-
turn_verification: Some(turn_verification),
|
|
903
|
-
});
|
|
904
|
-
}
|
|
905
|
-
store.mark(message_id, "submitted_unverified", Some(&reason))?;
|
|
906
|
-
bind_enter_watchdog(store, transport, state, &target, message_id, &message,
|
|
907
|
-
canonical_owner_team_id.as_deref(), event_log)?;
|
|
908
|
-
return Ok(DeliveryOutcome {
|
|
909
|
-
ok: false,
|
|
910
|
-
status: DeliveryStatus::Failed,
|
|
911
|
-
message_status: MessageStatusShadow("submitted_unverified".to_string()),
|
|
912
|
-
message_id: Some(message_id.to_string()),
|
|
913
|
-
verification: Some(reason),
|
|
914
|
-
stage: Some(DeliveryStage::Submit),
|
|
915
|
-
reason: None,
|
|
916
|
-
channel: None,
|
|
917
|
-
ack_forced_off: false,
|
|
918
|
-
turn_verification: Some(turn_verification),
|
|
919
|
-
});
|
|
920
|
-
}
|
|
921
|
-
// S1-CAPTURE-001 (0.4.8, CR M4 Claude phase-1): for Claude/ClaudeCode
|
|
922
|
-
// recipients with a known authoritative rollout_path, verify the message
|
|
923
|
-
// token actually reached the worker's transcript before marking
|
|
924
|
-
// delivered. This catches the gate's mis-attribution: pane inject
|
|
925
|
-
// succeeded but the token landed in the leader/unassigned transcript,
|
|
926
|
-
// not the worker's. Budget per architect plan: 64KB tail / single
|
|
927
|
-
// per-delivery check / short grace window. Phase-1 Claude only —
|
|
928
|
-
// codex/copilot keep the pre-fix behaviour (will be addressed in
|
|
929
|
-
// phase-2 once Claude phase-1 is field-validated).
|
|
930
|
-
if let Some((rollout_path, provider_wire_str)) =
|
|
931
|
-
claude_recipient_rollout(state, &message.recipient)
|
|
932
|
-
{
|
|
933
|
-
let token_marker = format!("[team-agent-token:{message_id}]");
|
|
934
|
-
let grace = std::time::Duration::from_millis(200);
|
|
935
|
-
let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
|
|
936
|
-
let transcript_has_token = loop {
|
|
937
|
-
let found = rollout_tail_contains(&rollout_path, &token_marker, 64 * 1024);
|
|
938
|
-
if found || std::time::Instant::now() >= deadline {
|
|
939
|
-
break found;
|
|
940
|
-
}
|
|
941
|
-
std::thread::sleep(grace);
|
|
942
|
-
};
|
|
943
|
-
if !transcript_has_token {
|
|
944
|
-
// Loud but non-fatal: emit a mismatch event for diagnose/status
|
|
945
|
-
// observability. Do NOT mark delivered — degrade to
|
|
946
|
-
// submitted_unverified so capture is forced to re-attribute.
|
|
947
|
-
let reason = format!(
|
|
948
|
-
"transcript_missing:provider={provider_wire_str},rollout={}",
|
|
949
|
-
rollout_path.display()
|
|
950
|
-
);
|
|
951
|
-
event_log.write(
|
|
952
|
-
"provider.session.transcript_mismatch",
|
|
953
|
-
serde_json::json!({
|
|
954
|
-
"message_id": message_id,
|
|
955
|
-
"recipient": message.recipient,
|
|
956
|
-
"provider": provider_wire_str,
|
|
957
|
-
"rollout_path": rollout_path.to_string_lossy(),
|
|
958
|
-
"pane_id": state
|
|
959
|
-
.get("agents")
|
|
960
|
-
.and_then(|a| a.get(&message.recipient))
|
|
961
|
-
.and_then(|a| a.get("pane_id"))
|
|
962
|
-
.and_then(serde_json::Value::as_str)
|
|
963
|
-
.unwrap_or(""),
|
|
964
|
-
"spawn_epoch": state
|
|
965
|
-
.get("agents")
|
|
966
|
-
.and_then(|a| a.get(&message.recipient))
|
|
967
|
-
.and_then(|a| a.get("spawn_epoch"))
|
|
968
|
-
.and_then(serde_json::Value::as_u64)
|
|
969
|
-
.unwrap_or(0),
|
|
970
|
-
"reason": "transcript_missing",
|
|
971
|
-
}),
|
|
972
|
-
)?;
|
|
973
|
-
store.mark(message_id, "submitted_unverified", Some(&reason))?;
|
|
974
|
-
bind_enter_watchdog(store, transport, state, &target, message_id, &message,
|
|
975
|
-
canonical_owner_team_id.as_deref(), event_log)?;
|
|
976
|
-
return Ok(DeliveryOutcome {
|
|
977
|
-
ok: false,
|
|
978
|
-
status: DeliveryStatus::Failed,
|
|
979
|
-
message_status: MessageStatusShadow("submitted_unverified".to_string()),
|
|
980
|
-
message_id: Some(message_id.to_string()),
|
|
981
|
-
verification: Some(reason),
|
|
982
|
-
stage: Some(DeliveryStage::Submit),
|
|
983
|
-
reason: None,
|
|
984
|
-
channel: None,
|
|
985
|
-
ack_forced_off: false,
|
|
986
|
-
turn_verification: Some(turn_verification),
|
|
987
|
-
});
|
|
988
|
-
}
|
|
989
|
-
}
|
|
990
|
-
if is_leader_recipient {
|
|
991
|
-
store.record_delivery_submission(message_id, readback_verified)?;
|
|
992
|
-
match observe_leader_receipt(state, message_id) {
|
|
993
|
-
LeaderReceiptObservation::SourceUnavailable => {
|
|
994
|
-
store.mark_injected_awaiting_receipt(message_id)?;
|
|
995
|
-
event_log.write(
|
|
996
|
-
"leader_receiver.receipt_source_unavailable",
|
|
997
|
-
serde_json::json!({"message_id": message_id}),
|
|
998
|
-
)?;
|
|
999
|
-
let mut outcome = leader_receipt_source_unavailable_outcome(message_id);
|
|
1000
|
-
outcome.turn_verification = Some(turn_verification);
|
|
1001
|
-
return Ok(outcome);
|
|
1002
|
-
}
|
|
1003
|
-
LeaderReceiptObservation::TokenAbsent => {
|
|
1004
|
-
store.mark(message_id, "submitted_pending_acceptance", None)?;
|
|
1005
|
-
event_log.write(
|
|
1006
|
-
"leader_receiver.acceptance_pending",
|
|
1007
|
-
serde_json::json!({
|
|
1008
|
-
"message_id": message_id,
|
|
1009
|
-
"reason": "provider_receipt_not_observed",
|
|
1010
|
-
}),
|
|
1011
|
-
)?;
|
|
1012
|
-
let mut outcome =
|
|
1013
|
-
leader_acceptance_pending_outcome(message_id, "submitted_pending_acceptance");
|
|
1014
|
-
outcome.turn_verification = Some(turn_verification);
|
|
1015
|
-
return Ok(outcome);
|
|
1016
|
-
}
|
|
1017
|
-
LeaderReceiptObservation::TokenObserved => {}
|
|
1018
|
-
}
|
|
1019
|
-
store.mark_delivered_with_receipt(message_id)?;
|
|
1020
|
-
} else {
|
|
1021
|
-
store.mark(message_id, "delivered", None)?;
|
|
1022
|
-
}
|
|
1023
|
-
let mut delivered_event = serde_json::json!({"message_id": message_id});
|
|
1024
|
-
if let Some(metadata) = resolved.metadata.as_ref() {
|
|
1025
|
-
append_target_metadata(&mut delivered_event, metadata);
|
|
1026
|
-
}
|
|
1027
|
-
event_log.write("message.delivered", delivered_event)?;
|
|
1028
|
-
let outcome = DeliveryOutcome {
|
|
1029
|
-
ok: true,
|
|
1030
|
-
status: DeliveryStatus::Delivered,
|
|
1031
|
-
message_status: MessageStatusShadow("delivered".to_string()),
|
|
1032
|
-
message_id: Some(message_id.to_string()),
|
|
1033
|
-
verification: None,
|
|
1034
|
-
stage: None,
|
|
1035
|
-
reason: None,
|
|
1036
|
-
channel: None,
|
|
1037
|
-
ack_forced_off: false,
|
|
1038
|
-
turn_verification: Some(turn_verification),
|
|
1039
|
-
};
|
|
1040
|
-
if let Err(error) = stamp_first_send_at_if_leader_to_worker_scoped(
|
|
1041
|
-
workspace,
|
|
1042
|
-
&message.sender,
|
|
1043
|
-
&message.recipient,
|
|
1044
|
-
canonical_owner_team_id.as_deref(),
|
|
1045
|
-
) {
|
|
1046
|
-
absorb_state_error_only_after_physical_submit(
|
|
1047
|
-
transport,
|
|
1048
|
-
state,
|
|
1049
|
-
&message.recipient,
|
|
1050
|
-
&target,
|
|
1051
|
-
message_id,
|
|
1052
|
-
event_log,
|
|
1053
|
-
"stamp_first_send_at",
|
|
1054
|
-
error,
|
|
1055
|
-
)?;
|
|
1056
|
-
}
|
|
1057
|
-
if let Err(error) = record_turn_open_if_leader_to_worker_scoped(
|
|
1058
|
-
workspace,
|
|
1059
|
-
&message.sender,
|
|
1060
|
-
&message.recipient,
|
|
1061
|
-
&outcome,
|
|
1062
|
-
event_log,
|
|
1063
|
-
canonical_owner_team_id.as_deref(),
|
|
1064
|
-
resolved.metadata.as_ref(),
|
|
1065
|
-
) {
|
|
1066
|
-
absorb_state_error_only_after_physical_submit(
|
|
1067
|
-
transport,
|
|
1068
|
-
state,
|
|
1069
|
-
&message.recipient,
|
|
1070
|
-
&target,
|
|
1071
|
-
message_id,
|
|
1072
|
-
event_log,
|
|
1073
|
-
"turn_open_after_delivery",
|
|
1074
|
-
error,
|
|
1075
|
-
)?;
|
|
1076
|
-
}
|
|
1077
|
-
Ok(outcome)
|
|
1078
|
-
}
|
|
1079
|
-
|
|
1080
|
-
fn block_missing_worker_target(
|
|
1081
|
-
store: &MessageStore,
|
|
1082
|
-
event_log: &EventLog,
|
|
1083
|
-
message_id: &str,
|
|
1084
|
-
recipient: &str,
|
|
1085
|
-
target: &Target,
|
|
1086
|
-
live_targets: &[PaneInfo],
|
|
1087
|
-
) -> Result<Option<DeliveryOutcome>, MessagingError> {
|
|
1088
|
-
let Target::SessionWindow { session, window } = target else {
|
|
1089
|
-
return Ok(None);
|
|
1090
|
-
};
|
|
1091
|
-
if live_targets.is_empty() {
|
|
1092
|
-
return Ok(None);
|
|
1093
|
-
}
|
|
1094
|
-
if window.as_str().ends_with("_pane_conflicts_with_leader") {
|
|
1095
|
-
return Ok(None);
|
|
1096
|
-
}
|
|
1097
|
-
if live_targets.iter().any(|pane| {
|
|
1098
|
-
pane.session.as_str() == session.as_str()
|
|
1099
|
-
&& pane
|
|
1100
|
-
.window_name
|
|
1101
|
-
.as_ref()
|
|
1102
|
-
.is_some_and(|name| name.as_str() == window.as_str())
|
|
1103
|
-
}) {
|
|
1104
|
-
return Ok(None);
|
|
1105
|
-
}
|
|
1106
|
-
mark_worker_target_missing(store, event_log, message_id, recipient, None).map(Some)
|
|
1107
|
-
}
|
|
1108
|
-
|
|
1109
|
-
pub(crate) fn mark_worker_target_missing(
|
|
1110
|
-
store: &MessageStore,
|
|
1111
|
-
event_log: &EventLog,
|
|
1112
|
-
message_id: &str,
|
|
1113
|
-
recipient: &str,
|
|
1114
|
-
verification: Option<String>,
|
|
1115
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
1116
|
-
let action = format!("run team-agent start-agent {recipient} --allow-fresh");
|
|
1117
|
-
store.mark(
|
|
1118
|
-
message_id,
|
|
1119
|
-
"queued_pane_missing",
|
|
1120
|
-
Some("tmux_target_missing"),
|
|
1121
|
-
)?;
|
|
1122
|
-
event_log.write(
|
|
1123
|
-
"send.inject_blocked",
|
|
1124
|
-
serde_json::json!({
|
|
1125
|
-
"message_id": message_id,
|
|
1126
|
-
"recipient": recipient,
|
|
1127
|
-
"reason": "tmux_target_missing",
|
|
1128
|
-
"channel": "delivery_blocked",
|
|
1129
|
-
"action": action,
|
|
1130
|
-
"verification": verification,
|
|
1131
|
-
}),
|
|
1132
|
-
)?;
|
|
1133
|
-
Ok(DeliveryOutcome {
|
|
1134
|
-
ok: false,
|
|
1135
|
-
status: DeliveryStatus::Blocked,
|
|
1136
|
-
message_status: MessageStatusShadow("queued_pane_missing".to_string()),
|
|
1137
|
-
message_id: Some(message_id.to_string()),
|
|
1138
|
-
verification: verification.or(Some(action)),
|
|
1139
|
-
stage: Some(DeliveryStage::Inject),
|
|
1140
|
-
reason: Some(DeliveryRefusal::TmuxTargetMissing),
|
|
1141
|
-
channel: Some("delivery_blocked".to_string()),
|
|
1142
|
-
ack_forced_off: false,
|
|
1143
|
-
turn_verification: None,
|
|
1144
|
-
})
|
|
1145
|
-
}
|
|
1146
|
-
|
|
1147
|
-
fn transport_error_is_target_missing(error: &crate::transport::TransportError) -> bool {
|
|
1148
|
-
match error {
|
|
1149
|
-
crate::transport::TransportError::TargetNotFound { .. } => true,
|
|
1150
|
-
crate::transport::TransportError::Subprocess { stderr, .. } => {
|
|
1151
|
-
let stderr = stderr.to_ascii_lowercase();
|
|
1152
|
-
(stderr.contains("can't find") || stderr.contains("no such"))
|
|
1153
|
-
&& (stderr.contains("pane")
|
|
1154
|
-
|| stderr.contains("window")
|
|
1155
|
-
|| stderr.contains("session"))
|
|
1156
|
-
}
|
|
1157
|
-
_ => false,
|
|
1158
|
-
}
|
|
1159
|
-
}
|
|
1160
|
-
|
|
1161
|
-
pub fn requeue_worker_target_missing_messages(
|
|
1162
|
-
workspace: &Path,
|
|
1163
|
-
store: &MessageStore,
|
|
1164
|
-
event_log: &EventLog,
|
|
1165
|
-
recipient: &str,
|
|
1166
|
-
owner_team_id: Option<&str>,
|
|
1167
|
-
) -> Result<Vec<String>, MessagingError> {
|
|
1168
|
-
let ids = store.recover_worker_pane_available(recipient, owner_team_id)?;
|
|
1169
|
-
if !ids.is_empty() {
|
|
1170
|
-
event_log.write(
|
|
1171
|
-
"worker_receiver.blocked_messages_requeued",
|
|
1172
|
-
serde_json::json!({
|
|
1173
|
-
"recipient": recipient,
|
|
1174
|
-
"owner_team_id": owner_team_id,
|
|
1175
|
-
"count": ids.len(),
|
|
1176
|
-
"message_ids": ids,
|
|
1177
|
-
}),
|
|
1178
|
-
)?;
|
|
1179
|
-
}
|
|
1180
|
-
let _ = workspace;
|
|
1181
|
-
Ok(ids)
|
|
1182
|
-
}
|
|
1183
|
-
|
|
1184
|
-
/// 把 post-Enter 消费判定落到 workspace,供确认面扫盘。
|
|
1185
|
-
///
|
|
1186
|
-
/// //! purpose: persist SubmitVerification after inject
|
|
1187
|
-
/// //! contract: file contains Debug variant name (SubmitConsumptionUnverified / EnterSentWithoutPlaceholderCheck)
|
|
1188
|
-
/// //! boundary: write failure must not fail delivery
|
|
1189
|
-
fn persist_submit_verification(workspace: &Path, message_id: &str, report: &InjectReport) {
|
|
1190
|
-
let dir = workspace.join(".team").join("runtime");
|
|
1191
|
-
if std::fs::create_dir_all(&dir).is_err() {
|
|
1192
|
-
return;
|
|
1193
|
-
}
|
|
1194
|
-
let mut body = serde_json::json!({
|
|
1195
|
-
"message_id": message_id,
|
|
1196
|
-
"submit_verification": format!("{:?}", report.submit_verification),
|
|
1197
|
-
"inject_verification": format!("{:?}", report.inject_verification),
|
|
1198
|
-
"turn_verification": turn_verification_wire(report.turn_verification),
|
|
1199
|
-
"submit_verified": inject_submit_verified(report),
|
|
1200
|
-
"attempts": report.attempts,
|
|
1201
|
-
});
|
|
1202
|
-
merge_inject_readback_fields(&mut body, report, None, None);
|
|
1203
|
-
let _ = std::fs::write(dir.join("submit-verification.json"), format!("{body}\n"));
|
|
1204
|
-
}
|
|
1205
|
-
|
|
1206
|
-
/// 0.3.27: promoted to pub(crate) for leader_receiver.rs verification gate.
|
|
1207
|
-
pub(crate) fn inject_submit_verified(report: &InjectReport) -> bool {
|
|
1208
|
-
match report.submit_verification {
|
|
1209
|
-
SubmitVerification::SendKeysFailed => false,
|
|
1210
|
-
SubmitVerification::PastedContentPromptStillPresentAfterSubmit => false,
|
|
1211
|
-
SubmitVerification::PastedContentPromptAbsentAfterSubmit => true,
|
|
1212
|
-
SubmitVerification::KeySentAfterVisibleToken { .. } => true,
|
|
1213
|
-
// MUST-10 preserved: EnterSentWithoutPlaceholderCheck still ⇒ delivered
|
|
1214
|
-
// (provider_submit_verification_red.rs:113-159 contract). E46 narrows
|
|
1215
|
-
// when transport returns this variant: it is now emitted ONLY after
|
|
1216
|
-
// post-Enter input-consumption confirmation succeeds. Fresh TUI
|
|
1217
|
-
// (bracketed-paste-stuck) instead returns SubmitConsumptionUnverified
|
|
1218
|
-
// so this branch keeps delivered semantics intact.
|
|
1219
|
-
SubmitVerification::EnterSentWithoutPlaceholderCheck => true,
|
|
1220
|
-
// E46 (0.3.24 bug#5): Enter was sent but post-Enter consumption was
|
|
1221
|
-
// NOT observed within the bounded resend cap. Treat as not delivered
|
|
1222
|
-
// (submitted_unverified / failed) — prevents the macmini假阳 where
|
|
1223
|
-
// demo-director's stuck bracketed-paste swallowed the Enter and
|
|
1224
|
-
// delivery still reported delivered.
|
|
1225
|
-
SubmitVerification::SubmitConsumptionUnverified => false,
|
|
1226
|
-
}
|
|
1227
|
-
}
|
|
1228
|
-
|
|
1229
|
-
/// U1 #7 step-2: pane-readback gate. `CaptureMissingToken` is negative readback
|
|
1230
|
-
/// evidence, but 0.3.30 submit evidence can supersede it: consumption or
|
|
1231
|
-
/// post-submit token observation proves the message reached the pane.
|
|
1232
|
-
/// 0.3.27: promoted to pub(crate) for leader_receiver.rs verification gate.
|
|
1233
|
-
pub(crate) fn pane_readback_verified(report: &InjectReport) -> bool {
|
|
1234
|
-
!matches!(
|
|
1235
|
-
report.inject_verification,
|
|
1236
|
-
InjectVerification::CaptureMissingToken
|
|
1237
|
-
)
|
|
1238
|
-
}
|
|
1239
|
-
|
|
1240
|
-
/// Render a message into the worker-facing protocol block (port of `rust_core.py:render_message`,
|
|
1241
|
-
/// golden-verified): `Team Agent message from {sender}[ for {task_id}]:\n\n{content}\n\n
|
|
1242
|
-
/// [team-agent-token:{message_id}]`. The worker (fake or real provider) only builds a result_envelope
|
|
1243
|
-
/// when it sees this block + extracts the token — the bare content gives WORKING but never a report
|
|
1244
|
-
/// (rt-host-a loop #4). token == message_id (exactly-once correlation).
|
|
1245
|
-
/// F1 (0.3.26): promoted to `pub` for direct pane send in cli/send.rs.
|
|
1246
|
-
pub fn render_message(
|
|
1247
|
-
sender: &str,
|
|
1248
|
-
task_id: Option<&str>,
|
|
1249
|
-
content: &str,
|
|
1250
|
-
message_id: &str,
|
|
1251
|
-
) -> String {
|
|
1252
|
-
let mut header = format!("Team Agent message from {sender}");
|
|
1253
|
-
if let Some(task_id) = task_id.filter(|t| !t.is_empty()) {
|
|
1254
|
-
header.push_str(&format!(" for {task_id}"));
|
|
1255
|
-
}
|
|
1256
|
-
format!("{header}:\n\n{content}\n\n[team-agent-token:{message_id}]")
|
|
1257
|
-
}
|
|
1258
|
-
|
|
1259
|
-
fn deliver_leader_via_app_server(
|
|
1260
|
-
store: &MessageStore,
|
|
1261
|
-
event_log: &EventLog,
|
|
1262
|
-
state: &serde_json::Value,
|
|
1263
|
-
message_id: &str,
|
|
1264
|
-
message: &PendingMessage,
|
|
1265
|
-
owner_team_id: Option<&str>,
|
|
1266
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
1267
|
-
let receiver = leader_receiver_value(state).ok_or_else(|| {
|
|
1268
|
-
MessagingError::Routing("codex_app_server leader_receiver missing".to_string())
|
|
1269
|
-
})?;
|
|
1270
|
-
let binding = match crate::codex_app_server::binding_from_receiver(receiver) {
|
|
1271
|
-
Ok(binding) => binding,
|
|
1272
|
-
Err(error) => {
|
|
1273
|
-
return Ok(app_server_delivery_failure(
|
|
1274
|
-
store,
|
|
1275
|
-
event_log,
|
|
1276
|
-
receiver,
|
|
1277
|
-
message_id,
|
|
1278
|
-
&message.sender,
|
|
1279
|
-
owner_team_id,
|
|
1280
|
-
&error,
|
|
1281
|
-
)?);
|
|
1282
|
-
}
|
|
1283
|
-
};
|
|
1284
|
-
let rendered = render_message(
|
|
1285
|
-
&message.sender,
|
|
1286
|
-
message.task_id.as_deref(),
|
|
1287
|
-
&message.content,
|
|
1288
|
-
message_id,
|
|
1289
|
-
);
|
|
1290
|
-
match crate::codex_app_server::submit_to_bound_thread(&binding, message_id, &rendered) {
|
|
1291
|
-
Ok(submit) => {
|
|
1292
|
-
store.record_delivery_submission(message_id, true)?;
|
|
1293
|
-
store.mark_delivered_with_receipt(message_id)?;
|
|
1294
|
-
event_log.write(
|
|
1295
|
-
"message.delivered",
|
|
1296
|
-
serde_json::json!({"message_id": message_id}),
|
|
1297
|
-
)?;
|
|
1298
|
-
event_log.write(
|
|
1299
|
-
"leader_receiver.app_server_submitted",
|
|
1300
|
-
serde_json::json!({
|
|
1301
|
-
"message_id": message_id,
|
|
1302
|
-
"owner_team_id": owner_team_id,
|
|
1303
|
-
"owner_epoch": receiver_owner_epoch(receiver),
|
|
1304
|
-
"socket": binding.socket,
|
|
1305
|
-
"thread_id": binding.thread_id,
|
|
1306
|
-
"turn_id": submit.turn_id,
|
|
1307
|
-
"turn_status": submit.turn_status,
|
|
1308
|
-
}),
|
|
1309
|
-
)?;
|
|
1310
|
-
Ok(DeliveryOutcome {
|
|
1311
|
-
ok: true,
|
|
1312
|
-
status: DeliveryStatus::Delivered,
|
|
1313
|
-
message_status: MessageStatusShadow("delivered".to_string()),
|
|
1314
|
-
message_id: Some(message_id.to_string()),
|
|
1315
|
-
verification: None,
|
|
1316
|
-
stage: None,
|
|
1317
|
-
reason: None,
|
|
1318
|
-
channel: Some("codex_app_server".to_string()),
|
|
1319
|
-
ack_forced_off: false,
|
|
1320
|
-
turn_verification: None,
|
|
1321
|
-
})
|
|
1322
|
-
}
|
|
1323
|
-
Err(error) => app_server_delivery_failure(
|
|
1324
|
-
store,
|
|
1325
|
-
event_log,
|
|
1326
|
-
receiver,
|
|
1327
|
-
message_id,
|
|
1328
|
-
&message.sender,
|
|
1329
|
-
owner_team_id,
|
|
1330
|
-
&error,
|
|
1331
|
-
),
|
|
1332
|
-
}
|
|
1333
|
-
}
|
|
1334
|
-
|
|
1335
|
-
fn app_server_delivery_failure(
|
|
1336
|
-
store: &MessageStore,
|
|
1337
|
-
event_log: &EventLog,
|
|
1338
|
-
receiver: &serde_json::Value,
|
|
1339
|
-
message_id: &str,
|
|
1340
|
-
sender: &str,
|
|
1341
|
-
owner_team_id: Option<&str>,
|
|
1342
|
-
error: &crate::codex_app_server::AppServerError,
|
|
1343
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
1344
|
-
let action = app_server_rebind_action(owner_team_id, receiver);
|
|
1345
|
-
match error {
|
|
1346
|
-
crate::codex_app_server::AppServerError::LeaderBusy(message) => {
|
|
1347
|
-
store.mark(message_id, "target_resolved", Some("leader_busy"))?;
|
|
1348
|
-
event_log.write(
|
|
1349
|
-
"leader_receiver.app_server_busy",
|
|
1350
|
-
serde_json::json!({
|
|
1351
|
-
"message_id": message_id,
|
|
1352
|
-
"sender": sender,
|
|
1353
|
-
"reason": "leader_busy",
|
|
1354
|
-
"error": message,
|
|
1355
|
-
}),
|
|
1356
|
-
)?;
|
|
1357
|
-
Ok(DeliveryOutcome {
|
|
1358
|
-
ok: false,
|
|
1359
|
-
status: DeliveryStatus::RetryScheduled,
|
|
1360
|
-
message_status: MessageStatusShadow("target_resolved".to_string()),
|
|
1361
|
-
message_id: Some(message_id.to_string()),
|
|
1362
|
-
verification: Some("leader_busy".to_string()),
|
|
1363
|
-
stage: None,
|
|
1364
|
-
reason: Some(DeliveryRefusal::RecipientBusy),
|
|
1365
|
-
channel: Some("leader_busy".to_string()),
|
|
1366
|
-
ack_forced_off: false,
|
|
1367
|
-
turn_verification: None,
|
|
1368
|
-
})
|
|
1369
|
-
}
|
|
1370
|
-
crate::codex_app_server::AppServerError::ThreadStale { expected, actual } => {
|
|
1371
|
-
store.mark(message_id, "failed", Some(error.code()))?;
|
|
1372
|
-
event_log.write(
|
|
1373
|
-
"leader_receiver.app_server_thread_stale",
|
|
1374
|
-
serde_json::json!({
|
|
1375
|
-
"message_id": message_id,
|
|
1376
|
-
"sender": sender,
|
|
1377
|
-
"owner_team_id": owner_team_id,
|
|
1378
|
-
"owner_epoch": receiver_owner_epoch(receiver),
|
|
1379
|
-
"expected": expected,
|
|
1380
|
-
"actual": actual,
|
|
1381
|
-
"action": action,
|
|
1382
|
-
}),
|
|
1383
|
-
)?;
|
|
1384
|
-
Ok(rebind_required_outcome(message_id, &action))
|
|
1385
|
-
}
|
|
1386
|
-
crate::codex_app_server::AppServerError::ApprovalUnsupported(method) => {
|
|
1387
|
-
store.mark(message_id, "failed", Some("approval_unsupported"))?;
|
|
1388
|
-
event_log.write(
|
|
1389
|
-
"codex_app_server.approval_unsupported",
|
|
1390
|
-
serde_json::json!({
|
|
1391
|
-
"message_id": message_id,
|
|
1392
|
-
"sender": sender,
|
|
1393
|
-
"method": method,
|
|
1394
|
-
"action": "handle approval in the Codex app-server session",
|
|
1395
|
-
}),
|
|
1396
|
-
)?;
|
|
1397
|
-
Ok(DeliveryOutcome {
|
|
1398
|
-
ok: false,
|
|
1399
|
-
status: DeliveryStatus::Blocked,
|
|
1400
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
1401
|
-
message_id: Some(message_id.to_string()),
|
|
1402
|
-
verification: Some("handle approval in the Codex app-server session".to_string()),
|
|
1403
|
-
stage: None,
|
|
1404
|
-
reason: Some(DeliveryRefusal::MissingPermissions),
|
|
1405
|
-
channel: Some("codex_app_server".to_string()),
|
|
1406
|
-
ack_forced_off: false,
|
|
1407
|
-
turn_verification: None,
|
|
1408
|
-
})
|
|
1409
|
-
}
|
|
1410
|
-
crate::codex_app_server::AppServerError::ProtocolMismatch(_)
|
|
1411
|
-
| crate::codex_app_server::AppServerError::MissingUserAgent => {
|
|
1412
|
-
store.mark(message_id, "failed", Some(error.code()))?;
|
|
1413
|
-
event_log.write(
|
|
1414
|
-
"leader_receiver.app_server_protocol_mismatch",
|
|
1415
|
-
serde_json::json!({
|
|
1416
|
-
"message_id": message_id,
|
|
1417
|
-
"sender": sender,
|
|
1418
|
-
"owner_team_id": owner_team_id,
|
|
1419
|
-
"owner_epoch": receiver_owner_epoch(receiver),
|
|
1420
|
-
"reason": error.code(),
|
|
1421
|
-
"error": error.to_string(),
|
|
1422
|
-
"action": action,
|
|
1423
|
-
}),
|
|
1424
|
-
)?;
|
|
1425
|
-
Ok(rebind_required_outcome(message_id, &action))
|
|
1426
|
-
}
|
|
1427
|
-
crate::codex_app_server::AppServerError::SocketUnreachable(_)
|
|
1428
|
-
| crate::codex_app_server::AppServerError::SocketOwnershipInvalid(_)
|
|
1429
|
-
| crate::codex_app_server::AppServerError::ThreadNotLive(_)
|
|
1430
|
-
| crate::codex_app_server::AppServerError::Io(_)
|
|
1431
|
-
| crate::codex_app_server::AppServerError::Json(_) => {
|
|
1432
|
-
store.mark(message_id, "failed", Some(error.code()))?;
|
|
1433
|
-
event_log.write(
|
|
1434
|
-
"leader_receiver.delivery_blocked",
|
|
1435
|
-
serde_json::json!({
|
|
1436
|
-
"message_id": message_id,
|
|
1437
|
-
"sender": sender,
|
|
1438
|
-
"reason": error.code(),
|
|
1439
|
-
"channel": "rebind_required",
|
|
1440
|
-
"action": action,
|
|
1441
|
-
"error": error.to_string(),
|
|
1442
|
-
}),
|
|
1443
|
-
)?;
|
|
1444
|
-
Ok(rebind_required_outcome(message_id, &action))
|
|
1445
|
-
}
|
|
1446
|
-
}
|
|
1447
|
-
}
|
|
1448
|
-
|
|
1449
|
-
fn rebind_required_outcome(message_id: &str, action: &str) -> DeliveryOutcome {
|
|
1450
|
-
DeliveryOutcome {
|
|
1451
|
-
ok: false,
|
|
1452
|
-
status: DeliveryStatus::Refused,
|
|
1453
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
1454
|
-
message_id: Some(message_id.to_string()),
|
|
1455
|
-
verification: Some(action.to_string()),
|
|
1456
|
-
stage: None,
|
|
1457
|
-
reason: Some(DeliveryRefusal::LeaderNotAttached),
|
|
1458
|
-
channel: Some("rebind_required".to_string()),
|
|
1459
|
-
ack_forced_off: false,
|
|
1460
|
-
turn_verification: None,
|
|
1461
|
-
}
|
|
1462
|
-
}
|
|
1463
|
-
|
|
1464
|
-
fn app_server_rebind_action(owner_team_id: Option<&str>, receiver: &serde_json::Value) -> String {
|
|
1465
|
-
let team = owner_team_id
|
|
1466
|
-
.filter(|team| !team.is_empty())
|
|
1467
|
-
.map(|team| format!(" --team {team}"))
|
|
1468
|
-
.unwrap_or_default();
|
|
1469
|
-
let Some(app) = receiver.get("app_server") else {
|
|
1470
|
-
return format!("run team-agent attach-app-server-leader{team} --socket <socket> --thread-id <thread_id>");
|
|
1471
|
-
};
|
|
1472
|
-
let socket = app
|
|
1473
|
-
.get("socket")
|
|
1474
|
-
.and_then(serde_json::Value::as_str)
|
|
1475
|
-
.unwrap_or("<socket>");
|
|
1476
|
-
let thread_id = app
|
|
1477
|
-
.get("thread_id")
|
|
1478
|
-
.and_then(serde_json::Value::as_str)
|
|
1479
|
-
.unwrap_or("<thread_id>");
|
|
1480
|
-
format!(
|
|
1481
|
-
"run team-agent attach-app-server-leader{team} --socket {socket} --thread-id {thread_id}"
|
|
1482
|
-
)
|
|
1483
|
-
}
|
|
1484
|
-
|
|
1485
|
-
/// Resolve a recipient agent-id to a tmux-RESOLVABLE inject target: the persisted pane-id if present,
|
|
1486
|
-
/// else a session-qualified `SessionWindow` (state.session_name + the agent's window, defaulting to the
|
|
1487
|
-
/// id). NEVER the bare agent-id as a pane — a clientless coordinator cannot resolve that
|
|
1488
|
-
/// ("can't find pane: w1", rt-host-a loop #3). Mirrors `coordinator/tick.rs::capture_target`.
|
|
1489
|
-
///
|
|
1490
|
-
/// Leader delivery uses the bound leader receiver pane. The leader is not a worker agent and
|
|
1491
|
-
/// must not fall through to a synthetic `SessionWindow{window="leader"}` target.
|
|
1492
|
-
///
|
|
1493
|
-
/// `live_targets` is passed in BY THE CALLER (probed ONCE per delivery — see U1-B); this fn is
|
|
1494
|
-
/// pure w.r.t. transport state. The caller must DEFER on `list_targets()` Err and never coerce
|
|
1495
|
-
/// to an empty vec.
|
|
1496
|
-
///
|
|
1497
|
-
/// **0.3.24 excision (U1-A real-machine RED v2, macmini fixture res_e4b40473d36f)**:
|
|
1498
|
-
/// the wave-2 LEADER drift fallback chain (session+window probe) was removed — see
|
|
1499
|
-
/// `.team/artifacts/u1-a-realmachine-v2-fix-or-excise.md` for the root-cause analysis.
|
|
1500
|
-
/// Drift now fails loudly as `leader_not_attached` rather than silently selecting a stale
|
|
1501
|
-
/// pane. U1-A real-machine fix is deferred to v0.3.25 (writer-shape + projection +
|
|
1502
|
-
/// rediscover-writer triad). U1-B jitter defer at try_deliver_message:213-237 and
|
|
1503
|
-
/// U1-C-Tail at the startup-prompt peek site are unchanged.
|
|
1504
|
-
#[derive(Clone)]
|
|
1505
|
-
struct ResolvedInjectTarget {
|
|
1506
|
-
target: Target,
|
|
1507
|
-
metadata: Option<TargetMetadata>,
|
|
1508
|
-
stale_binding: Option<WorkerPaneBindingStale>,
|
|
1509
|
-
}
|
|
1510
|
-
|
|
1511
|
-
#[derive(Clone)]
|
|
1512
|
-
struct TargetMetadata {
|
|
1513
|
-
tmux_endpoint: Option<String>,
|
|
1514
|
-
target_session: String,
|
|
1515
|
-
target_window: String,
|
|
1516
|
-
target_pane_id: String,
|
|
1517
|
-
target_pane_pid: Option<u32>,
|
|
1518
|
-
resolved_from: &'static str,
|
|
1519
|
-
}
|
|
1520
|
-
|
|
1521
|
-
#[derive(Clone)]
|
|
1522
|
-
struct WorkerPaneBindingStale {
|
|
1523
|
-
cached_pane_id: String,
|
|
1524
|
-
expected_session: String,
|
|
1525
|
-
expected_window: String,
|
|
1526
|
-
observed_session: String,
|
|
1527
|
-
observed_window: String,
|
|
1528
|
-
observed_pane_pid: Option<u32>,
|
|
1529
|
-
}
|
|
1530
|
-
|
|
1531
|
-
impl WorkerPaneBindingStale {
|
|
1532
|
-
fn as_event_payload(&self, message_id: &str, recipient: &str) -> serde_json::Value {
|
|
1533
|
-
serde_json::json!({
|
|
1534
|
-
"message_id": message_id,
|
|
1535
|
-
"recipient": recipient,
|
|
1536
|
-
"cached_pane_id": self.cached_pane_id,
|
|
1537
|
-
"expected_session": self.expected_session,
|
|
1538
|
-
"expected_window": self.expected_window,
|
|
1539
|
-
"observed_session": self.observed_session,
|
|
1540
|
-
"observed_window": self.observed_window,
|
|
1541
|
-
"observed_pane_pid": self.observed_pane_pid,
|
|
1542
|
-
})
|
|
1543
|
-
}
|
|
1544
|
-
}
|
|
1545
|
-
|
|
1546
|
-
fn resolve_inject_target(
|
|
1547
|
-
state: &serde_json::Value,
|
|
1548
|
-
recipient: &str,
|
|
1549
|
-
transport: &dyn Transport,
|
|
1550
|
-
live_targets: &[PaneInfo],
|
|
1551
|
-
) -> ResolvedInjectTarget {
|
|
1552
|
-
if recipient == "leader" {
|
|
1553
|
-
if let Some(pane_id) = leader_receiver_pane_id(state) {
|
|
1554
|
-
return ResolvedInjectTarget {
|
|
1555
|
-
target: Target::Pane(PaneId::new(pane_id)),
|
|
1556
|
-
metadata: None,
|
|
1557
|
-
stale_binding: None,
|
|
1558
|
-
};
|
|
1559
|
-
}
|
|
1560
|
-
}
|
|
1561
|
-
let agent = state.get("agents").and_then(|a| a.get(recipient));
|
|
1562
|
-
let session = state
|
|
1563
|
-
.get("session_name")
|
|
1564
|
-
.and_then(serde_json::Value::as_str)
|
|
1565
|
-
.unwrap_or_default();
|
|
1566
|
-
let window = agent
|
|
1567
|
-
.and_then(|a| a.get("window"))
|
|
1568
|
-
.and_then(serde_json::Value::as_str)
|
|
1569
|
-
.filter(|s| !s.is_empty())
|
|
1570
|
-
.unwrap_or(recipient);
|
|
1571
|
-
let cached_pane = agent
|
|
1572
|
-
.and_then(|a| a.get("pane_id"))
|
|
1573
|
-
.and_then(serde_json::Value::as_str)
|
|
1574
|
-
.filter(|s| !s.is_empty())
|
|
1575
|
-
.map(PaneId::new);
|
|
1576
|
-
// E51 (0.3.26 P0, delivery loop guard): if the worker's cached pane_id is
|
|
1577
|
-
// the SAME as leader_receiver.pane_id (the leader's handle), injecting into
|
|
1578
|
-
// it would deliver the worker's message back to the leader pane — a routing
|
|
1579
|
-
// loop that the macmini "hand-handle mapping 灾難" truth source exposed. Fail
|
|
1580
|
-
// loud with a SessionWindow target that will surface as a structured error
|
|
1581
|
-
// (the SessionWindow "leader" target trips the existing leader_not_attached
|
|
1582
|
-
// guard on any subsequent delivery attempt for this message). The root fix
|
|
1583
|
-
// is in lease.rs (E51 guard #1) which prevents the conflation; this is the
|
|
1584
|
-
// defence-in-depth in the delivery layer.
|
|
1585
|
-
if let Some(pane) = cached_pane.as_ref() {
|
|
1586
|
-
let worker_socket = worker_tmux_socket(state, agent, transport);
|
|
1587
|
-
if leader_receiver_pane_binding(state).is_some_and(|leader| {
|
|
1588
|
-
pane_conflicts_on_same_socket(pane.as_str(), worker_socket.as_deref(), leader)
|
|
1589
|
-
}) {
|
|
1590
|
-
return ResolvedInjectTarget {
|
|
1591
|
-
target: Target::SessionWindow {
|
|
1592
|
-
session: SessionName::new(session),
|
|
1593
|
-
window: WindowName::new(format!("{recipient}_pane_conflicts_with_leader")),
|
|
1594
|
-
},
|
|
1595
|
-
metadata: None,
|
|
1596
|
-
stale_binding: None,
|
|
1597
|
-
};
|
|
1598
|
-
}
|
|
1599
|
-
}
|
|
1600
|
-
let stale_binding = cached_pane.as_ref().and_then(|pane| {
|
|
1601
|
-
live_targets
|
|
1602
|
-
.iter()
|
|
1603
|
-
.find(|target| target.pane_id.as_str() == pane.as_str())
|
|
1604
|
-
.and_then(|target| stale_worker_pane_binding(target, session, window))
|
|
1605
|
-
});
|
|
1606
|
-
if let Some(live_pane) = live_pane_for_session_window(live_targets, session, window) {
|
|
1607
|
-
return ResolvedInjectTarget {
|
|
1608
|
-
target: Target::Pane(live_pane.pane_id.clone()),
|
|
1609
|
-
metadata: Some(target_metadata(
|
|
1610
|
-
transport,
|
|
1611
|
-
live_pane,
|
|
1612
|
-
"session_window_lookup",
|
|
1613
|
-
)),
|
|
1614
|
-
stale_binding,
|
|
1615
|
-
};
|
|
1616
|
-
}
|
|
1617
|
-
if let Some(pane) = cached_pane {
|
|
1618
|
-
if let Some(live_pane) = live_targets.iter().find(|target| {
|
|
1619
|
-
target.pane_id.as_str() == pane.as_str()
|
|
1620
|
-
&& target.session.as_str() == session
|
|
1621
|
-
&& target
|
|
1622
|
-
.window_name
|
|
1623
|
-
.as_ref()
|
|
1624
|
-
.is_some_and(|name| name.as_str() == window)
|
|
1625
|
-
}) {
|
|
1626
|
-
return ResolvedInjectTarget {
|
|
1627
|
-
target: Target::Pane(pane),
|
|
1628
|
-
metadata: Some(target_metadata(
|
|
1629
|
-
transport,
|
|
1630
|
-
live_pane,
|
|
1631
|
-
"validated_cached_pane",
|
|
1632
|
-
)),
|
|
1633
|
-
stale_binding: None,
|
|
1634
|
-
};
|
|
1635
|
-
}
|
|
1636
|
-
if live_targets.is_empty() {
|
|
1637
|
-
return ResolvedInjectTarget {
|
|
1638
|
-
target: Target::Pane(pane),
|
|
1639
|
-
metadata: None,
|
|
1640
|
-
stale_binding: None,
|
|
1641
|
-
};
|
|
1642
|
-
}
|
|
1643
|
-
}
|
|
1644
|
-
ResolvedInjectTarget {
|
|
1645
|
-
target: Target::SessionWindow {
|
|
1646
|
-
session: SessionName::new(session),
|
|
1647
|
-
window: WindowName::new(window),
|
|
1648
|
-
},
|
|
1649
|
-
metadata: None,
|
|
1650
|
-
stale_binding,
|
|
1651
|
-
}
|
|
1652
|
-
}
|
|
1653
|
-
|
|
1654
|
-
fn live_pane_for_session_window<'a>(
|
|
1655
|
-
targets: &'a [PaneInfo],
|
|
1656
|
-
session: &str,
|
|
1657
|
-
window: &str,
|
|
1658
|
-
) -> Option<&'a PaneInfo> {
|
|
1659
|
-
targets.iter().find(|target| {
|
|
1660
|
-
target.session.as_str() == session
|
|
1661
|
-
&& target
|
|
1662
|
-
.window_name
|
|
1663
|
-
.as_ref()
|
|
1664
|
-
.is_some_and(|name| name.as_str() == window)
|
|
1665
|
-
})
|
|
1666
|
-
}
|
|
1667
|
-
|
|
1668
|
-
fn stale_worker_pane_binding(
|
|
1669
|
-
observed: &PaneInfo,
|
|
1670
|
-
expected_session: &str,
|
|
1671
|
-
expected_window: &str,
|
|
1672
|
-
) -> Option<WorkerPaneBindingStale> {
|
|
1673
|
-
let observed_window = observed
|
|
1674
|
-
.window_name
|
|
1675
|
-
.as_ref()
|
|
1676
|
-
.map(|window| window.as_str())
|
|
1677
|
-
.unwrap_or_default();
|
|
1678
|
-
if observed.session.as_str() == expected_session && observed_window == expected_window {
|
|
1679
|
-
return None;
|
|
1680
|
-
}
|
|
1681
|
-
Some(WorkerPaneBindingStale {
|
|
1682
|
-
cached_pane_id: observed.pane_id.as_str().to_string(),
|
|
1683
|
-
expected_session: expected_session.to_string(),
|
|
1684
|
-
expected_window: expected_window.to_string(),
|
|
1685
|
-
observed_session: observed.session.as_str().to_string(),
|
|
1686
|
-
observed_window: observed_window.to_string(),
|
|
1687
|
-
observed_pane_pid: observed.pane_pid,
|
|
1688
|
-
})
|
|
1689
|
-
}
|
|
1690
|
-
|
|
1691
|
-
fn target_metadata(
|
|
1692
|
-
transport: &dyn Transport,
|
|
1693
|
-
pane: &PaneInfo,
|
|
1694
|
-
resolved_from: &'static str,
|
|
1695
|
-
) -> TargetMetadata {
|
|
1696
|
-
TargetMetadata {
|
|
1697
|
-
tmux_endpoint: transport.tmux_endpoint(),
|
|
1698
|
-
target_session: pane.session.as_str().to_string(),
|
|
1699
|
-
target_window: pane
|
|
1700
|
-
.window_name
|
|
1701
|
-
.as_ref()
|
|
1702
|
-
.map(|window| window.as_str().to_string())
|
|
1703
|
-
.unwrap_or_default(),
|
|
1704
|
-
target_pane_id: pane.pane_id.as_str().to_string(),
|
|
1705
|
-
target_pane_pid: pane.pane_pid,
|
|
1706
|
-
resolved_from,
|
|
1707
|
-
}
|
|
1708
|
-
}
|
|
1709
|
-
|
|
1710
|
-
fn append_target_metadata(event: &mut serde_json::Value, metadata: &TargetMetadata) {
|
|
1711
|
-
let Some(obj) = event.as_object_mut() else {
|
|
1712
|
-
return;
|
|
1713
|
-
};
|
|
1714
|
-
obj.insert("target_kind".to_string(), serde_json::json!("pane"));
|
|
1715
|
-
obj.insert(
|
|
1716
|
-
"tmux_endpoint".to_string(),
|
|
1717
|
-
metadata
|
|
1718
|
-
.tmux_endpoint
|
|
1719
|
-
.as_ref()
|
|
1720
|
-
.map(|endpoint| serde_json::json!(endpoint))
|
|
1721
|
-
.unwrap_or(serde_json::Value::Null),
|
|
1722
|
-
);
|
|
1723
|
-
obj.insert(
|
|
1724
|
-
"target_session".to_string(),
|
|
1725
|
-
serde_json::json!(metadata.target_session),
|
|
1726
|
-
);
|
|
1727
|
-
obj.insert(
|
|
1728
|
-
"target_window".to_string(),
|
|
1729
|
-
serde_json::json!(metadata.target_window),
|
|
1730
|
-
);
|
|
1731
|
-
obj.insert(
|
|
1732
|
-
"target_pane_id".to_string(),
|
|
1733
|
-
serde_json::json!(metadata.target_pane_id),
|
|
1734
|
-
);
|
|
1735
|
-
obj.insert(
|
|
1736
|
-
"target_pane_pid".to_string(),
|
|
1737
|
-
metadata
|
|
1738
|
-
.target_pane_pid
|
|
1739
|
-
.map(|pid| serde_json::json!(pid))
|
|
1740
|
-
.unwrap_or(serde_json::Value::Null),
|
|
1741
|
-
);
|
|
1742
|
-
obj.insert(
|
|
1743
|
-
"resolved_from".to_string(),
|
|
1744
|
-
serde_json::json!(metadata.resolved_from),
|
|
1745
|
-
);
|
|
1746
|
-
}
|
|
1747
|
-
|
|
1748
|
-
#[derive(Clone, Copy)]
|
|
1749
|
-
struct PaneSocketBinding<'a> {
|
|
1750
|
-
pane_id: &'a str,
|
|
1751
|
-
tmux_socket: Option<&'a str>,
|
|
1752
|
-
}
|
|
1753
|
-
|
|
1754
|
-
fn pane_conflicts_on_same_socket(
|
|
1755
|
-
pane_id: &str,
|
|
1756
|
-
worker_socket: Option<&str>,
|
|
1757
|
-
leader: PaneSocketBinding<'_>,
|
|
1758
|
-
) -> bool {
|
|
1759
|
-
leader.pane_id == pane_id && !tmux_sockets_known_different(worker_socket, leader.tmux_socket)
|
|
1760
|
-
}
|
|
1761
|
-
|
|
1762
|
-
fn tmux_sockets_known_different(left: Option<&str>, right: Option<&str>) -> bool {
|
|
1763
|
-
let (Some(left), Some(right)) = (left, right) else {
|
|
1764
|
-
return false;
|
|
1765
|
-
};
|
|
1766
|
-
if left == right {
|
|
1767
|
-
return false;
|
|
1768
|
-
}
|
|
1769
|
-
std::path::Path::new(left).is_absolute() && std::path::Path::new(right).is_absolute()
|
|
1770
|
-
}
|
|
1771
|
-
|
|
1772
|
-
fn worker_tmux_socket(
|
|
1773
|
-
state: &serde_json::Value,
|
|
1774
|
-
agent: Option<&serde_json::Value>,
|
|
1775
|
-
transport: &dyn Transport,
|
|
1776
|
-
) -> Option<String> {
|
|
1777
|
-
agent
|
|
1778
|
-
.and_then(tmux_socket_field)
|
|
1779
|
-
.or_else(|| runtime_tmux_socket(state))
|
|
1780
|
-
.map(str::to_string)
|
|
1781
|
-
.or_else(|| transport.tmux_endpoint())
|
|
1782
|
-
}
|
|
1783
|
-
|
|
1784
|
-
fn runtime_tmux_socket(state: &serde_json::Value) -> Option<&str> {
|
|
1785
|
-
tmux_socket_field(state)
|
|
1786
|
-
.or_else(|| active_team_entry(state).and_then(tmux_socket_field))
|
|
1787
|
-
.or_else(|| only_team_entry(state).and_then(tmux_socket_field))
|
|
1788
|
-
}
|
|
1789
|
-
|
|
1790
|
-
fn tmux_socket_field(value: &serde_json::Value) -> Option<&str> {
|
|
1791
|
-
value
|
|
1792
|
-
.get("tmux_endpoint")
|
|
1793
|
-
.or_else(|| value.get("tmux_socket"))
|
|
1794
|
-
.and_then(serde_json::Value::as_str)
|
|
1795
|
-
.filter(|value| !value.is_empty())
|
|
1796
|
-
}
|
|
1797
|
-
|
|
1798
|
-
/// Read the bound leader pane id off the projected or team-scoped runtime state.
|
|
1799
|
-
fn leader_receiver_pane_id(state: &serde_json::Value) -> Option<&str> {
|
|
1800
|
-
leader_receiver_pane_id_in_state(state)
|
|
1801
|
-
.or_else(|| active_team_entry(state).and_then(leader_receiver_pane_id_in_state))
|
|
1802
|
-
.or_else(|| only_team_entry(state).and_then(leader_receiver_pane_id_in_state))
|
|
1803
|
-
}
|
|
1804
|
-
|
|
1805
|
-
fn leader_receiver_value(state: &serde_json::Value) -> Option<&serde_json::Value> {
|
|
1806
|
-
leader_receiver_value_in_state(state)
|
|
1807
|
-
.or_else(|| active_team_entry(state).and_then(leader_receiver_value_in_state))
|
|
1808
|
-
.or_else(|| only_team_entry(state).and_then(leader_receiver_value_in_state))
|
|
1809
|
-
}
|
|
1810
|
-
|
|
1811
|
-
fn leader_receiver_value_in_state(state: &serde_json::Value) -> Option<&serde_json::Value> {
|
|
1812
|
-
state.get("leader_receiver")
|
|
1813
|
-
}
|
|
1814
|
-
|
|
1815
|
-
fn receiver_owner_epoch(receiver: &serde_json::Value) -> Option<u64> {
|
|
1816
|
-
receiver
|
|
1817
|
-
.get("owner_epoch")
|
|
1818
|
-
.and_then(serde_json::Value::as_u64)
|
|
1819
|
-
}
|
|
1820
|
-
|
|
1821
|
-
fn leader_receiver_transport_conflict_outcome(
|
|
1822
|
-
store: &MessageStore,
|
|
1823
|
-
event_log: &EventLog,
|
|
1824
|
-
message_id: &str,
|
|
1825
|
-
receiver: &serde_json::Value,
|
|
1826
|
-
sender: &str,
|
|
1827
|
-
) -> Result<Option<DeliveryOutcome>, MessagingError> {
|
|
1828
|
-
let mode = receiver.get("mode").and_then(serde_json::Value::as_str);
|
|
1829
|
-
let transport_kind = receiver
|
|
1830
|
-
.get("transport_kind")
|
|
1831
|
-
.and_then(serde_json::Value::as_str);
|
|
1832
|
-
if let (Some(mode), Some(transport_kind)) = (mode, transport_kind) {
|
|
1833
|
-
if !mode.is_empty() && !transport_kind.is_empty() && mode != transport_kind {
|
|
1834
|
-
store.mark(
|
|
1835
|
-
message_id,
|
|
1836
|
-
"failed",
|
|
1837
|
-
Some("leader_receiver_transport_conflict"),
|
|
1838
|
-
)?;
|
|
1839
|
-
event_log.write(
|
|
1840
|
-
"leader_receiver.delivery_blocked",
|
|
1841
|
-
serde_json::json!({
|
|
1842
|
-
"message_id": message_id,
|
|
1843
|
-
"sender": sender,
|
|
1844
|
-
"reason": "leader_receiver_transport_conflict",
|
|
1845
|
-
"mode": mode,
|
|
1846
|
-
"transport_kind": transport_kind,
|
|
1847
|
-
"channel": "rebind_required",
|
|
1848
|
-
"action": "run team-agent claim-leader, takeover, or attach-app-server-leader",
|
|
1849
|
-
}),
|
|
1850
|
-
)?;
|
|
1851
|
-
return Ok(Some(DeliveryOutcome {
|
|
1852
|
-
ok: false,
|
|
1853
|
-
status: DeliveryStatus::Refused,
|
|
1854
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
1855
|
-
message_id: Some(message_id.to_string()),
|
|
1856
|
-
verification: Some(
|
|
1857
|
-
"run team-agent claim-leader, takeover, or attach-app-server-leader"
|
|
1858
|
-
.to_string(),
|
|
1859
|
-
),
|
|
1860
|
-
stage: None,
|
|
1861
|
-
reason: Some(DeliveryRefusal::LeaderNotAttached),
|
|
1862
|
-
channel: Some("rebind_required".to_string()),
|
|
1863
|
-
ack_forced_off: false,
|
|
1864
|
-
turn_verification: None,
|
|
1865
|
-
}));
|
|
1866
|
-
}
|
|
1867
|
-
}
|
|
1868
|
-
Ok(None)
|
|
1869
|
-
}
|
|
1870
|
-
|
|
1871
|
-
fn leader_receiver_pane_binding(state: &serde_json::Value) -> Option<PaneSocketBinding<'_>> {
|
|
1872
|
-
leader_receiver_pane_binding_in_state(state)
|
|
1873
|
-
.or_else(|| active_team_entry(state).and_then(leader_receiver_pane_binding_in_state))
|
|
1874
|
-
.or_else(|| only_team_entry(state).and_then(leader_receiver_pane_binding_in_state))
|
|
1875
|
-
}
|
|
1876
|
-
|
|
1877
|
-
/// 0.5.x Phase 1d Batch 4: the `Owned` variant now carries a boxed
|
|
1878
|
-
/// `Transport` trait object rather than a concrete `TmuxBackend`. All
|
|
1879
|
-
/// existing leader-fallback sites still supply a `TmuxBackend` here
|
|
1880
|
-
/// (Batch 4 is a helper replacement at the leader channel only —
|
|
1881
|
-
/// `transport_kind`-based dispatch belongs to the parallel
|
|
1882
|
-
/// `feat/appserver-leader-host` work per leader msg_4ac2122489e0),
|
|
1883
|
-
/// but the type is now open so a future conpty leader-hosting flow
|
|
1884
|
-
/// can plug in without another enum widen.
|
|
1885
|
-
enum DeliveryTransport<'a> {
|
|
1886
|
-
Borrowed(&'a dyn Transport),
|
|
1887
|
-
Owned(Box<dyn Transport>),
|
|
1888
|
-
}
|
|
1889
|
-
|
|
1890
|
-
impl<'a> DeliveryTransport<'a> {
|
|
1891
|
-
fn as_transport(&'a self) -> &'a dyn Transport {
|
|
1892
|
-
match self {
|
|
1893
|
-
Self::Borrowed(transport) => *transport,
|
|
1894
|
-
Self::Owned(transport) => transport.as_ref(),
|
|
1895
|
-
}
|
|
1896
|
-
}
|
|
1897
|
-
}
|
|
1898
|
-
|
|
1899
|
-
fn delivery_transport_for_recipient<'a>(
|
|
1900
|
-
workspace: &Path,
|
|
1901
|
-
product_transport: &'a dyn Transport,
|
|
1902
|
-
state: &serde_json::Value,
|
|
1903
|
-
recipient: &str,
|
|
1904
|
-
) -> DeliveryTransport<'a> {
|
|
1905
|
-
if recipient != "leader" {
|
|
1906
|
-
return DeliveryTransport::Borrowed(product_transport);
|
|
1907
|
-
}
|
|
1908
|
-
// 0.5.x Phase 1d Batch 4: leader-fallback chain uses the factory
|
|
1909
|
-
// tmux channel helpers instead of `TmuxBackend::{new,for_workspace,
|
|
1910
|
-
// for_tmux_endpoint}` directly. Semantics are identical (helpers
|
|
1911
|
-
// are thin wrappers) but `grep -rn transport_factory::tmux_` at any
|
|
1912
|
-
// future point returns every intentional tmux-only leader-channel
|
|
1913
|
-
// site. Leader-channel dispatch by `transport_kind` is the parallel
|
|
1914
|
-
// `feat/appserver-leader-host` work — this batch stays helper-swap
|
|
1915
|
-
// only per leader msg_4ac2122489e0.
|
|
1916
|
-
let pane_id = leader_receiver_pane_id(state);
|
|
1917
|
-
let Some(socket) = leader_receiver_tmux_socket(state) else {
|
|
1918
|
-
if let Some(pane_id) = pane_id {
|
|
1919
|
-
let in_workspace = product_transport
|
|
1920
|
-
.list_targets()
|
|
1921
|
-
.unwrap_or_default()
|
|
1922
|
-
.iter()
|
|
1923
|
-
.any(|target| target.pane_id.as_str() == pane_id);
|
|
1924
|
-
if !in_workspace {
|
|
1925
|
-
let default_backend = crate::transport_factory::tmux_default_transport();
|
|
1926
|
-
if default_backend
|
|
1927
|
-
.list_targets()
|
|
1928
|
-
.unwrap_or_default()
|
|
1929
|
-
.iter()
|
|
1930
|
-
.any(|target| target.pane_id.as_str() == pane_id)
|
|
1931
|
-
{
|
|
1932
|
-
return DeliveryTransport::Owned(Box::new(default_backend));
|
|
1933
|
-
}
|
|
1934
|
-
}
|
|
1935
|
-
}
|
|
1936
|
-
return DeliveryTransport::Borrowed(product_transport);
|
|
1937
|
-
};
|
|
1938
|
-
// An exact endpoint match can reuse the supplied channel; do not select
|
|
1939
|
-
// another server merely because it has a pane with the same numeric id.
|
|
1940
|
-
if product_transport.tmux_endpoint().as_deref() == Some(socket)
|
|
1941
|
-
|| socket == crate::tmux_backend::socket_name_for_workspace(workspace)
|
|
1942
|
-
{
|
|
1943
|
-
DeliveryTransport::Borrowed(product_transport)
|
|
1944
|
-
} else {
|
|
1945
|
-
// 0.5.4 gate054 cross-team leak fix: when `leader_receiver.tmux_socket`
|
|
1946
|
-
// is present and non-canonical, it is a hard channel boundary — the
|
|
1947
|
-
// caller (team A on socket X) explicitly recorded which tmux server
|
|
1948
|
-
// hosts its leader pane. Pane ids (`%N`) are only unique per tmux
|
|
1949
|
-
// server, so probing product/default servers for the same pane id and
|
|
1950
|
-
// switching transports on a match can cross the team/tmux boundary and
|
|
1951
|
-
// inject A's leader traffic into team B's leader pane. If the pane is
|
|
1952
|
-
// absent on the recorded endpoint, let the downstream
|
|
1953
|
-
// the shared leader-channel resolver produce `rebind_required`
|
|
1954
|
-
// instead of falling back to another server.
|
|
1955
|
-
let endpoint_backend = crate::transport_factory::tmux_endpoint_transport(socket);
|
|
1956
|
-
DeliveryTransport::Owned(Box::new(endpoint_backend))
|
|
1957
|
-
}
|
|
1958
|
-
}
|
|
1959
|
-
|
|
1960
|
-
fn leader_receiver_pane_id_in_state(state: &serde_json::Value) -> Option<&str> {
|
|
1961
|
-
["leader_receiver", "team_owner"]
|
|
1962
|
-
.into_iter()
|
|
1963
|
-
.find_map(|key| {
|
|
1964
|
-
state
|
|
1965
|
-
.get(key)
|
|
1966
|
-
.and_then(|r| r.get("pane_id"))
|
|
1967
|
-
.and_then(serde_json::Value::as_str)
|
|
1968
|
-
.filter(|s| !s.is_empty() && *s != "__team_agent_unbound__")
|
|
1969
|
-
})
|
|
1970
|
-
}
|
|
1971
|
-
|
|
1972
|
-
fn leader_receiver_pane_binding_in_state(
|
|
1973
|
-
state: &serde_json::Value,
|
|
1974
|
-
) -> Option<PaneSocketBinding<'_>> {
|
|
1975
|
-
["leader_receiver", "team_owner"]
|
|
1976
|
-
.into_iter()
|
|
1977
|
-
.find_map(|key| state.get(key).and_then(pane_socket_binding))
|
|
1978
|
-
}
|
|
1979
|
-
|
|
1980
|
-
fn pane_socket_binding(value: &serde_json::Value) -> Option<PaneSocketBinding<'_>> {
|
|
1981
|
-
let pane_id = value
|
|
1982
|
-
.get("pane_id")
|
|
1983
|
-
.and_then(serde_json::Value::as_str)
|
|
1984
|
-
.filter(|s| !s.is_empty() && *s != "__team_agent_unbound__")?;
|
|
1985
|
-
Some(PaneSocketBinding {
|
|
1986
|
-
pane_id,
|
|
1987
|
-
tmux_socket: tmux_socket_field(value),
|
|
1988
|
-
})
|
|
1989
|
-
}
|
|
1990
|
-
|
|
1991
|
-
fn leader_receiver_tmux_socket(state: &serde_json::Value) -> Option<&str> {
|
|
1992
|
-
leader_receiver_field(state, "tmux_socket")
|
|
1993
|
-
}
|
|
1994
|
-
|
|
1995
|
-
fn leader_receiver_field<'a>(state: &'a serde_json::Value, field: &str) -> Option<&'a str> {
|
|
1996
|
-
leader_receiver_field_in_state(state, field)
|
|
1997
|
-
.or_else(|| {
|
|
1998
|
-
active_team_entry(state).and_then(|team| leader_receiver_field_in_state(team, field))
|
|
1999
|
-
})
|
|
2000
|
-
.or_else(|| {
|
|
2001
|
-
only_team_entry(state).and_then(|team| leader_receiver_field_in_state(team, field))
|
|
2002
|
-
})
|
|
2003
|
-
}
|
|
2004
|
-
|
|
2005
|
-
fn leader_receiver_field_in_state<'a>(
|
|
2006
|
-
state: &'a serde_json::Value,
|
|
2007
|
-
field: &str,
|
|
2008
|
-
) -> Option<&'a str> {
|
|
2009
|
-
state
|
|
2010
|
-
.get("leader_receiver")
|
|
2011
|
-
.and_then(|receiver| receiver.get(field))
|
|
2012
|
-
.and_then(serde_json::Value::as_str)
|
|
2013
|
-
.filter(|value| !value.is_empty())
|
|
2014
|
-
}
|
|
2015
|
-
|
|
2016
|
-
/// E50 PR-1 (0.3.24 P0): render `InjectReport.submit_diagnostics` as a JSON
|
|
2017
|
-
/// array suitable for inclusion in `send.unverified` / `send.failed` events.
|
|
2018
|
-
/// `null` if no diagnostics were attached (e.g. the inject went through a
|
|
2019
|
-
/// path that bypassed the paste-prompt + Enter instrumentation, or this is
|
|
2020
|
-
/// the pre-PR-2 inject-failed path with no `InjectReport`).
|
|
2021
|
-
fn render_submit_diagnostics(report: &InjectReport) -> serde_json::Value {
|
|
2022
|
-
let Some(diag) = report.submit_diagnostics.as_ref() else {
|
|
2023
|
-
return serde_json::Value::Null;
|
|
2024
|
-
};
|
|
2025
|
-
serde_json::Value::Array(
|
|
2026
|
-
diag.attempts_detail
|
|
2027
|
-
.iter()
|
|
2028
|
-
.map(|obs| {
|
|
2029
|
-
serde_json::json!({
|
|
2030
|
-
"attempt_index": obs.attempt_index,
|
|
2031
|
-
"matched": obs.matched,
|
|
2032
|
-
"matched_literal": obs.matched_literal,
|
|
2033
|
-
"where_in_tail": obs.where_in_tail,
|
|
2034
|
-
"pane_tail_excerpt": obs.pane_tail_excerpt,
|
|
2035
|
-
"pane_tail_lines": obs.pane_tail_lines,
|
|
2036
|
-
"elapsed_ms": obs.elapsed_ms,
|
|
2037
|
-
})
|
|
2038
|
-
})
|
|
2039
|
-
.collect(),
|
|
2040
|
-
)
|
|
2041
|
-
}
|
|
2042
|
-
|
|
2043
|
-
fn json_opt_bool(value: Option<bool>) -> serde_json::Value {
|
|
2044
|
-
match value {
|
|
2045
|
-
Some(flag) => serde_json::Value::Bool(flag),
|
|
2046
|
-
None => serde_json::Value::Null,
|
|
2047
|
-
}
|
|
2048
|
-
}
|
|
2049
|
-
|
|
2050
|
-
fn inject_pane_id(target: &Target) -> Option<&str> {
|
|
2051
|
-
match target {
|
|
2052
|
-
Target::Pane(pane) => Some(pane.as_str()),
|
|
2053
|
-
Target::SessionWindow { .. } => None,
|
|
2054
|
-
}
|
|
2055
|
-
}
|
|
2056
|
-
|
|
2057
|
-
fn merge_inject_readback_fields(
|
|
2058
|
-
event: &mut serde_json::Value,
|
|
2059
|
-
report: &InjectReport,
|
|
2060
|
-
target: Option<&Target>,
|
|
2061
|
-
metadata: Option<&TargetMetadata>,
|
|
2062
|
-
) {
|
|
2063
|
-
if let Some(metadata) = metadata {
|
|
2064
|
-
append_target_metadata(event, metadata);
|
|
2065
|
-
}
|
|
2066
|
-
let Some(obj) = event.as_object_mut() else {
|
|
2067
|
-
return;
|
|
2068
|
-
};
|
|
2069
|
-
let inject_pane = target.and_then(inject_pane_id);
|
|
2070
|
-
if let Some(pane) = inject_pane {
|
|
2071
|
-
obj.insert("inject_target_pane_id".to_string(), serde_json::json!(pane));
|
|
2072
|
-
}
|
|
2073
|
-
let resolved_pane = metadata.map(|meta| meta.target_pane_id.as_str());
|
|
2074
|
-
obj.insert(
|
|
2075
|
-
"target_pane_matched".to_string(),
|
|
2076
|
-
json_opt_bool(match (inject_pane, resolved_pane) {
|
|
2077
|
-
(Some(left), Some(right)) => Some(left == right),
|
|
2078
|
-
_ => None,
|
|
2079
|
-
}),
|
|
2080
|
-
);
|
|
2081
|
-
let inject_endpoint = metadata.and_then(|meta| meta.tmux_endpoint.as_deref());
|
|
2082
|
-
// metadata.tmux_endpoint is the transport used to resolve; compare to
|
|
2083
|
-
// itself is tautological. Equality vs inject target id is the pane check
|
|
2084
|
-
// above. Socket equality is recorded when both sides exist on metadata.
|
|
2085
|
-
obj.insert(
|
|
2086
|
-
"resolved_tmux_endpoint_present".to_string(),
|
|
2087
|
-
serde_json::Value::Bool(inject_endpoint.is_some()),
|
|
2088
|
-
);
|
|
2089
|
-
let diag = report.submit_diagnostics.as_ref();
|
|
2090
|
-
obj.insert(
|
|
2091
|
-
"token_seen_before_paste".to_string(),
|
|
2092
|
-
json_opt_bool(diag.and_then(|d| d.token_seen_before_paste)),
|
|
2093
|
-
);
|
|
2094
|
-
obj.insert(
|
|
2095
|
-
"token_seen_after_paste".to_string(),
|
|
2096
|
-
json_opt_bool(diag.and_then(|d| d.token_seen_after_paste)),
|
|
2097
|
-
);
|
|
2098
|
-
obj.insert(
|
|
2099
|
-
"token_seen_after_enter".to_string(),
|
|
2100
|
-
json_opt_bool(diag.and_then(|d| d.token_seen_after_enter)),
|
|
2101
|
-
);
|
|
2102
|
-
obj.insert(
|
|
2103
|
-
"capture_ok_count".to_string(),
|
|
2104
|
-
serde_json::json!(diag.map(|d| d.capture_ok_count).unwrap_or(0)),
|
|
2105
|
-
);
|
|
2106
|
-
obj.insert(
|
|
2107
|
-
"capture_err_count".to_string(),
|
|
2108
|
-
serde_json::json!(diag.map(|d| d.capture_err_count).unwrap_or(0)),
|
|
2109
|
-
);
|
|
2110
|
-
obj.insert(
|
|
2111
|
-
"capture_sample_count".to_string(),
|
|
2112
|
-
serde_json::json!(diag.map(|d| d.capture_sample_count).unwrap_or(0)),
|
|
2113
|
-
);
|
|
2114
|
-
obj.insert(
|
|
2115
|
-
"last_capture_outcome".to_string(),
|
|
2116
|
-
serde_json::json!(diag
|
|
2117
|
-
.map(|d| d.last_capture_outcome.as_str())
|
|
2118
|
-
.unwrap_or(CaptureSampleOutcome::NotAttempted.as_str())),
|
|
2119
|
-
);
|
|
2120
|
-
obj.insert(
|
|
2121
|
-
"consumption_reason".to_string(),
|
|
2122
|
-
serde_json::json!(diag
|
|
2123
|
-
.map(|d| d.consumption_reason.as_str())
|
|
2124
|
-
.unwrap_or("unknown")),
|
|
2125
|
-
);
|
|
2126
|
-
obj.insert(
|
|
2127
|
-
"before_busy_signal_kind".to_string(),
|
|
2128
|
-
serde_json::json!(diag.and_then(|d| d.before_busy_signal_kind.map(|kind| kind.as_str()))),
|
|
2129
|
-
);
|
|
2130
|
-
obj.insert(
|
|
2131
|
-
"busy_signal_kind".to_string(),
|
|
2132
|
-
serde_json::json!(diag.and_then(|d| d.busy_signal_kind.map(|kind| kind.as_str()))),
|
|
2133
|
-
);
|
|
2134
|
-
obj.insert(
|
|
2135
|
-
"busy_line_from_bottom".to_string(),
|
|
2136
|
-
serde_json::json!(diag.and_then(|d| d.busy_line_from_bottom)),
|
|
2137
|
-
);
|
|
2138
|
-
obj.insert(
|
|
2139
|
-
"current_marker_in_bottom_15".to_string(),
|
|
2140
|
-
serde_json::json!(diag.and_then(|d| d.current_marker_in_bottom_15)),
|
|
2141
|
-
);
|
|
2142
|
-
obj.insert(
|
|
2143
|
-
"paste_identity_in_composer".to_string(),
|
|
2144
|
-
serde_json::json!(diag.and_then(|d| d.paste_identity_in_composer)),
|
|
2145
|
-
);
|
|
2146
|
-
obj.insert(
|
|
2147
|
-
"consumption_from_capture_result".to_string(),
|
|
2148
|
-
serde_json::json!(diag.and_then(|d| d.consumption_from_capture_result)),
|
|
2149
|
-
);
|
|
2150
|
-
obj.insert(
|
|
2151
|
-
"pane_command_basename".to_string(),
|
|
2152
|
-
diag.and_then(|d| d.pane_command_basename.as_deref())
|
|
2153
|
-
.map(|name| serde_json::json!(name))
|
|
2154
|
-
.unwrap_or(serde_json::Value::Null),
|
|
2155
|
-
);
|
|
2156
|
-
obj.insert(
|
|
2157
|
-
"pane_command_query".to_string(),
|
|
2158
|
-
serde_json::json!(diag
|
|
2159
|
-
.map(|d| d.pane_command_query.as_str())
|
|
2160
|
-
.unwrap_or(QueryOutcome::Unavailable.as_str())),
|
|
2161
|
-
);
|
|
2162
|
-
obj.insert(
|
|
2163
|
-
"input_surface".to_string(),
|
|
2164
|
-
serde_json::json!(diag
|
|
2165
|
-
.map(|d| d.input_surface.as_str())
|
|
2166
|
-
.unwrap_or(InputSurfaceProbe::Unavailable.as_str())),
|
|
2167
|
-
);
|
|
2168
|
-
obj.insert(
|
|
2169
|
-
"diag_target_pane_id".to_string(),
|
|
2170
|
-
diag.and_then(|d| d.target_pane_id.as_deref())
|
|
2171
|
-
.map(|pane| serde_json::json!(pane))
|
|
2172
|
-
.unwrap_or(serde_json::Value::Null),
|
|
2173
|
-
);
|
|
2174
|
-
obj.insert(
|
|
2175
|
-
"diag_target_pane_query_matched".to_string(),
|
|
2176
|
-
json_opt_bool(diag.and_then(|d| d.target_pane_query_matched)),
|
|
2177
|
-
);
|
|
2178
|
-
}
|
|
2179
|
-
|
|
2180
|
-
#[allow(clippy::too_many_arguments)]
|
|
2181
|
-
fn emit_send_failed_exhausted(
|
|
2182
|
-
workspace: &Path,
|
|
2183
|
-
state: &serde_json::Value,
|
|
2184
|
-
event_log: &EventLog,
|
|
2185
|
-
message_id: &str,
|
|
2186
|
-
recipient: &str,
|
|
2187
|
-
attempts: u32,
|
|
2188
|
-
failure_reason: &str,
|
|
2189
|
-
verification: &str,
|
|
2190
|
-
inject_report: Option<&InjectReport>,
|
|
2191
|
-
) -> Result<(), MessagingError> {
|
|
2192
|
-
// E50 PR-1 (0.3.24 P0): forensic fields on send.failed. Legacy keys
|
|
2193
|
-
// (`message_id` / `recipient` / `attempts` / `max_attempts` / `reason` /
|
|
2194
|
-
// `verification`) preserved byte-for-byte for grep compatibility.
|
|
2195
|
-
let submit_attempts_detail = inject_report
|
|
2196
|
-
.map(render_submit_diagnostics)
|
|
2197
|
-
.unwrap_or_else(|| serde_json::Value::Array(Vec::new()));
|
|
2198
|
-
let total_elapsed_ms = inject_report
|
|
2199
|
-
.and_then(|r| r.submit_diagnostics.as_ref())
|
|
2200
|
-
.map(|d| d.total_elapsed_ms)
|
|
2201
|
-
.unwrap_or(0);
|
|
2202
|
-
let last_matched_literal = inject_report
|
|
2203
|
-
.and_then(|r| r.submit_diagnostics.as_ref())
|
|
2204
|
-
.and_then(|d| d.attempts_detail.last())
|
|
2205
|
-
.and_then(|a| a.matched_literal.clone());
|
|
2206
|
-
let last_pane_tail_excerpt = inject_report
|
|
2207
|
-
.and_then(|r| r.submit_diagnostics.as_ref())
|
|
2208
|
-
.and_then(|d| d.attempts_detail.last())
|
|
2209
|
-
.map(|a| a.pane_tail_excerpt.clone());
|
|
2210
|
-
let mut failed = serde_json::json!({
|
|
2211
|
-
"message_id": message_id,
|
|
2212
|
-
"recipient": recipient,
|
|
2213
|
-
"attempts": attempts,
|
|
2214
|
-
"max_attempts": SEND_RETRY_MAX_ATTEMPTS,
|
|
2215
|
-
"reason": failure_reason,
|
|
2216
|
-
"verification": verification,
|
|
2217
|
-
"submit_attempts_detail": submit_attempts_detail,
|
|
2218
|
-
"total_elapsed_ms": total_elapsed_ms,
|
|
2219
|
-
"last_matched_literal": last_matched_literal,
|
|
2220
|
-
"last_pane_tail_excerpt": last_pane_tail_excerpt,
|
|
2221
|
-
});
|
|
2222
|
-
if let Some(report) = inject_report {
|
|
2223
|
-
merge_inject_readback_fields(&mut failed, report, None, None);
|
|
2224
|
-
}
|
|
2225
|
-
event_log.write("send.failed", failed)?;
|
|
2226
|
-
let content = format!(
|
|
2227
|
-
"send.failed\nerror: send to {recipient} failed with {failure_reason} after {attempts}/{SEND_RETRY_MAX_ATTEMPTS} attempts\naction: inspect the target pane and retry the send\nlog: .team/logs/events.jsonl"
|
|
2228
|
-
);
|
|
2229
|
-
match crate::messaging::send_to_leader_receiver(
|
|
2230
|
-
workspace,
|
|
2231
|
-
state,
|
|
2232
|
-
"leader",
|
|
2233
|
-
&content,
|
|
2234
|
-
None,
|
|
2235
|
-
"coordinator",
|
|
2236
|
-
false,
|
|
2237
|
-
Some(&format!("send.failed:{message_id}")),
|
|
2238
|
-
event_log,
|
|
2239
|
-
) {
|
|
2240
|
-
Ok(outcome) => {
|
|
2241
|
-
event_log.write(
|
|
2242
|
-
"send.failed_notification",
|
|
2243
|
-
serde_json::json!({
|
|
2244
|
-
"message_id": message_id,
|
|
2245
|
-
"recipient": recipient,
|
|
2246
|
-
"leader_notification_status": super::helpers::status_wire(outcome.status),
|
|
2247
|
-
"leader_message_id": outcome.message_id,
|
|
2248
|
-
}),
|
|
2249
|
-
)?;
|
|
2250
|
-
}
|
|
2251
|
-
Err(error) => {
|
|
2252
|
-
event_log.write(
|
|
2253
|
-
"send.failed_notification_failed",
|
|
2254
|
-
serde_json::json!({
|
|
2255
|
-
"message_id": message_id,
|
|
2256
|
-
"recipient": recipient,
|
|
2257
|
-
"error": error.to_string(),
|
|
2258
|
-
}),
|
|
2259
|
-
)?;
|
|
2260
|
-
}
|
|
2261
|
-
}
|
|
2262
|
-
Ok(())
|
|
2263
|
-
}
|
|
2264
|
-
|
|
2265
|
-
fn active_team_entry(state: &serde_json::Value) -> Option<&serde_json::Value> {
|
|
2266
|
-
let team = state
|
|
2267
|
-
.get("active_team_key")
|
|
2268
|
-
.and_then(serde_json::Value::as_str)?;
|
|
2269
|
-
state
|
|
2270
|
-
.get("teams")
|
|
2271
|
-
.and_then(serde_json::Value::as_object)
|
|
2272
|
-
.and_then(|teams| teams.get(team))
|
|
2273
|
-
}
|
|
2274
|
-
|
|
2275
|
-
fn only_team_entry(state: &serde_json::Value) -> Option<&serde_json::Value> {
|
|
2276
|
-
let teams = state.get("teams").and_then(serde_json::Value::as_object)?;
|
|
2277
|
-
if teams.len() == 1 {
|
|
2278
|
-
teams.values().next()
|
|
2279
|
-
} else {
|
|
2280
|
-
None
|
|
2281
|
-
}
|
|
2282
|
-
}
|
|
2283
|
-
|
|
2284
|
-
/// Deliver pending rows without activity/composer admission; native CLIs queue input.
|
|
2285
|
-
/// Returns the message IDs whose post-submit evidence verified delivery.
|
|
2286
|
-
pub fn deliver_pending_messages(
|
|
2287
|
-
workspace: &Path,
|
|
2288
|
-
state: &serde_json::Value,
|
|
2289
|
-
transport: &dyn Transport,
|
|
2290
|
-
event_log: &EventLog,
|
|
2291
|
-
) -> Result<Vec<String>, MessagingError> {
|
|
2292
|
-
let store = MessageStore::open(workspace)?;
|
|
2293
|
-
let message_ids = {
|
|
2294
|
-
let conn = crate::db::schema::open_db(store.db_path())?;
|
|
2295
|
-
// `stored_only` is intentionally absent: C6 chose durable presentation without C5.
|
|
2296
|
-
let mut stmt = conn.prepare(
|
|
2297
|
-
"select message_id from messages
|
|
2298
|
-
where status in (
|
|
2299
|
-
'pending', 'accepted', 'target_resolved',
|
|
2300
|
-
'submitted_pending_acceptance', 'queued_until_leader_attach', ?1
|
|
2301
|
-
) or (status = 'queued_until_start' and error = ?2)
|
|
2302
|
-
order by created_at, message_id",
|
|
2303
|
-
)?;
|
|
2304
|
-
let rows = stmt.query_map(
|
|
2305
|
-
[crate::message_store::MessageRowStatus::QueuedCoordinatorUnavailable.as_str(), crate::message_store::MCP_HANDSHAKE_TIMEOUT],
|
|
2306
|
-
|row| row.get::<_, String>(0),
|
|
2307
|
-
)?;
|
|
2308
|
-
rows.collect::<Result<Vec<_>, _>>()?
|
|
2309
|
-
};
|
|
2310
|
-
let mut delivered = Vec::new();
|
|
2311
|
-
for message_id in message_ids {
|
|
2312
|
-
let Some(message) = message_for_delivery(&store, &message_id)? else {
|
|
2313
|
-
continue;
|
|
2314
|
-
};
|
|
2315
|
-
let prepared = match prepare_message_state(
|
|
2316
|
-
workspace,
|
|
2317
|
-
&store,
|
|
2318
|
-
&message_id,
|
|
2319
|
-
event_log,
|
|
2320
|
-
state,
|
|
2321
|
-
&message,
|
|
2322
|
-
true,
|
|
2323
|
-
)? {
|
|
2324
|
-
Ok(prepared) => prepared,
|
|
2325
|
-
Err(_) => continue,
|
|
2326
|
-
};
|
|
2327
|
-
let outcome = match deliver_prepared_message(
|
|
2328
|
-
workspace,
|
|
2329
|
-
&store,
|
|
2330
|
-
transport,
|
|
2331
|
-
&message_id,
|
|
2332
|
-
event_log,
|
|
2333
|
-
state,
|
|
2334
|
-
message,
|
|
2335
|
-
prepared,
|
|
2336
|
-
) {
|
|
2337
|
-
Ok(outcome) => outcome,
|
|
2338
|
-
Err(error) => {
|
|
2339
|
-
let _ = event_log.write(
|
|
2340
|
-
"delivery.item_blocked",
|
|
2341
|
-
serde_json::json!({
|
|
2342
|
-
"message_id": message_id.as_str(),
|
|
2343
|
-
"error": error.to_string(),
|
|
2344
|
-
}),
|
|
2345
|
-
);
|
|
2346
|
-
continue;
|
|
2347
|
-
}
|
|
2348
|
-
};
|
|
2349
|
-
if matches!(outcome.status, DeliveryStatus::Delivered) {
|
|
2350
|
-
delivered.push(message_id);
|
|
2351
|
-
}
|
|
2352
|
-
}
|
|
2353
|
-
Ok(delivered)
|
|
2354
|
-
}
|
|
2355
|
-
|
|
2356
|
-
struct PendingMessage {
|
|
2357
|
-
sender: String,
|
|
2358
|
-
recipient: String,
|
|
2359
|
-
content: String,
|
|
2360
|
-
task_id: Option<String>,
|
|
2361
|
-
owner_team_id: Option<String>,
|
|
2362
|
-
status: String,
|
|
2363
|
-
error: Option<String>,
|
|
2364
|
-
delivery_attempts: u32,
|
|
2365
|
-
created_at: Option<String>,
|
|
2366
|
-
}
|
|
2367
|
-
|
|
2368
|
-
fn message_for_delivery(
|
|
2369
|
-
store: &MessageStore,
|
|
2370
|
-
message_id: &str,
|
|
2371
|
-
) -> Result<Option<PendingMessage>, MessagingError> {
|
|
2372
|
-
let conn = crate::db::schema::open_db(store.db_path())?;
|
|
2373
|
-
let message = conn
|
|
2374
|
-
.query_row(
|
|
2375
|
-
"select sender, recipient, content, task_id, owner_team_id, status, error, delivery_attempts, created_at from messages where message_id = ?1",
|
|
2376
|
-
params![message_id],
|
|
2377
|
-
|row| {
|
|
2378
|
-
Ok(PendingMessage {
|
|
2379
|
-
sender: row.get::<_, String>(0)?,
|
|
2380
|
-
recipient: row.get::<_, String>(1)?,
|
|
2381
|
-
content: row.get::<_, String>(2)?,
|
|
2382
|
-
task_id: row.get::<_, Option<String>>(3)?,
|
|
2383
|
-
owner_team_id: row.get::<_, Option<String>>(4)?,
|
|
2384
|
-
status: row.get::<_, String>(5)?,
|
|
2385
|
-
error: row.get::<_, Option<String>>(6)?,
|
|
2386
|
-
delivery_attempts: row.get::<_, i64>(7)?.max(0) as u32,
|
|
2387
|
-
created_at: row.get::<_, Option<String>>(8)?,
|
|
2388
|
-
})
|
|
2389
|
-
},
|
|
2390
|
-
)
|
|
2391
|
-
.optional()?;
|
|
2392
|
-
Ok(message)
|
|
2393
|
-
}
|
|
2394
|
-
|
|
2395
|
-
/// Pre-inject gate (Contract B): peek the recipient pane and answer "is there an
|
|
2396
|
-
/// actionable provider startup prompt right now (trust menu or update prompt)" using
|
|
2397
|
-
/// the SHARED provider/startup_prompt recognizers — no second classifier, no provider
|
|
2398
|
-
/// API calls. Returns `false` if capture fails so providers without a startup
|
|
2399
|
-
/// recognizer (or any pane without the trust-menu shape) keep flowing through
|
|
2400
|
-
/// normal delivery.
|
|
2401
|
-
fn recipient_pane_has_actionable_startup_prompt(
|
|
2402
|
-
transport: &dyn Transport,
|
|
2403
|
-
state: &serde_json::Value,
|
|
2404
|
-
recipient: &str,
|
|
2405
|
-
target: &Target,
|
|
2406
|
-
) -> bool {
|
|
2407
|
-
let agent = state
|
|
2408
|
-
.get("agents")
|
|
2409
|
-
.and_then(serde_json::Value::as_object)
|
|
2410
|
-
.and_then(|agents| agents.get(recipient));
|
|
2411
|
-
let provider = agent
|
|
2412
|
-
.and_then(|agent| agent.get("provider"))
|
|
2413
|
-
.and_then(serde_json::Value::as_str)
|
|
2414
|
-
.and_then(parse_canonical_provider);
|
|
2415
|
-
let Some(provider) = provider else {
|
|
2416
|
-
return false;
|
|
2417
|
-
};
|
|
2418
|
-
if matches!(provider, Provider::GeminiCli | Provider::Fake) {
|
|
2419
|
-
return false;
|
|
2420
|
-
}
|
|
2421
|
-
// step2-retry/scrollback root-cause (rt binary 6c9c6c1c): once the agent's
|
|
2422
|
-
// `startup_prompts` has been flipped to `handled`/`complete`, the trust modal
|
|
2423
|
-
// has been answered and is the AUTHORITATIVE record of "no actionable startup
|
|
2424
|
-
// prompt remains". A `tmux capture-pane -S -` Full capture STILL contains the
|
|
2425
|
-
// dismissed modal text in scrollback ("Do you trust …" + `› 1. Yes, continue`),
|
|
2426
|
-
// so the recognizer's actionable-shape override matches the residue and the
|
|
2427
|
-
// delivery gate would loop forever (49-attempt no-deliver in real machine).
|
|
2428
|
-
// Trust the state (same source step1-idem uses) and skip the classify entirely.
|
|
2429
|
-
let startup_prompts = agent
|
|
2430
|
-
.and_then(|agent| agent.get("startup_prompts"))
|
|
2431
|
-
.and_then(serde_json::Value::as_str);
|
|
2432
|
-
if matches!(startup_prompts, Some("handled" | "complete")) {
|
|
2433
|
-
return false;
|
|
2434
|
-
}
|
|
2435
|
-
// U1-C wave-2: Tail(80) instead of Full. The peek is the DELIVERY-SITE pre-check
|
|
2436
|
-
// (NOT the startup-prompts dismissal phase, which legitimately needs the full
|
|
2437
|
-
// scrollback to anchor recency). Limiting to the visible screen avoids matching
|
|
2438
|
-
// residual already-answered trust modals that scrolled off — while a live trust
|
|
2439
|
-
// modal would still appear in the last 80 lines because Codex pins it to the
|
|
2440
|
-
// visible region until dismissed. Pair this with the U1-C recency guard in
|
|
2441
|
-
// `has_actionable_trust_shape`: either fix alone covers the symptom; both
|
|
2442
|
-
// together defend against both scrollback-residue AND pre-render pathologies.
|
|
2443
|
-
let captured = match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
|
2444
|
-
transport.capture(target, crate::transport::CaptureRange::Tail(80))
|
|
2445
|
-
})) {
|
|
2446
|
-
Ok(Ok(captured)) => captured.text,
|
|
2447
|
-
_ => return false,
|
|
2448
|
-
};
|
|
2449
|
-
match provider {
|
|
2450
|
-
Provider::Claude | Provider::ClaudeCode => matches!(
|
|
2451
|
-
crate::provider::classify_claude_startup_screen(&captured),
|
|
2452
|
-
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2453
|
-
),
|
|
2454
|
-
Provider::Copilot => matches!(
|
|
2455
|
-
crate::provider::classify_copilot_startup_screen(&captured),
|
|
2456
|
-
crate::provider::StartupScreenDecision::AnswerWorkspaceTrust
|
|
2457
|
-
),
|
|
2458
|
-
// Codex and Grok workers run only through their contract leaves; a
|
|
2459
|
-
// legacy row was refused before this peek.
|
|
2460
|
-
Provider::Codex
|
|
2461
|
-
| Provider::Pi
|
|
2462
|
-
| Provider::Grok
|
|
2463
|
-
| Provider::GeminiCli
|
|
2464
|
-
| Provider::Fake => false,
|
|
2465
|
-
}
|
|
2466
|
-
}
|
|
2467
|
-
|
|
2468
|
-
fn recipient_provider(state: &serde_json::Value, recipient: &str) -> Option<Provider> {
|
|
2469
|
-
state
|
|
2470
|
-
.get("agents")
|
|
2471
|
-
.and_then(serde_json::Value::as_object)
|
|
2472
|
-
.and_then(|agents| agents.get(recipient))
|
|
2473
|
-
.and_then(|agent| agent.get("provider"))
|
|
2474
|
-
.and_then(serde_json::Value::as_str)
|
|
2475
|
-
.and_then(parse_canonical_provider)
|
|
2476
|
-
}
|
|
2477
|
-
|
|
2478
|
-
/// ---
|
|
2479
|
-
/// purpose: 判断收件 provider 是否必须禁止 submit observer 重按 Enter
|
|
2480
|
-
/// returns: Pi 为 true,其余为 false
|
|
2481
|
-
/// ---
|
|
2482
|
-
pub(crate) fn recipient_requires_single_enter(state: &serde_json::Value, recipient: &str) -> bool {
|
|
2483
|
-
matches!(
|
|
2484
|
-
recipient_provider(state, recipient),
|
|
2485
|
-
Some(Provider::Pi)
|
|
2486
|
-
)
|
|
2487
|
-
}
|
|
2488
|
-
|
|
2489
|
-
/// ---
|
|
2490
|
-
/// purpose: 判断收件 provider 是否允许 Grok send-now 显式队列 flush
|
|
2491
|
-
/// returns: Pi 为 false,其余为 true
|
|
2492
|
-
/// ---
|
|
2493
|
-
pub(crate) fn recipient_allows_explicit_queue_flush(
|
|
2494
|
-
state: &serde_json::Value,
|
|
2495
|
-
recipient: &str,
|
|
2496
|
-
) -> bool {
|
|
2497
|
-
!matches!(
|
|
2498
|
-
recipient_provider(state, recipient),
|
|
2499
|
-
Some(Provider::Pi)
|
|
2500
|
-
)
|
|
2501
|
-
}
|
|
2502
|
-
|
|
2503
|
-
fn leader_rollout_path(state: &serde_json::Value) -> Option<std::path::PathBuf> {
|
|
2504
|
-
if let Some(receiver) = leader_receiver_value(state).filter(|receiver| {
|
|
2505
|
-
receiver.get("provider").and_then(serde_json::Value::as_str) == Some("pi")
|
|
2506
|
-
&& receiver.get("native_session").is_some()
|
|
2507
|
-
}) {
|
|
2508
|
-
let native = receiver.get("native_session")?;
|
|
2509
|
-
for key in ["pane_id", "tmux_socket", "leader_session_uuid", "owner_epoch"] {
|
|
2510
|
-
let bound = native.get(key)?;
|
|
2511
|
-
if bound.is_null() || receiver.get(key) != Some(bound) {
|
|
2512
|
-
return None;
|
|
2513
|
-
}
|
|
2514
|
-
}
|
|
2515
|
-
// Managed Pi's native ID is distinct from leader_session_uuid.
|
|
2516
|
-
// The JSONL appears asynchronously. Resolve only inside the recorded
|
|
2517
|
-
// root, by exact id/cwd/spawn time; ambiguity or an unknown
|
|
2518
|
-
// NativeDefault root stays unavailable (no HOME scan).
|
|
2519
|
-
let context = crate::provider::CaptureSessionContext {
|
|
2520
|
-
agent_id: "leader".into(),
|
|
2521
|
-
spawn_cwd: native.get("spawn_cwd")?.as_str()?.into(),
|
|
2522
|
-
pane_id: None,
|
|
2523
|
-
pane_pid: None,
|
|
2524
|
-
spawned_at: Some(native.get("spawned_at")?.as_str()?.into()),
|
|
2525
|
-
expected_session_id: native
|
|
2526
|
-
.get("expected_session_id")
|
|
2527
|
-
.and_then(|value| value.as_str())
|
|
2528
|
-
.filter(|value| !value.is_empty())
|
|
2529
|
-
.map(crate::provider::SessionId::new),
|
|
2530
|
-
provider_projects_root: Some(native.get("provider_projects_root")?.as_str()?.into()),
|
|
2531
|
-
};
|
|
2532
|
-
if !context.spawn_cwd.is_absolute()
|
|
2533
|
-
|| !context.provider_projects_root.as_ref()?.is_absolute()
|
|
2534
|
-
{
|
|
2535
|
-
return None;
|
|
2536
|
-
}
|
|
2537
|
-
let candidates = crate::provider::session_scan::scan_session_candidates_once(
|
|
2538
|
-
Provider::Pi,
|
|
2539
|
-
&context,
|
|
2540
|
-
)
|
|
2541
|
-
.ok()?;
|
|
2542
|
-
return match candidates.as_slice() {
|
|
2543
|
-
[candidate] => candidate
|
|
2544
|
-
.captured
|
|
2545
|
-
.rollout_path
|
|
2546
|
-
.as_ref()
|
|
2547
|
-
.map(|path| path.as_path().to_path_buf()),
|
|
2548
|
-
_ => None,
|
|
2549
|
-
};
|
|
2550
|
-
}
|
|
2551
|
-
state
|
|
2552
|
-
.get("leader")
|
|
2553
|
-
.and_then(|leader| leader.get("rollout_path"))
|
|
2554
|
-
.and_then(serde_json::Value::as_str)
|
|
2555
|
-
.or_else(|| {
|
|
2556
|
-
leader_receiver_value(state)
|
|
2557
|
-
.and_then(|receiver| receiver.get("rollout_path"))
|
|
2558
|
-
.and_then(serde_json::Value::as_str)
|
|
2559
|
-
})
|
|
2560
|
-
.filter(|path| !path.is_empty())
|
|
2561
|
-
.map(std::path::PathBuf::from)
|
|
2562
|
-
}
|
|
2563
|
-
|
|
2564
|
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
2565
|
-
pub(crate) enum LeaderReceiptObservation {
|
|
2566
|
-
SourceUnavailable,
|
|
2567
|
-
TokenAbsent,
|
|
2568
|
-
TokenObserved,
|
|
2569
|
-
}
|
|
2570
|
-
|
|
2571
|
-
pub(crate) fn observe_leader_receipt(
|
|
2572
|
-
state: &serde_json::Value,
|
|
2573
|
-
message_id: &str,
|
|
2574
|
-
) -> LeaderReceiptObservation {
|
|
2575
|
-
let Some(path) = leader_rollout_path(state) else {
|
|
2576
|
-
return LeaderReceiptObservation::SourceUnavailable;
|
|
2577
|
-
};
|
|
2578
|
-
let Ok(observed) = rollout_tail_contains_result(
|
|
2579
|
-
&path,
|
|
2580
|
-
&format!("[team-agent-token:{message_id}]"),
|
|
2581
|
-
64 * 1024,
|
|
2582
|
-
) else {
|
|
2583
|
-
return LeaderReceiptObservation::SourceUnavailable;
|
|
2584
|
-
};
|
|
2585
|
-
if observed {
|
|
2586
|
-
LeaderReceiptObservation::TokenObserved
|
|
2587
|
-
} else {
|
|
2588
|
-
LeaderReceiptObservation::TokenAbsent
|
|
2589
|
-
}
|
|
2590
|
-
}
|
|
2591
|
-
|
|
2592
|
-
pub(crate) fn leader_transcript_has_token(state: &serde_json::Value, message_id: &str) -> bool {
|
|
2593
|
-
observe_leader_receipt(state, message_id) == LeaderReceiptObservation::TokenObserved
|
|
2594
|
-
}
|
|
2595
|
-
|
|
2596
|
-
fn leader_acceptance_pending_outcome(message_id: &str, status: &str) -> DeliveryOutcome {
|
|
2597
|
-
DeliveryOutcome {
|
|
2598
|
-
ok: true,
|
|
2599
|
-
status: DeliveryStatus::RetryScheduled,
|
|
2600
|
-
message_status: MessageStatusShadow(status.to_string()),
|
|
2601
|
-
message_id: Some(message_id.to_string()),
|
|
2602
|
-
verification: Some("provider_receipt_not_observed".to_string()),
|
|
2603
|
-
stage: Some(DeliveryStage::Submit),
|
|
2604
|
-
reason: None,
|
|
2605
|
-
channel: Some("leader_acceptance_pending".to_string()),
|
|
2606
|
-
ack_forced_off: false,
|
|
2607
|
-
turn_verification: None,
|
|
2608
|
-
}
|
|
2609
|
-
}
|
|
2610
|
-
|
|
2611
|
-
pub(crate) fn leader_receipt_source_unavailable_outcome(message_id: &str) -> DeliveryOutcome {
|
|
2612
|
-
DeliveryOutcome {
|
|
2613
|
-
ok: true,
|
|
2614
|
-
status: DeliveryStatus::Blocked,
|
|
2615
|
-
message_status: MessageStatusShadow("injected_awaiting_receipt".to_string()),
|
|
2616
|
-
message_id: Some(message_id.to_string()),
|
|
2617
|
-
verification: Some("leader_receipt_source_unavailable".to_string()),
|
|
2618
|
-
stage: Some(DeliveryStage::Submit),
|
|
2619
|
-
reason: None,
|
|
2620
|
-
channel: Some("leader_receipt_source_unavailable".to_string()),
|
|
2621
|
-
ack_forced_off: false,
|
|
2622
|
-
turn_verification: None,
|
|
2623
|
-
}
|
|
2624
|
-
}
|
|
2625
|
-
|
|
2626
|
-
fn observe_pending_leader_acceptance(
|
|
2627
|
-
store: &MessageStore,
|
|
2628
|
-
event_log: &EventLog,
|
|
2629
|
-
state: &serde_json::Value,
|
|
2630
|
-
message_id: &str,
|
|
2631
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
2632
|
-
match observe_leader_receipt(state, message_id) {
|
|
2633
|
-
LeaderReceiptObservation::SourceUnavailable => {
|
|
2634
|
-
store.mark_injected_awaiting_receipt(message_id)?;
|
|
2635
|
-
event_log.write(
|
|
2636
|
-
"leader_receiver.receipt_source_unavailable",
|
|
2637
|
-
serde_json::json!({"message_id": message_id}),
|
|
2638
|
-
)?;
|
|
2639
|
-
return Ok(leader_receipt_source_unavailable_outcome(message_id));
|
|
2640
|
-
}
|
|
2641
|
-
LeaderReceiptObservation::TokenAbsent => {
|
|
2642
|
-
return Ok(leader_acceptance_pending_outcome(
|
|
2643
|
-
message_id,
|
|
2644
|
-
"submitted_pending_acceptance",
|
|
2645
|
-
));
|
|
2646
|
-
}
|
|
2647
|
-
LeaderReceiptObservation::TokenObserved => {}
|
|
2648
|
-
}
|
|
2649
|
-
store.mark_delivered_with_receipt(message_id)?;
|
|
2650
|
-
event_log.write(
|
|
2651
|
-
"message.delivered",
|
|
2652
|
-
serde_json::json!({"message_id": message_id}),
|
|
2653
|
-
)?;
|
|
2654
|
-
Ok(DeliveryOutcome {
|
|
2655
|
-
ok: true,
|
|
2656
|
-
status: DeliveryStatus::Delivered,
|
|
2657
|
-
message_status: MessageStatusShadow("delivered".to_string()),
|
|
2658
|
-
message_id: Some(message_id.to_string()),
|
|
2659
|
-
verification: Some("provider_transcript_receipt".to_string()),
|
|
2660
|
-
stage: None,
|
|
2661
|
-
reason: None,
|
|
2662
|
-
channel: Some("leader_receiver".to_string()),
|
|
2663
|
-
ack_forced_off: false,
|
|
2664
|
-
turn_verification: None,
|
|
2665
|
-
})
|
|
2666
|
-
}
|
|
2667
|
-
|
|
2668
|
-
/// `_handle_trust_retry_needed` (`delivery.py:221`):trust 应答失败时调度有界退避重试
|
|
2669
|
-
/// (`attempt < MAX` → schedule;`>= MAX` → 终态 mark failed + `trust_auto_answer_exhausted`)。
|
|
2670
|
-
pub fn handle_trust_retry_needed(
|
|
2671
|
-
store: &MessageStore,
|
|
2672
|
-
payload: &TrustRetryPayload,
|
|
2673
|
-
event_log: &EventLog,
|
|
2674
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
2675
|
-
if payload.attempt >= payload.max_attempts {
|
|
2676
|
-
let _ = store.mark(
|
|
2677
|
-
&payload.message_id,
|
|
2678
|
-
"failed",
|
|
2679
|
-
Some("trust_auto_answer_exhausted"),
|
|
2680
|
-
);
|
|
2681
|
-
event_log.write(
|
|
2682
|
-
"leader_panes.trust_auto_answer_exhausted",
|
|
2683
|
-
serde_json::json!({"message_id": payload.message_id, "attempt": payload.attempt}),
|
|
2684
|
-
)?;
|
|
2685
|
-
return Ok(DeliveryOutcome {
|
|
2686
|
-
ok: false,
|
|
2687
|
-
status: DeliveryStatus::TrustAutoAnswerExhausted,
|
|
2688
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
2689
|
-
message_id: Some(payload.message_id.clone()),
|
|
2690
|
-
verification: None,
|
|
2691
|
-
stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
|
|
2692
|
-
reason: None,
|
|
2693
|
-
channel: None,
|
|
2694
|
-
ack_forced_off: false,
|
|
2695
|
-
turn_verification: None,
|
|
2696
|
-
});
|
|
2697
|
-
}
|
|
2698
|
-
let next_attempt = payload.attempt.saturating_add(1);
|
|
2699
|
-
let backoff = super::TRUST_RETRY_BACKOFF_SECONDS
|
|
2700
|
-
.iter()
|
|
2701
|
-
.find_map(|(attempt, seconds)| (*attempt == next_attempt).then_some(*seconds))
|
|
2702
|
-
.unwrap_or(30);
|
|
2703
|
-
let due_at = (chrono::Utc::now() + chrono::Duration::seconds(i64::from(backoff))).to_rfc3339();
|
|
2704
|
-
let conn = crate::db::schema::open_db(store.db_path())?;
|
|
2705
|
-
conn.execute(
|
|
2706
|
-
"insert into scheduled_events(owner_team_id, due_at, target, kind, payload_json, status, created_at)
|
|
2707
|
-
values (null, ?1, ?2, 'trust_retry', ?3, 'pending', ?4)",
|
|
2708
|
-
params![
|
|
2709
|
-
due_at,
|
|
2710
|
-
payload.first_target.as_str(),
|
|
2711
|
-
serde_json::json!({
|
|
2712
|
-
"message_id": payload.message_id,
|
|
2713
|
-
"attempt": next_attempt,
|
|
2714
|
-
"max_attempts": payload.max_attempts,
|
|
2715
|
-
"first_target": payload.first_target.as_str(),
|
|
2716
|
-
})
|
|
2717
|
-
.to_string(),
|
|
2718
|
-
chrono::Utc::now().to_rfc3339(),
|
|
2719
|
-
],
|
|
2720
|
-
)?;
|
|
2721
|
-
let _ = store.mark(&payload.message_id, "queued_until_trust", None);
|
|
2722
|
-
event_log.write(
|
|
2723
|
-
"leader_panes.trust_auto_answer_retry_scheduled",
|
|
2724
|
-
serde_json::json!({"message_id": payload.message_id, "attempt": next_attempt, "due_at": due_at}),
|
|
2725
|
-
)?;
|
|
2726
|
-
Ok(DeliveryOutcome {
|
|
2727
|
-
ok: false,
|
|
2728
|
-
status: DeliveryStatus::RetryScheduled,
|
|
2729
|
-
message_status: MessageStatusShadow("queued_until_trust".to_string()),
|
|
2730
|
-
message_id: Some(payload.message_id.clone()),
|
|
2731
|
-
verification: None,
|
|
2732
|
-
stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
|
|
2733
|
-
reason: None,
|
|
2734
|
-
channel: None,
|
|
2735
|
-
ack_forced_off: false,
|
|
2736
|
-
turn_verification: None,
|
|
2737
|
-
})
|
|
2738
|
-
}
|
|
2739
|
-
|
|
2740
|
-
/// `_execute_trust_retry` (`delivery.py:330`):trust_retry scheduled event 的消费者 ——
|
|
2741
|
-
/// 把行重置回 `accepted`,attempt 穿透,重跑 `_deliver_pending_message`。
|
|
2742
|
-
pub fn execute_trust_retry(
|
|
2743
|
-
workspace: &Path,
|
|
2744
|
-
store: &MessageStore,
|
|
2745
|
-
transport: &dyn Transport,
|
|
2746
|
-
payload: &TrustRetryPayload,
|
|
2747
|
-
event_log: &EventLog,
|
|
2748
|
-
owner_team_id: Option<&TeamKey>,
|
|
2749
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
2750
|
-
let _ = owner_team_id;
|
|
2751
|
-
let _ = store.mark(&payload.message_id, "accepted", None);
|
|
2752
|
-
let state = crate::state::persist::load_runtime_state(workspace)?;
|
|
2753
|
-
deliver_pending_message(
|
|
2754
|
-
workspace,
|
|
2755
|
-
store,
|
|
2756
|
-
transport,
|
|
2757
|
-
&payload.message_id,
|
|
2758
|
-
event_log,
|
|
2759
|
-
&state,
|
|
2760
|
-
)
|
|
2761
|
-
}
|
|
2762
|
-
|
|
2763
|
-
/// `_record_turn_open_if_leader_to_worker` (`delivery.py:430`):**take-over arm 来自真实投递**
|
|
2764
|
-
/// (card §121) —— 仅 leader→worker 注入/投递成功后才 arm,绝不凭空 arm。
|
|
2765
|
-
pub(crate) fn record_turn_open_if_leader_to_worker(
|
|
2766
|
-
workspace: &Path,
|
|
2767
|
-
state: &serde_json::Value,
|
|
2768
|
-
sender: &str,
|
|
2769
|
-
recipient: &str,
|
|
2770
|
-
delivered: &DeliveryOutcome,
|
|
2771
|
-
event_log: &EventLog,
|
|
2772
|
-
) -> Result<(), MessagingError> {
|
|
2773
|
-
let _ = state;
|
|
2774
|
-
record_turn_open_if_leader_to_worker_scoped(
|
|
2775
|
-
workspace, sender, recipient, delivered, event_log, None, None,
|
|
2776
|
-
)
|
|
2777
|
-
}
|
|
2778
|
-
|
|
2779
|
-
/// A rescue that supplies the first successful Enter must arm the same turn
|
|
2780
|
-
/// linkage as normal delivery, immediately after the key (not after UI polling).
|
|
2781
|
-
pub(super) fn with_rescue_submit_observer<R>(
|
|
2782
|
-
workspace: &Path,
|
|
2783
|
-
store: &MessageStore,
|
|
2784
|
-
context: &crate::transport::enter_rescue::EnterRescueContext,
|
|
2785
|
-
event_log: &EventLog,
|
|
2786
|
-
execute: impl FnOnce(&dyn SubmitObserver) -> Result<R, MessagingError>,
|
|
2787
|
-
) -> Result<R, MessagingError> {
|
|
2788
|
-
let request = context;
|
|
2789
|
-
let binding = context.target.as_ref().filter(|target| target.bound())
|
|
2790
|
-
.ok_or_else(|| MessagingError::Validation("enter_rescue: original binding missing".into()))?;
|
|
2791
|
-
let conn = crate::db::schema::open_db(store.db_path())?;
|
|
2792
|
-
let sender: String = conn.query_row(
|
|
2793
|
-
"select sender from messages where message_id=?1 and owner_team_id=?2 and recipient=?3 and status='submitted_unverified'",
|
|
2794
|
-
params![request.message_id, request.owner_team_id, request.recipient],
|
|
2795
|
-
|row| row.get(0),
|
|
2796
|
-
)?;
|
|
2797
|
-
let metadata = TargetMetadata {
|
|
2798
|
-
tmux_endpoint: Some(binding.endpoint.clone()),
|
|
2799
|
-
target_session: binding.session.clone(),
|
|
2800
|
-
target_window: binding.window.clone(),
|
|
2801
|
-
target_pane_id: binding.pane_id.clone(),
|
|
2802
|
-
target_pane_pid: Some(binding.pane_pid),
|
|
2803
|
-
resolved_from: "enter_rescue_owned_binding",
|
|
2804
|
-
};
|
|
2805
|
-
let mut observer = CurrentTurnSubmitObserver::new(
|
|
2806
|
-
workspace, &sender, &request.recipient, &request.message_id, event_log,
|
|
2807
|
-
Some(&request.owner_team_id), Some(&metadata),
|
|
2808
|
-
);
|
|
2809
|
-
observer.rescue_context = Some(context);
|
|
2810
|
-
let result = execute(&observer)?;
|
|
2811
|
-
if let Some(error) = observer.take_error() { return Err(error); }
|
|
2812
|
-
Ok(result)
|
|
2813
|
-
}
|
|
2814
|
-
|
|
2815
|
-
struct CurrentTurnSubmitObserver<'a> {
|
|
2816
|
-
workspace: &'a Path,
|
|
2817
|
-
sender: &'a str,
|
|
2818
|
-
recipient: &'a str,
|
|
2819
|
-
message_id: &'a str,
|
|
2820
|
-
event_log: &'a EventLog,
|
|
2821
|
-
owner_team_id: Option<&'a str>,
|
|
2822
|
-
metadata: Option<&'a TargetMetadata>,
|
|
2823
|
-
rescue_context: Option<&'a crate::transport::enter_rescue::EnterRescueContext>,
|
|
2824
|
-
fired: Cell<bool>,
|
|
2825
|
-
error: RefCell<Option<MessagingError>>,
|
|
2826
|
-
}
|
|
2827
|
-
|
|
2828
|
-
impl<'a> CurrentTurnSubmitObserver<'a> {
|
|
2829
|
-
fn new(
|
|
2830
|
-
workspace: &'a Path,
|
|
2831
|
-
sender: &'a str,
|
|
2832
|
-
recipient: &'a str,
|
|
2833
|
-
message_id: &'a str,
|
|
2834
|
-
event_log: &'a EventLog,
|
|
2835
|
-
owner_team_id: Option<&'a str>,
|
|
2836
|
-
metadata: Option<&'a TargetMetadata>,
|
|
2837
|
-
) -> Self {
|
|
2838
|
-
Self {
|
|
2839
|
-
workspace,
|
|
2840
|
-
sender,
|
|
2841
|
-
recipient,
|
|
2842
|
-
message_id,
|
|
2843
|
-
event_log,
|
|
2844
|
-
owner_team_id,
|
|
2845
|
-
metadata,
|
|
2846
|
-
rescue_context: None,
|
|
2847
|
-
fired: Cell::new(false),
|
|
2848
|
-
error: RefCell::new(None),
|
|
2849
|
-
}
|
|
2850
|
-
}
|
|
2851
|
-
|
|
2852
|
-
fn take_error(&self) -> Option<MessagingError> {
|
|
2853
|
-
self.error.borrow_mut().take()
|
|
2854
|
-
}
|
|
2855
|
-
}
|
|
2856
|
-
|
|
2857
|
-
impl SubmitObserver for CurrentTurnSubmitObserver<'_> {
|
|
2858
|
-
fn after_physical_submit(&self) {
|
|
2859
|
-
if self.fired.replace(true) {
|
|
2860
|
-
return;
|
|
2861
|
-
}
|
|
2862
|
-
let result = if let Some(context) = self.rescue_context {
|
|
2863
|
-
record_rescue_turn_after_submit(self.workspace, self.sender, context, self.event_log, self.metadata)
|
|
2864
|
-
} else {
|
|
2865
|
-
record_current_turn_after_inject_if_leader_to_worker_scoped(
|
|
2866
|
-
self.workspace, self.sender, self.recipient, self.message_id,
|
|
2867
|
-
self.event_log, self.owner_team_id, self.metadata,
|
|
2868
|
-
)
|
|
2869
|
-
};
|
|
2870
|
-
if let Err(error) = result { *self.error.borrow_mut() = Some(error); }
|
|
2871
|
-
}
|
|
2872
|
-
}
|
|
2873
|
-
|
|
2874
|
-
fn record_rescue_turn_after_submit(
|
|
2875
|
-
workspace: &Path,
|
|
2876
|
-
sender: &str,
|
|
2877
|
-
context: &crate::transport::enter_rescue::EnterRescueContext,
|
|
2878
|
-
event_log: &EventLog,
|
|
2879
|
-
metadata: Option<&TargetMetadata>,
|
|
2880
|
-
) -> Result<(), MessagingError> {
|
|
2881
|
-
let request = context;
|
|
2882
|
-
let target = context.target.as_ref().filter(|target| target.bound())
|
|
2883
|
-
.ok_or_else(|| MessagingError::Validation("enter_rescue: original binding missing".into()))?;
|
|
2884
|
-
if !matches!(sender, "leader" | "Leader") { return Ok(()); }
|
|
2885
|
-
crate::state::repository::StateRepository::new(workspace).commit_messaging_checked(
|
|
2886
|
-
crate::state::repository::StateWriteIntent::MessagingDeliveryState {
|
|
2887
|
-
owner_team_id: Some(&request.owner_team_id),
|
|
2888
|
-
},
|
|
2889
|
-
|selected| {
|
|
2890
|
-
let agent = selected.get("agents").and_then(|agents| agents.get(&request.recipient));
|
|
2891
|
-
let matches = agent.is_some_and(|agent| {
|
|
2892
|
-
agent.get("status").and_then(serde_json::Value::as_str) == Some("running")
|
|
2893
|
-
&& agent.get("explicit_stop").and_then(serde_json::Value::as_bool) != Some(true)
|
|
2894
|
-
&& agent.get("pane_id").and_then(serde_json::Value::as_str) == Some(target.pane_id.as_str())
|
|
2895
|
-
&& agent.get("pane_pid").and_then(serde_json::Value::as_u64) == Some(u64::from(target.pane_pid))
|
|
2896
|
-
&& agent.get("window").and_then(serde_json::Value::as_str).unwrap_or(&request.recipient) == target.window
|
|
2897
|
-
&& agent.get("provider").cloned().and_then(|value| serde_json::from_value::<Provider>(value).ok()) == Some(target.provider)
|
|
2898
|
-
&& selected.get("session_name").and_then(serde_json::Value::as_str) == Some(target.session.as_str())
|
|
2899
|
-
});
|
|
2900
|
-
if !matches {
|
|
2901
|
-
return Err(crate::state::StateError::SaveConflict("rescue receiver changed before turn commit".into()));
|
|
2902
|
-
}
|
|
2903
|
-
arm_turn_open(selected, &request.recipient, &Some(request.message_id.clone()));
|
|
2904
|
-
Ok(())
|
|
2905
|
-
},
|
|
2906
|
-
)?;
|
|
2907
|
-
let mut event = serde_json::json!({"agent_id": request.recipient, "message_id": request.message_id});
|
|
2908
|
-
if let Some(metadata) = metadata { append_target_metadata(&mut event, metadata); }
|
|
2909
|
-
event_log.write("turn_open.armed_after_inject", event)?;
|
|
2910
|
-
Ok(())
|
|
2911
|
-
}
|
|
2912
|
-
|
|
2913
|
-
fn record_current_turn_after_inject_if_leader_to_worker_scoped(
|
|
2914
|
-
workspace: &Path,
|
|
2915
|
-
sender: &str,
|
|
2916
|
-
recipient: &str,
|
|
2917
|
-
message_id: &str,
|
|
2918
|
-
event_log: &EventLog,
|
|
2919
|
-
owner_team_id: Option<&str>,
|
|
2920
|
-
metadata: Option<&TargetMetadata>,
|
|
2921
|
-
) -> Result<(), MessagingError> {
|
|
2922
|
-
if !matches!(sender, "leader" | "Leader") || recipient == "leader" {
|
|
2923
|
-
return Ok(());
|
|
2924
|
-
}
|
|
2925
|
-
let message_id = Some(message_id.to_string());
|
|
2926
|
-
let mut state = scoped_state_for_write(workspace, owner_team_id)?;
|
|
2927
|
-
arm_turn_open(&mut state, recipient, &message_id);
|
|
2928
|
-
save_scoped_state_reapplying_after_conflict(workspace, &state, owner_team_id, |latest| {
|
|
2929
|
-
arm_turn_open(latest, recipient, &message_id);
|
|
2930
|
-
})?;
|
|
2931
|
-
let mut event = serde_json::json!({"agent_id": recipient, "message_id": message_id});
|
|
2932
|
-
if let Some(metadata) = metadata {
|
|
2933
|
-
append_target_metadata(&mut event, metadata);
|
|
2934
|
-
}
|
|
2935
|
-
event_log.write("turn_open.armed_after_inject", event)?;
|
|
2936
|
-
Ok(())
|
|
2937
|
-
}
|
|
2938
|
-
|
|
2939
|
-
fn record_turn_open_if_leader_to_worker_scoped(
|
|
2940
|
-
workspace: &Path,
|
|
2941
|
-
sender: &str,
|
|
2942
|
-
recipient: &str,
|
|
2943
|
-
delivered: &DeliveryOutcome,
|
|
2944
|
-
event_log: &EventLog,
|
|
2945
|
-
owner_team_id: Option<&str>,
|
|
2946
|
-
metadata: Option<&TargetMetadata>,
|
|
2947
|
-
) -> Result<(), MessagingError> {
|
|
2948
|
-
if !delivered.ok || !matches!(sender, "leader" | "Leader") || recipient == "leader" {
|
|
2949
|
-
return Ok(());
|
|
2950
|
-
}
|
|
2951
|
-
let mut state = scoped_state_for_write(workspace, owner_team_id)?;
|
|
2952
|
-
arm_turn_open(&mut state, recipient, &delivered.message_id);
|
|
2953
|
-
save_scoped_state_reapplying_after_conflict(workspace, &state, owner_team_id, |latest| {
|
|
2954
|
-
arm_turn_open(latest, recipient, &delivered.message_id);
|
|
2955
|
-
})?;
|
|
2956
|
-
let mut event = serde_json::json!({"agent_id": recipient, "message_id": delivered.message_id});
|
|
2957
|
-
if let Some(metadata) = metadata {
|
|
2958
|
-
append_target_metadata(&mut event, metadata);
|
|
2959
|
-
}
|
|
2960
|
-
event_log.write("turn_open.armed_after_delivery", event)?;
|
|
2961
|
-
Ok(())
|
|
2962
|
-
}
|
|
2963
|
-
|
|
2964
|
-
fn arm_turn_open(state: &mut serde_json::Value, recipient: &str, message_id: &Option<String>) {
|
|
2965
|
-
let Some(root) = state.as_object_mut() else {
|
|
2966
|
-
return;
|
|
2967
|
-
};
|
|
2968
|
-
let coordinator = root
|
|
2969
|
-
.entry("coordinator")
|
|
2970
|
-
.or_insert_with(|| serde_json::json!({}));
|
|
2971
|
-
if let Some(obj) = coordinator.as_object_mut() {
|
|
2972
|
-
obj.insert(
|
|
2973
|
-
"turn_open".to_string(),
|
|
2974
|
-
serde_json::json!({"armed": true, "node_id": recipient, "turn_id": message_id}),
|
|
2975
|
-
);
|
|
2976
|
-
}
|
|
2977
|
-
if let Some(agent) = root
|
|
2978
|
-
.get_mut("agents")
|
|
2979
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
2980
|
-
.and_then(|agents| agents.get_mut(recipient))
|
|
2981
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
2982
|
-
{
|
|
2983
|
-
// Phase-DX E2 (CR P0 red line #5): the leader→worker turn message id.
|
|
2984
|
-
// Renamed from a misleading legacy field name (which was never a task
|
|
2985
|
-
// FSM id — task FSM is A1) to `current_turn_message_id`, matching its
|
|
2986
|
-
// actual semantic. Reader compatibility lives in `coordinator/tick.rs`
|
|
2987
|
-
// (whitelisted for the transition) and `mcp_server/helpers.rs`; other
|
|
2988
|
-
// messaging/lifecycle/mcp_server code MUST NOT treat this as
|
|
2989
|
-
// authoritative task state.
|
|
2990
|
-
let field = message_id.as_ref().map_or(serde_json::Value::Null, |id| {
|
|
2991
|
-
serde_json::Value::String(id.clone())
|
|
2992
|
-
});
|
|
2993
|
-
agent.insert("current_turn_message_id".to_string(), field);
|
|
2994
|
-
}
|
|
2995
|
-
}
|
|
2996
|
-
|
|
2997
|
-
/// `_stamp_first_send_at_if_leader_to_worker` (`delivery.py:380`):首次 leader→worker 投递戳
|
|
2998
|
-
/// `first_send_at` (step 13 restart Route B atomicity 决策读它)。
|
|
2999
|
-
pub(crate) fn stamp_first_send_at_if_leader_to_worker(
|
|
3000
|
-
workspace: &Path,
|
|
3001
|
-
state: &serde_json::Value,
|
|
3002
|
-
sender: &str,
|
|
3003
|
-
recipient: &str,
|
|
3004
|
-
) -> Result<(), MessagingError> {
|
|
3005
|
-
let _ = state;
|
|
3006
|
-
stamp_first_send_at_if_leader_to_worker_scoped(workspace, sender, recipient, None)
|
|
3007
|
-
}
|
|
3008
|
-
|
|
3009
|
-
fn stamp_first_send_at_if_leader_to_worker_scoped(
|
|
3010
|
-
workspace: &Path,
|
|
3011
|
-
sender: &str,
|
|
3012
|
-
recipient: &str,
|
|
3013
|
-
owner_team_id: Option<&str>,
|
|
3014
|
-
) -> Result<(), MessagingError> {
|
|
3015
|
-
if !matches!(sender, "leader" | "Leader") || recipient == "leader" {
|
|
3016
|
-
return Ok(());
|
|
3017
|
-
}
|
|
3018
|
-
let mut state = scoped_state_for_write(workspace, owner_team_id)?;
|
|
3019
|
-
let now = chrono::Utc::now().to_rfc3339();
|
|
3020
|
-
if stamp_first_send_at(&mut state, recipient, &now) {
|
|
3021
|
-
save_scoped_state_reapplying_after_conflict(workspace, &state, owner_team_id, |latest| {
|
|
3022
|
-
let _ = stamp_first_send_at(latest, recipient, &now);
|
|
3023
|
-
})?;
|
|
3024
|
-
}
|
|
3025
|
-
Ok(())
|
|
3026
|
-
}
|
|
3027
|
-
|
|
3028
|
-
fn stamp_first_send_at(state: &mut serde_json::Value, recipient: &str, now: &str) -> bool {
|
|
3029
|
-
if let Some(agent) = state
|
|
3030
|
-
.get_mut("agents")
|
|
3031
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
3032
|
-
.and_then(|agents| agents.get_mut(recipient))
|
|
3033
|
-
.and_then(serde_json::Value::as_object_mut)
|
|
3034
|
-
{
|
|
3035
|
-
if !agent.contains_key("first_send_at")
|
|
3036
|
-
|| agent
|
|
3037
|
-
.get("first_send_at")
|
|
3038
|
-
.is_some_and(serde_json::Value::is_null)
|
|
3039
|
-
{
|
|
3040
|
-
agent.insert(
|
|
3041
|
-
"first_send_at".to_string(),
|
|
3042
|
-
serde_json::Value::String(now.to_string()),
|
|
3043
|
-
);
|
|
3044
|
-
return true;
|
|
3045
|
-
}
|
|
3046
|
-
}
|
|
3047
|
-
false
|
|
3048
|
-
}
|
|
3049
|
-
|
|
3050
|
-
fn scoped_state_for_write(
|
|
3051
|
-
workspace: &Path,
|
|
3052
|
-
owner_team_id: Option<&str>,
|
|
3053
|
-
) -> Result<serde_json::Value, MessagingError> {
|
|
3054
|
-
match owner_team_id.filter(|team| !team.is_empty()) {
|
|
3055
|
-
Some(team) => {
|
|
3056
|
-
let raw = crate::state::persist::load_runtime_state(workspace)?;
|
|
3057
|
-
match project_state_for_owner_team_value(&raw, team) {
|
|
3058
|
-
Some(projected) => Ok(projected),
|
|
3059
|
-
None => Ok(raw),
|
|
3060
|
-
}
|
|
3061
|
-
}
|
|
3062
|
-
None => Ok(crate::state::persist::load_runtime_state(workspace)?),
|
|
3063
|
-
}
|
|
3064
|
-
}
|
|
3065
|
-
|
|
3066
|
-
fn save_scoped_state(
|
|
3067
|
-
workspace: &Path,
|
|
3068
|
-
state: &serde_json::Value,
|
|
3069
|
-
owner_team_id: Option<&str>,
|
|
3070
|
-
) -> Result<(), MessagingError> {
|
|
3071
|
-
let scoped_owner_team_id = owner_team_id.filter(|team| !team.is_empty()).filter(|_| {
|
|
3072
|
-
state
|
|
3073
|
-
.get("teams")
|
|
3074
|
-
.and_then(serde_json::Value::as_object)
|
|
3075
|
-
.is_some_and(|teams| {
|
|
3076
|
-
owner_team_id
|
|
3077
|
-
.and_then(|team| {
|
|
3078
|
-
crate::state::projection::resolve_owner_team_id(state, team)
|
|
3079
|
-
.canonical_key()
|
|
3080
|
-
.map(str::to_string)
|
|
3081
|
-
})
|
|
3082
|
-
.is_some_and(|team| teams.contains_key(&team))
|
|
3083
|
-
})
|
|
3084
|
-
});
|
|
3085
|
-
crate::state::repository::StateRepository::new(workspace).save(
|
|
3086
|
-
crate::state::repository::StateWriteIntent::MessagingDeliveryState {
|
|
3087
|
-
owner_team_id: scoped_owner_team_id,
|
|
3088
|
-
},
|
|
3089
|
-
state,
|
|
3090
|
-
)?;
|
|
3091
|
-
Ok(())
|
|
3092
|
-
}
|
|
3093
|
-
|
|
3094
|
-
fn save_scoped_state_reapplying_after_conflict<F>(
|
|
3095
|
-
workspace: &Path,
|
|
3096
|
-
state: &serde_json::Value,
|
|
3097
|
-
owner_team_id: Option<&str>,
|
|
3098
|
-
reapply: F,
|
|
3099
|
-
) -> Result<(), MessagingError>
|
|
3100
|
-
where
|
|
3101
|
-
F: FnOnce(&mut serde_json::Value),
|
|
3102
|
-
{
|
|
3103
|
-
let scoped_owner_team_id = owner_team_id.filter(|team| !team.is_empty()).filter(|_| {
|
|
3104
|
-
state
|
|
3105
|
-
.get("teams")
|
|
3106
|
-
.and_then(serde_json::Value::as_object)
|
|
3107
|
-
.is_some_and(|teams| {
|
|
3108
|
-
owner_team_id
|
|
3109
|
-
.and_then(|team| {
|
|
3110
|
-
crate::state::projection::resolve_owner_team_id(state, team)
|
|
3111
|
-
.canonical_key()
|
|
3112
|
-
.map(str::to_string)
|
|
3113
|
-
})
|
|
3114
|
-
.is_some_and(|team| teams.contains_key(&team))
|
|
3115
|
-
})
|
|
3116
|
-
});
|
|
3117
|
-
crate::state::repository::StateRepository::new(workspace).save_reapplying(
|
|
3118
|
-
crate::state::repository::StateWriteIntent::MessagingDeliveryState {
|
|
3119
|
-
owner_team_id: scoped_owner_team_id,
|
|
3120
|
-
},
|
|
3121
|
-
state,
|
|
3122
|
-
reapply,
|
|
3123
|
-
)?;
|
|
3124
|
-
Ok(())
|
|
3125
|
-
}
|
|
3126
|
-
|
|
3127
|
-
enum OwnerTeamProjection {
|
|
3128
|
-
Projected {
|
|
3129
|
-
state: serde_json::Value,
|
|
3130
|
-
canonical_team: String,
|
|
3131
|
-
},
|
|
3132
|
-
Refused(DeliveryOutcome),
|
|
3133
|
-
}
|
|
3134
|
-
|
|
3135
|
-
fn project_state_for_owner_team(
|
|
3136
|
-
workspace: &Path,
|
|
3137
|
-
team: &str,
|
|
3138
|
-
fallback: &serde_json::Value,
|
|
3139
|
-
store: Option<&MessageStore>,
|
|
3140
|
-
message_id: Option<&str>,
|
|
3141
|
-
event_log: Option<&EventLog>,
|
|
3142
|
-
) -> Result<OwnerTeamProjection, MessagingError> {
|
|
3143
|
-
#[cfg(test)]
|
|
3144
|
-
preparation_probe::COUNTS.with(|counts| {
|
|
3145
|
-
let (prepare, project, claim) = counts.get();
|
|
3146
|
-
counts.set((prepare, project + 1, claim));
|
|
3147
|
-
});
|
|
3148
|
-
let raw = crate::state::persist::load_runtime_state(workspace)?;
|
|
3149
|
-
let fallback_has_teams = fallback
|
|
3150
|
-
.get("teams")
|
|
3151
|
-
.and_then(serde_json::Value::as_object)
|
|
3152
|
-
.is_some_and(|teams| !teams.is_empty());
|
|
3153
|
-
let (mut projection_source, mut resolution) = if fallback_has_teams {
|
|
3154
|
-
(
|
|
3155
|
-
fallback,
|
|
3156
|
-
crate::state::projection::resolve_owner_team_id(fallback, team),
|
|
3157
|
-
)
|
|
3158
|
-
} else {
|
|
3159
|
-
(
|
|
3160
|
-
&raw,
|
|
3161
|
-
crate::state::projection::resolve_owner_team_id(&raw, team),
|
|
3162
|
-
)
|
|
3163
|
-
};
|
|
3164
|
-
if !fallback_has_teams && matches!(resolution, OwnerTeamResolution::Unresolved { .. }) {
|
|
3165
|
-
let fallback_resolution = crate::state::projection::resolve_owner_team_id(fallback, team);
|
|
3166
|
-
if !matches!(fallback_resolution, OwnerTeamResolution::Unresolved { .. }) {
|
|
3167
|
-
resolution = fallback_resolution;
|
|
3168
|
-
projection_source = fallback;
|
|
3169
|
-
}
|
|
3170
|
-
}
|
|
3171
|
-
let canonical_team = match resolution {
|
|
3172
|
-
OwnerTeamResolution::Canonical(canonical) => canonical,
|
|
3173
|
-
OwnerTeamResolution::LegacyAlias {
|
|
3174
|
-
requested,
|
|
3175
|
-
canonical,
|
|
3176
|
-
} => {
|
|
3177
|
-
normalize_owner_team_id_rows(workspace, &requested, &canonical, message_id, event_log)?;
|
|
3178
|
-
canonical
|
|
3179
|
-
}
|
|
3180
|
-
OwnerTeamResolution::Unresolved { requested } => {
|
|
3181
|
-
let outcome = refuse_owner_team_resolution(
|
|
3182
|
-
store,
|
|
3183
|
-
message_id,
|
|
3184
|
-
event_log,
|
|
3185
|
-
"owner_team_unresolved",
|
|
3186
|
-
serde_json::json!({"owner_team_id": requested}),
|
|
3187
|
-
DeliveryRefusal::UnknownRecipient,
|
|
3188
|
-
)?;
|
|
3189
|
-
return Ok(OwnerTeamProjection::Refused(outcome));
|
|
3190
|
-
}
|
|
3191
|
-
OwnerTeamResolution::Ambiguous { requested, matches } => {
|
|
3192
|
-
let outcome = refuse_owner_team_resolution(
|
|
3193
|
-
store,
|
|
3194
|
-
message_id,
|
|
3195
|
-
event_log,
|
|
3196
|
-
"owner_team_ambiguous",
|
|
3197
|
-
serde_json::json!({"owner_team_id": requested, "matches": matches}),
|
|
3198
|
-
DeliveryRefusal::Ambiguous,
|
|
3199
|
-
)?;
|
|
3200
|
-
return Ok(OwnerTeamProjection::Refused(outcome));
|
|
3201
|
-
}
|
|
3202
|
-
};
|
|
3203
|
-
if top_level_state_matches_owner_team(fallback, &canonical_team)
|
|
3204
|
-
&& state_has_no_team_entries(fallback)
|
|
3205
|
-
{
|
|
3206
|
-
let mut state = fallback.clone();
|
|
3207
|
-
carry_top_level_leader_binding(&mut state, &raw);
|
|
3208
|
-
return Ok(OwnerTeamProjection::Projected {
|
|
3209
|
-
state,
|
|
3210
|
-
canonical_team,
|
|
3211
|
-
});
|
|
3212
|
-
}
|
|
3213
|
-
if top_level_state_matches_owner_team(&raw, &canonical_team) && state_has_no_team_entries(&raw)
|
|
3214
|
-
{
|
|
3215
|
-
return Ok(OwnerTeamProjection::Projected {
|
|
3216
|
-
state: raw,
|
|
3217
|
-
canonical_team,
|
|
3218
|
-
});
|
|
3219
|
-
}
|
|
3220
|
-
if state_has_no_team_entries(projection_source) {
|
|
3221
|
-
let mut state = projection_source.clone();
|
|
3222
|
-
carry_top_level_leader_binding(&mut state, &raw);
|
|
3223
|
-
return Ok(OwnerTeamProjection::Projected {
|
|
3224
|
-
state,
|
|
3225
|
-
canonical_team,
|
|
3226
|
-
});
|
|
3227
|
-
}
|
|
3228
|
-
let mut state = project_state_for_owner_team_value(projection_source, &canonical_team)
|
|
3229
|
-
.ok_or_else(|| {
|
|
3230
|
-
MessagingError::Routing(format!("owner_team_unresolved: {canonical_team}"))
|
|
3231
|
-
})?;
|
|
3232
|
-
carry_top_level_leader_binding(&mut state, projection_source);
|
|
3233
|
-
carry_top_level_leader_binding(&mut state, &raw);
|
|
3234
|
-
Ok(OwnerTeamProjection::Projected {
|
|
3235
|
-
state,
|
|
3236
|
-
canonical_team,
|
|
3237
|
-
})
|
|
3238
|
-
}
|
|
3239
|
-
|
|
3240
|
-
fn carry_top_level_leader_binding(projected: &mut serde_json::Value, raw: &serde_json::Value) {
|
|
3241
|
-
let Some(projected_obj) = projected.as_object_mut() else {
|
|
3242
|
-
return;
|
|
3243
|
-
};
|
|
3244
|
-
for key in ["leader_receiver", "team_owner", "owner_epoch"] {
|
|
3245
|
-
if projected_obj.contains_key(key) {
|
|
3246
|
-
continue;
|
|
3247
|
-
}
|
|
3248
|
-
if let Some(value) = raw.get(key) {
|
|
3249
|
-
projected_obj.insert(key.to_string(), value.clone());
|
|
3250
|
-
}
|
|
3251
|
-
}
|
|
3252
|
-
}
|
|
3253
|
-
|
|
3254
|
-
fn state_has_no_team_entries(state: &serde_json::Value) -> bool {
|
|
3255
|
-
state
|
|
3256
|
-
.get("teams")
|
|
3257
|
-
.and_then(serde_json::Value::as_object)
|
|
3258
|
-
.is_none_or(serde_json::Map::is_empty)
|
|
3259
|
-
}
|
|
3260
|
-
|
|
3261
|
-
pub(crate) fn normalize_owner_team_id_rows(
|
|
3262
|
-
workspace: &Path,
|
|
3263
|
-
requested: &str,
|
|
3264
|
-
canonical: &str,
|
|
3265
|
-
message_id: Option<&str>,
|
|
3266
|
-
event_log: Option<&EventLog>,
|
|
3267
|
-
) -> Result<(), MessagingError> {
|
|
3268
|
-
if requested == canonical {
|
|
3269
|
-
return Ok(());
|
|
3270
|
-
}
|
|
3271
|
-
if let Some(event_log) = event_log {
|
|
3272
|
-
event_log.write(
|
|
3273
|
-
"owner_team_id.compatibility_alias_detected",
|
|
3274
|
-
serde_json::json!({
|
|
3275
|
-
"requested_owner_team_id": requested,
|
|
3276
|
-
"canonical_owner_team_id": canonical,
|
|
3277
|
-
"message_id": message_id,
|
|
3278
|
-
"action": "read_only_no_db_update",
|
|
3279
|
-
"workspace": workspace.to_string_lossy().to_string(),
|
|
3280
|
-
}),
|
|
3281
|
-
)?;
|
|
3282
|
-
}
|
|
3283
|
-
Ok(())
|
|
3284
|
-
}
|
|
3285
|
-
|
|
3286
|
-
fn refuse_owner_team_resolution(
|
|
3287
|
-
store: Option<&MessageStore>,
|
|
3288
|
-
message_id: Option<&str>,
|
|
3289
|
-
event_log: Option<&EventLog>,
|
|
3290
|
-
error: &str,
|
|
3291
|
-
details: serde_json::Value,
|
|
3292
|
-
refusal: DeliveryRefusal,
|
|
3293
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
3294
|
-
if let (Some(store), Some(message_id)) = (store, message_id) {
|
|
3295
|
-
store.mark(message_id, "failed", Some(error))?;
|
|
3296
|
-
}
|
|
3297
|
-
if let Some(event_log) = event_log {
|
|
3298
|
-
event_log.write(
|
|
3299
|
-
"owner_team_id.resolution_failed",
|
|
3300
|
-
serde_json::json!({
|
|
3301
|
-
"message_id": message_id,
|
|
3302
|
-
"error": error,
|
|
3303
|
-
"details": details,
|
|
3304
|
-
}),
|
|
3305
|
-
)?;
|
|
3306
|
-
}
|
|
3307
|
-
Ok(DeliveryOutcome {
|
|
3308
|
-
ok: false,
|
|
3309
|
-
status: DeliveryStatus::Refused,
|
|
3310
|
-
message_status: MessageStatusShadow("failed".to_string()),
|
|
3311
|
-
message_id: message_id.map(str::to_string),
|
|
3312
|
-
verification: Some(error.to_string()),
|
|
3313
|
-
stage: None,
|
|
3314
|
-
reason: Some(refusal),
|
|
3315
|
-
channel: Some("owner_team_resolution".to_string()),
|
|
3316
|
-
ack_forced_off: false,
|
|
3317
|
-
turn_verification: None,
|
|
3318
|
-
})
|
|
3319
|
-
}
|
|
3320
|
-
|
|
3321
|
-
fn project_state_for_owner_team_value(
|
|
3322
|
-
raw: &serde_json::Value,
|
|
3323
|
-
team: &str,
|
|
3324
|
-
) -> Option<serde_json::Value> {
|
|
3325
|
-
if let Some(projected) = raw
|
|
3326
|
-
.get("teams")
|
|
3327
|
-
.and_then(serde_json::Value::as_object)
|
|
3328
|
-
.is_some_and(|teams| teams.contains_key(team))
|
|
3329
|
-
.then(|| crate::state::projection::project_top_level_view(raw, team))
|
|
3330
|
-
{
|
|
3331
|
-
return Some(projected);
|
|
3332
|
-
}
|
|
3333
|
-
if top_level_state_matches_owner_team(raw, team) {
|
|
3334
|
-
return None;
|
|
3335
|
-
}
|
|
3336
|
-
None
|
|
3337
|
-
}
|
|
3338
|
-
|
|
3339
|
-
pub(crate) fn top_level_state_matches_owner_team(state: &serde_json::Value, team: &str) -> bool {
|
|
3340
|
-
if !state.is_object() {
|
|
3341
|
-
return false;
|
|
3342
|
-
}
|
|
3343
|
-
if state
|
|
3344
|
-
.get("active_team_key")
|
|
3345
|
-
.and_then(serde_json::Value::as_str)
|
|
3346
|
-
.is_some_and(|value| value == team)
|
|
3347
|
-
{
|
|
3348
|
-
return true;
|
|
3349
|
-
}
|
|
3350
|
-
if state
|
|
3351
|
-
.get("session_name")
|
|
3352
|
-
.and_then(serde_json::Value::as_str)
|
|
3353
|
-
.is_some_and(|session| session == team || session.strip_prefix("team-") == Some(team))
|
|
3354
|
-
{
|
|
3355
|
-
return true;
|
|
3356
|
-
}
|
|
3357
|
-
let has_explicit_key = ["team_key", "team_dir", "spec_path"].iter().any(|field| {
|
|
3358
|
-
state
|
|
3359
|
-
.get(*field)
|
|
3360
|
-
.and_then(serde_json::Value::as_str)
|
|
3361
|
-
.is_some_and(|value| !value.is_empty())
|
|
3362
|
-
});
|
|
3363
|
-
has_explicit_key && crate::state::projection::team_state_key(state) == team
|
|
3364
|
-
}
|
|
3365
|
-
|
|
3366
|
-
/// `retry_injection_after_trust_auto_answer` (`trust_auto_answer.py`):leader 路径 trust 应答
|
|
3367
|
-
/// 后重注入 (查 pane_width fail-safe + attempt_trust_auto_answer + 等 dismissal + 重 inject)。
|
|
3368
|
-
pub fn retry_injection_after_trust_auto_answer(
|
|
3369
|
-
workspace: &Path,
|
|
3370
|
-
state: &serde_json::Value,
|
|
3371
|
-
transport: &dyn Transport,
|
|
3372
|
-
target: &Target,
|
|
3373
|
-
text: &str,
|
|
3374
|
-
provider: Provider,
|
|
3375
|
-
event_log: &EventLog,
|
|
3376
|
-
) -> Result<DeliveryOutcome, MessagingError> {
|
|
3377
|
-
let _ = (
|
|
3378
|
-
workspace, state, transport, target, text, provider, event_log,
|
|
3379
|
-
);
|
|
3380
|
-
Ok(DeliveryOutcome {
|
|
3381
|
-
ok: false,
|
|
3382
|
-
status: DeliveryStatus::RetryScheduled,
|
|
3383
|
-
message_status: MessageStatusShadow("retry_scheduled".to_string()),
|
|
3384
|
-
message_id: None,
|
|
3385
|
-
verification: None,
|
|
3386
|
-
stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
|
|
3387
|
-
reason: None,
|
|
3388
|
-
channel: None,
|
|
3389
|
-
ack_forced_off: false,
|
|
3390
|
-
turn_verification: None,
|
|
3391
|
-
})
|
|
3392
|
-
}
|
|
3393
|
-
|
|
3394
|
-
/// S1-CAPTURE-001 (0.4.8 phase-1): returns (rollout_path, provider_wire) when
|
|
3395
|
-
/// the recipient agent is Claude/ClaudeCode with a known authoritative
|
|
3396
|
-
/// rollout_path; otherwise None (skip transcript verify). Phase-1 Claude only —
|
|
3397
|
-
/// codex/copilot return None and keep pre-fix delivery semantics.
|
|
3398
|
-
fn claude_recipient_rollout(
|
|
3399
|
-
state: &serde_json::Value,
|
|
3400
|
-
recipient: &str,
|
|
3401
|
-
) -> Option<(std::path::PathBuf, &'static str)> {
|
|
3402
|
-
let agent = state.get("agents")?.get(recipient)?;
|
|
3403
|
-
let provider = agent
|
|
3404
|
-
.get("provider")
|
|
3405
|
-
.and_then(serde_json::Value::as_str)
|
|
3406
|
-
.and_then(parse_provider)?;
|
|
3407
|
-
if !is_claude_family(provider) {
|
|
3408
|
-
return None;
|
|
3409
|
-
}
|
|
3410
|
-
let provider_wire_str = provider_wire(provider);
|
|
3411
|
-
let rollout = agent
|
|
3412
|
-
.get("rollout_path")
|
|
3413
|
-
.and_then(serde_json::Value::as_str)
|
|
3414
|
-
.filter(|s| !s.is_empty())?;
|
|
3415
|
-
Some((std::path::PathBuf::from(rollout), provider_wire_str))
|
|
3416
|
-
}
|
|
3417
|
-
|
|
3418
|
-
/// S1-CAPTURE-001 (0.4.8 phase-1): bounded tail read of the rollout file
|
|
3419
|
-
/// searching for `needle`. Reads up to `tail_bytes` from the end of the file
|
|
3420
|
-
/// (default 64KB budget). Returns true iff the needle appears in the tail.
|
|
3421
|
-
/// Silent on read errors — callers treat missing/unreadable as "token not
|
|
3422
|
-
/// present" which forces the unverified path.
|
|
3423
|
-
fn rollout_tail_contains(path: &std::path::Path, needle: &str, tail_bytes: u64) -> bool {
|
|
3424
|
-
rollout_tail_contains_result(path, needle, tail_bytes).unwrap_or(false)
|
|
3425
|
-
}
|
|
3426
|
-
|
|
3427
|
-
fn message_token_marker(message_id: &str) -> String {
|
|
3428
|
-
format!("[team-agent-token:{message_id}]")
|
|
3429
|
-
}
|
|
3430
|
-
|
|
3431
|
-
fn text_contains_message_token(text: &str, message_id: &str) -> bool {
|
|
3432
|
-
!message_id.is_empty() && text.contains(&message_token_marker(message_id))
|
|
3433
|
-
}
|
|
3434
|
-
|
|
3435
|
-
fn marker_occurrences(text: &str, message_id: &str) -> usize {
|
|
3436
|
-
text.lines().map(str::trim).collect::<String>()
|
|
3437
|
-
.matches(&message_token_marker(message_id)).count()
|
|
3438
|
-
}
|
|
3439
|
-
|
|
3440
|
-
/// Provider-specific parsing is behind an observation port, never a delivery branch.
|
|
3441
|
-
/// None retains existing non-native transport receipts; unknown native frames veto success.
|
|
3442
|
-
fn observed_token_consumed(
|
|
3443
|
-
transport: &dyn Transport,
|
|
3444
|
-
state: &serde_json::Value,
|
|
3445
|
-
recipient: &str,
|
|
3446
|
-
target: &Target,
|
|
3447
|
-
message_id: &str,
|
|
3448
|
-
) -> Option<bool> {
|
|
3449
|
-
let provider = recipient_provider(state, recipient)?;
|
|
3450
|
-
match transport.observe_native_input(target, provider) {
|
|
3451
|
-
Ok(Some(frame)) => Some(frame.composer.is_empty()
|
|
3452
|
-
&& marker_occurrences(&frame.transcript, message_id) == 1),
|
|
3453
|
-
Ok(None) => None,
|
|
3454
|
-
Err(_) => Some(false),
|
|
3455
|
-
}
|
|
3456
|
-
}
|
|
3457
|
-
|
|
3458
|
-
fn existing_token_consumed(
|
|
3459
|
-
transport: &dyn Transport,
|
|
3460
|
-
state: &serde_json::Value,
|
|
3461
|
-
recipient: &str,
|
|
3462
|
-
target: &Target,
|
|
3463
|
-
message_id: &str,
|
|
3464
|
-
) -> bool {
|
|
3465
|
-
observed_token_consumed(transport, state, recipient, target, message_id)
|
|
3466
|
-
.unwrap_or_else(|| recipient_transcript_contains(state, recipient, &message_token_marker(message_id)))
|
|
3467
|
-
}
|
|
3468
|
-
|
|
3469
|
-
#[allow(clippy::too_many_arguments)]
|
|
3470
|
-
fn bind_enter_watchdog(
|
|
3471
|
-
store: &MessageStore,
|
|
3472
|
-
transport: &dyn Transport,
|
|
3473
|
-
state: &serde_json::Value,
|
|
3474
|
-
target: &Target,
|
|
3475
|
-
message_id: &str,
|
|
3476
|
-
message: &PendingMessage,
|
|
3477
|
-
owner_team_id: Option<&str>,
|
|
3478
|
-
event_log: &EventLog,
|
|
3479
|
-
) -> Result<(), MessagingError> {
|
|
3480
|
-
use crate::transport::enter_rescue::{EnterRescueContext, EnterRescueTarget};
|
|
3481
|
-
use sha2::{Digest, Sha256};
|
|
3482
|
-
let rendered = render_message(&message.sender, message.task_id.as_deref(), &message.content, message_id);
|
|
3483
|
-
let agent = state.get("agents").and_then(|agents| agents.get(&message.recipient));
|
|
3484
|
-
let selected = (|| {
|
|
3485
|
-
let agent = agent?;
|
|
3486
|
-
Some(EnterRescueTarget::selected(
|
|
3487
|
-
recipient_provider(state, &message.recipient)?,
|
|
3488
|
-
agent.get("pane_id")?.as_str()?.to_string(),
|
|
3489
|
-
u32::try_from(agent.get("pane_pid")?.as_u64()?).ok()?,
|
|
3490
|
-
state.get("session_name")?.as_str()?.to_string(),
|
|
3491
|
-
agent.get("window").and_then(serde_json::Value::as_str)
|
|
3492
|
-
.unwrap_or(&message.recipient).to_string(),
|
|
3493
|
-
))
|
|
3494
|
-
})();
|
|
3495
|
-
let context = EnterRescueContext {
|
|
3496
|
-
message_id: message_id.into(),
|
|
3497
|
-
owner_team_id: owner_team_id.unwrap_or_default().into(),
|
|
3498
|
-
recipient: message.recipient.clone(),
|
|
3499
|
-
payload_sha256: format!("{:x}", Sha256::digest(rendered.as_bytes())),
|
|
3500
|
-
target: selected,
|
|
3501
|
-
proof: None,
|
|
3502
|
-
};
|
|
3503
|
-
match transport.snapshot_enter_rescue(target, &context, &rendered) {
|
|
3504
|
-
Ok(snapshot) => { super::enter_rescue::bind_pending_context(store, &snapshot)?; }
|
|
3505
|
-
Err(error) => {
|
|
3506
|
-
event_log.write("enter_rescue.snapshot_unavailable", serde_json::json!({
|
|
3507
|
-
"message_id": message_id, "reason": error.to_string(),
|
|
3508
|
-
}))?;
|
|
3509
|
-
}
|
|
3510
|
-
}
|
|
3511
|
-
Ok(())
|
|
3512
|
-
}
|
|
3513
|
-
|
|
3514
|
-
/// Visibility prevents a duplicate paste; only a separate consumption receipt permits success.
|
|
3515
|
-
/// Read failures do not manufacture visibility. Capture stays bounded to Tail(80).
|
|
3516
|
-
pub(crate) fn token_already_visible(
|
|
3517
|
-
transport: &dyn Transport,
|
|
3518
|
-
state: &serde_json::Value,
|
|
3519
|
-
recipient: &str,
|
|
3520
|
-
target: &Target,
|
|
3521
|
-
message_id: &str,
|
|
3522
|
-
) -> bool {
|
|
3523
|
-
if message_id.is_empty() {
|
|
3524
|
-
return false;
|
|
3525
|
-
}
|
|
3526
|
-
let marker = message_token_marker(message_id);
|
|
3527
|
-
match transport.capture(target, CaptureRange::Tail(80)) {
|
|
3528
|
-
Ok(captured) if text_contains_message_token(&captured.text, message_id) => return true,
|
|
3529
|
-
_ => {}
|
|
3530
|
-
}
|
|
3531
|
-
recipient_transcript_contains(state, recipient, &marker)
|
|
3532
|
-
}
|
|
3533
|
-
|
|
3534
|
-
fn recipient_transcript_contains(state: &serde_json::Value, recipient: &str, marker: &str) -> bool {
|
|
3535
|
-
for path in recipient_transcript_paths(state, recipient) {
|
|
3536
|
-
if rollout_tail_contains(&path, marker, 64 * 1024) {
|
|
3537
|
-
return true;
|
|
3538
|
-
}
|
|
3539
|
-
}
|
|
3540
|
-
false
|
|
3541
|
-
}
|
|
3542
|
-
|
|
3543
|
-
fn recipient_transcript_paths(
|
|
3544
|
-
state: &serde_json::Value,
|
|
3545
|
-
recipient: &str,
|
|
3546
|
-
) -> Vec<std::path::PathBuf> {
|
|
3547
|
-
let mut paths = Vec::new();
|
|
3548
|
-
let push = |paths: &mut Vec<std::path::PathBuf>, value: Option<&serde_json::Value>| {
|
|
3549
|
-
if let Some(path) = value
|
|
3550
|
-
.and_then(serde_json::Value::as_str)
|
|
3551
|
-
.filter(|p| !p.is_empty())
|
|
3552
|
-
{
|
|
3553
|
-
paths.push(std::path::PathBuf::from(path));
|
|
3554
|
-
}
|
|
3555
|
-
};
|
|
3556
|
-
if recipient == "leader" {
|
|
3557
|
-
push(
|
|
3558
|
-
&mut paths,
|
|
3559
|
-
leader_receiver_record_path(state, "rollout_path"),
|
|
3560
|
-
);
|
|
3561
|
-
}
|
|
3562
|
-
let agent = state.get("agents").and_then(|agents| agents.get(recipient));
|
|
3563
|
-
push(
|
|
3564
|
-
&mut paths,
|
|
3565
|
-
agent.and_then(|agent| agent.get("rollout_path")),
|
|
3566
|
-
);
|
|
3567
|
-
paths
|
|
3568
|
-
}
|
|
3569
|
-
|
|
3570
|
-
fn leader_receiver_record_path<'a>(
|
|
3571
|
-
state: &'a serde_json::Value,
|
|
3572
|
-
field: &str,
|
|
3573
|
-
) -> Option<&'a serde_json::Value> {
|
|
3574
|
-
state
|
|
3575
|
-
.get("leader_receiver")
|
|
3576
|
-
.and_then(|receiver| receiver.get(field))
|
|
3577
|
-
.or_else(|| {
|
|
3578
|
-
let active = state
|
|
3579
|
-
.get("active_team_key")
|
|
3580
|
-
.and_then(serde_json::Value::as_str)?;
|
|
3581
|
-
state
|
|
3582
|
-
.get("teams")
|
|
3583
|
-
.and_then(serde_json::Value::as_object)
|
|
3584
|
-
.and_then(|teams| teams.get(active))
|
|
3585
|
-
.and_then(|team| team.get("leader_receiver"))
|
|
3586
|
-
.and_then(|receiver| receiver.get(field))
|
|
3587
|
-
})
|
|
3588
|
-
}
|
|
3589
|
-
|
|
3590
|
-
fn absorb_state_error_only_after_physical_submit(
|
|
3591
|
-
transport: &dyn Transport,
|
|
3592
|
-
state: &serde_json::Value,
|
|
3593
|
-
recipient: &str,
|
|
3594
|
-
target: &Target,
|
|
3595
|
-
message_id: &str,
|
|
3596
|
-
event_log: &EventLog,
|
|
3597
|
-
stage: &str,
|
|
3598
|
-
error: MessagingError,
|
|
3599
|
-
) -> Result<(), MessagingError> {
|
|
3600
|
-
if token_already_visible(transport, state, recipient, target, message_id) {
|
|
3601
|
-
log_post_physical_submit_state_error(event_log, message_id, stage, &error)
|
|
3602
|
-
} else {
|
|
3603
|
-
Err(error)
|
|
3604
|
-
}
|
|
3605
|
-
}
|
|
3606
|
-
|
|
3607
|
-
fn log_post_physical_submit_state_error(
|
|
3608
|
-
event_log: &EventLog,
|
|
3609
|
-
message_id: &str,
|
|
3610
|
-
stage: &str,
|
|
3611
|
-
error: &MessagingError,
|
|
3612
|
-
) -> Result<(), MessagingError> {
|
|
3613
|
-
event_log.write(
|
|
3614
|
-
"delivery.post_submit_state_degraded",
|
|
3615
|
-
serde_json::json!({
|
|
3616
|
-
"message_id": message_id,
|
|
3617
|
-
"stage": stage,
|
|
3618
|
-
"error": error.to_string(),
|
|
3619
|
-
"physical_submit": true,
|
|
3620
|
-
}),
|
|
3621
|
-
)?;
|
|
3622
|
-
Ok(())
|
|
3623
|
-
}
|
|
3624
|
-
|
|
3625
|
-
fn rollout_tail_contains_result(
|
|
3626
|
-
path: &std::path::Path,
|
|
3627
|
-
needle: &str,
|
|
3628
|
-
tail_bytes: u64,
|
|
3629
|
-
) -> std::io::Result<bool> {
|
|
3630
|
-
use std::io::{Read, Seek, SeekFrom};
|
|
3631
|
-
let mut file = std::fs::File::open(path)?;
|
|
3632
|
-
let metadata = file.metadata()?;
|
|
3633
|
-
let len = metadata.len();
|
|
3634
|
-
let start = len.saturating_sub(tail_bytes);
|
|
3635
|
-
file.seek(SeekFrom::Start(start))?;
|
|
3636
|
-
let mut buf = Vec::with_capacity(tail_bytes.min(len) as usize);
|
|
3637
|
-
file.take(tail_bytes).read_to_end(&mut buf)?;
|
|
3638
|
-
let haystack = String::from_utf8_lossy(&buf);
|
|
3639
|
-
Ok(haystack.contains(needle))
|
|
3640
|
-
}
|
|
3641
|
-
|
|
3642
|
-
#[cfg(test)]
|
|
3643
|
-
#[path = "delivery_consumption_tests.rs"]
|
|
3644
|
-
mod consumption_tests;
|
|
3645
|
-
|
|
3646
|
-
#[cfg(test)]
|
|
3647
|
-
mod paste_floor_tests {
|
|
3648
|
-
use super::*;
|
|
3649
|
-
|
|
3650
|
-
fn empty_report() -> InjectReport {
|
|
3651
|
-
InjectReport {
|
|
3652
|
-
stage_reached: crate::transport::InjectStage::Submit,
|
|
3653
|
-
inject_verification: InjectVerification::CaptureMissingToken,
|
|
3654
|
-
submit_verification: SubmitVerification::SubmitConsumptionUnverified,
|
|
3655
|
-
turn_verification: crate::transport::TurnVerification::NotYetObserved,
|
|
3656
|
-
attempts: 1,
|
|
3657
|
-
submit_diagnostics: Some(crate::transport::SubmitDiagnostics {
|
|
3658
|
-
consumption_reason: SubmitConsumptionReason::Unverified,
|
|
3659
|
-
before_busy_signal_kind: Some(BusySignalKind::Working),
|
|
3660
|
-
busy_signal_kind: Some(BusySignalKind::SpinnerGlyph),
|
|
3661
|
-
busy_line_from_bottom: Some(2),
|
|
3662
|
-
current_marker_in_bottom_15: Some(false),
|
|
3663
|
-
paste_identity_in_composer: None,
|
|
3664
|
-
consumption_from_capture_result: Some(false),
|
|
3665
|
-
last_capture_outcome: CaptureSampleOutcome::Failed,
|
|
3666
|
-
capture_err_count: 1,
|
|
3667
|
-
capture_sample_count: 1,
|
|
3668
|
-
pane_command_basename: Some("grok".to_string()),
|
|
3669
|
-
pane_command_query: QueryOutcome::Observed,
|
|
3670
|
-
input_surface: InputSurfaceProbe::Input,
|
|
3671
|
-
target_pane_id: Some("%9".to_string()),
|
|
3672
|
-
target_pane_query_matched: Some(true),
|
|
3673
|
-
token_seen_after_paste: None,
|
|
3674
|
-
..crate::transport::SubmitDiagnostics::default()
|
|
3675
|
-
}),
|
|
3676
|
-
}
|
|
3677
|
-
}
|
|
3678
|
-
|
|
3679
|
-
#[test]
|
|
3680
|
-
fn inject_readback_fields_are_safe_scalars_and_keep_attempts_array() {
|
|
3681
|
-
let report = empty_report();
|
|
3682
|
-
let mut event = serde_json::json!({
|
|
3683
|
-
"message_id": "msg_x",
|
|
3684
|
-
"submit_attempts_detail": [{"matched": false}],
|
|
3685
|
-
});
|
|
3686
|
-
merge_inject_readback_fields(
|
|
3687
|
-
&mut event,
|
|
3688
|
-
&report,
|
|
3689
|
-
Some(&Target::Pane(PaneId::new("%9"))),
|
|
3690
|
-
None,
|
|
3691
|
-
);
|
|
3692
|
-
assert_eq!(event["last_capture_outcome"], serde_json::json!("failed"));
|
|
3693
|
-
assert_eq!(event["consumption_reason"], serde_json::json!("unverified"));
|
|
3694
|
-
assert_eq!(
|
|
3695
|
-
event["before_busy_signal_kind"],
|
|
3696
|
-
serde_json::json!("working")
|
|
3697
|
-
);
|
|
3698
|
-
assert_eq!(event["busy_signal_kind"], serde_json::json!("spinner_glyph"));
|
|
3699
|
-
assert_eq!(event["busy_line_from_bottom"], serde_json::json!(2));
|
|
3700
|
-
assert_eq!(
|
|
3701
|
-
event["current_marker_in_bottom_15"],
|
|
3702
|
-
serde_json::json!(false)
|
|
3703
|
-
);
|
|
3704
|
-
assert_eq!(event["paste_identity_in_composer"], serde_json::Value::Null);
|
|
3705
|
-
assert_eq!(
|
|
3706
|
-
event["consumption_from_capture_result"],
|
|
3707
|
-
serde_json::json!(false)
|
|
3708
|
-
);
|
|
3709
|
-
assert_eq!(event["token_seen_after_paste"], serde_json::Value::Null);
|
|
3710
|
-
assert_eq!(event["pane_command_basename"], serde_json::json!("grok"));
|
|
3711
|
-
assert_eq!(event["input_surface"], serde_json::json!("input"));
|
|
3712
|
-
assert_eq!(event["inject_target_pane_id"], serde_json::json!("%9"));
|
|
3713
|
-
assert!(event["submit_attempts_detail"].is_array());
|
|
3714
|
-
assert!(event.get("pane_tail_excerpt").is_none());
|
|
3715
|
-
let dump = event.to_string();
|
|
3716
|
-
assert!(
|
|
3717
|
-
!dump.contains("--help") && !dump.contains("argv"),
|
|
3718
|
-
"readback fields must not leak argv: {dump}"
|
|
3719
|
-
);
|
|
3720
|
-
assert_eq!(
|
|
3721
|
-
report.inject_verification,
|
|
3722
|
-
InjectVerification::CaptureMissingToken
|
|
3723
|
-
);
|
|
3724
|
-
assert!(!inject_submit_verified(&report));
|
|
3725
|
-
assert!(!pane_readback_verified(&report));
|
|
3726
|
-
}
|
|
3727
|
-
}
|