@team-agent/installer 0.5.125 → 0.5.126
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/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +22 -138
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- 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 +2 -254
- 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 +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -23
- 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/repository/tests.rs +2 -2
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
//! - name: candidate_session_files
|
|
6
6
|
//! what: 按 provider 枚举候选文件(隔离根 + spawn_cwd 递归 + provider HOME 目录),去重排序并按 mtime 截到 300 条
|
|
7
7
|
//! - name: parse_candidate_files
|
|
8
|
-
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd
|
|
8
|
+
//! what: 逐个读头 64KB 解析成 CapturedSessionCandidate,途中套 cwd 匹配与 embedded 身份两道排除
|
|
9
9
|
//! - name: apply_spawned_at_filter
|
|
10
10
|
//! what: 剔除早于席位进程世代边界(spawned_at)的存档;spawned_at 存在但解析不了则清空候选
|
|
11
11
|
//! - name: apply_spawn_time_window_if_unique
|
|
@@ -29,14 +29,12 @@
|
|
|
29
29
|
//! requires:
|
|
30
30
|
//! - name: crate::provider::helpers
|
|
31
31
|
//! what: find_session_id 与 parse_jsonl_records
|
|
32
|
-
//! - name: super::claude
|
|
33
|
-
//! what: claude 家族的 projects 目录推导、cwd 字段判据与 leader marker 判据
|
|
34
32
|
//! - name: super::codex
|
|
35
33
|
//! what: spawned_at 解析、uuid 精度截断与 rollout 创建时间
|
|
36
34
|
//! boundary:
|
|
37
35
|
//! - 一律只读:不写盘、不改 state、不发事件
|
|
38
36
|
//! - 只产出候选与事实;归属最终由上游分配器裁定,本文件不写会话
|
|
39
|
-
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
|
|
37
|
+
//! - spawn_cwd 递归最深 4 层,且跳过 .team 运行时目录
|
|
40
38
|
//! - 候选上限 300 条,超出按 mtime 由新到旧截断——截掉的部分不留痕迹
|
|
41
39
|
//! - "看起来像会话文件"的判据很宽(.json/.jsonl 后缀,或名字含 session/rollout/席位 id),收窄靠后续 provider 专属过滤
|
|
42
40
|
//! maturity: wired
|
|
@@ -66,7 +64,7 @@ pub(super) const CAPTURE_HEAD_BYTES: u64 = 65_536;
|
|
|
66
64
|
/// ---
|
|
67
65
|
/// purpose: 枚举本席位可能对应的会话文件,产出待解析的候选路径表
|
|
68
66
|
/// params:
|
|
69
|
-
/// provider: 决定要不要去 ~/.codex/sessions
|
|
67
|
+
/// provider: 决定要不要去 ~/.codex/sessions 找
|
|
70
68
|
/// context: provider_projects_root(隔离根)、spawn_cwd(必扫)、agent_id(参与文件名匹配)
|
|
71
69
|
/// returns: 去重并排序后的候选;requires_cwd_match=false 的排前面,同组按路径字典序
|
|
72
70
|
/// errors: 只有 spawn_cwd 这一层根目录读不开才上抛 Io;provider HOME 侧目录读失败静默跳过
|
|
@@ -86,9 +84,7 @@ pub(super) fn candidate_session_files(
|
|
|
86
84
|
) -> Result<Vec<SessionCandidate>, ProviderError> {
|
|
87
85
|
let mut out = Vec::new();
|
|
88
86
|
if let Some(root) = context.provider_projects_root.as_ref() {
|
|
89
|
-
|
|
90
|
-
matches!(provider, Provider::Claude | Provider::ClaudeCode).then_some(root.as_path());
|
|
91
|
-
collect_optional_candidate_files(root, &context.agent_id, allowed_team_root, &mut out)?;
|
|
87
|
+
collect_optional_candidate_files(root, &context.agent_id, None, &mut out)?;
|
|
92
88
|
}
|
|
93
89
|
collect_candidate_files(
|
|
94
90
|
&context.spawn_cwd,
|
|
@@ -108,18 +104,9 @@ pub(super) fn candidate_session_files(
|
|
|
108
104
|
&mut out,
|
|
109
105
|
)?;
|
|
110
106
|
}
|
|
111
|
-
Provider::Claude
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
115
|
-
collect_optional_candidate_files(
|
|
116
|
-
&home.join(".claude").join("projects"),
|
|
117
|
-
&context.agent_id,
|
|
118
|
-
None,
|
|
119
|
-
&mut out,
|
|
120
|
-
)?;
|
|
121
|
-
}
|
|
122
|
-
Provider::Copilot
|
|
107
|
+
Provider::Claude
|
|
108
|
+
| Provider::ClaudeCode
|
|
109
|
+
| Provider::Copilot
|
|
123
110
|
| Provider::Grok
|
|
124
111
|
| Provider::Pi
|
|
125
112
|
| Provider::GeminiCli
|
|
@@ -139,7 +126,7 @@ pub(super) fn candidate_session_files(
|
|
|
139
126
|
/// ---
|
|
140
127
|
/// purpose: 把候选路径读头解析成结构化候选,并在解析途中就滤掉明显不属于本席位的
|
|
141
128
|
/// params:
|
|
142
|
-
///
|
|
129
|
+
/// _provider: 保留调用形状;不再有 provider 专属排除
|
|
143
130
|
/// context: 提供 spawn_cwd 与 agent_id 两个比对基准
|
|
144
131
|
/// candidates: candidate_session_files 的产物
|
|
145
132
|
/// returns: 通过全部排除的候选;每条带 embedded 身份、positive_agent_id_match 与 agent_path_match
|
|
@@ -148,12 +135,12 @@ pub(super) fn candidate_session_files(
|
|
|
148
135
|
/// - name: parse_candidate_files
|
|
149
136
|
/// what: 每个文件只读头 64KB,且只取到最后一个完整行
|
|
150
137
|
/// boundary:
|
|
151
|
-
/// -
|
|
138
|
+
/// - 三道排除:读不出头 / 解析不出记录 → 跳过;requires_cwd_match 的候选 cwd 对不上 → 跳过;embedded 身份存在且不等于本席位 → 跳过
|
|
152
139
|
/// - 无 session id 的候选不丢弃,降级为 FsMtimeFallback + Confidence::Low
|
|
153
140
|
/// - 身份判定用两套文本:正文 text 判 TEAM_AGENT_ID,未截行的原始字节判 embedded worker id
|
|
154
141
|
/// ---
|
|
155
142
|
pub(super) fn parse_candidate_files(
|
|
156
|
-
|
|
143
|
+
_provider: Provider,
|
|
157
144
|
context: &CaptureSessionContext,
|
|
158
145
|
candidates: Vec<SessionCandidate>,
|
|
159
146
|
) -> Vec<CapturedSessionCandidate> {
|
|
@@ -175,12 +162,6 @@ pub(super) fn parse_candidate_files(
|
|
|
175
162
|
continue;
|
|
176
163
|
}
|
|
177
164
|
let session_id = records.iter().find_map(find_session_id);
|
|
178
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
179
|
-
&& session_id.is_some()
|
|
180
|
-
&& !records.iter().any(super::claude::has_cwd_field)
|
|
181
|
-
{
|
|
182
|
-
continue;
|
|
183
|
-
}
|
|
184
165
|
let captured_via = if session_id.is_some() {
|
|
185
166
|
CaptureVia::FsWatch
|
|
186
167
|
} else {
|
|
@@ -201,11 +182,6 @@ pub(super) fn parse_candidate_files(
|
|
|
201
182
|
let positive_agent_id_match = candidate_text_has_team_agent_id(&text, context)
|
|
202
183
|
|| embedded_agent_id.as_deref() == Some(context.agent_id.as_str());
|
|
203
184
|
let agent_path_match = candidate_path_matches_agent_id(&path, context);
|
|
204
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode)
|
|
205
|
-
&& super::claude::records_have_leader_marker(&records)
|
|
206
|
-
{
|
|
207
|
-
continue;
|
|
208
|
-
}
|
|
209
185
|
out.push(CapturedSessionCandidate {
|
|
210
186
|
captured: CapturedSession {
|
|
211
187
|
session_id: session_id.map(SessionId::new),
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
//! ---
|
|
2
|
-
//! purpose: 在记录的 Pi
|
|
2
|
+
//! purpose: 在记录的 Pi session root 内按真实 header 捕获 exact JSONL backing(Pi leader 的投递回执用)
|
|
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
|
|
9
7
|
//! boundary:
|
|
10
8
|
//! - 只递归 recorded provider_projects_root,不扫描 HOME 或消息正文
|
|
11
9
|
//! - 不以文件名、mtime 或唯一文件替代 header 匹配
|
|
@@ -97,37 +95,6 @@ fn collect_jsonl(root: &Path, out: &mut Vec<PathBuf>) -> Result<(), ProviderErro
|
|
|
97
95
|
Ok(())
|
|
98
96
|
}
|
|
99
97
|
|
|
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
|
-
|
|
131
98
|
/// ---
|
|
132
99
|
/// purpose: 仅在 recorded seat root 内递归捕获 Pi session header 候选
|
|
133
100
|
/// returns: 有预期 id 时按 id/cwd/timestamp 匹配;否则读取 Pi header 自己的 id,并按 cwd/timestamp 匹配
|
|
@@ -10,7 +10,6 @@ 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;
|
|
14
13
|
pub(crate) mod codex;
|
|
15
14
|
pub(crate) mod common;
|
|
16
15
|
pub(crate) mod copilot;
|
|
@@ -49,10 +48,10 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
49
48
|
if matches!(provider, Provider::Pi) {
|
|
50
49
|
return pi::scan_session_store(context);
|
|
51
50
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
{
|
|
55
|
-
return Ok(
|
|
51
|
+
// Claude Code workers run only through the contract leaf; a pre-upgrade
|
|
52
|
+
// legacy row has nothing left to capture.
|
|
53
|
+
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
54
|
+
return Ok(Vec::new());
|
|
56
55
|
}
|
|
57
56
|
|
|
58
57
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
@@ -62,9 +61,6 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
62
61
|
}
|
|
63
62
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
64
63
|
|
|
65
|
-
if matches!(provider, Provider::Claude | Provider::ClaudeCode) {
|
|
66
|
-
return claude::apply_expected_session_filter(context, out);
|
|
67
|
-
}
|
|
68
64
|
if matches!(provider, Provider::Codex) {
|
|
69
65
|
out = codex::apply_expected_session_filter(context, out);
|
|
70
66
|
}
|
|
@@ -73,5 +69,3 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
73
69
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
74
70
|
Ok(out)
|
|
75
71
|
}
|
|
76
|
-
|
|
77
|
-
pub(crate) use claude::rollout_path_has_leader_marker as rollout_path_has_claude_leader_marker;
|
|
@@ -106,7 +106,7 @@ fn abnormal_dedup_key_uses_signature_and_optional_turn_id() {
|
|
|
106
106
|
|
|
107
107
|
#[test]
|
|
108
108
|
fn capture_session_id_success_payload_fields() {
|
|
109
|
-
//
|
|
109
|
+
// Shared spawn_cwd scan success → CapturedSession high confidence, fs_watch,
|
|
110
110
|
// session_id Some, rollout_path Some. Drive the real fn against a temp cwd
|
|
111
111
|
// that contains a discoverable transcript; assert ALL 5 typed fields.
|
|
112
112
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -119,7 +119,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
119
119
|
&transcript,
|
|
120
120
|
r#"{"type":"user","sessionId":"sess-1","cwd":"PLACEHOLDER","message":{"content":"hi"}}"#,
|
|
121
121
|
);
|
|
122
|
-
let adapter = get_adapter(Provider::
|
|
122
|
+
let adapter = get_adapter(Provider::Fake);
|
|
123
123
|
let cs = adapter
|
|
124
124
|
.capture_session_id("agentX", &dir, 3)
|
|
125
125
|
.expect("capture ok")
|
|
@@ -133,7 +133,7 @@ fn capture_session_id_success_payload_fields() {
|
|
|
133
133
|
|
|
134
134
|
#[test]
|
|
135
135
|
fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_session() {
|
|
136
|
-
// probe(
|
|
136
|
+
// probe(shared scan fallback): transcript w/o a session_id →
|
|
137
137
|
// session_id=None, captured_via=fs_mtime_fallback, confidence=low,
|
|
138
138
|
// rollout_path SET. The half-state is LEGAL and must not panic (bug-085).
|
|
139
139
|
let dir = std::env::temp_dir().join(format!(
|
|
@@ -143,7 +143,7 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
143
143
|
let _ = std::fs::create_dir_all(&dir);
|
|
144
144
|
let transcript = dir.join("nosession.jsonl");
|
|
145
145
|
let _ = std::fs::write(&transcript, r#"{"type":"user","message":{"content":"hi"}}"#);
|
|
146
|
-
let adapter = get_adapter(Provider::
|
|
146
|
+
let adapter = get_adapter(Provider::Fake);
|
|
147
147
|
let cs = adapter
|
|
148
148
|
.capture_session_id("agentX", &dir, 3)
|
|
149
149
|
.expect("capture ok")
|
|
@@ -157,10 +157,10 @@ fn capture_session_id_bug085_compatible_api_fallback_is_low_confidence_none_sess
|
|
|
157
157
|
|
|
158
158
|
#[test]
|
|
159
159
|
fn capture_session_id_no_match_returns_none() {
|
|
160
|
-
//
|
|
160
|
+
// Deadline with no match → Ok(None), explicitly NOT Err.
|
|
161
161
|
let empty = std::env::temp_dir().join(format!("ta-cap-empty-{}", std::process::id()));
|
|
162
162
|
let _ = std::fs::create_dir_all(&empty);
|
|
163
|
-
let adapter = get_adapter(Provider::
|
|
163
|
+
let adapter = get_adapter(Provider::Fake);
|
|
164
164
|
let res = adapter.capture_session_id("agentX", &empty, 0);
|
|
165
165
|
// ProviderError 非 PartialEq(携 Io)→ 用 matches! 而非 ==。
|
|
166
166
|
assert!(matches!(res, Ok(None)), "no transcript + timeout 0 → Ok(None), never Err");
|
|
@@ -170,20 +170,27 @@ fn capture_session_id_no_match_returns_none() {
|
|
|
170
170
|
// ---- resume / fork / build_command / caps — command-build core ----
|
|
171
171
|
|
|
172
172
|
#[test]
|
|
173
|
-
fn
|
|
174
|
-
//
|
|
175
|
-
//
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
173
|
+
fn retired_claude_worker_caps_are_neither_resumable_nor_forkable() {
|
|
174
|
+
// Claude Code workers run only through the contract leaf; a pre-upgrade
|
|
175
|
+
// legacy row must never become capture-pending or resumable.
|
|
176
|
+
for provider in [Provider::Claude, Provider::ClaudeCode] {
|
|
177
|
+
let adapter = get_adapter(provider);
|
|
178
|
+
assert_eq!(
|
|
179
|
+
adapter.caps(),
|
|
180
|
+
ProviderCaps {
|
|
181
|
+
resume: false,
|
|
182
|
+
fork: false,
|
|
183
|
+
native_mcp_config: false,
|
|
184
|
+
writes_global_settings: false,
|
|
185
|
+
},
|
|
186
|
+
"{provider:?}"
|
|
187
|
+
);
|
|
188
|
+
assert_eq!(adapter.auth_hint(AuthMode::Subscription), AuthHintStatus::Unknown);
|
|
189
|
+
assert!(matches!(
|
|
190
|
+
adapter.build_command(AuthMode::Subscription, None, Some("worker"), Some("opus")),
|
|
191
|
+
Err(ProviderError::Command(_))
|
|
192
|
+
));
|
|
193
|
+
}
|
|
187
194
|
}
|
|
188
195
|
|
|
189
196
|
#[test]
|
|
@@ -196,26 +203,10 @@ fn gemini_writes_global_settings_cap() {
|
|
|
196
203
|
assert!(!caps.native_mcp_config, "gemini has no native --mcp-config flag");
|
|
197
204
|
}
|
|
198
205
|
|
|
199
|
-
#[test]
|
|
200
|
-
fn claude_fork_blocked_under_compatible_api() {
|
|
201
|
-
// claude.py:54 supports_session_fork == (auth_mode != compatible_api).
|
|
202
|
-
// fork under CompatibleApi must Err (never silently empty) — capability path.
|
|
203
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
204
|
-
let sid = SessionId::new("src-1");
|
|
205
|
-
let res = adapter.fork(Some(&sid), AuthMode::CompatibleApi, None);
|
|
206
|
-
assert!(
|
|
207
|
-
matches!(
|
|
208
|
-
res,
|
|
209
|
-
Err(ProviderError::CapabilityUnsupported(_)) | Err(ProviderError::ResumeUnavailable(_))
|
|
210
|
-
),
|
|
211
|
-
"fork under compatible_api must Err, got {res:?}"
|
|
212
|
-
);
|
|
213
|
-
}
|
|
214
|
-
|
|
215
206
|
#[test]
|
|
216
207
|
fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
217
|
-
//
|
|
218
|
-
let adapter = get_adapter(Provider::
|
|
208
|
+
// No session_id → ResumeUnavailable, never a bare crash.
|
|
209
|
+
let adapter = get_adapter(Provider::Copilot);
|
|
219
210
|
let res = adapter.build_resume_command(None, AuthMode::Subscription, None);
|
|
220
211
|
assert!(
|
|
221
212
|
matches!(res, Err(ProviderError::ResumeUnavailable(_))),
|
|
@@ -225,8 +216,8 @@ fn build_resume_command_without_session_id_is_resume_unavailable() {
|
|
|
225
216
|
|
|
226
217
|
#[test]
|
|
227
218
|
fn session_is_resumable_none_session_is_false_not_panic() {
|
|
228
|
-
//
|
|
229
|
-
let adapter = get_adapter(Provider::
|
|
219
|
+
// session_id falsy → not resumable; bug-085 None穿透.
|
|
220
|
+
let adapter = get_adapter(Provider::Copilot);
|
|
230
221
|
let res = adapter.session_is_resumable(None, AuthMode::CompatibleApi);
|
|
231
222
|
assert!(matches!(res, Ok(false)), "None session → Ok(false), never panic (bug-085)");
|
|
232
223
|
}
|
|
@@ -240,54 +231,6 @@ fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
|
240
231
|
.any(|w| w.iter().zip(needle).all(|(a, b)| a == b))
|
|
241
232
|
}
|
|
242
233
|
|
|
243
|
-
#[test]
|
|
244
|
-
fn build_command_includes_model_and_system_prompt() {
|
|
245
|
-
// claude.py:175-199 — _base_command appends --model <m> + --append-system-prompt <p>;
|
|
246
|
-
// --strict-mcp-config only appears when mcp_config is present. With mcp_config=None,
|
|
247
|
-
// assert both flag pairs present adjacently AND --strict-mcp-config ABSENT.
|
|
248
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
249
|
-
let argv = adapter
|
|
250
|
-
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("opus"))
|
|
251
|
-
.expect("build_command ok");
|
|
252
|
-
assert!(
|
|
253
|
-
argv_contains_adjacent(&argv, &["--model", "opus"]),
|
|
254
|
-
"argv must contain `--model opus` adjacency: {argv:?}"
|
|
255
|
-
);
|
|
256
|
-
assert!(
|
|
257
|
-
argv_contains_adjacent(&argv, &["--append-system-prompt", "be helpful"]),
|
|
258
|
-
"argv must contain `--append-system-prompt 'be helpful'`: {argv:?}"
|
|
259
|
-
);
|
|
260
|
-
assert!(
|
|
261
|
-
!argv.iter().any(|a| a == "--strict-mcp-config"),
|
|
262
|
-
"no mcp_config → --strict-mcp-config must be absent: {argv:?}"
|
|
263
|
-
);
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
#[test]
|
|
267
|
-
fn claude_mcp_config_does_not_enable_strict_mode() {
|
|
268
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
269
|
-
let config = adapter
|
|
270
|
-
.mcp_config(AuthMode::Subscription)
|
|
271
|
-
.expect("mcp config");
|
|
272
|
-
let argv = adapter
|
|
273
|
-
.build_command(
|
|
274
|
-
AuthMode::Subscription,
|
|
275
|
-
Some(&config),
|
|
276
|
-
Some("worker"),
|
|
277
|
-
Some("opus"),
|
|
278
|
-
)
|
|
279
|
-
.expect("build command with mcp config");
|
|
280
|
-
|
|
281
|
-
assert!(
|
|
282
|
-
argv_contains_adjacent(&argv, &["--mcp-config"]),
|
|
283
|
-
"Claude worker argv must still pass Team Agent MCP config: {argv:?}"
|
|
284
|
-
);
|
|
285
|
-
assert!(
|
|
286
|
-
!argv.iter().any(|arg| arg == "--strict-mcp-config"),
|
|
287
|
-
"--mcp-config must merge with user-level Claude MCP; strict mode hides user MCP: {argv:?}"
|
|
288
|
-
);
|
|
289
|
-
}
|
|
290
|
-
|
|
291
234
|
#[test]
|
|
292
235
|
fn unsupported_provider_capability_error_message_shape() {
|
|
293
236
|
// unsupported.py:31 ProviderCapabilityError — placeholder providers reject
|
|
@@ -311,7 +254,6 @@ fn unsupported_provider_capability_error_message_shape() {
|
|
|
311
254
|
// Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
|
|
312
255
|
|
|
313
256
|
// ═══════════════ 0.5.67 provider-adapter (Grok) ═══════════════
|
|
314
|
-
// 仿 claude build_command tests 结构 (见 build_command_includes_model_and_system_prompt)。
|
|
315
257
|
// 不跑 cargo (禁 cargo 红线), 静态编码 + leader verify 时执行。
|
|
316
258
|
|
|
317
259
|
#[test]
|
|
@@ -429,12 +371,13 @@ fn pi_wire_roundtrip_requires_backing() {
|
|
|
429
371
|
}
|
|
430
372
|
|
|
431
373
|
#[test]
|
|
432
|
-
fn
|
|
374
|
+
fn pi_caps_resume_false_fork_false_native_mcp_false_auth_unknown() {
|
|
375
|
+
// Pi workers run only through the contract leaf; a legacy row is not resumable.
|
|
433
376
|
let adapter = get_adapter(Provider::Pi);
|
|
434
377
|
assert_eq!(
|
|
435
378
|
adapter.caps(),
|
|
436
379
|
ProviderCaps {
|
|
437
|
-
resume:
|
|
380
|
+
resume: false,
|
|
438
381
|
fork: false,
|
|
439
382
|
native_mcp_config: false,
|
|
440
383
|
writes_global_settings: false,
|
|
@@ -1,19 +1,15 @@
|
|
|
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;
|
|
4
5
|
use crate::model::enums::ProviderEffort;
|
|
5
|
-
use crate::provider::adapters::{
|
|
6
|
+
use crate::provider::adapters::{codex, copilot, grok};
|
|
6
7
|
use crate::provider::ProviderCommandOverrides;
|
|
7
8
|
|
|
8
9
|
#[test]
|
|
9
10
|
fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
10
11
|
let raw = " \"'\\\n ";
|
|
11
12
|
let mcp = McpConfig { raw: serde_json::json!({}) };
|
|
12
|
-
assert_eq!(claude::claude_base_command(
|
|
13
|
-
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
14
|
-
Some(&mcp), Some(raw), Some(""), false, false, Some(ProviderEffort::High),
|
|
15
|
-
).expect("claude"), ["claude", "--permission-mode", "default", "--model", "", "--effort", "high", "--append-system-prompt", raw, "--mcp-config", "{\"mcpServers\":{}}"]);
|
|
16
|
-
|
|
17
13
|
let overrides = ProviderCommandOverrides {
|
|
18
14
|
codex_profile: Some("".to_string()),
|
|
19
15
|
codex_config: vec!["model_reasoning_effort=low".to_string()],
|
|
@@ -33,17 +29,12 @@ fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
|
33
29
|
assert_eq!(pi::build_pi_command_argv(pi::PiCommandRequest {
|
|
34
30
|
extension: std::path::Path::new("extension.ts"), model: Some("vendor/model"),
|
|
35
31
|
effort: Some(ProviderEffort::XHigh), system_prompt: raw,
|
|
36
|
-
session_dir: Some(std::path::Path::new("sessions")),
|
|
37
|
-
session: pi::PiSessionSelector::Fresh, agent_id: "worker",
|
|
32
|
+
session_dir: Some(std::path::Path::new("sessions")), agent_id: "worker",
|
|
38
33
|
}).expect("pi"), ["pi", "-e", "extension.ts", "--model", "vendor/model", "--thinking", "xhigh", "--append-system-prompt", raw, "--session-dir", "sessions", "--name", "worker"]);
|
|
39
34
|
}
|
|
40
35
|
|
|
41
36
|
#[test]
|
|
42
37
|
fn command_helpers_keep_absent_options_and_safe_defaults() {
|
|
43
|
-
assert_eq!(claude::claude_base_command(
|
|
44
|
-
&BasicProviderAdapter { provider: Provider::Claude }, AuthMode::Subscription,
|
|
45
|
-
None, None, None, false, false, None,
|
|
46
|
-
).expect("claude"), ["claude", "--permission-mode", "default"]);
|
|
47
38
|
assert_eq!(codex::codex_base_command(None, AuthMode::Subscription, None, None, None, false, None, None),
|
|
48
39
|
["codex", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps"]);
|
|
49
40
|
assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
|
|
@@ -141,10 +141,6 @@ fn idle_leader_activity_never_arms_but_leader_idle_allows_ping() {
|
|
|
141
141
|
// Full own-vs-foreign realpath judgement + truncated-workspace logic deferred.
|
|
142
142
|
|
|
143
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
144
|
const CODEX_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
149
145
|
env!("CARGO_MANIFEST_DIR"),
|
|
150
146
|
"/../../snapshot/fixtures/idle_prompts/codex_idle.txt"
|
|
@@ -158,27 +154,6 @@ fn fixture_matches(re: ®ex::Regex, fixture: &str) -> bool {
|
|
|
158
154
|
fixture.lines().any(|l| re.is_match(l))
|
|
159
155
|
}
|
|
160
156
|
|
|
161
|
-
#[test]
|
|
162
|
-
fn claude_status_patterns_compile() {
|
|
163
|
-
// provider_cli/claude.py:225 status_patterns idle=r"[>❯]\s".
|
|
164
|
-
// The real fixture has prompt lines like "❯ /compact" → idle MUST match.
|
|
165
|
-
// The processing pattern r"[✶✢✽✻✳·].*…" must NOT match those idle prompt lines.
|
|
166
|
-
let adapter = get_adapter(Provider::ClaudeCode);
|
|
167
|
-
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
168
|
-
assert!(
|
|
169
|
-
fixture_matches(&pats.idle, CLAUDE_IDLE_FIXTURE),
|
|
170
|
-
"claude idle pattern must match a '❯ ' prompt line in the idle fixture"
|
|
171
|
-
);
|
|
172
|
-
assert!(
|
|
173
|
-
pats.idle.is_match("❯ /compact"),
|
|
174
|
-
"claude idle pattern matches the canonical prompt line"
|
|
175
|
-
);
|
|
176
|
-
assert!(
|
|
177
|
-
!pats.processing.is_match("❯ /compact"),
|
|
178
|
-
"claude processing pattern must NOT match an idle prompt line"
|
|
179
|
-
);
|
|
180
|
-
}
|
|
181
|
-
|
|
182
157
|
#[test]
|
|
183
158
|
fn codex_status_patterns_compile() {
|
|
184
159
|
// provider_cli/codex.py:140 idle=r"(›|❯|codex>)" processing=r"•.*esc to interrupt".
|
|
@@ -24,36 +24,55 @@
|
|
|
24
24
|
|
|
25
25
|
use crate::model::enums::Provider;
|
|
26
26
|
|
|
27
|
-
/// A state row written by a release that still ran
|
|
28
|
-
///
|
|
29
|
-
///
|
|
27
|
+
/// A state row written by a release that still ran a legacy worker engine:
|
|
28
|
+
/// Cursor's `cursor_agent`/`agent`, Claude Code's `claude`/`claude_code` or
|
|
29
|
+
/// Pi's `pi`. No legacy worker runtime exists for it now; it must never fall
|
|
30
|
+
/// back to another provider. Role and CLI declarations of these names select
|
|
31
|
+
/// the contract leaf, whose state row carries the leaf id instead. A leader is
|
|
32
|
+
/// not an `agents` row, so its own provider key is unaffected.
|
|
30
33
|
pub(crate) const RETIRED_PROVIDER_ERROR: &str =
|
|
31
34
|
"legacy cursor_agent seat has no runtime in this release; stop or remove it, then add it again (provider: cursor)";
|
|
35
|
+
const RETIRED_CLAUDE_ERROR: &str =
|
|
36
|
+
"legacy claude seat has no runtime in this release; stop or remove it, then add it again (provider: claude)";
|
|
37
|
+
const RETIRED_PI_ERROR: &str =
|
|
38
|
+
"legacy pi seat has no runtime in this release; stop or remove it, then add it again (provider: pi)";
|
|
32
39
|
|
|
33
40
|
pub(crate) fn is_retired_provider(raw: &str) -> bool {
|
|
34
|
-
matches!(
|
|
41
|
+
matches!(
|
|
42
|
+
raw.trim().to_ascii_lowercase().as_str(),
|
|
43
|
+
"cursor_agent" | "agent" | "claude" | "claude_code" | "claude-code" | "pi"
|
|
44
|
+
)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/// The refusal for a retired state row, naming the provider to re-add it with.
|
|
48
|
+
pub(crate) fn retired_provider_error(raw: &str) -> &'static str {
|
|
49
|
+
match raw.trim().to_ascii_lowercase().as_str() {
|
|
50
|
+
"claude" | "claude_code" | "claude-code" => RETIRED_CLAUDE_ERROR,
|
|
51
|
+
"pi" => RETIRED_PI_ERROR,
|
|
52
|
+
_ => RETIRED_PROVIDER_ERROR,
|
|
53
|
+
}
|
|
35
54
|
}
|
|
36
55
|
|
|
37
56
|
pub(crate) fn require_active_state_providers(
|
|
38
57
|
state: &serde_json::Value,
|
|
39
58
|
target: Option<&str>,
|
|
40
59
|
) -> Result<(), &'static str> {
|
|
41
|
-
|
|
60
|
+
let retired = state
|
|
42
61
|
.get("agents")
|
|
43
62
|
.and_then(serde_json::Value::as_object)
|
|
44
|
-
.
|
|
45
|
-
agents.iter().
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
.
|
|
50
|
-
|
|
63
|
+
.and_then(|agents| {
|
|
64
|
+
agents.iter().find_map(|(id, row)| {
|
|
65
|
+
row.get("provider")
|
|
66
|
+
.and_then(serde_json::Value::as_str)
|
|
67
|
+
.filter(|provider| {
|
|
68
|
+
target.is_none_or(|target| target == id) && is_retired_provider(provider)
|
|
69
|
+
})
|
|
51
70
|
})
|
|
52
|
-
})
|
|
53
|
-
{
|
|
54
|
-
|
|
71
|
+
});
|
|
72
|
+
match retired {
|
|
73
|
+
Some(provider) => Err(retired_provider_error(provider)),
|
|
74
|
+
None => Ok(()),
|
|
55
75
|
}
|
|
56
|
-
Ok(())
|
|
57
76
|
}
|
|
58
77
|
|
|
59
78
|
/// Canonical snake_case wire string for `Provider`. Used for state JSON,
|
|
@@ -239,9 +258,7 @@ mod tests {
|
|
|
239
258
|
"compiler must validate providers through typed helpers"
|
|
240
259
|
);
|
|
241
260
|
assert!(
|
|
242
|
-
delivery_rs.contains("parse_canonical_provider")
|
|
243
|
-
&& delivery_rs.contains("parse_provider")
|
|
244
|
-
&& delivery_rs.contains("provider_wire"),
|
|
261
|
+
delivery_rs.contains("parse_canonical_provider"),
|
|
245
262
|
"message delivery provider dispatch must use wire helpers"
|
|
246
263
|
);
|
|
247
264
|
for (path, source) in [
|
|
@@ -317,17 +334,28 @@ mod tests {
|
|
|
317
334
|
#[test]
|
|
318
335
|
fn retired_state_guard_is_scoped_to_the_addressed_seat() {
|
|
319
336
|
let state = serde_json::json!({"agents": {
|
|
320
|
-
"pi": {"provider": "
|
|
321
|
-
"claude": {"provider": "
|
|
322
|
-
"
|
|
337
|
+
"pi": {"provider": "pi_tui"},
|
|
338
|
+
"claude": {"provider": "claude_tui"},
|
|
339
|
+
"copilot": {"provider": "copilot"},
|
|
340
|
+
"retired": {"provider": "cursor_agent"},
|
|
341
|
+
"legacy_claude": {"provider": "claude_code"},
|
|
342
|
+
"legacy_pi": {"provider": "pi"}
|
|
323
343
|
}});
|
|
324
344
|
assert!(require_active_state_providers(&state, Some("pi")).is_ok());
|
|
325
345
|
assert!(require_active_state_providers(&state, Some("claude")).is_ok());
|
|
326
|
-
assert!(require_active_state_providers(&state, Some("
|
|
346
|
+
assert!(require_active_state_providers(&state, Some("copilot")).is_ok());
|
|
347
|
+
assert_eq!(require_active_state_providers(&state, Some("retired")), Err(RETIRED_PROVIDER_ERROR));
|
|
348
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_claude")), Err(RETIRED_CLAUDE_ERROR));
|
|
349
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_pi")), Err(RETIRED_PI_ERROR));
|
|
327
350
|
assert!(require_active_state_providers(&state, None).is_err());
|
|
328
351
|
for retired in ["cursor_agent", "agent"] {
|
|
329
352
|
assert_eq!(parse_provider(retired), None, "no legacy engine to parse into");
|
|
330
353
|
}
|
|
354
|
+
// The leader keys still parse: a leader is never an `agents` row.
|
|
355
|
+
for leader in ["claude", "claude_code", "pi"] {
|
|
356
|
+
assert!(is_retired_provider(leader), "{leader}");
|
|
357
|
+
assert!(parse_provider(leader).is_some(), "{leader}");
|
|
358
|
+
}
|
|
331
359
|
}
|
|
332
360
|
|
|
333
361
|
#[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!("copilot")),
|
|
106
106
|
("/agents/w/spawned_at", json!("new-incarnation")),
|
|
107
107
|
] {
|
|
108
108
|
let mut changed = initial.clone();
|