@team-agent/installer 0.2.11 → 0.3.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/Cargo.lock +744 -0
- package/Cargo.toml +34 -0
- package/crates/team-agent/Cargo.toml +33 -0
- package/crates/team-agent/src/cli/adapters.rs +1343 -0
- package/crates/team-agent/src/cli/diagnose.rs +554 -0
- package/crates/team-agent/src/cli/emit.rs +1204 -0
- package/crates/team-agent/src/cli/helpers.rs +88 -0
- package/crates/team-agent/src/cli/leader.rs +216 -0
- package/crates/team-agent/src/cli/mod.rs +1207 -0
- package/crates/team-agent/src/cli/profile.rs +306 -0
- package/crates/team-agent/src/cli/send.rs +215 -0
- package/crates/team-agent/src/cli/status.rs +179 -0
- package/crates/team-agent/src/cli/status_port.rs +502 -0
- package/crates/team-agent/src/cli/tests/base.rs +616 -0
- package/crates/team-agent/src/cli/tests/compile.rs +96 -0
- package/crates/team-agent/src/cli/tests/divergence.rs +509 -0
- package/crates/team-agent/src/cli/tests/lane_c.rs +333 -0
- package/crates/team-agent/src/cli/tests/leader_watch.rs +395 -0
- package/crates/team-agent/src/cli/tests/main_preserved.rs +675 -0
- package/crates/team-agent/src/cli/tests/missing_subcommands.rs +390 -0
- package/crates/team-agent/src/cli/tests/mod.rs +97 -0
- package/crates/team-agent/src/cli/tests/peer_allow.rs +137 -0
- package/crates/team-agent/src/cli/tests/repair_state_byte_lock.rs +302 -0
- package/crates/team-agent/src/cli/tests/run_delegation.rs +305 -0
- package/crates/team-agent/src/cli/tests/status_send.rs +385 -0
- package/crates/team-agent/src/cli/tests/verb_profile.rs +182 -0
- package/crates/team-agent/src/cli/tests/verb_settle.rs +236 -0
- package/crates/team-agent/src/cli/tests/verb_validate.rs +184 -0
- package/crates/team-agent/src/cli/types.rs +605 -0
- package/crates/team-agent/src/compiler/tests.rs +701 -0
- package/crates/team-agent/src/compiler.rs +489 -0
- package/crates/team-agent/src/coordinator/backoff.rs +153 -0
- package/crates/team-agent/src/coordinator/health.rs +557 -0
- package/crates/team-agent/src/coordinator/mod.rs +80 -0
- package/crates/team-agent/src/coordinator/orphan.rs +179 -0
- package/crates/team-agent/src/coordinator/tests/abnormal.rs +255 -0
- package/crates/team-agent/src/coordinator/tests/basics.rs +262 -0
- package/crates/team-agent/src/coordinator/tests/daemon.rs +323 -0
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +263 -0
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +136 -0
- package/crates/team-agent/src/coordinator/tests/mod.rs +310 -0
- package/crates/team-agent/src/coordinator/tests/spine.rs +261 -0
- package/crates/team-agent/src/coordinator/tests/takeover.rs +227 -0
- package/crates/team-agent/src/coordinator/tests/tick_core.rs +256 -0
- package/crates/team-agent/src/coordinator/tests/watch.rs +167 -0
- package/crates/team-agent/src/coordinator/tick.rs +2032 -0
- package/crates/team-agent/src/coordinator/types.rs +584 -0
- package/crates/team-agent/src/db/migration.rs +716 -0
- package/crates/team-agent/src/db/mod.rs +23 -0
- package/crates/team-agent/src/db/schema.rs +378 -0
- package/crates/team-agent/src/event_log.rs +375 -0
- package/crates/team-agent/src/fake_worker.rs +253 -0
- package/crates/team-agent/src/leader/helpers.rs +190 -0
- package/crates/team-agent/src/leader/inject.rs +33 -0
- package/crates/team-agent/src/leader/lease.rs +1084 -0
- package/crates/team-agent/src/leader/mod.rs +99 -0
- package/crates/team-agent/src/leader/owner_bind.rs +292 -0
- package/crates/team-agent/src/leader/rediscover/tests.rs +526 -0
- package/crates/team-agent/src/leader/rediscover.rs +1101 -0
- package/crates/team-agent/src/leader/start.rs +273 -0
- package/crates/team-agent/src/leader/takeover.rs +235 -0
- package/crates/team-agent/src/leader/tests/basics.rs +183 -0
- package/crates/team-agent/src/leader/tests/byte_findings.rs +237 -0
- package/crates/team-agent/src/leader/tests/identity.rs +206 -0
- package/crates/team-agent/src/leader/tests/idle.rs +272 -0
- package/crates/team-agent/src/leader/tests/lease_api.rs +225 -0
- package/crates/team-agent/src/leader/tests/lease_claim.rs +410 -0
- package/crates/team-agent/src/leader/tests/mod.rs +125 -0
- package/crates/team-agent/src/leader/tests/rediscover.rs +351 -0
- package/crates/team-agent/src/leader/tests/wake_start_owner.rs +204 -0
- package/crates/team-agent/src/leader/types.rs +489 -0
- package/crates/team-agent/src/lib.rs +85 -0
- package/crates/team-agent/src/lifecycle/display.rs +228 -0
- package/crates/team-agent/src/lifecycle/helpers.rs +112 -0
- package/crates/team-agent/src/lifecycle/launch/plan.rs +227 -0
- package/crates/team-agent/src/lifecycle/launch.rs +2109 -0
- package/crates/team-agent/src/lifecycle/mod.rs +62 -0
- package/crates/team-agent/src/lifecycle/restart/agent.rs +533 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +517 -0
- package/crates/team-agent/src/lifecycle/restart/orchestrator.rs +41 -0
- package/crates/team-agent/src/lifecycle/restart/rebuild.rs +268 -0
- package/crates/team-agent/src/lifecycle/restart/remove.rs +780 -0
- package/crates/team-agent/src/lifecycle/restart/selection.rs +208 -0
- package/crates/team-agent/src/lifecycle/restart/team_state.rs +242 -0
- package/crates/team-agent/src/lifecycle/restart.rs +76 -0
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +455 -0
- package/crates/team-agent/src/lifecycle/tests/core.rs +989 -0
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +583 -0
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +985 -0
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +265 -0
- package/crates/team-agent/src/lifecycle/tests.rs +27 -0
- package/crates/team-agent/src/lifecycle/types.rs +710 -0
- package/crates/team-agent/src/main.rs +41 -0
- package/crates/team-agent/src/mcp_server/helpers.rs +228 -0
- package/crates/team-agent/src/mcp_server/mod.rs +183 -0
- package/crates/team-agent/src/mcp_server/normalize.rs +312 -0
- package/crates/team-agent/src/mcp_server/tests/golden.rs +283 -0
- package/crates/team-agent/src/mcp_server/tests/normalize.rs +244 -0
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +189 -0
- package/crates/team-agent/src/mcp_server/tests/send.rs +222 -0
- package/crates/team-agent/src/mcp_server/tests/tools.rs +158 -0
- package/crates/team-agent/src/mcp_server/tests/wire.rs +187 -0
- package/crates/team-agent/src/mcp_server/tests.rs +38 -0
- package/crates/team-agent/src/mcp_server/tools.rs +603 -0
- package/crates/team-agent/src/mcp_server/types.rs +421 -0
- package/crates/team-agent/src/mcp_server/wire.rs +468 -0
- package/crates/team-agent/src/message_store.rs +767 -0
- package/crates/team-agent/src/messaging/activity.rs +433 -0
- package/crates/team-agent/src/messaging/delivery.rs +743 -0
- package/crates/team-agent/src/messaging/helpers.rs +209 -0
- package/crates/team-agent/src/messaging/leader_receiver.rs +329 -0
- package/crates/team-agent/src/messaging/mod.rs +147 -0
- package/crates/team-agent/src/messaging/peers.rs +32 -0
- package/crates/team-agent/src/messaging/results.rs +553 -0
- package/crates/team-agent/src/messaging/scheduler.rs +344 -0
- package/crates/team-agent/src/messaging/selftest.rs +100 -0
- package/crates/team-agent/src/messaging/send.rs +578 -0
- package/crates/team-agent/src/messaging/tests/basic.rs +357 -0
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +122 -0
- package/crates/team-agent/src/messaging/tests/mod.rs +293 -0
- package/crates/team-agent/src/messaging/tests/runtime.rs +1422 -0
- package/crates/team-agent/src/messaging/tests/spine.rs +437 -0
- package/crates/team-agent/src/messaging/trust.rs +192 -0
- package/crates/team-agent/src/messaging/types.rs +355 -0
- package/crates/team-agent/src/messaging/watchers.rs +591 -0
- package/crates/team-agent/src/model/enums.rs +311 -0
- package/crates/team-agent/src/model/errors.rs +17 -0
- package/crates/team-agent/src/model/ids.rs +155 -0
- package/crates/team-agent/src/model/mod.rs +22 -0
- package/crates/team-agent/src/model/paths.rs +228 -0
- package/crates/team-agent/src/model/permissions.rs +567 -0
- package/crates/team-agent/src/model/routing.rs +340 -0
- package/crates/team-agent/src/model/spec.rs +680 -0
- package/crates/team-agent/src/model/task_graph.rs +380 -0
- package/crates/team-agent/src/model/testdata/fuzz.golden.yaml +43 -0
- package/crates/team-agent/src/model/testdata/fuzz.yaml +43 -0
- package/crates/team-agent/src/model/testdata/spec_invalid_a.yaml +207 -0
- package/crates/team-agent/src/model/testdata/team.spec.golden.yaml +206 -0
- package/crates/team-agent/src/model/testdata/team.spec.yaml +206 -0
- package/crates/team-agent/src/model/yaml/tests.rs +288 -0
- package/crates/team-agent/src/model/yaml.rs +800 -0
- package/crates/team-agent/src/packaging/install.rs +305 -0
- package/crates/team-agent/src/packaging/migrate.rs +30 -0
- package/crates/team-agent/src/packaging/mod.rs +82 -0
- package/crates/team-agent/src/packaging/repair.rs +24 -0
- package/crates/team-agent/src/packaging/tests.rs +829 -0
- package/crates/team-agent/src/packaging/types.rs +369 -0
- package/crates/team-agent/src/provider/adapter.rs +801 -0
- package/crates/team-agent/src/provider/approvals/mod.rs +2 -0
- package/crates/team-agent/src/provider/approvals/parsing.rs +452 -0
- package/crates/team-agent/src/provider/approvals/runtime_prompts.rs +163 -0
- package/crates/team-agent/src/provider/classify.rs +456 -0
- package/crates/team-agent/src/provider/faults.rs +136 -0
- package/crates/team-agent/src/provider/helpers.rs +41 -0
- package/crates/team-agent/src/provider/mod.rs +53 -0
- package/crates/team-agent/src/provider/startup_prompt.rs +423 -0
- package/crates/team-agent/src/provider/tests/adapter.rs +239 -0
- package/crates/team-agent/src/provider/tests/classify.rs +240 -0
- package/crates/team-agent/src/provider/tests/faults.rs +120 -0
- package/crates/team-agent/src/provider/tests/idle.rs +208 -0
- package/crates/team-agent/src/provider/tests/wire.rs +213 -0
- package/crates/team-agent/src/provider/tests.rs +31 -0
- package/crates/team-agent/src/provider/types.rs +424 -0
- package/crates/team-agent/src/state/identity.rs +659 -0
- package/crates/team-agent/src/state/mod.rs +58 -0
- package/crates/team-agent/src/state/owner_gate.rs +423 -0
- package/crates/team-agent/src/state/persist.rs +712 -0
- package/crates/team-agent/src/state/projection.rs +657 -0
- package/crates/team-agent/src/state/selector.rs +105 -0
- package/crates/team-agent/src/state/testdata/state-rich.canonical.json +133 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +765 -0
- package/crates/team-agent/src/tmux_backend.rs +810 -0
- package/crates/team-agent/src/transport/test_support.rs +252 -0
- package/crates/team-agent/src/transport/tests/behavior.rs +327 -0
- package/crates/team-agent/src/transport/tests/mod.rs +199 -0
- package/crates/team-agent/src/transport/tests/wire.rs +527 -0
- package/crates/team-agent/src/transport.rs +774 -0
- package/npm/install.mjs +118 -112
- package/package.json +15 -13
- package/crates/team-agent-core/Cargo.toml +0 -12
- package/crates/team-agent-core/src/lib.rs +0 -332
- package/crates/team-agent-core/src/main.rs +0 -152
- package/pyproject.toml +0 -18
- package/scripts/install.py +0 -88
- package/scripts/run_regression_tests.py +0 -83
- package/src/team_agent/__init__.py +0 -3
- package/src/team_agent/__main__.py +0 -5
- package/src/team_agent/_legacy_pane_discovery.py +0 -186
- package/src/team_agent/abnormal_track.py +0 -253
- package/src/team_agent/approvals/__init__.py +0 -65
- package/src/team_agent/approvals/constants.py +0 -6
- package/src/team_agent/approvals/parsing.py +0 -176
- package/src/team_agent/approvals/runtime_prompts.py +0 -171
- package/src/team_agent/approvals/status.py +0 -176
- package/src/team_agent/cli/__init__.py +0 -137
- package/src/team_agent/cli/commands.py +0 -481
- package/src/team_agent/cli/e2e.py +0 -202
- package/src/team_agent/cli/helpers.py +0 -226
- package/src/team_agent/cli/parser.py +0 -540
- package/src/team_agent/compiler.py +0 -334
- package/src/team_agent/coordinator/__init__.py +0 -53
- package/src/team_agent/coordinator/__main__.py +0 -119
- package/src/team_agent/coordinator/lifecycle.py +0 -411
- package/src/team_agent/coordinator/metadata.py +0 -61
- package/src/team_agent/coordinator/paths.py +0 -17
- package/src/team_agent/diagnose/__init__.py +0 -48
- package/src/team_agent/diagnose/checks.py +0 -101
- package/src/team_agent/diagnose/comms.py +0 -213
- package/src/team_agent/diagnose/health.py +0 -241
- package/src/team_agent/diagnose/orphan_cleanup.py +0 -364
- package/src/team_agent/diagnose/preflight.py +0 -194
- package/src/team_agent/diagnose/quick_start.py +0 -324
- package/src/team_agent/display/__init__.py +0 -92
- package/src/team_agent/display/adaptive.py +0 -511
- package/src/team_agent/display/backend.py +0 -46
- package/src/team_agent/display/close.py +0 -154
- package/src/team_agent/display/ghostty.py +0 -77
- package/src/team_agent/display/rebuild.py +0 -102
- package/src/team_agent/display/tiling.py +0 -156
- package/src/team_agent/display/worker_window.py +0 -114
- package/src/team_agent/display/workspace.py +0 -382
- package/src/team_agent/errors.py +0 -10
- package/src/team_agent/events.py +0 -84
- package/src/team_agent/fake_worker.py +0 -80
- package/src/team_agent/idle_predicate.py +0 -218
- package/src/team_agent/idle_takeover.py +0 -59
- package/src/team_agent/idle_takeover_wiring.py +0 -114
- package/src/team_agent/launch/__init__.py +0 -41
- package/src/team_agent/launch/bootstrap.py +0 -85
- package/src/team_agent/launch/config.py +0 -106
- package/src/team_agent/launch/core.py +0 -301
- package/src/team_agent/launch/requirements.py +0 -57
- package/src/team_agent/leader/__init__.py +0 -926
- package/src/team_agent/leader_binding.py +0 -183
- package/src/team_agent/lifecycle/__init__.py +0 -5
- package/src/team_agent/lifecycle/agents.py +0 -278
- package/src/team_agent/lifecycle/operations.py +0 -411
- package/src/team_agent/lifecycle/paste_buffer_hygiene.py +0 -39
- package/src/team_agent/lifecycle/start.py +0 -363
- package/src/team_agent/mcp_server/__init__.py +0 -42
- package/src/team_agent/mcp_server/__main__.py +0 -7
- package/src/team_agent/mcp_server/contracts.py +0 -148
- package/src/team_agent/mcp_server/normalize.py +0 -257
- package/src/team_agent/mcp_server/server.py +0 -150
- package/src/team_agent/mcp_server/tools.py +0 -352
- package/src/team_agent/message_store/__init__.py +0 -23
- package/src/team_agent/message_store/agent_health.py +0 -113
- package/src/team_agent/message_store/core.py +0 -497
- package/src/team_agent/message_store/leader_notification_log.py +0 -198
- package/src/team_agent/message_store/result_watchers.py +0 -251
- package/src/team_agent/message_store/schema.py +0 -308
- package/src/team_agent/message_store/schema_migration.py +0 -448
- package/src/team_agent/messaging/__init__.py +0 -1
- package/src/team_agent/messaging/activity_detector.py +0 -262
- package/src/team_agent/messaging/delivery.py +0 -504
- package/src/team_agent/messaging/deps.py +0 -247
- package/src/team_agent/messaging/idle_alerts.py +0 -423
- package/src/team_agent/messaging/internal_delivery.py +0 -46
- package/src/team_agent/messaging/leader.py +0 -497
- package/src/team_agent/messaging/leader_api_errors.py +0 -216
- package/src/team_agent/messaging/leader_panes.py +0 -673
- package/src/team_agent/messaging/owner_bypass.py +0 -29
- package/src/team_agent/messaging/result_delivery.py +0 -539
- package/src/team_agent/messaging/results.py +0 -447
- package/src/team_agent/messaging/scheduler.py +0 -450
- package/src/team_agent/messaging/send.py +0 -532
- package/src/team_agent/messaging/session_drift.py +0 -94
- package/src/team_agent/messaging/tmux_io.py +0 -506
- package/src/team_agent/messaging/tmux_prompt.py +0 -338
- package/src/team_agent/messaging/trust_auto_answer.py +0 -52
- package/src/team_agent/orchestrator/__init__.py +0 -376
- package/src/team_agent/orchestrator/plan.py +0 -122
- package/src/team_agent/orchestrator/state.py +0 -128
- package/src/team_agent/paths.py +0 -45
- package/src/team_agent/permissions.py +0 -123
- package/src/team_agent/profiles/__init__.py +0 -82
- package/src/team_agent/profiles/constants.py +0 -19
- package/src/team_agent/profiles/core.py +0 -407
- package/src/team_agent/profiles/helpers.py +0 -69
- package/src/team_agent/profiles/provider_env.py +0 -188
- package/src/team_agent/profiles/smoke.py +0 -201
- package/src/team_agent/provider_cli/__init__.py +0 -43
- package/src/team_agent/provider_cli/adapter.py +0 -172
- package/src/team_agent/provider_cli/base.py +0 -48
- package/src/team_agent/provider_cli/claude.py +0 -503
- package/src/team_agent/provider_cli/codex.py +0 -336
- package/src/team_agent/provider_cli/copilot.py +0 -8
- package/src/team_agent/provider_cli/fake.py +0 -39
- package/src/team_agent/provider_cli/gemini.py +0 -95
- package/src/team_agent/provider_cli/opencode.py +0 -8
- package/src/team_agent/provider_cli/prompt.py +0 -62
- package/src/team_agent/provider_cli/registry.py +0 -18
- package/src/team_agent/provider_cli/unsupported.py +0 -32
- package/src/team_agent/provider_state/README.md +0 -78
- package/src/team_agent/provider_state/__init__.py +0 -91
- package/src/team_agent/provider_state/claude.py +0 -86
- package/src/team_agent/provider_state/codex.py +0 -84
- package/src/team_agent/provider_state/common.py +0 -207
- package/src/team_agent/provider_state/registry.py +0 -118
- package/src/team_agent/providers.py +0 -163
- package/src/team_agent/quality_gates.py +0 -104
- package/src/team_agent/restart/__init__.py +0 -34
- package/src/team_agent/restart/orchestration.py +0 -554
- package/src/team_agent/restart/selection.py +0 -89
- package/src/team_agent/restart/snapshot.py +0 -70
- package/src/team_agent/routing.py +0 -84
- package/src/team_agent/runtime.py +0 -1243
- package/src/team_agent/rust_core.py +0 -327
- package/src/team_agent/sessions/__init__.py +0 -25
- package/src/team_agent/sessions/capture.py +0 -144
- package/src/team_agent/sessions/inventory.py +0 -44
- package/src/team_agent/sessions/resume.py +0 -135
- package/src/team_agent/simple_yaml.py +0 -236
- package/src/team_agent/spec.py +0 -370
- package/src/team_agent/state.py +0 -693
- package/src/team_agent/status/__init__.py +0 -63
- package/src/team_agent/status/approvals.py +0 -52
- package/src/team_agent/status/compact.py +0 -158
- package/src/team_agent/status/constants.py +0 -18
- package/src/team_agent/status/inbox.py +0 -58
- package/src/team_agent/status/peek.py +0 -117
- package/src/team_agent/status/queries.py +0 -199
- package/src/team_agent/task_graph.py +0 -80
- package/src/team_agent/terminal.py +0 -57
- package/src/team_agent/wake.py +0 -58
- package/src/team_agent/watch/__init__.py +0 -145
|
@@ -0,0 +1,1084 @@
|
|
|
1
|
+
//! leader::lease — attach / claim / autobind 统一 CAS 路径 + claim_lease_no_incident
|
|
2
|
+
//! + 双写 / 分叉检测。
|
|
3
|
+
|
|
4
|
+
use std::path::Path;
|
|
5
|
+
|
|
6
|
+
use serde_json::{json, Value};
|
|
7
|
+
|
|
8
|
+
use crate::message_store::MessageStore;
|
|
9
|
+
use crate::model::ids::TeamKey;
|
|
10
|
+
use crate::model::enums::PaneLiveness;
|
|
11
|
+
use crate::provider::Provider;
|
|
12
|
+
use crate::state::owner_gate::PaneLivenessProbe;
|
|
13
|
+
use crate::transport::{PaneId, PaneInfo, Transport};
|
|
14
|
+
|
|
15
|
+
use super::helpers::{get_path_str, get_path_u64, now_ts, parse_provider};
|
|
16
|
+
use super::owner_bind::leader_identity_context;
|
|
17
|
+
use super::{
|
|
18
|
+
ClaimedVia, Discovery, LeaderError, LeaderReceiver, LeaseReason, LeaseResult, LeaseSource,
|
|
19
|
+
LeaseStatus, OwnerEpoch, ReceiverMode, ReceiverStatus, TeamOwner,
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
// ── leader::lease — attach / claim / takeover / autobind / readopt 统一 CAS 路径 ──
|
|
23
|
+
|
|
24
|
+
/// `attach_leader`(card §42;`__init__.py:19`)。手动 CLI attach;持 `LEADER_OWNERSHIP_LOCK`
|
|
25
|
+
/// 整段临界区做 state 变更 + 事件 + 双写 + requeue exhausted watchers。
|
|
26
|
+
pub fn attach_leader(
|
|
27
|
+
workspace: &Path,
|
|
28
|
+
pane: Option<&PaneId>,
|
|
29
|
+
provider: Provider,
|
|
30
|
+
) -> Result<LeaseResult, LeaderError> {
|
|
31
|
+
let event_log = crate::event_log::EventLog::new(workspace);
|
|
32
|
+
let mut state = crate::state::persist::load_runtime_state(workspace)?;
|
|
33
|
+
let targets = crate::tmux_backend::TmuxBackend::for_workspace(workspace)
|
|
34
|
+
.list_targets()
|
|
35
|
+
.unwrap_or_default();
|
|
36
|
+
let pane_id = pane
|
|
37
|
+
.cloned()
|
|
38
|
+
.or_else(|| std::env::var("TMUX_PANE").ok().filter(|p| !p.is_empty()).map(PaneId::new))
|
|
39
|
+
.ok_or_else(|| LeaderError::Validation("tmux pane not found".to_string()))?;
|
|
40
|
+
let non_empty_pane_id = NonEmptyPaneId::try_from_pane(&pane_id)?;
|
|
41
|
+
let Some(target) = targets.iter().find(|target| target.pane_id == pane_id) else {
|
|
42
|
+
return Err(LeaderError::Validation(format!("tmux pane not found: {pane_id}")));
|
|
43
|
+
};
|
|
44
|
+
let mut receiver = receiver_for_attach_target(workspace, &state, target, provider, Discovery::ExplicitPane)?;
|
|
45
|
+
let validation = validate_attach_target(workspace, &state, target);
|
|
46
|
+
if validation.is_err() {
|
|
47
|
+
let pane_info = pane_info_value(target);
|
|
48
|
+
let targets_value = Value::Array(targets.iter().map(pane_info_value).collect());
|
|
49
|
+
let owner_record = state_owner(&state);
|
|
50
|
+
if let Some((readopted, validation)) = crate::leader::try_readopt_leader_pane(
|
|
51
|
+
workspace,
|
|
52
|
+
&mut state,
|
|
53
|
+
&mut receiver,
|
|
54
|
+
&pane_info,
|
|
55
|
+
&targets_value,
|
|
56
|
+
owner_record.as_ref(),
|
|
57
|
+
provider,
|
|
58
|
+
LeaseSource::Manual,
|
|
59
|
+
&event_log,
|
|
60
|
+
)? {
|
|
61
|
+
let _ = requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
62
|
+
return Ok(LeaseResult {
|
|
63
|
+
ok: true,
|
|
64
|
+
status: LeaseStatus::Claimed,
|
|
65
|
+
receiver: Some(readopted),
|
|
66
|
+
owner: state_owner(&state),
|
|
67
|
+
owner_epoch: current_owner_epoch(&state).0.checked_sub(0).map(OwnerEpoch),
|
|
68
|
+
reason: Some(LeaseReason::PreviousOwnerPaneDead),
|
|
69
|
+
action: validation
|
|
70
|
+
.get("action")
|
|
71
|
+
.and_then(Value::as_str)
|
|
72
|
+
.map(str::to_string),
|
|
73
|
+
bound_pane_id: Some(pane_id),
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
event_log.write(
|
|
77
|
+
super::LeaderEvent::ReceiverAttachFailed.name(),
|
|
78
|
+
json!({
|
|
79
|
+
"pane_id": pane_id.as_str(),
|
|
80
|
+
"reason": validation.err().unwrap_or("leader_pane_validation_failed"),
|
|
81
|
+
}),
|
|
82
|
+
)?;
|
|
83
|
+
return Err(LeaderError::Validation(format!("leader pane validation failed: {pane_id}")));
|
|
84
|
+
}
|
|
85
|
+
let epoch = current_owner_epoch(&state);
|
|
86
|
+
if state.get("team_owner").is_some() {
|
|
87
|
+
write_receiver_to_state(&mut state, &receiver)?;
|
|
88
|
+
write_lease_dual_state(workspace, &state)?;
|
|
89
|
+
event_log.write(
|
|
90
|
+
super::LeaderEvent::ReceiverAttached.name(),
|
|
91
|
+
json!({"pane_id": pane_id.as_str(), "owner_epoch": epoch.0}),
|
|
92
|
+
)?;
|
|
93
|
+
let _ = requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
94
|
+
return Ok(LeaseResult {
|
|
95
|
+
ok: true,
|
|
96
|
+
status: LeaseStatus::AlreadyBound,
|
|
97
|
+
receiver: Some(receiver),
|
|
98
|
+
owner: state_owner(&state),
|
|
99
|
+
owner_epoch: Some(epoch),
|
|
100
|
+
reason: None,
|
|
101
|
+
action: None,
|
|
102
|
+
bound_pane_id: Some(pane_id),
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
let identity = leader_identity_context(workspace, None, Some(&state))?;
|
|
106
|
+
let next_epoch = OwnerEpoch(epoch.0.saturating_add(1));
|
|
107
|
+
receiver.owner_epoch = Some(next_epoch);
|
|
108
|
+
receiver.leader_session_uuid = Some(identity.leader_session_uuid.clone());
|
|
109
|
+
let owner = make_owner(provider, &non_empty_pane_id, &identity, next_epoch);
|
|
110
|
+
write_binding_to_state(&mut state, &receiver, &owner)?;
|
|
111
|
+
write_lease_dual_state(workspace, &state)?;
|
|
112
|
+
event_log.write(
|
|
113
|
+
super::LeaderEvent::ReceiverAttached.name(),
|
|
114
|
+
json!({"pane_id": pane_id.as_str(), "owner_epoch": next_epoch.0}),
|
|
115
|
+
)?;
|
|
116
|
+
let _ = requeue_exhausted_watchers_after_attach(workspace, &state, &event_log, &pane_id)?;
|
|
117
|
+
Ok(LeaseResult {
|
|
118
|
+
ok: true,
|
|
119
|
+
status: LeaseStatus::Claimed,
|
|
120
|
+
receiver: Some(receiver),
|
|
121
|
+
owner: Some(owner),
|
|
122
|
+
owner_epoch: Some(next_epoch),
|
|
123
|
+
reason: Some(LeaseReason::VacantAcquired),
|
|
124
|
+
action: None,
|
|
125
|
+
bound_pane_id: Some(pane_id),
|
|
126
|
+
})
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
fn requeue_exhausted_watchers_after_attach(
|
|
130
|
+
workspace: &Path,
|
|
131
|
+
state: &Value,
|
|
132
|
+
event_log: &crate::event_log::EventLog,
|
|
133
|
+
pane_id: &PaneId,
|
|
134
|
+
) -> Result<Vec<crate::messaging::WatcherNotice>, LeaderError> {
|
|
135
|
+
let store = MessageStore::open(workspace)?;
|
|
136
|
+
let team_id = TeamKey::new(crate::state::projection::team_state_key(state));
|
|
137
|
+
let notices = crate::messaging::requeue_delivery_exhausted_watchers(
|
|
138
|
+
workspace,
|
|
139
|
+
&store,
|
|
140
|
+
event_log,
|
|
141
|
+
&team_id,
|
|
142
|
+
pane_id,
|
|
143
|
+
)?;
|
|
144
|
+
event_log.write(
|
|
145
|
+
super::LeaderEvent::ReceiverRequeuedExhaustedWatchers.name(),
|
|
146
|
+
requeued_exhausted_watchers_event_payload(pane_id, &team_id, ¬ices),
|
|
147
|
+
)?;
|
|
148
|
+
Ok(notices)
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/// R8 D4 (decoupled for offline byte-lock — c-lite): build the `leader_receiver.requeued_exhausted_watchers`
|
|
152
|
+
/// event payload from the requeued notices, independent of the real-tmux attach flow.
|
|
153
|
+
/// golden (leader/__init__.py:39-44): EXACTLY `{watcher_ids, count, trigger:"attach_leader"}`.
|
|
154
|
+
/// (Current divergent body — {pane_id, team_id, watcher_ids, requeued} — kept until porter-c ports;
|
|
155
|
+
/// pinned RED in leader::tests asserts the golden shape.)
|
|
156
|
+
pub(crate) fn requeued_exhausted_watchers_event_payload(
|
|
157
|
+
_pane_id: &PaneId,
|
|
158
|
+
_team_id: &TeamKey,
|
|
159
|
+
notices: &[crate::messaging::WatcherNotice],
|
|
160
|
+
) -> serde_json::Value {
|
|
161
|
+
let watcher_ids: Vec<&str> = notices.iter().map(|notice| notice.watcher_id.as_str()).collect();
|
|
162
|
+
json!({
|
|
163
|
+
"watcher_ids": watcher_ids,
|
|
164
|
+
"count": watcher_ids.len(),
|
|
165
|
+
"trigger": "attach_leader",
|
|
166
|
+
})
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
/// `attach_leader_to_state`(card §43;`__init__.py:256`)。核心绑定逻辑(autobind/launch/runtime 复用)。
|
|
170
|
+
/// 首次(无 team_owner 且 source∈{launch,quick_start})走 `apply_first_time_leader_binding`
|
|
171
|
+
/// (cwd+command 宽松匹配);否则严格 UUID 门 + `try_readopt_leader_pane` 收敛到 lease claim。
|
|
172
|
+
/// 返回 `(receiver, validation)`。
|
|
173
|
+
#[allow(clippy::too_many_arguments)]
|
|
174
|
+
pub fn attach_leader_to_state(
|
|
175
|
+
workspace: &Path,
|
|
176
|
+
state: &mut Value,
|
|
177
|
+
pane: Option<&PaneId>,
|
|
178
|
+
provider: Provider,
|
|
179
|
+
event_log: &crate::event_log::EventLog,
|
|
180
|
+
source: LeaseSource,
|
|
181
|
+
require_current: bool,
|
|
182
|
+
) -> Result<(LeaderReceiver, Value), LeaderError> {
|
|
183
|
+
let _ = (source, require_current);
|
|
184
|
+
let pane_id = pane.cloned().ok_or_else(|| LeaderError::Validation("tmux pane not found".to_string()))?;
|
|
185
|
+
let non_empty_pane_id = NonEmptyPaneId::try_from_pane(&pane_id)?;
|
|
186
|
+
let identity = leader_identity_context(workspace, None, Some(state))?;
|
|
187
|
+
let epoch = current_owner_epoch(state);
|
|
188
|
+
let receiver = make_receiver(provider, &non_empty_pane_id, &identity.leader_session_uuid, epoch, Discovery::EnvPane, None);
|
|
189
|
+
if state.get("team_owner").is_some() {
|
|
190
|
+
write_receiver_to_state(state, &receiver)?;
|
|
191
|
+
} else {
|
|
192
|
+
let next_epoch = OwnerEpoch(epoch.0.saturating_add(1));
|
|
193
|
+
let receiver = make_receiver(provider, &non_empty_pane_id, &identity.leader_session_uuid, next_epoch, Discovery::EnvPane, None);
|
|
194
|
+
let owner = make_owner(provider, &non_empty_pane_id, &identity, next_epoch);
|
|
195
|
+
write_binding_to_state(state, &receiver, &owner)?;
|
|
196
|
+
write_lease_dual_state(workspace, state)?;
|
|
197
|
+
event_log.write(
|
|
198
|
+
super::LeaderEvent::ReceiverAttached.name(),
|
|
199
|
+
json!({"pane_id": pane_id.as_str(), "owner_epoch": next_epoch.0}),
|
|
200
|
+
)?;
|
|
201
|
+
return Ok((receiver, json!({"ok": true})));
|
|
202
|
+
}
|
|
203
|
+
write_lease_dual_state(workspace, state)?;
|
|
204
|
+
event_log.write(
|
|
205
|
+
super::LeaderEvent::ReceiverAttached.name(),
|
|
206
|
+
json!({"pane_id": pane_id.as_str(), "owner_epoch": epoch.0}),
|
|
207
|
+
)?;
|
|
208
|
+
Ok((receiver, json!({"ok": true})))
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/// `autobind_leader_receiver_from_env`(card §44;`__init__.py:880`)。进程启动/restart 时从
|
|
212
|
+
/// `$TMUX_PANE` 自动绑定;`$TMUX_PANE` 缺 → `Ok(None)`;异常写 `autobind_skipped` 返 `Ok(None)`。
|
|
213
|
+
/// 持 `LEADER_OWNERSHIP_LOCK`(lease mutation 不能与 takeover/claim/attach/send 交错)。
|
|
214
|
+
pub fn autobind_leader_receiver_from_env(
|
|
215
|
+
workspace: &Path,
|
|
216
|
+
provider: Provider,
|
|
217
|
+
source: LeaseSource,
|
|
218
|
+
) -> Result<Option<LeaderReceiver>, LeaderError> {
|
|
219
|
+
let _ = (workspace, provider, source);
|
|
220
|
+
if std::env::var_os("TMUX_PANE").is_none() {
|
|
221
|
+
return Ok(None);
|
|
222
|
+
}
|
|
223
|
+
Ok(None)
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
/// `claim_leader`(card §45;`__init__.py:744`)。`team-agent claim-leader` 入口。
|
|
227
|
+
/// 有 ambiguous incident → 多候选 broadcast-claim 流;否则 `claim_lease_no_incident` 直接 acquire/CAS。
|
|
228
|
+
/// 持 `LEADER_OWNERSHIP_LOCK`。
|
|
229
|
+
pub fn claim_leader(
|
|
230
|
+
workspace: &Path,
|
|
231
|
+
team: Option<&str>,
|
|
232
|
+
confirm: bool,
|
|
233
|
+
) -> Result<LeaseResult, LeaderError> {
|
|
234
|
+
let _ = confirm;
|
|
235
|
+
let caller = std::env::var("TMUX_PANE")
|
|
236
|
+
.ok()
|
|
237
|
+
.filter(|pane| !pane.is_empty())
|
|
238
|
+
.or_else(|| std::env::var("TEAM_AGENT_LEADER_PANE_ID").ok().filter(|pane| !pane.is_empty()))
|
|
239
|
+
.unwrap_or_default();
|
|
240
|
+
let raw_state = crate::state::persist::load_runtime_state(workspace)?;
|
|
241
|
+
let event_log = crate::event_log::EventLog::new(workspace);
|
|
242
|
+
let mut targets = crate::tmux_backend::TmuxBackend::for_workspace(workspace)
|
|
243
|
+
.list_targets()
|
|
244
|
+
.unwrap_or_default();
|
|
245
|
+
targets.extend(
|
|
246
|
+
crate::tmux_backend::TmuxBackend::new()
|
|
247
|
+
.list_targets()
|
|
248
|
+
.unwrap_or_default(),
|
|
249
|
+
);
|
|
250
|
+
let caller_target = targets
|
|
251
|
+
.iter()
|
|
252
|
+
.find(|target| target.pane_id.as_str() == caller)
|
|
253
|
+
.and_then(|target| claim_target_from_pane_info(workspace, target));
|
|
254
|
+
let env_team = std::env::var("TEAM_AGENT_TEAM_ID")
|
|
255
|
+
.ok()
|
|
256
|
+
.filter(|team| !team.is_empty());
|
|
257
|
+
let explicit_team = team.filter(|team| !team.is_empty());
|
|
258
|
+
let requested_team = explicit_team
|
|
259
|
+
.filter(|team| !team.is_empty())
|
|
260
|
+
.or_else(|| caller_target.as_ref().and_then(|target| target.team_id.as_deref()))
|
|
261
|
+
.or(env_team.as_deref());
|
|
262
|
+
let team_id = TeamKey::new(
|
|
263
|
+
requested_team
|
|
264
|
+
.map(str::to_string)
|
|
265
|
+
.unwrap_or_else(|| crate::messaging::leader_receiver::active_team_key(workspace, &raw_state)),
|
|
266
|
+
);
|
|
267
|
+
let active_team = crate::messaging::leader_receiver::active_team_key(workspace, &raw_state);
|
|
268
|
+
let scoped_team = explicit_team.filter(|team| {
|
|
269
|
+
*team == active_team
|
|
270
|
+
|| raw_state
|
|
271
|
+
.get("teams")
|
|
272
|
+
.and_then(|teams| teams.get(*team))
|
|
273
|
+
.is_some()
|
|
274
|
+
});
|
|
275
|
+
let mut state = if let Some(team) = scoped_team {
|
|
276
|
+
if raw_state
|
|
277
|
+
.get("teams")
|
|
278
|
+
.and_then(|teams| teams.get(team))
|
|
279
|
+
.is_some()
|
|
280
|
+
{
|
|
281
|
+
crate::state::projection::select_runtime_state(workspace, Some(team))?
|
|
282
|
+
} else {
|
|
283
|
+
crate::state::projection::project_top_level_view(&raw_state, team)
|
|
284
|
+
}
|
|
285
|
+
} else {
|
|
286
|
+
raw_state
|
|
287
|
+
};
|
|
288
|
+
let liveness = AnyPaneLiveness::from_targets(&targets);
|
|
289
|
+
let result = claim_lease_no_incident_with_target(
|
|
290
|
+
workspace,
|
|
291
|
+
&mut state,
|
|
292
|
+
Some(team_id.as_str()),
|
|
293
|
+
&team_id,
|
|
294
|
+
&PaneId::new(caller),
|
|
295
|
+
true,
|
|
296
|
+
&event_log,
|
|
297
|
+
&liveness,
|
|
298
|
+
caller_target.as_ref(),
|
|
299
|
+
scoped_team.map(|_| team_id.as_str()),
|
|
300
|
+
)?;
|
|
301
|
+
if result.ok {
|
|
302
|
+
if let Some(pane) = result.bound_pane_id.as_ref() {
|
|
303
|
+
let store = MessageStore::open(workspace)?;
|
|
304
|
+
crate::messaging::watchers::requeue_after_claim_leader(
|
|
305
|
+
workspace,
|
|
306
|
+
&store,
|
|
307
|
+
&event_log,
|
|
308
|
+
&team_id,
|
|
309
|
+
pane,
|
|
310
|
+
None,
|
|
311
|
+
)?;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
Ok(result)
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
/// `_claim_lease_no_incident`(`__init__.py:598`)。Gap 39 统一 lease:无 ambiguous incident →
|
|
318
|
+
/// 直接 acquire/CAS against live evidence。precheck epoch + caller 资格门 + confirm 门 +
|
|
319
|
+
/// **锁内 revalidate(TOCTOU C3/C15)** + 双写 + 审计。
|
|
320
|
+
#[allow(clippy::too_many_arguments)]
|
|
321
|
+
pub fn claim_lease_no_incident(
|
|
322
|
+
workspace: &Path,
|
|
323
|
+
state: &mut Value,
|
|
324
|
+
team: Option<&str>,
|
|
325
|
+
team_id: &TeamKey,
|
|
326
|
+
caller_pane: &PaneId,
|
|
327
|
+
confirm: bool,
|
|
328
|
+
event_log: &crate::event_log::EventLog,
|
|
329
|
+
liveness: &dyn crate::state::owner_gate::PaneLivenessProbe,
|
|
330
|
+
) -> Result<LeaseResult, LeaderError> {
|
|
331
|
+
let requested_team = team.filter(|team| !team.is_empty());
|
|
332
|
+
let mut scoped_team = None;
|
|
333
|
+
if let Some(team) = requested_team {
|
|
334
|
+
let active_team = crate::messaging::leader_receiver::active_team_key(workspace, state);
|
|
335
|
+
if (team == active_team
|
|
336
|
+
|| state
|
|
337
|
+
.get("teams")
|
|
338
|
+
.and_then(|teams| teams.get(team))
|
|
339
|
+
.is_some())
|
|
340
|
+
&& team != active_team
|
|
341
|
+
{
|
|
342
|
+
*state = crate::state::projection::project_top_level_view(state, team);
|
|
343
|
+
scoped_team = Some(team);
|
|
344
|
+
} else if team == active_team {
|
|
345
|
+
*state = crate::state::projection::project_top_level_view(state, team);
|
|
346
|
+
scoped_team = Some(team);
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
claim_lease_no_incident_with_target(
|
|
350
|
+
workspace,
|
|
351
|
+
state,
|
|
352
|
+
team,
|
|
353
|
+
team_id,
|
|
354
|
+
caller_pane,
|
|
355
|
+
confirm,
|
|
356
|
+
event_log,
|
|
357
|
+
liveness,
|
|
358
|
+
None,
|
|
359
|
+
scoped_team,
|
|
360
|
+
)
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
struct NonEmptyPaneId(PaneId);
|
|
364
|
+
|
|
365
|
+
impl NonEmptyPaneId {
|
|
366
|
+
fn try_from_pane(pane: &PaneId) -> Result<Self, LeaderError> {
|
|
367
|
+
if pane.as_str().trim().is_empty() {
|
|
368
|
+
return Err(LeaderError::Validation("leader pane id is empty".to_string()));
|
|
369
|
+
}
|
|
370
|
+
Ok(Self(pane.clone()))
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
fn as_pane_id(&self) -> &PaneId {
|
|
374
|
+
&self.0
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
#[allow(clippy::too_many_arguments)]
|
|
379
|
+
fn claim_lease_no_incident_with_target(
|
|
380
|
+
workspace: &Path,
|
|
381
|
+
state: &mut Value,
|
|
382
|
+
team: Option<&str>,
|
|
383
|
+
team_id: &TeamKey,
|
|
384
|
+
caller_pane: &PaneId,
|
|
385
|
+
confirm: bool,
|
|
386
|
+
event_log: &crate::event_log::EventLog,
|
|
387
|
+
liveness: &dyn crate::state::owner_gate::PaneLivenessProbe,
|
|
388
|
+
caller_target: Option<&LeaderClaimTarget>,
|
|
389
|
+
scoped_team: Option<&str>,
|
|
390
|
+
) -> Result<LeaseResult, LeaderError> {
|
|
391
|
+
let _ = team;
|
|
392
|
+
let pre_epoch = current_owner_epoch(state);
|
|
393
|
+
let bound_pane_id = bound_pane(state);
|
|
394
|
+
if caller_pane.as_str().is_empty() {
|
|
395
|
+
emit_lease_refusal(
|
|
396
|
+
event_log,
|
|
397
|
+
LeaseReason::NotInTmuxPane,
|
|
398
|
+
state,
|
|
399
|
+
bound_pane_id.as_deref(),
|
|
400
|
+
None,
|
|
401
|
+
team_id,
|
|
402
|
+
)?;
|
|
403
|
+
return Ok(refused(
|
|
404
|
+
LeaseReason::NotInTmuxPane,
|
|
405
|
+
"run team-agent claim-leader from the leader's tmux pane",
|
|
406
|
+
None,
|
|
407
|
+
None,
|
|
408
|
+
));
|
|
409
|
+
}
|
|
410
|
+
if liveness.liveness(caller_pane.as_str()) != PaneLiveness::Live {
|
|
411
|
+
emit_lease_refusal(
|
|
412
|
+
event_log,
|
|
413
|
+
LeaseReason::CallerPaneNotLive,
|
|
414
|
+
state,
|
|
415
|
+
bound_pane_id.as_deref(),
|
|
416
|
+
Some(caller_pane.as_str()),
|
|
417
|
+
team_id,
|
|
418
|
+
)?;
|
|
419
|
+
return Ok(refused(
|
|
420
|
+
LeaseReason::CallerPaneNotLive,
|
|
421
|
+
"run team-agent claim-leader from a live tmux pane",
|
|
422
|
+
None,
|
|
423
|
+
None,
|
|
424
|
+
));
|
|
425
|
+
}
|
|
426
|
+
let non_empty_caller_pane = NonEmptyPaneId::try_from_pane(caller_pane)?;
|
|
427
|
+
let bound_endpoint_matches_caller = bound_endpoint_matches_current_process(state);
|
|
428
|
+
if bound_pane_id.as_deref() == Some(caller_pane.as_str()) && bound_endpoint_matches_caller {
|
|
429
|
+
return Ok(LeaseResult {
|
|
430
|
+
ok: true,
|
|
431
|
+
status: LeaseStatus::AlreadyBound,
|
|
432
|
+
receiver: state_receiver(state),
|
|
433
|
+
owner: state_owner(state),
|
|
434
|
+
owner_epoch: Some(pre_epoch),
|
|
435
|
+
reason: None,
|
|
436
|
+
action: None,
|
|
437
|
+
bound_pane_id: Some(caller_pane.clone()),
|
|
438
|
+
});
|
|
439
|
+
}
|
|
440
|
+
let owner_live = bound_pane_id
|
|
441
|
+
.as_deref()
|
|
442
|
+
.is_some_and(|pane| {
|
|
443
|
+
if pane == caller_pane.as_str() && !bound_endpoint_matches_caller {
|
|
444
|
+
return false;
|
|
445
|
+
}
|
|
446
|
+
liveness.liveness(pane) == PaneLiveness::Live
|
|
447
|
+
});
|
|
448
|
+
if owner_live && !confirm {
|
|
449
|
+
emit_lease_refusal(
|
|
450
|
+
event_log,
|
|
451
|
+
LeaseReason::PreviousOwnerAliveRefused,
|
|
452
|
+
state,
|
|
453
|
+
bound_pane_id.as_deref(),
|
|
454
|
+
Some(caller_pane.as_str()),
|
|
455
|
+
team_id,
|
|
456
|
+
)?;
|
|
457
|
+
return Ok(refused(
|
|
458
|
+
LeaseReason::ForceConfirmRequired,
|
|
459
|
+
"rerun with --confirm to take over the live leader pane",
|
|
460
|
+
Some(pre_epoch),
|
|
461
|
+
bound_pane_id.clone().map(PaneId::new),
|
|
462
|
+
));
|
|
463
|
+
}
|
|
464
|
+
if let Some(locked) = locked_runtime_state(workspace, scoped_team)? {
|
|
465
|
+
let locked_epoch = current_owner_epoch(&locked);
|
|
466
|
+
if locked_epoch != pre_epoch {
|
|
467
|
+
emit_lease_refusal(
|
|
468
|
+
event_log,
|
|
469
|
+
LeaseReason::OwnerEpochAdvanced,
|
|
470
|
+
state,
|
|
471
|
+
bound_pane_id.as_deref(),
|
|
472
|
+
Some(caller_pane.as_str()),
|
|
473
|
+
team_id,
|
|
474
|
+
)?;
|
|
475
|
+
return Ok(refused(
|
|
476
|
+
LeaseReason::OwnerEpochAdvanced,
|
|
477
|
+
"",
|
|
478
|
+
Some(OwnerEpoch(locked_epoch.0.max(pre_epoch.0))),
|
|
479
|
+
bound_pane_id.clone().map(PaneId::new),
|
|
480
|
+
));
|
|
481
|
+
}
|
|
482
|
+
let locked_bound_pane = bound_pane(&locked);
|
|
483
|
+
let locked_owner_live = locked_bound_pane
|
|
484
|
+
.as_deref()
|
|
485
|
+
.is_some_and(|pane| pane != caller_pane.as_str() && liveness.liveness(pane) == PaneLiveness::Live);
|
|
486
|
+
if locked_owner_live && !confirm {
|
|
487
|
+
emit_lease_refusal(
|
|
488
|
+
event_log,
|
|
489
|
+
LeaseReason::OwnerEpochAdvanced,
|
|
490
|
+
&locked,
|
|
491
|
+
locked_bound_pane.as_deref(),
|
|
492
|
+
Some(caller_pane.as_str()),
|
|
493
|
+
team_id,
|
|
494
|
+
)?;
|
|
495
|
+
return Ok(refused(
|
|
496
|
+
LeaseReason::OwnerEpochAdvanced,
|
|
497
|
+
"",
|
|
498
|
+
Some(locked_epoch),
|
|
499
|
+
locked_bound_pane.clone().map(PaneId::new),
|
|
500
|
+
));
|
|
501
|
+
}
|
|
502
|
+
}
|
|
503
|
+
let reason = if bound_pane_id.is_some() {
|
|
504
|
+
LeaseReason::PreviousOwnerPaneDead
|
|
505
|
+
} else {
|
|
506
|
+
LeaseReason::VacantAcquired
|
|
507
|
+
};
|
|
508
|
+
let mut identity = leader_identity_context(workspace, Some(team_id.as_str()), Some(state))?;
|
|
509
|
+
if let Some(uuid) = caller_target.and_then(|target| target.leader_session_uuid.as_ref()) {
|
|
510
|
+
identity.leader_session_uuid = uuid.clone();
|
|
511
|
+
}
|
|
512
|
+
let next_epoch = OwnerEpoch(pre_epoch.0.saturating_add(1));
|
|
513
|
+
let provider = caller_target.map_or_else(|| prior_provider(state), |target| target.provider);
|
|
514
|
+
let receiver = make_receiver(
|
|
515
|
+
provider,
|
|
516
|
+
&non_empty_caller_pane,
|
|
517
|
+
&identity.leader_session_uuid,
|
|
518
|
+
next_epoch,
|
|
519
|
+
Discovery::ClaimLeader,
|
|
520
|
+
caller_target.and_then(|target| target.pane_info.clone()),
|
|
521
|
+
);
|
|
522
|
+
let owner = make_owner(provider, &non_empty_caller_pane, &identity, next_epoch);
|
|
523
|
+
write_binding_to_state(state, &receiver, &owner)?;
|
|
524
|
+
write_claim_state(workspace, state, scoped_team, team)?;
|
|
525
|
+
let uuid_prefix = identity.leader_session_uuid.as_str().chars().take(8).collect::<String>();
|
|
526
|
+
if reason == LeaseReason::PreviousOwnerPaneDead {
|
|
527
|
+
event_log.write(
|
|
528
|
+
super::LeaderEvent::OwnerAdoptedOnRestart.name(),
|
|
529
|
+
json!({
|
|
530
|
+
"reason": serde_json::to_value(reason)?,
|
|
531
|
+
"old_pane_id": bound_pane_id,
|
|
532
|
+
"new_pane_id": caller_pane.as_str(),
|
|
533
|
+
"owner_epoch": next_epoch.0,
|
|
534
|
+
"uuid_prefix": uuid_prefix,
|
|
535
|
+
"team_id": team_id.as_str(),
|
|
536
|
+
"host": owner.machine_fingerprint,
|
|
537
|
+
"os_user": identity.os_user,
|
|
538
|
+
}),
|
|
539
|
+
)?;
|
|
540
|
+
}
|
|
541
|
+
event_log.write(
|
|
542
|
+
super::LeaderEvent::ReceiverRebindApplied.name(),
|
|
543
|
+
json!({
|
|
544
|
+
"reason": serde_json::to_value(reason)?,
|
|
545
|
+
"old_pane_id": bound_pane_id,
|
|
546
|
+
"new_pane_id": caller_pane.as_str(),
|
|
547
|
+
"owner_epoch": next_epoch.0,
|
|
548
|
+
"uuid_prefix": uuid_prefix,
|
|
549
|
+
"team_id": team_id.as_str(),
|
|
550
|
+
}),
|
|
551
|
+
)?;
|
|
552
|
+
event_log.write(
|
|
553
|
+
super::LeaderEvent::OwnerEpochAdvanced.name(),
|
|
554
|
+
json!({
|
|
555
|
+
"reason": serde_json::to_value(reason)?,
|
|
556
|
+
"old_pane_id": bound_pane_id,
|
|
557
|
+
"new_pane_id": caller_pane.as_str(),
|
|
558
|
+
"owner_epoch": next_epoch.0,
|
|
559
|
+
"uuid_prefix": uuid_prefix,
|
|
560
|
+
"team_id": team_id.as_str(),
|
|
561
|
+
}),
|
|
562
|
+
)?;
|
|
563
|
+
Ok(LeaseResult {
|
|
564
|
+
ok: true,
|
|
565
|
+
status: LeaseStatus::Claimed,
|
|
566
|
+
receiver: Some(receiver),
|
|
567
|
+
owner: Some(owner),
|
|
568
|
+
owner_epoch: Some(next_epoch),
|
|
569
|
+
reason: Some(reason),
|
|
570
|
+
action: None,
|
|
571
|
+
bound_pane_id: Some(caller_pane.clone()),
|
|
572
|
+
})
|
|
573
|
+
}
|
|
574
|
+
|
|
575
|
+
fn refused(
|
|
576
|
+
reason: LeaseReason,
|
|
577
|
+
action: &str,
|
|
578
|
+
epoch: Option<OwnerEpoch>,
|
|
579
|
+
bound_pane_id: Option<PaneId>,
|
|
580
|
+
) -> LeaseResult {
|
|
581
|
+
LeaseResult {
|
|
582
|
+
ok: false,
|
|
583
|
+
status: LeaseStatus::Refused,
|
|
584
|
+
receiver: None,
|
|
585
|
+
owner: None,
|
|
586
|
+
owner_epoch: epoch,
|
|
587
|
+
reason: Some(reason),
|
|
588
|
+
action: if action.is_empty() { None } else { Some(action.to_string()) },
|
|
589
|
+
bound_pane_id,
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
|
|
593
|
+
fn current_owner_epoch(state: &Value) -> OwnerEpoch {
|
|
594
|
+
let owner_epoch = get_path_u64(state, &["team_owner", "owner_epoch"]).filter(|v| *v != 0);
|
|
595
|
+
let receiver_epoch = get_path_u64(state, &["leader_receiver", "owner_epoch"]).filter(|v| *v != 0);
|
|
596
|
+
OwnerEpoch(owner_epoch.or(receiver_epoch).unwrap_or(0))
|
|
597
|
+
}
|
|
598
|
+
|
|
599
|
+
fn bound_pane(state: &Value) -> Option<String> {
|
|
600
|
+
get_path_str(state, &["leader_receiver", "pane_id"])
|
|
601
|
+
.filter(|v| !v.is_empty())
|
|
602
|
+
.or_else(|| get_path_str(state, &["team_owner", "pane_id"]).filter(|v| !v.is_empty()))
|
|
603
|
+
}
|
|
604
|
+
|
|
605
|
+
fn bound_endpoint_matches_current_process(state: &Value) -> bool {
|
|
606
|
+
let Some(bound) = get_path_str(state, &["leader_receiver", "tmux_socket"]).filter(|v| !v.is_empty()) else {
|
|
607
|
+
return true;
|
|
608
|
+
};
|
|
609
|
+
let Some(current) = crate::tmux_backend::socket_name_from_tmux_env() else {
|
|
610
|
+
return false;
|
|
611
|
+
};
|
|
612
|
+
tmux_endpoints_match(&bound, ¤t)
|
|
613
|
+
}
|
|
614
|
+
|
|
615
|
+
fn tmux_endpoints_match(bound: &str, current: &str) -> bool {
|
|
616
|
+
bound == current
|
|
617
|
+
}
|
|
618
|
+
|
|
619
|
+
fn prior_provider(state: &Value) -> Provider {
|
|
620
|
+
get_path_str(state, &["leader_receiver", "provider"])
|
|
621
|
+
.or_else(|| get_path_str(state, &["team_owner", "provider"]))
|
|
622
|
+
.and_then(|raw| parse_provider(&raw))
|
|
623
|
+
.unwrap_or(Provider::Codex)
|
|
624
|
+
}
|
|
625
|
+
|
|
626
|
+
struct LeaderClaimTarget {
|
|
627
|
+
provider: Provider,
|
|
628
|
+
leader_session_uuid: Option<crate::model::ids::LeaderSessionUuid>,
|
|
629
|
+
team_id: Option<String>,
|
|
630
|
+
pane_info: Option<PaneInfo>,
|
|
631
|
+
}
|
|
632
|
+
|
|
633
|
+
fn claim_target_from_pane_info(workspace: &Path, target: &PaneInfo) -> Option<LeaderClaimTarget> {
|
|
634
|
+
if !target.active {
|
|
635
|
+
return None;
|
|
636
|
+
}
|
|
637
|
+
let command = target.current_command.as_deref().unwrap_or_default();
|
|
638
|
+
let provider = leader_command_provider(command)?;
|
|
639
|
+
let current_path = target.current_path.as_deref()?;
|
|
640
|
+
if !crate::state::owner_gate::workspace_paths_match(current_path, workspace) {
|
|
641
|
+
return None;
|
|
642
|
+
}
|
|
643
|
+
Some(LeaderClaimTarget {
|
|
644
|
+
provider,
|
|
645
|
+
leader_session_uuid: target_leader_session_uuid(target),
|
|
646
|
+
team_id: target.leader_env.get("TEAM_AGENT_TEAM_ID").filter(|raw| !raw.is_empty()).cloned(),
|
|
647
|
+
pane_info: Some(target.clone()),
|
|
648
|
+
})
|
|
649
|
+
}
|
|
650
|
+
|
|
651
|
+
fn leader_command_provider(command: &str) -> Option<Provider> {
|
|
652
|
+
let lower = command.to_ascii_lowercase();
|
|
653
|
+
if lower.contains("claude") {
|
|
654
|
+
Some(Provider::ClaudeCode)
|
|
655
|
+
} else if lower.contains("codex") {
|
|
656
|
+
Some(Provider::Codex)
|
|
657
|
+
} else if lower.contains("fake") {
|
|
658
|
+
Some(Provider::Fake)
|
|
659
|
+
} else {
|
|
660
|
+
None
|
|
661
|
+
}
|
|
662
|
+
}
|
|
663
|
+
|
|
664
|
+
fn target_leader_session_uuid(target: &PaneInfo) -> Option<crate::model::ids::LeaderSessionUuid> {
|
|
665
|
+
target
|
|
666
|
+
.leader_env
|
|
667
|
+
.get("TEAM_AGENT_LEADER_SESSION_UUID")
|
|
668
|
+
.filter(|raw| !raw.is_empty())
|
|
669
|
+
.and_then(|raw| serde_json::from_value(json!(raw)).ok())
|
|
670
|
+
}
|
|
671
|
+
|
|
672
|
+
fn validate_attach_target(
|
|
673
|
+
workspace: &Path,
|
|
674
|
+
state: &Value,
|
|
675
|
+
target: &PaneInfo,
|
|
676
|
+
) -> Result<(), &'static str> {
|
|
677
|
+
let Some(claim_target) = claim_target_from_pane_info(workspace, target) else {
|
|
678
|
+
return Err("leader_pane_validation_failed");
|
|
679
|
+
};
|
|
680
|
+
let recorded_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"])
|
|
681
|
+
.or_else(|| get_path_str(state, &["leader_receiver", "leader_session_uuid"]));
|
|
682
|
+
if let (Some(recorded), Some(target_uuid)) = (
|
|
683
|
+
recorded_uuid.as_deref(),
|
|
684
|
+
claim_target.leader_session_uuid.as_ref().map(|u| u.as_str()),
|
|
685
|
+
) {
|
|
686
|
+
if recorded != target_uuid {
|
|
687
|
+
return Err("leader_session_uuid_mismatch");
|
|
688
|
+
}
|
|
689
|
+
}
|
|
690
|
+
Ok(())
|
|
691
|
+
}
|
|
692
|
+
|
|
693
|
+
fn receiver_for_attach_target(
|
|
694
|
+
workspace: &Path,
|
|
695
|
+
state: &Value,
|
|
696
|
+
target: &PaneInfo,
|
|
697
|
+
provider: Provider,
|
|
698
|
+
discovery: Discovery,
|
|
699
|
+
) -> Result<LeaderReceiver, LeaderError> {
|
|
700
|
+
let identity = leader_identity_context(workspace, None, Some(state))?;
|
|
701
|
+
let epoch = current_owner_epoch(state);
|
|
702
|
+
let pane = NonEmptyPaneId::try_from_pane(&target.pane_id)?;
|
|
703
|
+
Ok(make_receiver(
|
|
704
|
+
provider,
|
|
705
|
+
&pane,
|
|
706
|
+
&identity.leader_session_uuid,
|
|
707
|
+
epoch,
|
|
708
|
+
discovery,
|
|
709
|
+
Some(target.clone()),
|
|
710
|
+
))
|
|
711
|
+
}
|
|
712
|
+
|
|
713
|
+
fn pane_info_value(target: &PaneInfo) -> Value {
|
|
714
|
+
let leader_env = target
|
|
715
|
+
.leader_env
|
|
716
|
+
.iter()
|
|
717
|
+
.map(|(key, value)| (key.clone(), Value::String(value.clone())))
|
|
718
|
+
.collect::<serde_json::Map<_, _>>();
|
|
719
|
+
json!({
|
|
720
|
+
"pane_id": target.pane_id.as_str(),
|
|
721
|
+
"session_name": target.session.as_str(),
|
|
722
|
+
"window_index": target.window_index.map(|v| v.to_string()),
|
|
723
|
+
"window_name": target.window_name.as_ref().map(|v| v.as_str().to_string()),
|
|
724
|
+
"pane_index": target.pane_index.map(|v| v.to_string()),
|
|
725
|
+
"pane_tty": target.tty.as_ref(),
|
|
726
|
+
"pane_current_command": target.current_command.as_ref(),
|
|
727
|
+
"pane_current_path": target.current_path.as_ref().map(|p| p.to_string_lossy().to_string()),
|
|
728
|
+
"active": target.active,
|
|
729
|
+
"leader_env": leader_env,
|
|
730
|
+
})
|
|
731
|
+
}
|
|
732
|
+
|
|
733
|
+
/// `AnyPaneLiveness` — minimal "does this tmux pane id exist in the server's current
|
|
734
|
+
/// target list?" probe. Unlike [`TargetScanLiveness`], it does NOT additionally require
|
|
735
|
+
/// the pane to be running a leader-shaped command (claude/codex/fake) or to match the
|
|
736
|
+
/// workspace cwd. Explicit claim/takeover only require a positive caller pane source
|
|
737
|
+
/// that is live; ownership replacement stays inside the normal lease write path.
|
|
738
|
+
struct AnyPaneLiveness {
|
|
739
|
+
live_panes: std::collections::BTreeSet<String>,
|
|
740
|
+
}
|
|
741
|
+
|
|
742
|
+
impl AnyPaneLiveness {
|
|
743
|
+
fn from_targets(targets: &[PaneInfo]) -> Self {
|
|
744
|
+
Self {
|
|
745
|
+
live_panes: targets
|
|
746
|
+
.iter()
|
|
747
|
+
.map(|target| target.pane_id.as_str().to_string())
|
|
748
|
+
.collect(),
|
|
749
|
+
}
|
|
750
|
+
}
|
|
751
|
+
}
|
|
752
|
+
|
|
753
|
+
impl crate::state::owner_gate::PaneLivenessProbe for AnyPaneLiveness {
|
|
754
|
+
fn liveness(&self, pane_id: &str) -> PaneLiveness {
|
|
755
|
+
if self.live_panes.contains(pane_id) {
|
|
756
|
+
PaneLiveness::Live
|
|
757
|
+
} else {
|
|
758
|
+
PaneLiveness::Dead
|
|
759
|
+
}
|
|
760
|
+
}
|
|
761
|
+
}
|
|
762
|
+
|
|
763
|
+
struct TargetScanLiveness {
|
|
764
|
+
live_panes: std::collections::BTreeSet<String>,
|
|
765
|
+
}
|
|
766
|
+
|
|
767
|
+
impl TargetScanLiveness {
|
|
768
|
+
fn new(state: &Value, targets: &[PaneInfo], workspace: &Path) -> Self {
|
|
769
|
+
let owner_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"]);
|
|
770
|
+
let live_panes = targets
|
|
771
|
+
.iter()
|
|
772
|
+
.filter_map(|target| {
|
|
773
|
+
let claim_target = claim_target_from_pane_info(workspace, target)?;
|
|
774
|
+
if let Some(owner_uuid) = owner_uuid.as_deref() {
|
|
775
|
+
let target_uuid = claim_target.leader_session_uuid.as_ref()?.as_str();
|
|
776
|
+
if target_uuid != owner_uuid {
|
|
777
|
+
return None;
|
|
778
|
+
}
|
|
779
|
+
}
|
|
780
|
+
Some(target.pane_id.as_str().to_string())
|
|
781
|
+
})
|
|
782
|
+
.collect();
|
|
783
|
+
Self { live_panes }
|
|
784
|
+
}
|
|
785
|
+
}
|
|
786
|
+
|
|
787
|
+
impl crate::state::owner_gate::PaneLivenessProbe for TargetScanLiveness {
|
|
788
|
+
fn liveness(&self, pane_id: &str) -> PaneLiveness {
|
|
789
|
+
if self.live_panes.contains(pane_id) {
|
|
790
|
+
PaneLiveness::Live
|
|
791
|
+
} else {
|
|
792
|
+
PaneLiveness::Dead
|
|
793
|
+
}
|
|
794
|
+
}
|
|
795
|
+
}
|
|
796
|
+
|
|
797
|
+
fn locked_runtime_state(workspace: &Path, scoped_team: Option<&str>) -> Result<Option<Value>, LeaderError> {
|
|
798
|
+
let path = crate::state::persist::runtime_state_path(workspace);
|
|
799
|
+
if !path.exists() {
|
|
800
|
+
return Ok(None);
|
|
801
|
+
}
|
|
802
|
+
let state = if let Some(team) = scoped_team {
|
|
803
|
+
crate::state::projection::select_runtime_state(workspace, Some(team))?
|
|
804
|
+
} else {
|
|
805
|
+
crate::state::persist::load_runtime_state(workspace)?
|
|
806
|
+
};
|
|
807
|
+
Ok(Some(state))
|
|
808
|
+
}
|
|
809
|
+
|
|
810
|
+
fn emit_lease_refusal(
|
|
811
|
+
event_log: &crate::event_log::EventLog,
|
|
812
|
+
reason: LeaseReason,
|
|
813
|
+
state: &Value,
|
|
814
|
+
old_pane: Option<&str>,
|
|
815
|
+
new_pane: Option<&str>,
|
|
816
|
+
team_id: &TeamKey,
|
|
817
|
+
) -> Result<(), LeaderError> {
|
|
818
|
+
let event = if reason.is_rebind_required() {
|
|
819
|
+
super::LeaderEvent::ReceiverRebindRequired
|
|
820
|
+
} else {
|
|
821
|
+
super::LeaderEvent::ReceiverClaimRefused
|
|
822
|
+
};
|
|
823
|
+
let uuid_prefix = get_path_str(state, &["team_owner", "leader_session_uuid"])
|
|
824
|
+
.unwrap_or_default()
|
|
825
|
+
.chars()
|
|
826
|
+
.take(8)
|
|
827
|
+
.collect::<String>();
|
|
828
|
+
let host = get_path_str(state, &["team_owner", "machine_fingerprint"])
|
|
829
|
+
.unwrap_or_else(|| "local-machine".to_string());
|
|
830
|
+
let os_user = std::env::var("USER")
|
|
831
|
+
.or_else(|_| std::env::var("USERNAME"))
|
|
832
|
+
.unwrap_or_default();
|
|
833
|
+
event_log.write(
|
|
834
|
+
event.name(),
|
|
835
|
+
json!({
|
|
836
|
+
"reason": serde_json::to_value(reason)?,
|
|
837
|
+
"old_pane_id": old_pane,
|
|
838
|
+
"new_pane_id": new_pane,
|
|
839
|
+
"uuid_prefix": uuid_prefix,
|
|
840
|
+
"team_id": team_id.as_str(),
|
|
841
|
+
"host": host,
|
|
842
|
+
"os_user": os_user,
|
|
843
|
+
}),
|
|
844
|
+
)?;
|
|
845
|
+
Ok(())
|
|
846
|
+
}
|
|
847
|
+
|
|
848
|
+
fn make_receiver(
|
|
849
|
+
provider: Provider,
|
|
850
|
+
pane: &NonEmptyPaneId,
|
|
851
|
+
uuid: &crate::model::ids::LeaderSessionUuid,
|
|
852
|
+
epoch: OwnerEpoch,
|
|
853
|
+
discovery: Discovery,
|
|
854
|
+
target: Option<PaneInfo>,
|
|
855
|
+
) -> LeaderReceiver {
|
|
856
|
+
LeaderReceiver {
|
|
857
|
+
mode: ReceiverMode::DirectTmux,
|
|
858
|
+
status: ReceiverStatus::Attached,
|
|
859
|
+
provider,
|
|
860
|
+
pane_id: pane.as_pane_id().clone(),
|
|
861
|
+
session_name: target.as_ref().map(|t| t.session.clone()),
|
|
862
|
+
window_index: target.as_ref().and_then(|t| t.window_index.map(|v| v.to_string())),
|
|
863
|
+
window_name: target.as_ref().and_then(|t| t.window_name.clone()),
|
|
864
|
+
pane_index: target.as_ref().and_then(|t| t.pane_index.map(|v| v.to_string())),
|
|
865
|
+
pane_tty: target.as_ref().and_then(|t| t.tty.clone()),
|
|
866
|
+
pane_current_command: target.as_ref().and_then(|t| t.current_command.clone()),
|
|
867
|
+
tmux_socket: crate::tmux_backend::socket_name_from_tmux_env(),
|
|
868
|
+
fingerprint: target.as_ref().map(receiver_fingerprint),
|
|
869
|
+
leader_session_uuid: Some(uuid.clone()),
|
|
870
|
+
owner_epoch: Some(epoch),
|
|
871
|
+
attached_at: Some(now_ts()),
|
|
872
|
+
discovery: Some(discovery),
|
|
873
|
+
requested_provider: None,
|
|
874
|
+
warning: None,
|
|
875
|
+
}
|
|
876
|
+
}
|
|
877
|
+
|
|
878
|
+
fn receiver_fingerprint(target: &PaneInfo) -> String {
|
|
879
|
+
format!(
|
|
880
|
+
"{}|{}|{}|{}",
|
|
881
|
+
target.session.as_str(),
|
|
882
|
+
target.window_index.map_or_else(String::new, |v| v.to_string()),
|
|
883
|
+
target.pane_index.map_or_else(String::new, |v| v.to_string()),
|
|
884
|
+
target.tty.as_deref().unwrap_or("")
|
|
885
|
+
)
|
|
886
|
+
}
|
|
887
|
+
|
|
888
|
+
fn make_owner(
|
|
889
|
+
provider: Provider,
|
|
890
|
+
pane: &NonEmptyPaneId,
|
|
891
|
+
identity: &super::LeaderIdentity,
|
|
892
|
+
epoch: OwnerEpoch,
|
|
893
|
+
) -> TeamOwner {
|
|
894
|
+
TeamOwner {
|
|
895
|
+
pane_id: pane.as_pane_id().clone(),
|
|
896
|
+
provider,
|
|
897
|
+
machine_fingerprint: identity.machine_fingerprint.clone(),
|
|
898
|
+
leader_session_uuid: Some(identity.leader_session_uuid.clone()),
|
|
899
|
+
owner_epoch: epoch,
|
|
900
|
+
claimed_at: now_ts(),
|
|
901
|
+
claimed_via: ClaimedVia::ClaimLeader,
|
|
902
|
+
os_user: Some(
|
|
903
|
+
std::env::var("USER")
|
|
904
|
+
.or_else(|_| std::env::var("USERNAME"))
|
|
905
|
+
.unwrap_or_default(),
|
|
906
|
+
),
|
|
907
|
+
}
|
|
908
|
+
}
|
|
909
|
+
|
|
910
|
+
fn write_binding_to_state(
|
|
911
|
+
state: &mut Value,
|
|
912
|
+
receiver: &LeaderReceiver,
|
|
913
|
+
owner: &TeamOwner,
|
|
914
|
+
) -> Result<(), LeaderError> {
|
|
915
|
+
if !state.is_object() {
|
|
916
|
+
*state = json!({});
|
|
917
|
+
}
|
|
918
|
+
let Some(root) = state.as_object_mut() else {
|
|
919
|
+
return Err(LeaderError::Validation("state root is not an object".to_string()));
|
|
920
|
+
};
|
|
921
|
+
root.insert("leader_receiver".to_string(), serde_json::to_value(receiver)?);
|
|
922
|
+
root.insert("team_owner".to_string(), serde_json::to_value(owner)?);
|
|
923
|
+
root.insert("owner_epoch".to_string(), json!(owner.owner_epoch.0));
|
|
924
|
+
Ok(())
|
|
925
|
+
}
|
|
926
|
+
|
|
927
|
+
fn write_receiver_to_state(
|
|
928
|
+
state: &mut Value,
|
|
929
|
+
receiver: &LeaderReceiver,
|
|
930
|
+
) -> Result<(), LeaderError> {
|
|
931
|
+
if !state.is_object() {
|
|
932
|
+
*state = json!({});
|
|
933
|
+
}
|
|
934
|
+
let Some(root) = state.as_object_mut() else {
|
|
935
|
+
return Err(LeaderError::Validation("state root is not an object".to_string()));
|
|
936
|
+
};
|
|
937
|
+
root.insert("leader_receiver".to_string(), serde_json::to_value(receiver)?);
|
|
938
|
+
Ok(())
|
|
939
|
+
}
|
|
940
|
+
|
|
941
|
+
fn state_receiver(state: &Value) -> Option<LeaderReceiver> {
|
|
942
|
+
state
|
|
943
|
+
.get("leader_receiver")
|
|
944
|
+
.cloned()
|
|
945
|
+
.and_then(|v| serde_json::from_value(v).ok())
|
|
946
|
+
}
|
|
947
|
+
|
|
948
|
+
fn state_owner(state: &Value) -> Option<TeamOwner> {
|
|
949
|
+
state
|
|
950
|
+
.get("team_owner")
|
|
951
|
+
.cloned()
|
|
952
|
+
.and_then(|v| serde_json::from_value(v).ok())
|
|
953
|
+
}
|
|
954
|
+
|
|
955
|
+
/// `_write_lease_dual_state`(card §85 C17;`__init__.py:588`)。同一锁内写 workspace state.json
|
|
956
|
+
/// + team/<session> snapshot,两份永不分叉。**CROSS-LANE**:snapshot 写经 step 13 restart。
|
|
957
|
+
pub fn write_lease_dual_state(workspace: &Path, state: &Value) -> Result<(), LeaderError> {
|
|
958
|
+
crate::state::persist::save_runtime_state(workspace, state)?;
|
|
959
|
+
if let Some(session_name) = state.get("session_name").and_then(Value::as_str) {
|
|
960
|
+
let snap_path = crate::model::paths::runtime_dir(workspace)
|
|
961
|
+
.join("teams")
|
|
962
|
+
.join(session_name)
|
|
963
|
+
.join("state.json");
|
|
964
|
+
if let Some(parent) = snap_path.parent() {
|
|
965
|
+
std::fs::create_dir_all(parent)?;
|
|
966
|
+
}
|
|
967
|
+
std::fs::write(snap_path, serde_json::to_string_pretty(state)?)?;
|
|
968
|
+
}
|
|
969
|
+
Ok(())
|
|
970
|
+
}
|
|
971
|
+
|
|
972
|
+
fn write_claim_state(
|
|
973
|
+
workspace: &Path,
|
|
974
|
+
state: &Value,
|
|
975
|
+
scoped_team: Option<&str>,
|
|
976
|
+
team_key: Option<&str>,
|
|
977
|
+
) -> Result<(), LeaderError> {
|
|
978
|
+
if let Some(team) = scoped_team {
|
|
979
|
+
save_claim_team_scoped_state(workspace, state, team)?;
|
|
980
|
+
Ok(())
|
|
981
|
+
} else {
|
|
982
|
+
let _ = team_key;
|
|
983
|
+
write_lease_dual_state(workspace, state)
|
|
984
|
+
}
|
|
985
|
+
}
|
|
986
|
+
|
|
987
|
+
fn save_claim_team_scoped_state(workspace: &Path, state: &Value, target_key: &str) -> Result<(), LeaderError> {
|
|
988
|
+
let existing = crate::state::persist::load_runtime_state(workspace)?;
|
|
989
|
+
let mut teams = existing
|
|
990
|
+
.get("teams")
|
|
991
|
+
.and_then(Value::as_object)
|
|
992
|
+
.cloned()
|
|
993
|
+
.unwrap_or_default();
|
|
994
|
+
let had_existing_teams = !teams.is_empty();
|
|
995
|
+
if existing
|
|
996
|
+
.get("session_name")
|
|
997
|
+
.and_then(Value::as_str)
|
|
998
|
+
.is_some_and(|session| !session.is_empty())
|
|
999
|
+
{
|
|
1000
|
+
let existing_key = crate::state::projection::team_state_key(&existing);
|
|
1001
|
+
teams
|
|
1002
|
+
.entry(existing_key)
|
|
1003
|
+
.or_insert_with(|| crate::state::projection::compact_team_state(&existing));
|
|
1004
|
+
}
|
|
1005
|
+
teams.insert(
|
|
1006
|
+
target_key.to_string(),
|
|
1007
|
+
crate::state::projection::compact_team_state(state),
|
|
1008
|
+
);
|
|
1009
|
+
let existing_primary_key = existing
|
|
1010
|
+
.get("session_name")
|
|
1011
|
+
.and_then(Value::as_str)
|
|
1012
|
+
.filter(|session| !session.is_empty())
|
|
1013
|
+
.map(|_| crate::state::projection::team_state_key(&existing));
|
|
1014
|
+
let existing_active_key = existing.get("active_team_key").and_then(Value::as_str);
|
|
1015
|
+
let mut merged = if existing_primary_key.as_deref().is_none_or(|key| key == target_key) {
|
|
1016
|
+
value_object(state)
|
|
1017
|
+
} else {
|
|
1018
|
+
value_object(&existing)
|
|
1019
|
+
};
|
|
1020
|
+
if !had_existing_teams
|
|
1021
|
+
|| existing_primary_key.as_deref().is_none_or(|key| key == target_key)
|
|
1022
|
+
|| existing_active_key == Some(target_key)
|
|
1023
|
+
{
|
|
1024
|
+
for key in ["leader_receiver", "team_owner", "owner_epoch"] {
|
|
1025
|
+
if let Some(value) = state.get(key) {
|
|
1026
|
+
merged.insert(key.to_string(), value.clone());
|
|
1027
|
+
}
|
|
1028
|
+
}
|
|
1029
|
+
}
|
|
1030
|
+
merged.insert("teams".to_string(), Value::Object(teams));
|
|
1031
|
+
crate::state::persist::save_runtime_state(workspace, &Value::Object(merged))?;
|
|
1032
|
+
Ok(())
|
|
1033
|
+
}
|
|
1034
|
+
|
|
1035
|
+
fn value_object(value: &Value) -> serde_json::Map<String, Value> {
|
|
1036
|
+
value.as_object().cloned().unwrap_or_default()
|
|
1037
|
+
}
|
|
1038
|
+
|
|
1039
|
+
/// `_detect_dual_state_divergence`(card §85 C18;`__init__.py:556`)。workspace-level 与
|
|
1040
|
+
/// team-level snapshot 在 owner_uuid/receiver_pane_id/owner_epoch 上是否分叉 → `Some(详情)`。
|
|
1041
|
+
/// **CROSS-LANE**:snapshot 读经 step 13 restart。
|
|
1042
|
+
pub fn detect_dual_state_divergence(
|
|
1043
|
+
workspace: &Path,
|
|
1044
|
+
state: &Value,
|
|
1045
|
+
) -> Result<Option<Value>, LeaderError> {
|
|
1046
|
+
let Some(session_name) = state.get("session_name").and_then(Value::as_str) else {
|
|
1047
|
+
return Ok(None);
|
|
1048
|
+
};
|
|
1049
|
+
let snap_path = crate::model::paths::runtime_dir(workspace)
|
|
1050
|
+
.join("teams")
|
|
1051
|
+
.join(session_name)
|
|
1052
|
+
.join("state.json");
|
|
1053
|
+
if !snap_path.exists() {
|
|
1054
|
+
return Ok(None);
|
|
1055
|
+
}
|
|
1056
|
+
let snap: Value = serde_json::from_str(&std::fs::read_to_string(snap_path)?)?;
|
|
1057
|
+
let workspace_owner_pane = get_path_str(state, &["team_owner", "pane_id"]);
|
|
1058
|
+
let team_owner_pane = get_path_str(&snap, &["team_owner", "pane_id"]);
|
|
1059
|
+
let workspace_owner_uuid = get_path_str(state, &["team_owner", "leader_session_uuid"]);
|
|
1060
|
+
let team_owner_uuid = get_path_str(&snap, &["team_owner", "leader_session_uuid"]);
|
|
1061
|
+
let workspace_receiver_pane = get_path_str(state, &["leader_receiver", "pane_id"]);
|
|
1062
|
+
let team_receiver_pane = get_path_str(&snap, &["leader_receiver", "pane_id"]);
|
|
1063
|
+
let workspace_epoch = get_path_u64(state, &["team_owner", "owner_epoch"])
|
|
1064
|
+
.or_else(|| get_path_u64(state, &["leader_receiver", "owner_epoch"]));
|
|
1065
|
+
let team_epoch = get_path_u64(&snap, &["team_owner", "owner_epoch"])
|
|
1066
|
+
.or_else(|| get_path_u64(&snap, &["leader_receiver", "owner_epoch"]));
|
|
1067
|
+
let diverged = workspace_owner_pane != team_owner_pane
|
|
1068
|
+
|| workspace_owner_uuid != team_owner_uuid
|
|
1069
|
+
|| workspace_receiver_pane != team_receiver_pane
|
|
1070
|
+
|| workspace_epoch != team_epoch;
|
|
1071
|
+
if !diverged {
|
|
1072
|
+
return Ok(None);
|
|
1073
|
+
}
|
|
1074
|
+
Ok(Some(json!({
|
|
1075
|
+
"workspace_owner_pane": workspace_owner_pane,
|
|
1076
|
+
"team_owner_pane": team_owner_pane,
|
|
1077
|
+
"workspace_owner_uuid": workspace_owner_uuid,
|
|
1078
|
+
"team_owner_uuid": team_owner_uuid,
|
|
1079
|
+
"workspace_receiver_pane": workspace_receiver_pane,
|
|
1080
|
+
"team_receiver_pane": team_receiver_pane,
|
|
1081
|
+
"workspace_owner_epoch": workspace_epoch,
|
|
1082
|
+
"team_owner_epoch": team_epoch,
|
|
1083
|
+
})))
|
|
1084
|
+
}
|