@team-agent/installer 0.5.127 → 0.5.128
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/README.md +11 -0
- package/crates/team-agent/src/cli/adapters.rs +3 -13
- package/crates/team-agent/src/cli/arguments.rs +4 -0
- package/crates/team-agent/src/cli/diagnose.rs +68 -22
- package/crates/team-agent/src/cli/emit.rs +58 -26
- package/crates/team-agent/src/cli/intent/runtime.rs +32 -5
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +102 -11
- package/crates/team-agent/src/cli/intent/tests.rs +10 -12
- package/crates/team-agent/src/cli/intent.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +25 -8
- package/crates/team-agent/src/cli/models.rs +764 -7
- package/crates/team-agent/src/cli/schedule.rs +175 -0
- package/crates/team-agent/src/cli/send/persist.rs +0 -36
- package/crates/team-agent/src/cli/send/presentation.rs +1 -1
- package/crates/team-agent/src/cli/send.rs +108 -110
- package/crates/team-agent/src/cli/spec.rs +6 -0
- package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
- package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +9 -6
- package/crates/team-agent/src/cli/tests/status_send.rs +68 -271
- package/crates/team-agent/src/compiler/tests.rs +3 -18
- package/crates/team-agent/src/compiler.rs +205 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +145 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +7 -7
- package/crates/team-agent/src/contract_runtime/config.rs +26 -16
- package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
- package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
- package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
- package/crates/team-agent/src/contract_runtime/framework.rs +28 -11
- package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
- package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
- package/crates/team-agent/src/contract_runtime/registry.rs +56 -92
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +11 -11
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +16 -54
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +42 -0
- package/crates/team-agent/src/coordinator/tick.rs +1 -89
- package/crates/team-agent/src/db/message_store.rs +7 -65
- package/crates/team-agent/src/direct_delivery.rs +368 -0
- package/crates/team-agent/src/inbox_store.rs +169 -0
- package/crates/team-agent/src/leader/registry.rs +5 -0
- package/crates/team-agent/src/leader/start.rs +2 -1
- package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
- package/crates/team-agent/src/lib.rs +2 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +38 -13
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +9 -1
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +24 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +36 -13
- package/crates/team-agent/src/lifecycle/launch.rs +24 -1
- package/crates/team-agent/src/lifecycle/profile_launch.rs +321 -11
- package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +345 -35
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +4 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +39 -14
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +236 -13
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +5 -4
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +47 -18
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +14 -14
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +28 -26
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +10 -11
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +5 -6
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +16 -7
- package/crates/team-agent/src/lifecycle/tests.rs +3 -0
- package/crates/team-agent/src/lifecycle/types.rs +18 -2
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
- package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +98 -119
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
- package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
- package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
- package/crates/team-agent/src/mcp_server/tools.rs +70 -196
- package/crates/team-agent/src/messaging/delivery.rs +160 -218
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/helpers.rs +1 -19
- package/crates/team-agent/src/messaging/mod.rs +1 -0
- package/crates/team-agent/src/messaging/reminders.rs +316 -0
- package/crates/team-agent/src/messaging/scheduler.rs +7 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +191 -85
- package/crates/team-agent/src/messaging/tests/runtime.rs +4 -110
- package/crates/team-agent/src/messaging/tests/spine.rs +40 -24
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +303 -51
- package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +7 -5
- package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
- package/crates/team-agent/src/provider/classify.rs +1 -66
- package/crates/team-agent/src/provider/model_catalog.rs +201 -13
- package/crates/team-agent/src/provider/session/capture.rs +106 -6
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +4 -0
- package/crates/team-agent/src/provider/session/context_fork.rs +150 -18
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +44 -8
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +16 -6
- package/crates/team-agent/src/provider/tests/adapter.rs +104 -17
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +12 -3
- package/crates/team-agent/src/provider/tests/idle.rs +37 -0
- package/crates/team-agent/src/provider/wire.rs +22 -34
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/projection.rs +1 -1
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
- package/crates/team-agent/src/tmux_backend.rs +5 -40
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +5 -7
- package/skills/team-agent/command-coverage.json +1 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -3
- package/skills/team-agent/references/team-agent-operator.md +3 -3
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
//! ---
|
|
2
|
-
//! purpose: 在记录的 Pi session root 内按真实 header 捕获 exact JSONL backing
|
|
2
|
+
//! purpose: 在记录的 Pi 席位 session root 内按真实 header 捕获 exact JSONL backing
|
|
3
3
|
//! contract:
|
|
4
4
|
//! provides:
|
|
5
5
|
//! - name: scan_session_store
|
|
6
6
|
//! what: 只读每个 JSONL 的首个完整 header;有预期 id 时按 id/cwd/spawned_at,否则按 cwd/spawned_at 读取 Pi 自己的 id
|
|
7
|
+
//! - name: validate_exact_backing
|
|
8
|
+
//! what: restart 前重验 exact path 的 id/cwd header
|
|
7
9
|
//! boundary:
|
|
8
10
|
//! - 只递归 recorded provider_projects_root,不扫描 HOME 或消息正文
|
|
9
11
|
//! - 不以文件名、mtime 或唯一文件替代 header 匹配
|
|
@@ -95,6 +97,37 @@ fn collect_jsonl(root: &Path, out: &mut Vec<PathBuf>) -> Result<(), ProviderErro
|
|
|
95
97
|
Ok(())
|
|
96
98
|
}
|
|
97
99
|
|
|
100
|
+
/// ---
|
|
101
|
+
/// purpose: restart 前重验调用方给出的 exact Pi JSONL backing
|
|
102
|
+
/// returns: header type/version/id/cwd 全匹配时成功
|
|
103
|
+
/// errors: 文件缺失、header 不完整或 identity 不匹配时返回 ResumeUnavailable
|
|
104
|
+
/// ---
|
|
105
|
+
pub(crate) fn validate_exact_backing(
|
|
106
|
+
path: &Path,
|
|
107
|
+
expected_session_id: &SessionId,
|
|
108
|
+
spawn_cwd: &Path,
|
|
109
|
+
) -> Result<(), ProviderError> {
|
|
110
|
+
if !path.is_file() {
|
|
111
|
+
return Err(ProviderError::ResumeUnavailable(format!(
|
|
112
|
+
"Pi exact session backing is missing: {}",
|
|
113
|
+
path.display()
|
|
114
|
+
)));
|
|
115
|
+
}
|
|
116
|
+
let header = read_header(path).ok_or_else(|| {
|
|
117
|
+
ProviderError::ResumeUnavailable(format!(
|
|
118
|
+
"Pi exact session backing has no complete session header: {}",
|
|
119
|
+
path.display()
|
|
120
|
+
))
|
|
121
|
+
})?;
|
|
122
|
+
if !header_matches(&header, expected_session_id, spawn_cwd, None) {
|
|
123
|
+
return Err(ProviderError::ResumeUnavailable(format!(
|
|
124
|
+
"Pi exact session backing header does not match id/cwd: {}",
|
|
125
|
+
path.display()
|
|
126
|
+
)));
|
|
127
|
+
}
|
|
128
|
+
Ok(())
|
|
129
|
+
}
|
|
130
|
+
|
|
98
131
|
/// ---
|
|
99
132
|
/// purpose: 仅在 recorded seat root 内递归捕获 Pi session header 候选
|
|
100
133
|
/// returns: 有预期 id 时按 id/cwd/timestamp 匹配;否则读取 Pi header 自己的 id,并按 cwd/timestamp 匹配
|
|
@@ -10,6 +10,7 @@ use std::path::PathBuf;
|
|
|
10
10
|
use crate::provider::types::{CapturedSession, ProviderError, SessionId};
|
|
11
11
|
use crate::provider::Provider;
|
|
12
12
|
|
|
13
|
+
pub(crate) mod claude;
|
|
13
14
|
pub(crate) mod common;
|
|
14
15
|
pub(crate) mod copilot;
|
|
15
16
|
pub(crate) mod pi;
|
|
@@ -43,19 +44,28 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
43
44
|
if matches!(provider, Provider::Pi) {
|
|
44
45
|
return pi::scan_session_store(context);
|
|
45
46
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
48
|
+
&& context.expected_session_id.is_some()
|
|
49
|
+
{
|
|
50
|
+
return Ok(claude::scan_expected_session(context));
|
|
51
|
+
}
|
|
52
|
+
// Codex and Grok workers run only through their contract leaves; a
|
|
53
|
+
// pre-upgrade legacy row has nothing left to capture.
|
|
54
|
+
if matches!(provider, Provider::Codex | Provider::Grok) {
|
|
52
55
|
return Ok(Vec::new());
|
|
53
56
|
}
|
|
54
57
|
|
|
55
58
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
56
59
|
let mut out = common::parse_candidate_files(provider, context, candidates);
|
|
57
60
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
61
|
+
|
|
62
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
63
|
+
return claude::apply_expected_session_filter(context, out);
|
|
64
|
+
}
|
|
65
|
+
|
|
58
66
|
common::apply_spawn_time_window_if_unique(provider, context, &mut out);
|
|
59
67
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
60
68
|
Ok(out)
|
|
61
69
|
}
|
|
70
|
+
|
|
71
|
+
pub(crate) use claude::rollout_path_has_leader_marker as rollout_path_has_claude_leader_marker;
|
|
@@ -102,7 +102,7 @@ fn abnormal_dedup_key_uses_signature_and_optional_turn_id() {
|
|
|
102
102
|
|
|
103
103
|
#[test]
|
|
104
104
|
fn capture_session_id_success_payload_fields() {
|
|
105
|
-
//
|
|
105
|
+
// claude.py:73-106 success → CapturedSession high confidence, fs_watch,
|
|
106
106
|
// session_id Some, rollout_path Some. Drive the real fn against a temp cwd
|
|
107
107
|
// that contains a discoverable transcript; assert ALL 5 typed fields.
|
|
108
108
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -115,7 +115,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
115
115
|
&transcript,
|
|
116
116
|
r#"{"type":"user","sessionId":"sess-1","cwd":"PLACEHOLDER","message":{"content":"hi"}}"#,
|
|
117
117
|
);
|
|
118
|
-
let adapter = get_adapter(Provider::
|
|
118
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
119
119
|
let cs = adapter
|
|
120
120
|
.capture_session_id("agentX", &dir, 3)
|
|
121
121
|
.expect("capture ok")
|
|
@@ -129,7 +129,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
129
129
|
|
|
130
130
|
#[test]
|
|
131
131
|
fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_session() {
|
|
132
|
-
// probe(
|
|
132
|
+
// probe(claude fallback): compatible_api transcript w/o a session_id →
|
|
133
133
|
// session_id=None, captured_via=fs_mtime_fallback, confidence=low,
|
|
134
134
|
// rollout_path SET. The half-state is LEGAL and must not panic (bug-085).
|
|
135
135
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -139,7 +139,7 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
139
139
|
let _ = std::fs::create_dir_all(&dir);
|
|
140
140
|
let transcript = dir.join("nosession.jsonl");
|
|
141
141
|
let _ = std::fs::write(&transcript, r#"{"type":"user","message":{"content":"hi"}}"#);
|
|
142
|
-
let adapter = get_adapter(Provider::
|
|
142
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
143
143
|
let cs = adapter
|
|
144
144
|
.capture_session_id("agentX", &dir, 3)
|
|
145
145
|
.expect("capture ok")
|
|
@@ -153,10 +153,10 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
153
153
|
|
|
154
154
|
#[test]
|
|
155
155
|
fn capture_session_id_no_match_returns_none() {
|
|
156
|
-
//
|
|
156
|
+
// claude.py:111-113 deadline with no match → Ok(None), explicitly NOT Err.
|
|
157
157
|
let empty = std::env::temp_dir().join(format!("ta-cap-empty-{}", std::process::id()));
|
|
158
158
|
let _ = std::fs::create_dir_all(&empty);
|
|
159
|
-
let adapter = get_adapter(Provider::
|
|
159
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
160
160
|
let res = adapter.capture_session_id("agentX", &empty, 0);
|
|
161
161
|
// ProviderError 非 PartialEq(携 Io)→ 用 matches! 而非 ==。
|
|
162
162
|
assert!(matches!(res, Ok(None)), "no transcript + timeout 0 → Ok(None), never Err");
|
|
@@ -167,10 +167,9 @@ fn capture_session_id_no_match_returns_none() {
|
|
|
167
167
|
|
|
168
168
|
#[test]
|
|
169
169
|
fn retired_worker_caps_are_neither_resumable_nor_forkable() {
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
|
|
173
|
-
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok] {
|
|
170
|
+
// Codex and Grok workers run only through their contract leaves; a
|
|
171
|
+
// pre-upgrade legacy row must never become capture-pending or resumable.
|
|
172
|
+
for provider in [Provider::Codex, Provider::Grok] {
|
|
174
173
|
let adapter = get_adapter(provider);
|
|
175
174
|
assert_eq!(
|
|
176
175
|
adapter.caps(),
|
|
@@ -222,6 +221,23 @@ fn retired_worker_caps_are_neither_resumable_nor_forkable() {
|
|
|
222
221
|
}
|
|
223
222
|
}
|
|
224
223
|
|
|
224
|
+
#[test]
|
|
225
|
+
fn claude_caps_resume_and_fork_and_native_mcp() {
|
|
226
|
+
// doc §59 + claude.py: claude supports resume + fork (static cap true,
|
|
227
|
+
// runtime auth-gated) + native --mcp-config; does NOT write a global settings file.
|
|
228
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
229
|
+
let caps = adapter.caps();
|
|
230
|
+
assert_eq!(
|
|
231
|
+
caps,
|
|
232
|
+
ProviderCaps {
|
|
233
|
+
resume: true,
|
|
234
|
+
fork: true,
|
|
235
|
+
native_mcp_config: true,
|
|
236
|
+
writes_global_settings: false,
|
|
237
|
+
}
|
|
238
|
+
);
|
|
239
|
+
}
|
|
240
|
+
|
|
225
241
|
#[test]
|
|
226
242
|
fn gemini_writes_global_settings_cap() {
|
|
227
243
|
// gemini.py:40-78 — install_mcp writes ~/.gemini/settings.json →
|
|
@@ -232,10 +248,26 @@ fn gemini_writes_global_settings_cap() {
|
|
|
232
248
|
assert!(!caps.native_mcp_config, "gemini has no native --mcp-config flag");
|
|
233
249
|
}
|
|
234
250
|
|
|
251
|
+
#[test]
|
|
252
|
+
fn claude_fork_blocked_under_compatible_api() {
|
|
253
|
+
// claude.py:54 supports_session_fork == (auth_mode != compatible_api).
|
|
254
|
+
// fork under CompatibleApi must Err (never silently empty) — capability path.
|
|
255
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
256
|
+
let sid = SessionId::new("src-1");
|
|
257
|
+
let res = adapter.fork(Some(&sid), AuthMode::CompatibleApi, None);
|
|
258
|
+
assert!(
|
|
259
|
+
matches!(
|
|
260
|
+
res,
|
|
261
|
+
Err(ProviderError::CapabilityUnsupported(_)) | Err(ProviderError::ResumeUnavailable(_))
|
|
262
|
+
),
|
|
263
|
+
"fork under compatible_api must Err, got {res:?}"
|
|
264
|
+
);
|
|
265
|
+
}
|
|
266
|
+
|
|
235
267
|
#[test]
|
|
236
268
|
fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
237
|
-
//
|
|
238
|
-
let adapter = get_adapter(Provider::
|
|
269
|
+
// claude.py:41-42 — no session_id → ResumeUnavailable, never a bare crash.
|
|
270
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
239
271
|
let res = adapter.build_resume_command(None, AuthMode::Subscription, None);
|
|
240
272
|
assert!(
|
|
241
273
|
matches!(res, Err(ProviderError::ResumeUnavailable(_))),
|
|
@@ -245,12 +277,68 @@ fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
|
245
277
|
|
|
246
278
|
#[test]
|
|
247
279
|
fn session_is_resumable_none_session_is_false_not_panic() {
|
|
248
|
-
// session_id falsy → not resumable; bug-085 None穿透.
|
|
249
|
-
let adapter = get_adapter(Provider::
|
|
280
|
+
// claude.py:116-118 — session_id falsy → not resumable; bug-085 None穿透.
|
|
281
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
250
282
|
let res = adapter.session_is_resumable(None, AuthMode::CompatibleApi);
|
|
251
283
|
assert!(matches!(res, Ok(false)), "None session → Ok(false), never panic (bug-085)");
|
|
252
284
|
}
|
|
253
285
|
|
|
286
|
+
fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
287
|
+
if needle.is_empty() {
|
|
288
|
+
return true;
|
|
289
|
+
}
|
|
290
|
+
hay.windows(needle.len())
|
|
291
|
+
.any(|w| w.iter().zip(needle).all(|(a, b)| a == b))
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
#[test]
|
|
295
|
+
fn build_command_includes_model_and_system_prompt() {
|
|
296
|
+
// claude.py:175-199 — _base_command appends --model <m> + --append-system-prompt <p>;
|
|
297
|
+
// --strict-mcp-config only appears when mcp_config is present. With mcp_config=None,
|
|
298
|
+
// assert both flag pairs present adjacently AND --strict-mcp-config ABSENT.
|
|
299
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
300
|
+
let argv = adapter
|
|
301
|
+
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("opus"))
|
|
302
|
+
.expect("build_command ok");
|
|
303
|
+
assert!(
|
|
304
|
+
argv_contains_adjacent(&argv, &["--model", "opus"]),
|
|
305
|
+
"argv must contain `--model opus` adjacency: {argv:?}"
|
|
306
|
+
);
|
|
307
|
+
assert!(
|
|
308
|
+
argv_contains_adjacent(&argv, &["--append-system-prompt", "be helpful"]),
|
|
309
|
+
"argv must contain `--append-system-prompt 'be helpful'`: {argv:?}"
|
|
310
|
+
);
|
|
311
|
+
assert!(
|
|
312
|
+
!argv.iter().any(|a| a == "--strict-mcp-config"),
|
|
313
|
+
"no mcp_config → --strict-mcp-config must be absent: {argv:?}"
|
|
314
|
+
);
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
#[test]
|
|
318
|
+
fn claude_mcp_config_does_not_enable_strict_mode() {
|
|
319
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
320
|
+
let config = adapter
|
|
321
|
+
.mcp_config(AuthMode::Subscription)
|
|
322
|
+
.expect("mcp config");
|
|
323
|
+
let argv = adapter
|
|
324
|
+
.build_command(
|
|
325
|
+
AuthMode::Subscription,
|
|
326
|
+
Some(&config),
|
|
327
|
+
Some("worker"),
|
|
328
|
+
Some("opus"),
|
|
329
|
+
)
|
|
330
|
+
.expect("build command with mcp config");
|
|
331
|
+
|
|
332
|
+
assert!(
|
|
333
|
+
argv_contains_adjacent(&argv, &["--mcp-config"]),
|
|
334
|
+
"Claude worker argv must still pass Team Agent MCP config: {argv:?}"
|
|
335
|
+
);
|
|
336
|
+
assert!(
|
|
337
|
+
!argv.iter().any(|arg| arg == "--strict-mcp-config"),
|
|
338
|
+
"--mcp-config must merge with user-level Claude MCP; strict mode hides user MCP: {argv:?}"
|
|
339
|
+
);
|
|
340
|
+
}
|
|
341
|
+
|
|
254
342
|
#[test]
|
|
255
343
|
fn unsupported_provider_capability_error_message_shape() {
|
|
256
344
|
// unsupported.py:31 ProviderCapabilityError — placeholder providers reject
|
|
@@ -290,13 +378,12 @@ fn pi_wire_roundtrip_requires_backing() {
|
|
|
290
378
|
}
|
|
291
379
|
|
|
292
380
|
#[test]
|
|
293
|
-
fn
|
|
294
|
-
// Pi workers run only through the contract leaf; a legacy row is not resumable.
|
|
381
|
+
fn pi_caps_resume_true_fork_false_native_mcp_false_auth_unknown() {
|
|
295
382
|
let adapter = get_adapter(Provider::Pi);
|
|
296
383
|
assert_eq!(
|
|
297
384
|
adapter.caps(),
|
|
298
385
|
ProviderCaps {
|
|
299
|
-
resume:
|
|
386
|
+
resume: true,
|
|
300
387
|
fork: false,
|
|
301
388
|
native_mcp_config: false,
|
|
302
389
|
writes_global_settings: false,
|
|
@@ -146,56 +146,3 @@ fn classify_open_turn_dead_is_abnormal_crashed_mid_turn() {
|
|
|
146
146
|
// Golden via /tmp/probe_idle.py (idle_predicate.evaluate_takeover_reminder).
|
|
147
147
|
// Nodes / monitor_state passed as serde_json::Value dicts (Python dict shape).
|
|
148
148
|
|
|
149
|
-
|
|
150
|
-
// #379: Claude Code's live session registry, located before and after capture.
|
|
151
|
-
#[cfg(unix)]
|
|
152
|
-
#[test]
|
|
153
|
-
fn claude_registry_turn_state_reads_the_live_record_for_this_transcript() {
|
|
154
|
-
let config = std::env::temp_dir().join(format!("ta-claude-registry-{}", std::process::id()));
|
|
155
|
-
let _ = std::fs::remove_dir_all(&config);
|
|
156
|
-
let sid = "11111111-2222-4333-8444-555555555555";
|
|
157
|
-
let projects = config.join("projects").join("-owned-cwd");
|
|
158
|
-
std::fs::create_dir_all(&projects).unwrap();
|
|
159
|
-
std::fs::create_dir_all(config.join("sessions")).unwrap();
|
|
160
|
-
let rollout = projects.join(format!("{sid}.jsonl"));
|
|
161
|
-
std::fs::write(&rollout, "").unwrap();
|
|
162
|
-
let sessions = config.join("sessions");
|
|
163
|
-
let expected_key = Some((sessions.clone(), sid.to_string()));
|
|
164
|
-
assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": rollout})), expected_key);
|
|
165
|
-
// Cold start: the launch's `--session-id` and projects root, before any capture.
|
|
166
|
-
assert_eq!(
|
|
167
|
-
claude_registry_key(&serde_json::json!({
|
|
168
|
-
"_pending_session_id": sid, "session_id": "stale", "claude_projects_root": config.join("projects"),
|
|
169
|
-
})),
|
|
170
|
-
expected_key
|
|
171
|
-
);
|
|
172
|
-
// Only `<config>/projects/<slug>/<id>.jsonl` names a registry.
|
|
173
|
-
assert_eq!(claude_registry_key(&serde_json::json!({"rollout_path": config.join(format!("{sid}.jsonl"))})), None);
|
|
174
|
-
let live = std::process::id();
|
|
175
|
-
let write = |pid: u32, session: &str, tmux: &str, status: &str| {
|
|
176
|
-
let record = serde_json::json!({"pid": pid, "sessionId": session, "tmux": tmux, "status": status});
|
|
177
|
-
std::fs::write(sessions.join(format!("{pid}.json")), record.to_string()).unwrap();
|
|
178
|
-
};
|
|
179
|
-
let read = |pane: Option<&str>| claude_registry_turn_state(&sessions, sid, pane);
|
|
180
|
-
for (status, expected) in [
|
|
181
|
-
("busy", Some(TurnState::Working)),
|
|
182
|
-
("waiting", Some(TurnState::BlockedOnHuman)),
|
|
183
|
-
("idle", Some(TurnState::Idle)),
|
|
184
|
-
("starting", None),
|
|
185
|
-
] {
|
|
186
|
-
write(live, sid, "team-x:@3.%7", status);
|
|
187
|
-
assert_eq!(read(Some("%7")), expected, "{status}");
|
|
188
|
-
}
|
|
189
|
-
write(live, sid, "team-x:@3.%7", "busy");
|
|
190
|
-
assert_eq!(read(None), Some(TurnState::Working));
|
|
191
|
-
assert_eq!(read(Some("%8")), None, "another pane's record");
|
|
192
|
-
write(live, "99999999-2222-4333-8444-555555555555", "team-x:@3.%7", "busy");
|
|
193
|
-
assert_eq!(read(Some("%7")), None, "another session's record");
|
|
194
|
-
std::fs::remove_file(sessions.join(format!("{live}.json"))).unwrap();
|
|
195
|
-
let mut child = std::process::Command::new("true").spawn().unwrap();
|
|
196
|
-
let dead = child.id();
|
|
197
|
-
child.wait().unwrap();
|
|
198
|
-
write(dead, sid, "team-x:@3.%7", "busy");
|
|
199
|
-
assert_eq!(read(Some("%7")), None, "a dead process is no evidence");
|
|
200
|
-
let _ = std::fs::remove_dir_all(&config);
|
|
201
|
-
}
|
|
@@ -1,26 +1,35 @@
|
|
|
1
1
|
//! Exact argv characterization: no helper may trim, escape or reorder caller values.
|
|
2
2
|
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
|
|
3
3
|
use super::*;
|
|
4
|
-
use crate::lifecycle::launch::pi_mcp as pi;
|
|
5
4
|
use crate::model::enums::ProviderEffort;
|
|
6
|
-
use crate::provider::adapters::copilot;
|
|
5
|
+
use crate::provider::adapters::{claude, copilot, pi};
|
|
7
6
|
|
|
8
7
|
#[test]
|
|
9
8
|
fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
10
9
|
let raw = " \"'\\\n ";
|
|
11
10
|
let mcp = McpConfig { raw: serde_json::json!({}) };
|
|
11
|
+
assert_eq!(claude::claude_base_command(
|
|
12
|
+
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
13
|
+
Some(&mcp), Some(raw), Some(""), false, false, Some(ProviderEffort::High),
|
|
14
|
+
).expect("claude"), ["claude", "--permission-mode", "default", "--model", "", "--effort", "high", "--append-system-prompt", raw, "--mcp-config", "{\"mcpServers\":{}}"]);
|
|
15
|
+
|
|
12
16
|
assert_eq!(copilot::copilot_base_command(
|
|
13
17
|
AuthMode::Subscription, Some(&mcp), Some(raw), Some(""), true,
|
|
14
18
|
), ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-all", "--allow-tool", "team_orchestrator", "--model", "", "--additional-mcp-config", "{}"]);
|
|
15
19
|
assert_eq!(pi::build_pi_command_argv(pi::PiCommandRequest {
|
|
16
20
|
extension: std::path::Path::new("extension.ts"), model: Some("vendor/model"),
|
|
17
21
|
effort: Some(ProviderEffort::XHigh), system_prompt: raw,
|
|
18
|
-
session_dir: Some(std::path::Path::new("sessions")),
|
|
22
|
+
session_dir: Some(std::path::Path::new("sessions")),
|
|
23
|
+
session: pi::PiSessionSelector::Fresh, agent_id: "worker",
|
|
19
24
|
}).expect("pi"), ["pi", "-e", "extension.ts", "--model", "vendor/model", "--thinking", "xhigh", "--append-system-prompt", raw, "--session-dir", "sessions", "--name", "worker"]);
|
|
20
25
|
}
|
|
21
26
|
|
|
22
27
|
#[test]
|
|
23
28
|
fn command_helpers_keep_absent_options_and_safe_defaults() {
|
|
29
|
+
assert_eq!(claude::claude_base_command(
|
|
30
|
+
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
31
|
+
None, None, None, false, false, None,
|
|
32
|
+
).expect("claude"), ["claude", "--permission-mode", "default"]);
|
|
24
33
|
assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
|
|
25
34
|
["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-tool", "team_orchestrator"]);
|
|
26
35
|
}
|
|
@@ -133,6 +133,43 @@ fn idle_leader_activity_never_arms_but_leader_idle_allows_ping() {
|
|
|
133
133
|
assert_eq!(r2.reason, NoPingReason::AllIdleDebounceElapsed);
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
+
// ---- (c) trust-prompt recognizer (REAL fixtures, own-vs-foreign) ----
|
|
137
|
+
//
|
|
138
|
+
// NOTE: the own-vs-foreign trust recognizer lives in messaging/leader_panes.py
|
|
139
|
+
// (step 9/10 owns it per card §42). The provider.rs skeleton exposes only
|
|
140
|
+
// `status_patterns()` (idle/processing/trust regex set) — driven RED below.
|
|
141
|
+
// Full own-vs-foreign realpath judgement + truncated-workspace logic deferred.
|
|
142
|
+
|
|
143
|
+
// Real fixtures (mirrored into the rust workspace from team-agent-public).
|
|
144
|
+
const CLAUDE_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
145
|
+
env!("CARGO_MANIFEST_DIR"),
|
|
146
|
+
"/../../snapshot/fixtures/idle_prompts/claude_code_idle.txt"
|
|
147
|
+
));
|
|
148
|
+
fn fixture_matches(re: ®ex::Regex, fixture: &str) -> bool {
|
|
149
|
+
fixture.lines().any(|l| re.is_match(l))
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
#[test]
|
|
153
|
+
fn claude_status_patterns_compile() {
|
|
154
|
+
// provider_cli/claude.py:225 status_patterns idle=r"[>❯]\s".
|
|
155
|
+
// The real fixture has prompt lines like "❯ /compact" → idle MUST match.
|
|
156
|
+
// The processing pattern r"[✶✢✽✻✳·].*…" must NOT match those idle prompt lines.
|
|
157
|
+
let adapter = get_adapter(Provider::ClaudeCode);
|
|
158
|
+
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
159
|
+
assert!(
|
|
160
|
+
fixture_matches(&pats.idle, CLAUDE_IDLE_FIXTURE),
|
|
161
|
+
"claude idle pattern must match a '❯ ' prompt line in the idle fixture"
|
|
162
|
+
);
|
|
163
|
+
assert!(
|
|
164
|
+
pats.idle.is_match("❯ /compact"),
|
|
165
|
+
"claude idle pattern matches the canonical prompt line"
|
|
166
|
+
);
|
|
167
|
+
assert!(
|
|
168
|
+
!pats.processing.is_match("❯ /compact"),
|
|
169
|
+
"claude processing pattern must NOT match an idle prompt line"
|
|
170
|
+
);
|
|
171
|
+
}
|
|
172
|
+
|
|
136
173
|
// ---- (d) abnormal dedup key (signature, Option<TurnId>) ----
|
|
137
174
|
//
|
|
138
175
|
// NOTE: read_fault_facts lives in provider_state; not on the skeleton trait.
|
|
@@ -25,46 +25,28 @@
|
|
|
25
25
|
use crate::model::enums::Provider;
|
|
26
26
|
|
|
27
27
|
/// A state row written by a release that still ran a legacy worker engine:
|
|
28
|
-
/// Cursor's `cursor_agent`/`agent
|
|
29
|
-
///
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
///
|
|
33
|
-
///
|
|
28
|
+
/// Cursor's `cursor_agent`/`agent` or Codex's `codex`/`codex_cli`.
|
|
29
|
+
/// No legacy worker runtime exists for it now; it must never fall back
|
|
30
|
+
/// to another provider. Role and CLI declarations of these names select the
|
|
31
|
+
/// contract leaf, whose state row carries the leaf id instead. A leader is not
|
|
32
|
+
/// an `agents` row, so its own provider key is unaffected. Claude Code
|
|
33
|
+
/// (`claude`/`claude_code`) and Pi (`pi`) rows keep their legacy runtimes.
|
|
34
34
|
pub(crate) const RETIRED_PROVIDER_ERROR: &str =
|
|
35
35
|
"legacy cursor_agent seat has no runtime in this release; stop or remove it, then add it again (provider: cursor)";
|
|
36
|
-
const RETIRED_CLAUDE_ERROR: &str =
|
|
37
|
-
"legacy claude seat has no runtime in this release; stop or remove it, then add it again (provider: claude)";
|
|
38
36
|
const RETIRED_CODEX_ERROR: &str =
|
|
39
37
|
"legacy codex seat has no runtime in this release; stop or remove it, then add it again (provider: codex)";
|
|
40
|
-
const RETIRED_GROK_ERROR: &str =
|
|
41
|
-
"legacy grok seat has no runtime in this release; stop or remove it, then add it again (provider: grok)";
|
|
42
|
-
const RETIRED_PI_ERROR: &str =
|
|
43
|
-
"legacy pi seat has no runtime in this release; stop or remove it, then add it again (provider: pi)";
|
|
44
38
|
|
|
45
39
|
pub(crate) fn is_retired_provider(raw: &str) -> bool {
|
|
46
40
|
matches!(
|
|
47
41
|
raw.trim().to_ascii_lowercase().as_str(),
|
|
48
|
-
"cursor_agent"
|
|
49
|
-
| "agent"
|
|
50
|
-
| "claude"
|
|
51
|
-
| "claude_code"
|
|
52
|
-
| "claude-code"
|
|
53
|
-
| "codex"
|
|
54
|
-
| "codex_cli"
|
|
55
|
-
| "codex-cli"
|
|
56
|
-
| "grok"
|
|
57
|
-
| "pi"
|
|
42
|
+
"cursor_agent" | "agent" | "codex" | "codex_cli" | "codex-cli"
|
|
58
43
|
)
|
|
59
44
|
}
|
|
60
45
|
|
|
61
46
|
/// The refusal for a retired state row, naming the provider to re-add it with.
|
|
62
47
|
pub(crate) fn retired_provider_error(raw: &str) -> &'static str {
|
|
63
48
|
match raw.trim().to_ascii_lowercase().as_str() {
|
|
64
|
-
"claude" | "claude_code" | "claude-code" => RETIRED_CLAUDE_ERROR,
|
|
65
49
|
"codex" | "codex_cli" | "codex-cli" => RETIRED_CODEX_ERROR,
|
|
66
|
-
"grok" => RETIRED_GROK_ERROR,
|
|
67
|
-
"pi" => RETIRED_PI_ERROR,
|
|
68
50
|
_ => RETIRED_PROVIDER_ERROR,
|
|
69
51
|
}
|
|
70
52
|
}
|
|
@@ -274,7 +256,9 @@ mod tests {
|
|
|
274
256
|
"compiler must validate providers through typed helpers"
|
|
275
257
|
);
|
|
276
258
|
assert!(
|
|
277
|
-
delivery_rs.contains("parse_canonical_provider")
|
|
259
|
+
delivery_rs.contains("parse_canonical_provider")
|
|
260
|
+
&& delivery_rs.contains("parse_provider")
|
|
261
|
+
&& delivery_rs.contains("provider_wire"),
|
|
278
262
|
"message delivery provider dispatch must use wire helpers"
|
|
279
263
|
);
|
|
280
264
|
for (path, source) in [
|
|
@@ -350,12 +334,11 @@ mod tests {
|
|
|
350
334
|
#[test]
|
|
351
335
|
fn retired_state_guard_is_scoped_to_the_addressed_seat() {
|
|
352
336
|
let state = serde_json::json!({"agents": {
|
|
353
|
-
"pi": {"provider": "
|
|
354
|
-
"claude": {"provider": "
|
|
337
|
+
"pi": {"provider": "pi"},
|
|
338
|
+
"claude": {"provider": "claude"},
|
|
339
|
+
"claude_code": {"provider": "claude_code"},
|
|
355
340
|
"copilot": {"provider": "copilot"},
|
|
356
341
|
"retired": {"provider": "cursor_agent"},
|
|
357
|
-
"legacy_claude": {"provider": "claude_code"},
|
|
358
|
-
"legacy_pi": {"provider": "pi"},
|
|
359
342
|
"codex": {"provider": "codex_tui"},
|
|
360
343
|
"grok": {"provider": "grok_build"},
|
|
361
344
|
"legacy_codex": {"provider": "codex"},
|
|
@@ -364,24 +347,29 @@ mod tests {
|
|
|
364
347
|
}});
|
|
365
348
|
assert!(require_active_state_providers(&state, Some("pi")).is_ok());
|
|
366
349
|
assert!(require_active_state_providers(&state, Some("claude")).is_ok());
|
|
350
|
+
assert!(require_active_state_providers(&state, Some("claude_code")).is_ok());
|
|
367
351
|
assert!(require_active_state_providers(&state, Some("copilot")).is_ok());
|
|
368
352
|
assert!(require_active_state_providers(&state, Some("codex")).is_ok());
|
|
369
353
|
assert!(require_active_state_providers(&state, Some("grok")).is_ok());
|
|
370
354
|
assert_eq!(require_active_state_providers(&state, Some("retired")), Err(RETIRED_PROVIDER_ERROR));
|
|
371
|
-
assert_eq!(require_active_state_providers(&state, Some("legacy_claude")), Err(RETIRED_CLAUDE_ERROR));
|
|
372
|
-
assert_eq!(require_active_state_providers(&state, Some("legacy_pi")), Err(RETIRED_PI_ERROR));
|
|
373
355
|
assert_eq!(require_active_state_providers(&state, Some("legacy_codex")), Err(RETIRED_CODEX_ERROR));
|
|
374
356
|
assert_eq!(require_active_state_providers(&state, Some("legacy_codex_cli")), Err(RETIRED_CODEX_ERROR));
|
|
375
|
-
|
|
357
|
+
assert!(require_active_state_providers(&state, Some("legacy_grok")).is_ok());
|
|
358
|
+
assert!(!is_retired_provider("grok"));
|
|
376
359
|
assert!(require_active_state_providers(&state, None).is_err());
|
|
377
360
|
for retired in ["cursor_agent", "agent"] {
|
|
378
361
|
assert_eq!(parse_provider(retired), None, "no legacy engine to parse into");
|
|
379
362
|
}
|
|
380
363
|
// The leader keys still parse: a leader is never an `agents` row.
|
|
381
|
-
for leader in ["
|
|
364
|
+
for leader in ["codex"] {
|
|
382
365
|
assert!(is_retired_provider(leader), "{leader}");
|
|
383
366
|
assert!(parse_provider(leader).is_some(), "{leader}");
|
|
384
367
|
}
|
|
368
|
+
// Claude Code and Pi keep their legacy worker runtimes.
|
|
369
|
+
for legacy in ["claude", "claude_code", "claude-code", "pi"] {
|
|
370
|
+
assert!(!is_retired_provider(legacy), "{legacy}");
|
|
371
|
+
assert!(parse_provider(legacy).is_some(), "{legacy}");
|
|
372
|
+
}
|
|
385
373
|
}
|
|
386
374
|
|
|
387
375
|
#[test]
|
|
@@ -102,7 +102,7 @@ fn observation_identity_separates_same_name_team_path_and_spawn_generation() {
|
|
|
102
102
|
("/active_team_key", json!("b")),
|
|
103
103
|
("/agents/w/rollout_path", json!("/fixture/other.jsonl")),
|
|
104
104
|
("/agents/w/spawn_epoch", json!(2)),
|
|
105
|
-
("/agents/w/provider", json!("
|
|
105
|
+
("/agents/w/provider", json!("claude")),
|
|
106
106
|
("/agents/w/spawned_at", json!("new-incarnation")),
|
|
107
107
|
] {
|
|
108
108
|
let mut changed = initial.clone();
|
|
@@ -2730,7 +2730,7 @@ mod tests {
|
|
|
2730
2730
|
&json!({
|
|
2731
2731
|
"session_name": "team-a",
|
|
2732
2732
|
"active_team_key": "team-a",
|
|
2733
|
-
"agents": {"f1": {"provider": "
|
|
2733
|
+
"agents": {"f1": {"provider": "claude", "status": "starting"}}
|
|
2734
2734
|
}),
|
|
2735
2735
|
);
|
|
2736
2736
|
// f2 loaded before f1's reservation. Persist carries the still-unspawned
|
|
@@ -2738,7 +2738,7 @@ mod tests {
|
|
|
2738
2738
|
let incoming = json!({
|
|
2739
2739
|
"session_name": "team-a",
|
|
2740
2740
|
"active_team_key": "team-a",
|
|
2741
|
-
"agents": {"f2": {"provider": "
|
|
2741
|
+
"agents": {"f2": {"provider": "claude", "status": "starting"}}
|
|
2742
2742
|
});
|
|
2743
2743
|
save_runtime_state_with_lifecycle_topology_authority(&ws, &incoming, "team-a", &["f2"])
|
|
2744
2744
|
.unwrap();
|
|
@@ -2749,7 +2749,7 @@ mod tests {
|
|
|
2749
2749
|
// f1 starts after f2 takes its snapshot; capture is not complete yet.
|
|
2750
2750
|
let mut started = stale.clone();
|
|
2751
2751
|
started["agents"]["f1"] = json!({
|
|
2752
|
-
"provider": "
|
|
2752
|
+
"provider": "claude",
|
|
2753
2753
|
"status": "running",
|
|
2754
2754
|
"pane_id": "%1",
|
|
2755
2755
|
"pane_pid": 101,
|
|
@@ -2763,7 +2763,7 @@ mod tests {
|
|
|
2763
2763
|
.unwrap();
|
|
2764
2764
|
let latest = read_state(&ws);
|
|
2765
2765
|
stale["agents"]["f2"] = json!({
|
|
2766
|
-
"provider": "
|
|
2766
|
+
"provider": "claude",
|
|
2767
2767
|
"status": "running",
|
|
2768
2768
|
"pane_id": "%2",
|
|
2769
2769
|
"pane_pid": 102,
|
|
@@ -3410,7 +3410,7 @@ mod tests {
|
|
|
3410
3410
|
"agents": {
|
|
3411
3411
|
"alpha": {
|
|
3412
3412
|
"status": "stopped",
|
|
3413
|
-
"provider": "
|
|
3413
|
+
"provider": "claude",
|
|
3414
3414
|
"session_id": "stale-poisoned-uuid",
|
|
3415
3415
|
"rollout_path": Value::Null,
|
|
3416
3416
|
"captured_at": Value::Null,
|
|
@@ -3427,7 +3427,7 @@ mod tests {
|
|
|
3427
3427
|
"agents": {
|
|
3428
3428
|
"alpha": {
|
|
3429
3429
|
"status": "running",
|
|
3430
|
-
"provider": "
|
|
3430
|
+
"provider": "claude",
|
|
3431
3431
|
"session_id": Value::Null,
|
|
3432
3432
|
"rollout_path": Value::Null,
|
|
3433
3433
|
"captured_at": Value::Null,
|
|
@@ -712,7 +712,7 @@ pub fn select_runtime_state(workspace: &Path, team: Option<&str>) -> Result<Valu
|
|
|
712
712
|
resolve_runtime_team_scope(workspace, team).map(|resolved| resolved.state)
|
|
713
713
|
}
|
|
714
714
|
|
|
715
|
-
fn team_selector_matches(team: &str, key: &str, value: &Value) -> bool {
|
|
715
|
+
pub(crate) fn team_selector_matches(team: &str, key: &str, value: &Value) -> bool {
|
|
716
716
|
if team == key {
|
|
717
717
|
return true;
|
|
718
718
|
}
|
|
@@ -123,9 +123,9 @@ fn stopped_start_commit_updates_exact_target_and_both_mirrors()
|
|
|
123
123
|
let held = json!({"agent_id":"worker","provider":"grok_build","runtime_family":"contract",
|
|
124
124
|
"status":"stopped","explicit_stop":true,"generation":1,"contract_instance":"instance-one",
|
|
125
125
|
"session_id":"same-session","native_endpoint":"old-endpoint"});
|
|
126
|
-
let peer = json!({"agent_id":"peer","provider":"
|
|
126
|
+
let peer = json!({"agent_id":"peer","provider":"pi","status":"stopped","explicit_stop":true,
|
|
127
127
|
"session_id":"peer-session","generation":1});
|
|
128
|
-
let control = json!({"agent_id":"control","provider":"
|
|
128
|
+
let control = json!({"agent_id":"control","provider":"pi","status":"running","session_id":"control-session"});
|
|
129
129
|
let agents = json!({"worker":held,"peer":peer,"control":control});
|
|
130
130
|
let initial = json!({"session_name":"team-a","active_team_key":"team-a","agents":agents,
|
|
131
131
|
"teams":{"team-a":{"session_name":"team-a","status":"alive","agents":agents},
|