@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,657 @@
|
|
|
1
|
+
//! projection:team 选择 / top-level 派生视图(真相源 `state.py`,0.2.6 Family B C6-C8)。
|
|
2
|
+
//!
|
|
3
|
+
//! `state.teams` 是唯一候选源(`status == "alive"`);顶层 `session_name`/`team_dir`/`agents`/`tasks`
|
|
4
|
+
//! 是「当前 team」的**派生视图**,不算独立候选。选 team 用时把 `teams[key]` 投影回扁平 dict
|
|
5
|
+
//! (`_project_top_level_view`),并保留 `team_owner`/`leader_receiver`/`coordinator` 等辅助态。
|
|
6
|
+
//!
|
|
7
|
+
//! 纯函数操作 `serde_json::Value`;`select_runtime_state`/`resolve_team_scoped_state` 经
|
|
8
|
+
//! `persist::load_runtime_state` 读盘。键序对齐 Python dict(preserve_order):`setdefault`→
|
|
9
|
+
//! 「缺则末尾插」,`d[k]=v`→「在则原位更新,缺则末尾插」(serde_json::Map = IndexMap)。
|
|
10
|
+
//! §10:无 unwrap/expect/panic(全程 owned `Map`,非 object 优雅退化为空 object)。
|
|
11
|
+
|
|
12
|
+
use std::path::Path;
|
|
13
|
+
|
|
14
|
+
use serde_json::{json, Map, Value};
|
|
15
|
+
|
|
16
|
+
use super::StateError;
|
|
17
|
+
use crate::state::persist::{load_runtime_state, save_runtime_state};
|
|
18
|
+
|
|
19
|
+
/// `team_state_key`(`state.py:93`):从 team_dir(.name)/spec_path(.parent.name)派生 team key,
|
|
20
|
+
/// 跳过 `.team`/`runtime`;兜底 `session_name` 或 `"current"`。
|
|
21
|
+
pub fn team_state_key(state: &Value) -> String {
|
|
22
|
+
for field in ["team_dir", "spec_path"] {
|
|
23
|
+
// Python `if not value: continue` —— None/空串 falsy 跳过。
|
|
24
|
+
let value = match state.get(field).and_then(Value::as_str) {
|
|
25
|
+
Some(v) if !v.is_empty() => v,
|
|
26
|
+
_ => continue,
|
|
27
|
+
};
|
|
28
|
+
let path = Path::new(value);
|
|
29
|
+
let key = if field == "team_dir" {
|
|
30
|
+
path.file_name()
|
|
31
|
+
} else {
|
|
32
|
+
path.parent().and_then(Path::file_name)
|
|
33
|
+
};
|
|
34
|
+
let key = key.map(|s| s.to_string_lossy().into_owned()).unwrap_or_default();
|
|
35
|
+
if !key.is_empty() && key != ".team" && key != "runtime" {
|
|
36
|
+
return key;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
state
|
|
40
|
+
.get("session_name")
|
|
41
|
+
.and_then(Value::as_str)
|
|
42
|
+
.filter(|s| !s.is_empty())
|
|
43
|
+
.map_or_else(|| "current".to_string(), str::to_string)
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/// `compact_team_state`(`state.py:105`):剔除 `teams`(team entry 不嵌套全量 teams),保序。
|
|
47
|
+
pub fn compact_team_state(state: &Value) -> Value {
|
|
48
|
+
match state.as_object() {
|
|
49
|
+
Some(obj) => Value::Object(
|
|
50
|
+
obj.iter()
|
|
51
|
+
.filter(|(k, _)| k.as_str() != "teams")
|
|
52
|
+
.map(|(k, v)| (k.clone(), v.clone()))
|
|
53
|
+
.collect(),
|
|
54
|
+
),
|
|
55
|
+
None => state.clone(),
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/// `merge_workspace_team_state`(`state.py:111`):把新启动的 team 并入既有 workspace state。
|
|
60
|
+
pub fn merge_workspace_team_state(existing: &Value, launched: &Value) -> Value {
|
|
61
|
+
let launched_key = team_state_key(launched);
|
|
62
|
+
// existing 无 session_name → 直接以 launched 为基,seed teams。
|
|
63
|
+
if !truthy_str(existing.get("session_name")) {
|
|
64
|
+
let mut merged = to_object(launched);
|
|
65
|
+
let mut teams = take_object(merged.get("teams"));
|
|
66
|
+
teams.insert(launched_key, compact_team_state(launched));
|
|
67
|
+
merged.insert("teams".to_string(), Value::Object(teams));
|
|
68
|
+
return Value::Object(merged);
|
|
69
|
+
}
|
|
70
|
+
let existing_key = team_state_key(existing);
|
|
71
|
+
if existing_key == launched_key {
|
|
72
|
+
// 同 key → launched 为基,teams 取 existing 历史 + launched。
|
|
73
|
+
let mut merged = to_object(launched);
|
|
74
|
+
let mut teams = take_object(existing.get("teams"));
|
|
75
|
+
teams.insert(launched_key, compact_team_state(launched));
|
|
76
|
+
merged.insert("teams".to_string(), Value::Object(teams));
|
|
77
|
+
return Value::Object(merged);
|
|
78
|
+
}
|
|
79
|
+
// 异 key → existing 为基,两个 team 都进 teams(existing 仅在缺时 seed)。
|
|
80
|
+
let mut merged = to_object(existing);
|
|
81
|
+
let mut teams = take_object(merged.get("teams"));
|
|
82
|
+
teams.entry(existing_key).or_insert_with(|| compact_team_state(existing));
|
|
83
|
+
teams.insert(launched_key, compact_team_state(launched));
|
|
84
|
+
merged.insert("teams".to_string(), Value::Object(teams));
|
|
85
|
+
Value::Object(merged)
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/// `team_state_candidates`(`state.py:131`):唯一候选源 = `state.teams` 中 `status=="alive"`
|
|
89
|
+
/// (大小写不敏感;缺 status/空 视为 alive)。保留 teams 插入序。
|
|
90
|
+
pub fn team_state_candidates(state: &Value) -> Map<String, Value> {
|
|
91
|
+
let mut out = Map::new();
|
|
92
|
+
let teams = match state.get("teams") {
|
|
93
|
+
Some(Value::Object(m)) => m,
|
|
94
|
+
_ => return out,
|
|
95
|
+
};
|
|
96
|
+
for (key, value) in teams {
|
|
97
|
+
if !value.is_object() {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
if value.get("archived_at").is_some_and(|v| !v.is_null()) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
// `str(value.get("status") or "alive").lower()` —— None/空串 → "alive"。
|
|
104
|
+
let status = value
|
|
105
|
+
.get("status")
|
|
106
|
+
.and_then(Value::as_str)
|
|
107
|
+
.filter(|s| !s.is_empty())
|
|
108
|
+
.unwrap_or("alive");
|
|
109
|
+
if !status.eq_ignore_ascii_case("alive") {
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
out.insert(key.clone(), value.clone());
|
|
113
|
+
}
|
|
114
|
+
out
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/// `format_team_candidates`(`state.py:148`):候选摘要串(key 排序;agents 排序逗号连,空→`-`)。
|
|
118
|
+
pub fn format_team_candidates(team_states: &Map<String, Value>) -> String {
|
|
119
|
+
if team_states.is_empty() {
|
|
120
|
+
return "No team state was found.".to_string();
|
|
121
|
+
}
|
|
122
|
+
let mut keys: Vec<&String> = team_states.keys().collect();
|
|
123
|
+
keys.sort();
|
|
124
|
+
let mut parts = Vec::new();
|
|
125
|
+
for key in keys {
|
|
126
|
+
let st = &team_states[key];
|
|
127
|
+
let mut agent_keys: Vec<&String> = st
|
|
128
|
+
.get("agents")
|
|
129
|
+
.and_then(Value::as_object)
|
|
130
|
+
.map(|a| a.keys().collect())
|
|
131
|
+
.unwrap_or_default();
|
|
132
|
+
agent_keys.sort();
|
|
133
|
+
let agents = if agent_keys.is_empty() {
|
|
134
|
+
"-".to_string()
|
|
135
|
+
} else {
|
|
136
|
+
agent_keys.iter().map(|s| s.as_str()).collect::<Vec<_>>().join(",")
|
|
137
|
+
};
|
|
138
|
+
let session = st
|
|
139
|
+
.get("session_name")
|
|
140
|
+
.and_then(Value::as_str)
|
|
141
|
+
.filter(|s| !s.is_empty())
|
|
142
|
+
.unwrap_or("-");
|
|
143
|
+
parts.push(format!("{key} session={session} agents={agents}"));
|
|
144
|
+
}
|
|
145
|
+
"Candidates: ".to_string() + &parts.join("; ")
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/// `_team_entry_from_state`(`state.py:159`):`teams[team_key]` 若为 dict 则返回引用。
|
|
149
|
+
fn team_entry_from_state<'a>(state: &'a Value, team_key: &str) -> Option<&'a Value> {
|
|
150
|
+
state
|
|
151
|
+
.get("teams")
|
|
152
|
+
.and_then(Value::as_object)
|
|
153
|
+
.and_then(|teams| teams.get(team_key))
|
|
154
|
+
.filter(|e| e.is_object())
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
pub fn read_owner<'a>(state: &'a Value, team_key: Option<&str>) -> Option<&'a Value> {
|
|
158
|
+
let owner = match team_key.filter(|team| !team.is_empty()) {
|
|
159
|
+
Some(team) => team_entry_from_state(state, team).and_then(|entry| entry.get("team_owner")),
|
|
160
|
+
None => state.get("team_owner"),
|
|
161
|
+
}?;
|
|
162
|
+
let pane_id = owner.get("pane_id").and_then(Value::as_str)?;
|
|
163
|
+
if !valid_owner_pane_id(pane_id) {
|
|
164
|
+
return None;
|
|
165
|
+
}
|
|
166
|
+
Some(owner)
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
fn valid_owner_pane_id(pane_id: &str) -> bool {
|
|
170
|
+
let pane_id = pane_id.trim();
|
|
171
|
+
if pane_id.is_empty() {
|
|
172
|
+
return false;
|
|
173
|
+
}
|
|
174
|
+
pane_id.starts_with('%') || pane_id.chars().all(|ch| ch.is_ascii_digit())
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/// `_project_top_level_view`(`state.py:167`,C8):把 `teams[team_key]` 投影成扁平顶层视图。
|
|
178
|
+
pub fn project_top_level_view(state: &Value, team_key: &str) -> Value {
|
|
179
|
+
// entry = _team_entry_from_state(...) or {} —— 空 dict 亦走 {} 分支(同内容)。
|
|
180
|
+
let entry_obj: Map<String, Value> =
|
|
181
|
+
team_entry_from_state(state, team_key).and_then(Value::as_object).cloned().unwrap_or_default();
|
|
182
|
+
let mut p = entry_obj.clone(); // projection = deepcopy(entry)
|
|
183
|
+
// setdefault session_name/team_dir ← entry.get(...)(缺则插,值可为 null)。
|
|
184
|
+
if !p.contains_key("session_name") {
|
|
185
|
+
p.insert("session_name".to_string(), entry_obj.get("session_name").cloned().unwrap_or(Value::Null));
|
|
186
|
+
}
|
|
187
|
+
if !p.contains_key("team_dir") {
|
|
188
|
+
p.insert("team_dir".to_string(), entry_obj.get("team_dir").cloned().unwrap_or(Value::Null));
|
|
189
|
+
}
|
|
190
|
+
// d[k]=v:active_team_key 原位更新或末尾插。
|
|
191
|
+
p.insert("active_team_key".to_string(), Value::String(team_key.to_string()));
|
|
192
|
+
// 保全全量 teams 供消费者看兄弟 team(`state.get("teams") or {}` 的 truthy 语义)。
|
|
193
|
+
p.insert("teams".to_string(), py_or_empty_map(state.get("teams")));
|
|
194
|
+
let has_team_entries = state
|
|
195
|
+
.get("teams")
|
|
196
|
+
.and_then(Value::as_object)
|
|
197
|
+
.is_some_and(|teams| !teams.is_empty());
|
|
198
|
+
// owner binding is team-scoped: never borrow another team's top-level binding.
|
|
199
|
+
if let Some(v) = entry_obj.get("team_owner") {
|
|
200
|
+
p.insert("team_owner".to_string(), v.clone());
|
|
201
|
+
} else if !has_team_entries && state.get("team_owner").is_some_and(|v| !v.is_null()) {
|
|
202
|
+
p.insert("team_owner".to_string(), state["team_owner"].clone());
|
|
203
|
+
}
|
|
204
|
+
if let Some(v) = entry_obj.get("leader_receiver") {
|
|
205
|
+
p.insert("leader_receiver".to_string(), v.clone());
|
|
206
|
+
} else if !has_team_entries && state.get("leader_receiver").is_some_and(|v| !v.is_null()) {
|
|
207
|
+
p.insert("leader_receiver".to_string(), state["leader_receiver"].clone());
|
|
208
|
+
}
|
|
209
|
+
// coordinator:仅顶层有 key 时 setdefault(投影里没有才插)。
|
|
210
|
+
if state.as_object().is_some_and(|o| o.contains_key("coordinator")) && !p.contains_key("coordinator") {
|
|
211
|
+
p.insert("coordinator".to_string(), state["coordinator"].clone());
|
|
212
|
+
}
|
|
213
|
+
Value::Object(p)
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
/// `select_runtime_state`(`state.py:193`):读 state → 按 `team` 选候选 → 投影顶层视图。
|
|
217
|
+
/// 歧义/未找到 → `Err(StateError::TeamSelect(msg))`(msg == Python `str(RuntimeError)`)。
|
|
218
|
+
pub fn select_runtime_state(workspace: &Path, team: Option<&str>) -> Result<Value, StateError> {
|
|
219
|
+
let state = load_runtime_state(workspace)?;
|
|
220
|
+
let alive = team_state_candidates(&state);
|
|
221
|
+
// Python `if team:` —— 空串 falsy,等同无 team(对抗 P1:此前 Some("") 误入 team 分支,空
|
|
222
|
+
// team_dir 匹配致歧义/未找到错误串漂移)。
|
|
223
|
+
let team = team.filter(|t| !t.is_empty());
|
|
224
|
+
if let Some(team) = team {
|
|
225
|
+
// 无 alive 但 team 命中 active_team_key / 派生 key → 直接以全量 state 投影。
|
|
226
|
+
if alive.is_empty() {
|
|
227
|
+
let active = state.get("active_team_key").and_then(Value::as_str).unwrap_or("");
|
|
228
|
+
if team == active || team == team_state_key(&state) {
|
|
229
|
+
let mut projection = state.clone();
|
|
230
|
+
match projection.as_object_mut() {
|
|
231
|
+
Some(o) => {
|
|
232
|
+
o.insert("active_team_key".to_string(), Value::String(team.to_string()));
|
|
233
|
+
}
|
|
234
|
+
None => projection = json!({ "active_team_key": team }),
|
|
235
|
+
}
|
|
236
|
+
return Ok(projection);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
if alive.contains_key(team) {
|
|
240
|
+
return Ok(project_top_level_view(&state, team));
|
|
241
|
+
}
|
|
242
|
+
let matches: Vec<&String> = alive
|
|
243
|
+
.iter()
|
|
244
|
+
.filter(|(key, value)| {
|
|
245
|
+
let session = value.get("session_name").and_then(Value::as_str).unwrap_or("");
|
|
246
|
+
let dir = value.get("team_dir").and_then(Value::as_str).unwrap_or("");
|
|
247
|
+
team == key.as_str() || team == session || team == dir
|
|
248
|
+
})
|
|
249
|
+
.map(|(k, _)| k)
|
|
250
|
+
.collect();
|
|
251
|
+
if matches.len() == 1 {
|
|
252
|
+
return Ok(project_top_level_view(&state, matches[0]));
|
|
253
|
+
}
|
|
254
|
+
if matches.len() > 1 {
|
|
255
|
+
return Err(StateError::TeamSelect(
|
|
256
|
+
"team selector is ambiguous. ".to_string() + &format_team_candidates(&alive),
|
|
257
|
+
));
|
|
258
|
+
}
|
|
259
|
+
return Err(StateError::TeamSelect(format!(
|
|
260
|
+
"team {} not found. {}",
|
|
261
|
+
py_repr_str(team),
|
|
262
|
+
format_team_candidates(&alive)
|
|
263
|
+
)));
|
|
264
|
+
}
|
|
265
|
+
// 无 team 参数:active 命中 → 投影;唯一 alive → 投影;无 alive → 全量;多 alive → 歧义。
|
|
266
|
+
let active = state.get("active_team_key").and_then(Value::as_str).filter(|s| !s.is_empty());
|
|
267
|
+
if let Some(active) = active {
|
|
268
|
+
if alive.contains_key(active) {
|
|
269
|
+
return Ok(project_top_level_view(&state, active));
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
if alive.len() == 1 {
|
|
273
|
+
let only = alive.keys().next().cloned().unwrap_or_default();
|
|
274
|
+
return Ok(project_top_level_view(&state, &only));
|
|
275
|
+
}
|
|
276
|
+
if alive.is_empty() {
|
|
277
|
+
return Ok(state);
|
|
278
|
+
}
|
|
279
|
+
Err(StateError::TeamSelect(
|
|
280
|
+
"multiple teams found in this workspace; pass --team <team> to choose. ".to_string()
|
|
281
|
+
+ &format_team_candidates(&alive),
|
|
282
|
+
))
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
/// `ambiguous_team_target_result`(`state.py:226`):无显式 team 且多候选 → 拒绝 dict;否则 None。
|
|
286
|
+
pub fn ambiguous_team_target_result(state: &Value) -> Option<Value> {
|
|
287
|
+
let alive = team_state_candidates(state);
|
|
288
|
+
let active = state.get("active_team_key").and_then(Value::as_str).filter(|s| !s.is_empty());
|
|
289
|
+
if let Some(active) = active {
|
|
290
|
+
if alive.contains_key(active) {
|
|
291
|
+
return None;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
if alive.len() <= 1 {
|
|
295
|
+
return None;
|
|
296
|
+
}
|
|
297
|
+
let mut candidates: Vec<&String> = alive.keys().collect();
|
|
298
|
+
candidates.sort();
|
|
299
|
+
Some(json!({
|
|
300
|
+
"ok": false,
|
|
301
|
+
"status": "refused",
|
|
302
|
+
"reason": "team_target_ambiguous",
|
|
303
|
+
"candidates": candidates,
|
|
304
|
+
"message": "multiple teams found in this workspace; pass --team <team> to choose. ".to_string()
|
|
305
|
+
+ &format_team_candidates(&alive),
|
|
306
|
+
}))
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
/// `resolve_team_scoped_state`(`state.py:243`):返回 `(state, refusal)`,二者恰一为 Some。
|
|
310
|
+
/// `team=None` 且歧义 → refusal;否则 select,RuntimeError → `team_target_unresolved` refusal。
|
|
311
|
+
pub fn resolve_team_scoped_state(
|
|
312
|
+
workspace: &Path,
|
|
313
|
+
team: Option<&str>,
|
|
314
|
+
) -> Result<(Option<Value>, Option<Value>), StateError> {
|
|
315
|
+
if team.is_none() {
|
|
316
|
+
let state = load_runtime_state(workspace)?;
|
|
317
|
+
if let Some(ambiguous) = ambiguous_team_target_result(&state) {
|
|
318
|
+
return Ok((None, Some(ambiguous)));
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
match select_runtime_state(workspace, team) {
|
|
322
|
+
Ok(state) => Ok((Some(state), None)),
|
|
323
|
+
Err(StateError::TeamSelect(msg)) => Ok((
|
|
324
|
+
None,
|
|
325
|
+
Some(json!({
|
|
326
|
+
"ok": false,
|
|
327
|
+
"status": "refused",
|
|
328
|
+
"reason": "team_target_unresolved",
|
|
329
|
+
"team": team,
|
|
330
|
+
"error": msg,
|
|
331
|
+
})),
|
|
332
|
+
)),
|
|
333
|
+
Err(e) => Err(e),
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
/// `save_team_scoped_state`(`state.py:594`):把 team-scoped(投影后)state 写回 workspace,**保全**
|
|
338
|
+
/// 多 team workspace 里其他 team 的持久态。单 team(磁盘无 `teams` 且 primary key == target)退化为
|
|
339
|
+
/// 纯 `save_runtime_state`(字节等价);多 team 时把本 team 落到 `teams[target_key]=compact(...)`,顶层
|
|
340
|
+
/// 视图按 golden 的 `existing_primary_key` 逻辑择 incoming/existing。§10:无 unwrap/panic。
|
|
341
|
+
pub fn save_team_scoped_state(workspace: &Path, team_state: &Value) -> Result<(), StateError> {
|
|
342
|
+
let target_key = team_state_key(team_state);
|
|
343
|
+
let existing = load_runtime_state(workspace)?;
|
|
344
|
+
// existing_primary_key = team_state_key(existing) if existing.get("session_name") else None
|
|
345
|
+
let mut existing_primary_key = if truthy_str(existing.get("session_name")) {
|
|
346
|
+
Some(team_state_key(&existing))
|
|
347
|
+
} else {
|
|
348
|
+
None
|
|
349
|
+
};
|
|
350
|
+
// 异 key 但顶层 session_name 与 incoming 相同 → 视为同 primary(golden:把 existing_primary_key 拉成 target)。
|
|
351
|
+
let same_session = existing
|
|
352
|
+
.get("session_name")
|
|
353
|
+
.and_then(Value::as_str)
|
|
354
|
+
.filter(|s| !s.is_empty())
|
|
355
|
+
.is_some_and(|s| {
|
|
356
|
+
team_state
|
|
357
|
+
.get("session_name")
|
|
358
|
+
.and_then(Value::as_str)
|
|
359
|
+
.is_some_and(|t| t == s)
|
|
360
|
+
});
|
|
361
|
+
if existing_primary_key.as_deref().is_some_and(|k| k != target_key) && same_session {
|
|
362
|
+
existing_primary_key = Some(target_key.clone());
|
|
363
|
+
}
|
|
364
|
+
let existing_teams = take_object(existing.get("teams"));
|
|
365
|
+
// incoming_teams = team_state.get("teams") if isinstance(dict) else None
|
|
366
|
+
let incoming_teams = team_state.get("teams").and_then(Value::as_object).cloned();
|
|
367
|
+
// not existing_teams and existing_primary_key == target_key → 纯 save(剔 teams)。
|
|
368
|
+
if existing_teams.is_empty() && existing_primary_key.as_deref() == Some(target_key.as_str()) {
|
|
369
|
+
let merged = compact_team_state(team_state);
|
|
370
|
+
return save_runtime_state(workspace, &merged);
|
|
371
|
+
}
|
|
372
|
+
// teams = deepcopy(incoming_teams or existing_teams)
|
|
373
|
+
let mut teams = match incoming_teams {
|
|
374
|
+
Some(m) if !m.is_empty() => m,
|
|
375
|
+
_ => existing_teams,
|
|
376
|
+
};
|
|
377
|
+
teams.insert(target_key.clone(), compact_team_state(team_state));
|
|
378
|
+
let mut merged = if existing_primary_key.is_none()
|
|
379
|
+
|| existing_primary_key.as_deref() == Some(target_key.as_str())
|
|
380
|
+
{
|
|
381
|
+
to_object(team_state)
|
|
382
|
+
} else {
|
|
383
|
+
to_object(&existing)
|
|
384
|
+
};
|
|
385
|
+
merged.insert("teams".to_string(), Value::Object(teams));
|
|
386
|
+
// if not merged.get("teams"): merged.pop("teams", None) —— teams 为空 dict(falsy)则剔除。
|
|
387
|
+
if merged.get("teams").and_then(Value::as_object).is_some_and(Map::is_empty) {
|
|
388
|
+
merged.remove("teams");
|
|
389
|
+
}
|
|
390
|
+
save_runtime_state(workspace, &Value::Object(merged))
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
// ---- helpers ----
|
|
394
|
+
|
|
395
|
+
/// Python truthiness of a string-or-null value(非空串 → true;null/缺/空串 → false)。
|
|
396
|
+
fn truthy_str(v: Option<&Value>) -> bool {
|
|
397
|
+
v.and_then(Value::as_str).is_some_and(|s| !s.is_empty())
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
/// Python `x or {}`:`x` truthy 则取 `x`,否则 `{}`。
|
|
401
|
+
fn py_or_empty_map(v: Option<&Value>) -> Value {
|
|
402
|
+
match v {
|
|
403
|
+
Some(x) if super::json_truthy(x) => x.clone(),
|
|
404
|
+
_ => json!({}),
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
/// `v` 为 object → 克隆其 `Map`;否则空 `Map`(deepcopy(dict) 的优雅退化)。
|
|
409
|
+
fn to_object(v: &Value) -> Map<String, Value> {
|
|
410
|
+
v.as_object().cloned().unwrap_or_default()
|
|
411
|
+
}
|
|
412
|
+
|
|
413
|
+
/// `v.get(...) or {}` 取 object → 克隆;否则空 `Map`。
|
|
414
|
+
fn take_object(v: Option<&Value>) -> Map<String, Value> {
|
|
415
|
+
v.and_then(Value::as_object).cloned().unwrap_or_default()
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
/// Python `repr()` of a `str`(与 `model::spec::py_repr_str` 同实现,本地副本免改工作模块)。
|
|
419
|
+
fn py_repr_str(s: &str) -> String {
|
|
420
|
+
let quote = if s.contains('\'') && !s.contains('"') { '"' } else { '\'' };
|
|
421
|
+
let mut out = String::new();
|
|
422
|
+
out.push(quote);
|
|
423
|
+
for c in s.chars() {
|
|
424
|
+
match c {
|
|
425
|
+
'\\' => out.push_str("\\\\"),
|
|
426
|
+
c if c == quote => {
|
|
427
|
+
out.push('\\');
|
|
428
|
+
out.push(c);
|
|
429
|
+
}
|
|
430
|
+
'\n' => out.push_str("\\n"),
|
|
431
|
+
'\r' => out.push_str("\\r"),
|
|
432
|
+
'\t' => out.push_str("\\t"),
|
|
433
|
+
c => out.push(c),
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
out.push(quote);
|
|
437
|
+
out
|
|
438
|
+
}
|
|
439
|
+
|
|
440
|
+
#[cfg(test)]
|
|
441
|
+
mod tests {
|
|
442
|
+
#![allow(clippy::unwrap_used, clippy::panic, clippy::expect_used)]
|
|
443
|
+
use super::*;
|
|
444
|
+
use std::sync::atomic::{AtomicU32, Ordering};
|
|
445
|
+
|
|
446
|
+
static SEQ: AtomicU32 = AtomicU32::new(0);
|
|
447
|
+
|
|
448
|
+
/// 比较紧凑序列化(serde_json::to_string 无空格)—— 同时锁值 + 键插入序。
|
|
449
|
+
fn same_repr(a: &Value, b: &Value) {
|
|
450
|
+
assert_eq!(serde_json::to_string(a).unwrap(), serde_json::to_string(b).unwrap());
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
fn temp_ws_with_state(state: &Value) -> std::path::PathBuf {
|
|
454
|
+
let n = SEQ.fetch_add(1, Ordering::Relaxed);
|
|
455
|
+
let ws = std::env::temp_dir().join(format!("ta_rs_proj_{}_{}", std::process::id(), n));
|
|
456
|
+
let rt = ws.join(".team").join("runtime");
|
|
457
|
+
std::fs::create_dir_all(&rt).unwrap();
|
|
458
|
+
std::fs::write(rt.join("state.json"), serde_json::to_string(state).unwrap()).unwrap();
|
|
459
|
+
ws
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
#[test]
|
|
463
|
+
fn team_state_key_cases() {
|
|
464
|
+
assert_eq!(team_state_key(&json!({"team_dir": "/ws/.team/myteam"})), "myteam");
|
|
465
|
+
assert_eq!(team_state_key(&json!({"team_dir": "/ws/.team/runtime", "session_name": "sess"})), "sess");
|
|
466
|
+
assert_eq!(team_state_key(&json!({"spec_path": "/ws/.team/alpha/TEAM.md"})), "alpha");
|
|
467
|
+
assert_eq!(team_state_key(&json!({"session_name": "sname"})), "sname");
|
|
468
|
+
assert_eq!(team_state_key(&json!({})), "current");
|
|
469
|
+
assert_eq!(team_state_key(&json!({"session_name": ""})), "current");
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
#[test]
|
|
473
|
+
fn compact_drops_teams_keeps_order() {
|
|
474
|
+
let r = compact_team_state(&json!({"a": 1, "teams": {"x": {}}, "b": 2}));
|
|
475
|
+
same_repr(&r, &json!({"a": 1, "b": 2}));
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
#[test]
|
|
479
|
+
fn candidates_alive_filter_and_order() {
|
|
480
|
+
let s = json!({"teams": {
|
|
481
|
+
"alive1": {"status": "alive", "session_name": "sa"},
|
|
482
|
+
"dead1": {"status": "shutdown"},
|
|
483
|
+
"nostatus": {"session_name": "sn"},
|
|
484
|
+
"ALIVE_CASE": {"status": "ALIVE"},
|
|
485
|
+
}});
|
|
486
|
+
let cands = team_state_candidates(&s);
|
|
487
|
+
let keys: Vec<&String> = cands.keys().collect();
|
|
488
|
+
assert_eq!(keys, vec!["alive1", "nostatus", "ALIVE_CASE"]);
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
#[test]
|
|
492
|
+
fn format_candidates_golden() {
|
|
493
|
+
let s = json!({"teams": {
|
|
494
|
+
"alive1": {"status": "alive", "session_name": "sa"},
|
|
495
|
+
"dead1": {"status": "shutdown"},
|
|
496
|
+
"nostatus": {"session_name": "sn"},
|
|
497
|
+
"ALIVE_CASE": {"status": "ALIVE"},
|
|
498
|
+
}});
|
|
499
|
+
assert_eq!(
|
|
500
|
+
format_team_candidates(&team_state_candidates(&s)),
|
|
501
|
+
"Candidates: ALIVE_CASE session=- agents=-; alive1 session=sa agents=-; nostatus session=sn agents=-"
|
|
502
|
+
);
|
|
503
|
+
assert_eq!(format_team_candidates(&Map::new()), "No team state was found.");
|
|
504
|
+
let mut m = Map::new();
|
|
505
|
+
m.insert("k2".to_string(), json!({"session_name": "s2", "agents": {"b": {}, "a": {}}}));
|
|
506
|
+
m.insert("k1".to_string(), json!({}));
|
|
507
|
+
assert_eq!(format_team_candidates(&m), "Candidates: k1 session=- agents=-; k2 session=s2 agents=a,b");
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
#[test]
|
|
511
|
+
fn project_top_level_view_golden() {
|
|
512
|
+
let s = json!({
|
|
513
|
+
"teams": {"t1": {"session_name": "ses1", "team_dir": "/w/.team/t1", "agents": {"a": {}}, "team_owner": {"pane_id": "%1"}}},
|
|
514
|
+
"team_owner": {"pane_id": "%top"},
|
|
515
|
+
"leader_receiver": {"pane_id": "%lr"},
|
|
516
|
+
"coordinator": {"pid": 99},
|
|
517
|
+
});
|
|
518
|
+
let expected = json!({
|
|
519
|
+
"session_name": "ses1", "team_dir": "/w/.team/t1", "agents": {"a": {}}, "team_owner": {"pane_id": "%1"},
|
|
520
|
+
"active_team_key": "t1",
|
|
521
|
+
"teams": {"t1": {"session_name": "ses1", "team_dir": "/w/.team/t1", "agents": {"a": {}}, "team_owner": {"pane_id": "%1"}}},
|
|
522
|
+
"coordinator": {"pid": 99},
|
|
523
|
+
});
|
|
524
|
+
same_repr(&project_top_level_view(&s, "t1"), &expected);
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
#[test]
|
|
528
|
+
fn project_top_level_view_does_not_fall_to_toplevel_owner_when_teams_exist() {
|
|
529
|
+
let s = json!({"teams": {"t2": {"session_name": "s2"}}, "team_owner": {"pane_id": "%top2"}});
|
|
530
|
+
let expected = json!({
|
|
531
|
+
"session_name": "s2", "team_dir": null, "active_team_key": "t2",
|
|
532
|
+
"teams": {"t2": {"session_name": "s2"}},
|
|
533
|
+
});
|
|
534
|
+
same_repr(&project_top_level_view(&s, "t2"), &expected);
|
|
535
|
+
}
|
|
536
|
+
|
|
537
|
+
#[test]
|
|
538
|
+
fn merge_three_branches_golden() {
|
|
539
|
+
same_repr(
|
|
540
|
+
&merge_workspace_team_state(&json!({}), &json!({"team_dir": "/w/.team/t1", "session_name": "s1", "agents": {}})),
|
|
541
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "s1", "agents": {},
|
|
542
|
+
"teams": {"t1": {"team_dir": "/w/.team/t1", "session_name": "s1", "agents": {}}}}),
|
|
543
|
+
);
|
|
544
|
+
same_repr(
|
|
545
|
+
&merge_workspace_team_state(
|
|
546
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "old", "teams": {"t1": {"session_name": "older"}}}),
|
|
547
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "new"}),
|
|
548
|
+
),
|
|
549
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "new",
|
|
550
|
+
"teams": {"t1": {"team_dir": "/w/.team/t1", "session_name": "new"}}}),
|
|
551
|
+
);
|
|
552
|
+
same_repr(
|
|
553
|
+
&merge_workspace_team_state(
|
|
554
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "s1"}),
|
|
555
|
+
&json!({"team_dir": "/w/.team/t2", "session_name": "s2"}),
|
|
556
|
+
),
|
|
557
|
+
&json!({"team_dir": "/w/.team/t1", "session_name": "s1",
|
|
558
|
+
"teams": {"t1": {"team_dir": "/w/.team/t1", "session_name": "s1"},
|
|
559
|
+
"t2": {"team_dir": "/w/.team/t2", "session_name": "s2"}}}),
|
|
560
|
+
);
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
#[test]
|
|
564
|
+
fn select_runtime_state_errors_match_python() {
|
|
565
|
+
let ws = temp_ws_with_state(&json!({"teams": {
|
|
566
|
+
"t1": {"status": "alive", "session_name": "s1"},
|
|
567
|
+
"t2": {"status": "alive", "session_name": "s2"},
|
|
568
|
+
}}));
|
|
569
|
+
let e = select_runtime_state(&ws, Some("missing")).unwrap_err();
|
|
570
|
+
assert_eq!(
|
|
571
|
+
e.to_string(),
|
|
572
|
+
"team 'missing' not found. Candidates: t1 session=s1 agents=-; t2 session=s2 agents=-"
|
|
573
|
+
);
|
|
574
|
+
let e2 = select_runtime_state(&ws, None).unwrap_err();
|
|
575
|
+
assert_eq!(
|
|
576
|
+
e2.to_string(),
|
|
577
|
+
"multiple teams found in this workspace; pass --team <team> to choose. Candidates: t1 session=s1 agents=-; t2 session=s2 agents=-"
|
|
578
|
+
);
|
|
579
|
+
|
|
580
|
+
let ws2 = temp_ws_with_state(&json!({"teams": {
|
|
581
|
+
"t1": {"status": "alive", "session_name": "dup"},
|
|
582
|
+
"t2": {"status": "alive", "session_name": "dup"},
|
|
583
|
+
}}));
|
|
584
|
+
let e3 = select_runtime_state(&ws2, Some("dup")).unwrap_err();
|
|
585
|
+
assert_eq!(
|
|
586
|
+
e3.to_string(),
|
|
587
|
+
"team selector is ambiguous. Candidates: t1 session=dup agents=-; t2 session=dup agents=-"
|
|
588
|
+
);
|
|
589
|
+
}
|
|
590
|
+
|
|
591
|
+
// 对抗 P1:空串 team 必须走「无 team」分支(Python `if team:` falsy),报「multiple teams」
|
|
592
|
+
// 而非「team selector is ambiguous」(后者是非空 team 多匹配)。
|
|
593
|
+
#[test]
|
|
594
|
+
fn select_runtime_state_empty_team_is_no_team() {
|
|
595
|
+
let ws = temp_ws_with_state(&json!({"teams": {
|
|
596
|
+
"t1": {"status": "alive", "session_name": "s1"},
|
|
597
|
+
"t2": {"status": "alive", "session_name": "s2"},
|
|
598
|
+
}}));
|
|
599
|
+
let empty = select_runtime_state(&ws, Some("")).unwrap_err();
|
|
600
|
+
let none = select_runtime_state(&ws, None).unwrap_err();
|
|
601
|
+
assert_eq!(empty.to_string(), none.to_string());
|
|
602
|
+
assert!(empty.to_string().starts_with("multiple teams found in this workspace"));
|
|
603
|
+
}
|
|
604
|
+
|
|
605
|
+
#[test]
|
|
606
|
+
fn select_runtime_state_team_id_exact_match_beats_session_alias() {
|
|
607
|
+
let ws = temp_ws_with_state(&json!({"teams": {
|
|
608
|
+
"current": {"status": "alive", "session_name": "dup"},
|
|
609
|
+
"dup": {"status": "alive", "session_name": "actual-session"},
|
|
610
|
+
}}));
|
|
611
|
+
let selected = select_runtime_state(&ws, Some("dup")).unwrap();
|
|
612
|
+
assert_eq!(
|
|
613
|
+
selected["active_team_key"],
|
|
614
|
+
json!("dup"),
|
|
615
|
+
"an exact team-id match must not be ambiguous just because another team has the same session alias"
|
|
616
|
+
);
|
|
617
|
+
assert_eq!(selected["session_name"], json!("actual-session"));
|
|
618
|
+
}
|
|
619
|
+
|
|
620
|
+
#[test]
|
|
621
|
+
fn archived_team_without_alive_status_is_not_a_default_status_candidate() {
|
|
622
|
+
let candidates = team_state_candidates(&json!({"teams": {
|
|
623
|
+
"archived": {"archived_at": "2026-06-04T00:00:00Z", "session_name": "old-session"},
|
|
624
|
+
"current": {"status": "alive", "session_name": "current-session"},
|
|
625
|
+
}}));
|
|
626
|
+
assert_eq!(
|
|
627
|
+
candidates.keys().cloned().collect::<Vec<_>>(),
|
|
628
|
+
vec!["current".to_string()],
|
|
629
|
+
"status should default to the current/live team; archived markers must not be treated as alive"
|
|
630
|
+
);
|
|
631
|
+
}
|
|
632
|
+
|
|
633
|
+
#[test]
|
|
634
|
+
fn select_runtime_state_single_alive_projects() {
|
|
635
|
+
let ws = temp_ws_with_state(&json!({"teams": {"only": {"status": "alive", "session_name": "so"}}}));
|
|
636
|
+
let r = select_runtime_state(&ws, None).unwrap();
|
|
637
|
+
assert_eq!(r["active_team_key"], json!("only"));
|
|
638
|
+
assert_eq!(r["session_name"], json!("so"));
|
|
639
|
+
}
|
|
640
|
+
|
|
641
|
+
#[test]
|
|
642
|
+
fn resolve_team_scoped_state_ambiguous_refusal() {
|
|
643
|
+
let ws = temp_ws_with_state(&json!({"teams": {
|
|
644
|
+
"t1": {"status": "alive", "session_name": "s1"},
|
|
645
|
+
"t2": {"status": "alive", "session_name": "s2"},
|
|
646
|
+
}}));
|
|
647
|
+
let (state, refusal) = resolve_team_scoped_state(&ws, None).unwrap();
|
|
648
|
+
assert!(state.is_none());
|
|
649
|
+
let refusal = refusal.unwrap();
|
|
650
|
+
assert_eq!(refusal["reason"], json!("team_target_ambiguous"));
|
|
651
|
+
assert_eq!(refusal["candidates"], json!(["t1", "t2"]));
|
|
652
|
+
|
|
653
|
+
let (state2, refusal2) = resolve_team_scoped_state(&ws, Some("missing")).unwrap();
|
|
654
|
+
assert!(state2.is_none());
|
|
655
|
+
assert_eq!(refusal2.unwrap()["reason"], json!("team_target_unresolved"));
|
|
656
|
+
}
|
|
657
|
+
}
|