@team-agent/installer 0.5.61 → 0.5.63
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 +1 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/adapters.rs +5 -2
- package/crates/team-agent/src/cli/attach_app_server_leader.rs +1 -0
- package/crates/team-agent/src/cli/diagnose.rs +1 -0
- package/crates/team-agent/src/cli/emit.rs +41 -7
- package/crates/team-agent/src/cli/helpers.rs +1 -0
- package/crates/team-agent/src/cli/leader.rs +6 -1
- package/crates/team-agent/src/cli/leaders.rs +2 -0
- package/crates/team-agent/src/cli/mod.rs +33 -3
- package/crates/team-agent/src/cli/named_address.rs +8 -1
- package/crates/team-agent/src/cli/profile.rs +2 -1
- package/crates/team-agent/src/cli/send/coordinator.rs +1 -0
- package/crates/team-agent/src/cli/send/mailbox.rs +3 -0
- package/crates/team-agent/src/cli/send/persist.rs +1 -0
- package/crates/team-agent/src/cli/send/presentation.rs +1 -0
- package/crates/team-agent/src/cli/send/resolve.rs +206 -1
- package/crates/team-agent/src/cli/send.rs +2 -1
- package/crates/team-agent/src/cli/spec.rs +1 -0
- package/crates/team-agent/src/cli/status.rs +2 -1
- package/crates/team-agent/src/cli/status_port/compact.rs +1 -0
- package/crates/team-agent/src/cli/status_port/format.rs +1 -0
- package/crates/team-agent/src/cli/status_port/inbox.rs +1 -0
- package/crates/team-agent/src/cli/tests/verb_profile.rs +38 -0
- package/crates/team-agent/src/cli/types.rs +3 -2
- package/crates/team-agent/src/communication_mode/mod.rs +1 -0
- package/crates/team-agent/src/compiler.rs +1 -0
- package/crates/team-agent/src/conpty/backend.rs +1 -0
- package/crates/team-agent/src/conpty/mod.rs +1 -0
- package/crates/team-agent/src/coordinator/backoff.rs +5 -8
- package/crates/team-agent/src/coordinator/conpty_shim.rs +3 -2
- package/crates/team-agent/src/coordinator/health.rs +1 -0
- package/crates/team-agent/src/coordinator/mod.rs +2 -2
- package/crates/team-agent/src/coordinator/orphan.rs +4 -116
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +1 -0
- package/crates/team-agent/src/coordinator/runtime_observation.rs +1 -0
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +15 -866
- package/crates/team-agent/src/coordinator/steps/delivery.rs +1 -0
- package/crates/team-agent/src/coordinator/steps/health_sync.rs +1 -0
- package/crates/team-agent/src/coordinator/steps/mod.rs +2 -0
- package/crates/team-agent/src/coordinator/steps/persist.rs +1 -0
- package/crates/team-agent/src/coordinator/steps/runtime_prompts.rs +1 -0
- package/crates/team-agent/src/coordinator/steps/session_gate.rs +1 -0
- package/crates/team-agent/src/coordinator/tests/abnormal.rs +0 -174
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +139 -375
- package/crates/team-agent/src/coordinator/tests/basics.rs +0 -184
- package/crates/team-agent/src/coordinator/tests/mod.rs +2 -17
- package/crates/team-agent/src/coordinator/tests/tick_core.rs +0 -49
- package/crates/team-agent/src/coordinator/tick.rs +23 -40
- package/crates/team-agent/src/coordinator/types.rs +3 -176
- package/crates/team-agent/src/db/agent_health_capture.rs +1 -0
- package/crates/team-agent/src/db/message_store.rs +2 -1
- package/crates/team-agent/src/db/migration.rs +5 -4
- package/crates/team-agent/src/db/mod.rs +1 -0
- package/crates/team-agent/src/db/schema.rs +1 -0
- package/crates/team-agent/src/diagnose/comms.rs +2 -1
- package/crates/team-agent/src/diagnose/mod.rs +1 -0
- package/crates/team-agent/src/diagnose/orphans.rs +1 -0
- package/crates/team-agent/src/layout/manager.rs +3 -7
- package/crates/team-agent/src/layout/mod.rs +2 -2
- package/crates/team-agent/src/layout/overlay.rs +6 -1
- package/crates/team-agent/src/layout/placement.rs +1 -0
- package/crates/team-agent/src/layout/recovery.rs +3 -0
- package/crates/team-agent/src/layout/runtime_sessions.rs +8 -3
- package/crates/team-agent/src/layout/sessions.rs +8 -1
- package/crates/team-agent/src/layout/tmux_endpoint.rs +3 -0
- package/crates/team-agent/src/layout/worker_env.rs +3 -0
- package/crates/team-agent/src/layout/worker_window_helpers.rs +2 -0
- package/crates/team-agent/src/leader/helpers.rs +1 -0
- package/crates/team-agent/src/leader/incident.rs +1 -0
- package/crates/team-agent/src/leader/lease.rs +27 -22
- package/crates/team-agent/src/leader/mod.rs +2 -3
- package/crates/team-agent/src/leader/owner_bind.rs +13 -3
- package/crates/team-agent/src/leader/provider_attribution.rs +1 -0
- package/crates/team-agent/src/leader/rediscover.rs +4 -17
- package/crates/team-agent/src/leader/registry.rs +3 -15
- package/crates/team-agent/src/leader/start.rs +373 -125
- package/crates/team-agent/src/leader/takeover.rs +10 -232
- package/crates/team-agent/src/leader/tests/claim_leader_mailbox_flush_contract.rs +544 -0
- package/crates/team-agent/src/leader/tests/historical_inventory_upgrade_gate_red.rs +624 -0
- package/crates/team-agent/src/leader/tests/identity.rs +7 -2
- package/crates/team-agent/src/leader/tests/idle.rs +0 -193
- package/crates/team-agent/src/leader/tests/lease_api.rs +0 -45
- package/crates/team-agent/src/leader/tests/mod.rs +4 -41
- package/crates/team-agent/src/leader/tests/rehomed_env.rs +83 -0
- package/crates/team-agent/src/leader/tests/team_in_team_state_scope_red.rs +1273 -0
- package/crates/team-agent/src/leader/tests/terminal_and_replay_vs_rerender_invariants_red.rs +417 -0
- package/crates/team-agent/src/leader/tests/wake_start_owner.rs +22 -103
- package/crates/team-agent/src/leader/types.rs +1 -28
- package/crates/team-agent/src/lib.rs +3 -0
- package/crates/team-agent/src/lifecycle/display.rs +7 -1
- package/crates/team-agent/src/lifecycle/helpers.rs +3 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent/completion.rs +1 -0
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +1 -0
- package/crates/team-agent/src/lifecycle/launch/fork_finalize.rs +1 -0
- package/crates/team-agent/src/lifecycle/launch/plan.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +4 -26
- package/crates/team-agent/src/lifecycle/launch/readiness.rs +0 -27
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +1 -27
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +4 -32
- package/crates/team-agent/src/lifecycle/launch/state_projection.rs +1 -0
- package/crates/team-agent/src/lifecycle/launch.rs +11 -12
- package/crates/team-agent/src/lifecycle/mod.rs +2 -1
- package/crates/team-agent/src/lifecycle/restart/agent.rs +3 -66
- package/crates/team-agent/src/lifecycle/restart/orchestrator.rs +2 -2
- package/crates/team-agent/src/lifecycle/restart/rebuild.rs +13 -5
- package/crates/team-agent/src/lifecycle/restart/remove.rs +1 -1
- package/crates/team-agent/src/lifecycle/restart/selection.rs +3 -3
- package/crates/team-agent/src/lifecycle/restart.rs +13 -15
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1007 -0
- package/crates/team-agent/src/lifecycle/tests/b0_legacy_snapshot_nonauthority_contract.rs +265 -0
- package/crates/team-agent/src/lifecycle/tests/b0_reader_hideone_audit_contract.rs +459 -0
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +849 -0
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +323 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +423 -0
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +737 -0
- package/crates/team-agent/src/lifecycle/tests/codex_mcp_approval_inheritance_red.rs +1187 -0
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +683 -0
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +394 -0
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +1856 -0
- package/crates/team-agent/src/lifecycle/tests/core_034_real_red.rs +917 -0
- package/crates/team-agent/src/lifecycle/tests/display_adaptive_red.rs +481 -0
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +301 -0
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +516 -0
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +986 -0
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +651 -0
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +2 -0
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +332 -0
- package/crates/team-agent/src/lifecycle/tests/realmachine_clusters_1_6_red.rs +846 -0
- package/crates/team-agent/src/lifecycle/tests/realmachine_residual_g1_g4_red.rs +648 -0
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +910 -0
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +630 -0
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +1083 -0
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +1677 -0
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +410 -0
- package/crates/team-agent/src/lifecycle/tests/stale_team_saveconflict_contract.rs +428 -0
- package/crates/team-agent/src/lifecycle/tests/startup_latency_contract.rs +1032 -0
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +869 -0
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +1249 -0
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +342 -0
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +542 -0
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1103 -0
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +1276 -0
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_roster_red.rs +145 -0
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +603 -0
- package/crates/team-agent/src/lifecycle/tests/test_isolation_escape_contract.rs +837 -0
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +928 -0
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +951 -0
- package/crates/team-agent/src/lifecycle/tests/worker_dangerous_bypass_argv_red.rs +327 -0
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +760 -0
- package/crates/team-agent/src/lifecycle/tests.rs +59 -0
- package/crates/team-agent/src/lifecycle/types.rs +0 -9
- package/crates/team-agent/src/mcp_server/helpers.rs +1 -0
- package/crates/team-agent/src/mcp_server/lifecycle_tools/mod.rs +1 -0
- package/crates/team-agent/src/mcp_server/lifecycle_tools/state_status.rs +1 -0
- package/crates/team-agent/src/mcp_server/mod.rs +1 -0
- package/crates/team-agent/src/mcp_server/normalize.rs +4 -3
- package/crates/team-agent/src/mcp_server/tools.rs +1 -0
- package/crates/team-agent/src/mcp_server/types.rs +1 -18
- package/crates/team-agent/src/mcp_server/wire.rs +5 -5
- package/crates/team-agent/src/messaging/activity.rs +1 -0
- package/crates/team-agent/src/messaging/address.rs +1 -0
- package/crates/team-agent/src/messaging/delivery.rs +4 -3
- package/crates/team-agent/src/messaging/helpers.rs +2 -1
- package/crates/team-agent/src/messaging/leader_channel.rs +1 -0
- package/crates/team-agent/src/messaging/leader_receiver.rs +2 -1
- package/crates/team-agent/src/messaging/mod.rs +10 -14
- package/crates/team-agent/src/messaging/peers.rs +2 -0
- package/crates/team-agent/src/messaging/persist.rs +3 -1
- package/crates/team-agent/src/messaging/presentation.rs +2 -1
- package/crates/team-agent/src/messaging/results.rs +1 -0
- package/crates/team-agent/src/messaging/scheduler.rs +1 -0
- package/crates/team-agent/src/messaging/selftest.rs +1 -1
- package/crates/team-agent/src/messaging/send.rs +41 -8
- package/crates/team-agent/src/messaging/tests/mod.rs +5 -0
- package/crates/team-agent/src/messaging/types.rs +2 -2
- package/crates/team-agent/src/messaging/watchers.rs +19 -13
- package/crates/team-agent/src/model/enums.rs +1 -0
- package/crates/team-agent/src/model/errors.rs +1 -0
- package/crates/team-agent/src/model/ids.rs +1 -0
- package/crates/team-agent/src/model/mod.rs +1 -0
- package/crates/team-agent/src/model/name_similarity.rs +1 -0
- package/crates/team-agent/src/model/pane_authority_refusal.rs +1 -0
- package/crates/team-agent/src/model/paths.rs +1 -0
- package/crates/team-agent/src/model/permissions.rs +3 -2
- package/crates/team-agent/src/model/routing.rs +1 -0
- package/crates/team-agent/src/model/spec.rs +1 -0
- package/crates/team-agent/src/model/task_graph.rs +1 -0
- package/crates/team-agent/src/model/yaml/tests.rs +1 -0
- package/crates/team-agent/src/model/yaml.rs +1 -0
- package/crates/team-agent/src/packaging/install.rs +9 -147
- package/crates/team-agent/src/packaging/migrate.rs +2 -0
- package/crates/team-agent/src/packaging/mod.rs +1 -0
- package/crates/team-agent/src/packaging/repair.rs +2 -0
- package/crates/team-agent/src/packaging/tests.rs +29 -218
- package/crates/team-agent/src/packaging/types.rs +8 -15
- package/crates/team-agent/src/platform/argv.rs +4 -0
- package/crates/team-agent/src/platform/errors.rs +10 -1
- package/crates/team-agent/src/platform/file_lock.rs +4 -157
- package/crates/team-agent/src/platform/mod.rs +0 -61
- package/crates/team-agent/src/platform/process.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +1 -0
- package/crates/team-agent/src/provider/adapters/claude.rs +1 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +1 -0
- package/crates/team-agent/src/provider/adapters/codex.rs +1 -0
- package/crates/team-agent/src/provider/adapters/copilot.rs +1 -0
- package/crates/team-agent/src/provider/adapters/copilot_fork.rs +1 -0
- package/crates/team-agent/src/provider/adapters/fake.rs +1 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +1 -0
- package/crates/team-agent/src/provider/approvals/mod.rs +1 -0
- package/crates/team-agent/src/provider/approvals/parsing.rs +2 -5
- package/crates/team-agent/src/provider/approvals/runtime_prompts.rs +6 -5
- package/crates/team-agent/src/provider/classify.rs +1 -0
- package/crates/team-agent/src/provider/faults.rs +1 -26
- package/crates/team-agent/src/provider/helpers.rs +1 -0
- package/crates/team-agent/src/provider/mod.rs +1 -1
- package/crates/team-agent/src/provider/session/capture.rs +1 -4
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +1 -0
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +1 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +1 -0
- package/crates/team-agent/src/provider/session/context_fork.rs +1 -0
- package/crates/team-agent/src/provider/session/mod.rs +2 -4
- package/crates/team-agent/src/provider/session/resume.rs +2 -209
- package/crates/team-agent/src/provider/session_scan/claude.rs +1 -0
- package/crates/team-agent/src/provider/session_scan/codex.rs +1 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +1 -0
- package/crates/team-agent/src/provider/session_scan/copilot.rs +1 -0
- package/crates/team-agent/src/provider/session_scan.rs +1 -42
- package/crates/team-agent/src/provider/startup_prompt.rs +1 -0
- package/crates/team-agent/src/provider/types.rs +1 -0
- package/crates/team-agent/src/provider/wire.rs +1 -0
- package/crates/team-agent/src/state/identity.rs +16 -5
- package/crates/team-agent/src/state/identity_keys.rs +1 -0
- package/crates/team-agent/src/state/mod.rs +2 -0
- package/crates/team-agent/src/state/owner_gate.rs +5 -0
- package/crates/team-agent/src/state/ownership.rs +10 -4
- package/crates/team-agent/src/state/paths.rs +12 -0
- package/crates/team-agent/src/state/persist.rs +9 -3
- package/crates/team-agent/src/state/projection.rs +15 -2
- package/crates/team-agent/src/state/repository/intent.rs +1 -0
- package/crates/team-agent/src/state/repository/tests.rs +1 -0
- package/crates/team-agent/src/state/repository.rs +7 -13
- package/crates/team-agent/src/state/selector.rs +1 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +39 -0
- package/crates/team-agent/src/tmux_backend.rs +63 -0
- package/crates/team-agent/src/transport.rs +15 -0
- package/package.json +4 -4
- package/crates/team-agent/src/leader/inject.rs +0 -33
- package/crates/team-agent/src/provider/command.rs +0 -80
|
@@ -1,145 +1,12 @@
|
|
|
1
|
-
//!
|
|
2
|
-
//!
|
|
3
|
-
//! + provider-neutral wake 层(should_reread / on_file_changed / take_pending)。
|
|
1
|
+
//!
|
|
2
|
+
//! leader::takeover — idle take-over 提醒判定面。
|
|
4
3
|
|
|
5
|
-
use
|
|
4
|
+
use serde_json::Value;
|
|
6
5
|
|
|
7
|
-
use
|
|
6
|
+
use crate::provider::TurnState;
|
|
8
7
|
|
|
9
|
-
use
|
|
10
|
-
|
|
11
|
-
use super::helpers::{parse_provider, provider_wire, read_rollout_text, turn_state_wire};
|
|
12
|
-
use super::{
|
|
13
|
-
IdleNode, LeaderError, LeaderEvent, NodeRole, RereadDecision, RereadReason,
|
|
14
|
-
TakeoverReminderResult, TurnClassification, TurnStateClassifier, WakeWatchState,
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
// ── leader::idle — build_idle_nodes / push_idle_reminder(coordinator tick 面)──
|
|
18
|
-
|
|
19
|
-
/// `build_idle_nodes`(card §50;`idle_takeover_wiring.py:20`)。从每个 live node 的 provider
|
|
20
|
-
/// session-log 文件分类 turn 状态(**绝不读 pane 屏幕**)。
|
|
21
|
-
/// **bug-085**:`rollout_path=None` → 该 node `Unknown`(不猜 idle);leader path/provider 缺
|
|
22
|
-
/// 则省略 leader 节点(`_leader_node` 返 `None`)而非猜 idle。
|
|
23
|
-
/// **MUST-NOT-13**:分类走 `read_turn_state`(provider_state trait,注入 mock),零 provider client。
|
|
24
|
-
pub fn build_idle_nodes(
|
|
25
|
-
state: &Value,
|
|
26
|
-
classifier: &dyn TurnStateClassifier,
|
|
27
|
-
) -> Result<Vec<IdleNode>, LeaderError> {
|
|
28
|
-
let mut nodes = Vec::new();
|
|
29
|
-
if let Some(agents) = state.get("agents").and_then(Value::as_object) {
|
|
30
|
-
for (node_id, agent) in agents {
|
|
31
|
-
if matches!(
|
|
32
|
-
agent.get("status").and_then(Value::as_str),
|
|
33
|
-
Some("stopped" | "paused")
|
|
34
|
-
) {
|
|
35
|
-
continue;
|
|
36
|
-
}
|
|
37
|
-
let Some(provider) = agent
|
|
38
|
-
.get("provider")
|
|
39
|
-
.and_then(Value::as_str)
|
|
40
|
-
.and_then(parse_provider)
|
|
41
|
-
else {
|
|
42
|
-
continue;
|
|
43
|
-
};
|
|
44
|
-
let rollout_path = agent
|
|
45
|
-
.get("rollout_path")
|
|
46
|
-
.and_then(Value::as_str)
|
|
47
|
-
.map(|p| RolloutPath::new(PathBuf::from(p)));
|
|
48
|
-
let text = read_rollout_text(rollout_path.as_ref())?;
|
|
49
|
-
let classification = classifier.classify(provider, &text)?;
|
|
50
|
-
nodes.push(IdleNode {
|
|
51
|
-
node_id: node_id.clone(),
|
|
52
|
-
role: NodeRole::Worker,
|
|
53
|
-
state: classification.state,
|
|
54
|
-
turn_id: classification.turn_id,
|
|
55
|
-
annotations: classification.annotations,
|
|
56
|
-
provider: Some(provider),
|
|
57
|
-
auth_mode: agent
|
|
58
|
-
.get("auth_mode")
|
|
59
|
-
.and_then(Value::as_str)
|
|
60
|
-
.map(str::to_string),
|
|
61
|
-
rollout_path,
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
if let Some(node) = leader_node(state, classifier)? {
|
|
66
|
-
nodes.push(node);
|
|
67
|
-
}
|
|
68
|
-
Ok(nodes)
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
/// `_leader_node`(`idle_takeover_wiring.py:77`)。leader 自身 transcript 分类(C13)。
|
|
72
|
-
/// path 或 provider 缺 → `None`(省略而非猜 idle)。
|
|
73
|
-
pub fn leader_node(
|
|
74
|
-
state: &Value,
|
|
75
|
-
classifier: &dyn TurnStateClassifier,
|
|
76
|
-
) -> Result<Option<IdleNode>, LeaderError> {
|
|
77
|
-
let leader = state.get("leader");
|
|
78
|
-
let receiver = state.get("leader_receiver");
|
|
79
|
-
let provider = leader
|
|
80
|
-
.and_then(|l| l.get("provider"))
|
|
81
|
-
.and_then(Value::as_str)
|
|
82
|
-
.or_else(|| {
|
|
83
|
-
receiver
|
|
84
|
-
.and_then(|r| r.get("provider"))
|
|
85
|
-
.and_then(Value::as_str)
|
|
86
|
-
})
|
|
87
|
-
.and_then(parse_provider);
|
|
88
|
-
let rollout_path = leader
|
|
89
|
-
.and_then(|l| l.get("rollout_path"))
|
|
90
|
-
.and_then(Value::as_str)
|
|
91
|
-
.or_else(|| {
|
|
92
|
-
receiver
|
|
93
|
-
.and_then(|r| r.get("rollout_path"))
|
|
94
|
-
.and_then(Value::as_str)
|
|
95
|
-
})
|
|
96
|
-
.map(|p| RolloutPath::new(PathBuf::from(p)));
|
|
97
|
-
let (Some(provider), Some(rollout_path)) = (provider, rollout_path) else {
|
|
98
|
-
return Ok(None);
|
|
99
|
-
};
|
|
100
|
-
let text = read_rollout_text(Some(&rollout_path))?;
|
|
101
|
-
let classification = classifier.classify(provider, &text)?;
|
|
102
|
-
Ok(Some(IdleNode {
|
|
103
|
-
node_id: "leader".to_string(),
|
|
104
|
-
role: NodeRole::Leader,
|
|
105
|
-
state: classification.state,
|
|
106
|
-
turn_id: classification.turn_id,
|
|
107
|
-
annotations: classification.annotations,
|
|
108
|
-
provider: Some(provider),
|
|
109
|
-
auth_mode: None,
|
|
110
|
-
rollout_path: Some(rollout_path),
|
|
111
|
-
}))
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
// ── leader::idle facade re-export(验收契约 import 面:from team_agent.idle_takeover import ...)──
|
|
115
|
-
|
|
116
|
-
/// `classify_provider_turn_state`(card §51;`idle_takeover.py:18`)。门面:分类一个 node 的 turn
|
|
117
|
-
/// 状态;`state ∈ {unknown, abnormal}` 且有 event_sink → 写 `idle_takeover.classify`。
|
|
118
|
-
/// **unknown ≠ idle** 命门下游(`TurnState` 穷尽)。
|
|
119
|
-
pub fn classify_provider_turn_state(
|
|
120
|
-
provider: Provider,
|
|
121
|
-
session_log_text: &str,
|
|
122
|
-
classifier: &dyn TurnStateClassifier,
|
|
123
|
-
event_log: Option<&crate::event_log::EventLog>,
|
|
124
|
-
) -> Result<TurnClassification, LeaderError> {
|
|
125
|
-
let classification = classifier.classify(provider, session_log_text)?;
|
|
126
|
-
if matches!(
|
|
127
|
-
classification.state,
|
|
128
|
-
TurnState::Unknown | TurnState::Abnormal
|
|
129
|
-
) {
|
|
130
|
-
if let Some(log) = event_log {
|
|
131
|
-
log.write(
|
|
132
|
-
LeaderEvent::IdleTakeoverClassify.name(),
|
|
133
|
-
json!({
|
|
134
|
-
"provider": provider_wire(provider),
|
|
135
|
-
"state": turn_state_wire(classification.state),
|
|
136
|
-
"reason": classification.reason,
|
|
137
|
-
}),
|
|
138
|
-
)?;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
Ok(classification)
|
|
142
|
-
}
|
|
8
|
+
use super::helpers::turn_state_wire;
|
|
9
|
+
use super::{IdleNode, LeaderError, TakeoverReminderResult};
|
|
143
10
|
|
|
144
11
|
/// `evaluate_takeover_reminder`(card §51 facade re-export)。provider-neutral 谓词:全 idle 且
|
|
145
12
|
/// armed-after-delegation 才 `should_ping`。**CROSS-LANE**:真逻辑在 provider-neutral `idle_predicate`
|
|
@@ -165,10 +32,10 @@ pub fn evaluate_takeover_reminder(
|
|
|
165
32
|
});
|
|
166
33
|
}
|
|
167
34
|
// idle_predicate.py:55-62 (C1): only a real worker turn-open arms the watch — an
|
|
168
|
-
// un-armed monitor must never ping. The facade honors
|
|
169
|
-
//
|
|
170
|
-
//
|
|
171
|
-
//
|
|
35
|
+
// un-armed monitor must never ping. The facade honors the legacy `armed` input and
|
|
36
|
+
// the classify-layer monitor_state key (`opened_worker_turn_since_ack`);
|
|
37
|
+
// debounce/episode tiers stay at the classify layer
|
|
38
|
+
// (provider/classify.rs evaluate_takeover_reminder).
|
|
172
39
|
let armed = arm_state.get("armed").and_then(Value::as_bool) == Some(true)
|
|
173
40
|
|| arm_state
|
|
174
41
|
.get("opened_worker_turn_since_ack")
|
|
@@ -196,92 +63,3 @@ pub fn evaluate_takeover_reminder(
|
|
|
196
63
|
reason: Some("all_idle_debounce_elapsed".to_string()),
|
|
197
64
|
})
|
|
198
65
|
}
|
|
199
|
-
|
|
200
|
-
/// `record_turn_open_after_delivery`(card §51 / §80;facade re-export)。take-over arm **只来自
|
|
201
|
-
/// 真实投递的 turn-open 边**,不凭空 arm。**CROSS-LANE**:真逻辑在 `idle_predicate`(step 8 相邻)。
|
|
202
|
-
pub fn record_turn_open_after_delivery(
|
|
203
|
-
arm_state: &mut Value,
|
|
204
|
-
node_id: &str,
|
|
205
|
-
turn_id: Option<&str>,
|
|
206
|
-
) -> Result<(), LeaderError> {
|
|
207
|
-
if !arm_state.is_object() {
|
|
208
|
-
*arm_state = json!({});
|
|
209
|
-
}
|
|
210
|
-
if let Some(obj) = arm_state.as_object_mut() {
|
|
211
|
-
obj.insert("armed".to_string(), Value::Bool(true));
|
|
212
|
-
obj.insert("node_id".to_string(), Value::String(node_id.to_string()));
|
|
213
|
-
obj.insert(
|
|
214
|
-
"turn_id".to_string(),
|
|
215
|
-
turn_id.map_or(Value::Null, |id| Value::String(id.to_string())),
|
|
216
|
-
);
|
|
217
|
-
}
|
|
218
|
-
Ok(())
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
// ── leader::wake — provider-neutral wake 层(纯函数,不解析/不轮询/无 provider 名)──
|
|
222
|
-
|
|
223
|
-
/// `should_reread`(card §52;`wake.py:16`)。决定是否值得重读 session 文件尾巴 + 为何。
|
|
224
|
-
/// 纯函数:file 变了 / 静默超 debounce 且未在此 mtime 分类过。provider-neutral(C6)。
|
|
225
|
-
pub fn should_reread(
|
|
226
|
-
last_mtime: Option<f64>,
|
|
227
|
-
current_mtime: Option<f64>,
|
|
228
|
-
last_classified_mtime: Option<f64>,
|
|
229
|
-
now: f64,
|
|
230
|
-
debounce_seconds: f64,
|
|
231
|
-
) -> RereadDecision {
|
|
232
|
-
let _ = last_mtime;
|
|
233
|
-
let Some(current) = current_mtime else {
|
|
234
|
-
return RereadDecision {
|
|
235
|
-
reread: false,
|
|
236
|
-
reason: RereadReason::NoFile,
|
|
237
|
-
};
|
|
238
|
-
};
|
|
239
|
-
let Some(classified) = last_classified_mtime else {
|
|
240
|
-
return RereadDecision {
|
|
241
|
-
reread: true,
|
|
242
|
-
reason: RereadReason::NeverClassified,
|
|
243
|
-
};
|
|
244
|
-
};
|
|
245
|
-
if current != classified {
|
|
246
|
-
return RereadDecision {
|
|
247
|
-
reread: true,
|
|
248
|
-
reason: RereadReason::FileChanged,
|
|
249
|
-
};
|
|
250
|
-
}
|
|
251
|
-
let silent_for = (now - current).max(0.0);
|
|
252
|
-
if silent_for >= debounce_seconds {
|
|
253
|
-
RereadDecision {
|
|
254
|
-
reread: false,
|
|
255
|
-
reason: RereadReason::QuiescentAlreadyClassified,
|
|
256
|
-
}
|
|
257
|
-
} else {
|
|
258
|
-
RereadDecision {
|
|
259
|
-
reread: false,
|
|
260
|
-
reason: RereadReason::Unchanged,
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
/// `on_file_changed`(card §52;`wake.py:43`)。记录一个 node 的文件变更 wake(push 路径)。
|
|
266
|
-
pub fn on_file_changed(
|
|
267
|
-
watch_state: Option<&WakeWatchState>,
|
|
268
|
-
node_id: &str,
|
|
269
|
-
mtime: f64,
|
|
270
|
-
) -> WakeWatchState {
|
|
271
|
-
let mut state = watch_state.cloned().unwrap_or_default();
|
|
272
|
-
if !state.pending.iter().any(|p| p == node_id) {
|
|
273
|
-
state.pending.push(node_id.to_string());
|
|
274
|
-
}
|
|
275
|
-
state.pending.sort();
|
|
276
|
-
state.mtimes.insert(node_id.to_string(), mtime);
|
|
277
|
-
state
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
/// `take_pending`(card §52;`wake.py:53`)。排空自上次 drain 以来文件变更的 node 集。
|
|
281
|
-
pub fn take_pending(watch_state: Option<&WakeWatchState>) -> (Vec<String>, WakeWatchState) {
|
|
282
|
-
let mut state = watch_state.cloned().unwrap_or_default();
|
|
283
|
-
let mut drained = state.pending.clone();
|
|
284
|
-
drained.sort();
|
|
285
|
-
state.pending.clear();
|
|
286
|
-
(drained, state)
|
|
287
|
-
}
|