@team-agent/installer 0.5.126 → 0.5.127
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 -69
- package/crates/team-agent/src/cli/emit.rs +10 -9
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +6 -4
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +45 -0
- package/crates/team-agent/src/cli/mod.rs +13 -1
- package/crates/team-agent/src/cli/models.rs +27 -181
- package/crates/team-agent/src/cli/tests/leader_watch.rs +1 -1
- package/crates/team-agent/src/cli/tests/mod.rs +2 -2
- package/crates/team-agent/src/cli/tests/run_delegation.rs +3 -3
- package/crates/team-agent/src/cli/tests/status_send.rs +2 -2
- package/crates/team-agent/src/compiler/tests.rs +36 -9
- package/crates/team-agent/src/compiler.rs +3 -2
- package/crates/team-agent/src/contract_runtime/backend.rs +36 -0
- package/crates/team-agent/src/contract_runtime/commands.rs +335 -4
- package/crates/team-agent/src/contract_runtime/config.rs +6 -5
- package/crates/team-agent/src/contract_runtime/framework.rs +2 -5
- package/crates/team-agent/src/contract_runtime/registry.rs +66 -67
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +27 -10
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/coordinator/tests/spine.rs +1 -1
- package/crates/team-agent/src/coordinator/tests/takeover.rs +3 -3
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +17 -185
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +4 -487
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +2 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +8 -21
- package/crates/team-agent/src/lifecycle/launch.rs +3 -11
- package/crates/team-agent/src/lifecycle/profile_launch.rs +8 -64
- package/crates/team-agent/src/lifecycle/restart/common.rs +6 -151
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +40 -13
- package/crates/team-agent/src/lifecycle/tests/acceptance_b_batch_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/agent_ops.rs +8 -12
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +37 -240
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +95 -59
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +20 -35
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +22 -48
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +6 -124
- package/crates/team-agent/src/lifecycle/tests/host_cotenant_death_p0_contract.rs +30 -67
- package/crates/team-agent/src/lifecycle/tests/issue238_codex_effort_contract.rs +3 -31
- package/crates/team-agent/src/lifecycle/tests/lane_ops.rs +194 -169
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +136 -256
- package/crates/team-agent/src/lifecycle/tests/lifecycle_rollback_red.rs +15 -78
- package/crates/team-agent/src/lifecycle/tests/main_preserved.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs +75 -69
- package/crates/team-agent/src/lifecycle/tests/phase_golden.rs +2 -10
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +7 -7
- package/crates/team-agent/src/lifecycle/tests/restart.rs +12 -153
- package/crates/team-agent/src/lifecycle/tests/restart_build_before_destroy_0540_contract.rs +27 -5
- package/crates/team-agent/src/lifecycle/tests/restart_liveness_red.rs +59 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +47 -6
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +3 -1374
- package/crates/team-agent/src/lifecycle/tests/resume_recover_red.rs +27 -10
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +5 -5
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/team_in_team_identity_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_in_team_sibling_quick_start_red.rs +1 -1
- package/crates/team-agent/src/lifecycle/tests/team_in_team_state_scope_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/team_key_retirement_txn_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +70 -15
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +35 -35
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +36 -82
- package/crates/team-agent/src/lifecycle/tests.rs +0 -4
- package/crates/team-agent/src/lifecycle/types.rs +2 -5
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +15 -17
- package/crates/team-agent/src/messaging/delivery.rs +9 -61
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -68
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +5 -5
- package/crates/team-agent/src/messaging/tests/spine.rs +5 -1
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/provider/adapter.rs +58 -356
- package/crates/team-agent/src/provider/adapters/mod.rs +5 -7
- package/crates/team-agent/src/provider/session/capture.rs +5 -105
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +8 -20
- package/crates/team-agent/src/provider/session/context_fork.rs +23 -142
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/common.rs +21 -57
- package/crates/team-agent/src/provider/session_scan.rs +6 -16
- package/crates/team-agent/src/provider/tests/adapter.rs +37 -118
- package/crates/team-agent/src/provider/tests/command_helpers.rs +1 -18
- package/crates/team-agent/src/provider/tests/idle.rs +0 -43
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -8
- package/crates/team-agent/src/tmux_backend.rs +4 -3
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +3 -2
- package/skills/team-agent/command-coverage.json +14 -0
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -1
- package/skills/team-agent/references/team-agent-operator.md +3 -1
- package/crates/team-agent/src/lifecycle/launch/grok_per_seat.rs +0 -260
- package/crates/team-agent/src/lifecycle/tests/codex_weak_window_attribution_red.rs +0 -683
- package/crates/team-agent/src/lifecycle/tests/grok_effort_argv_red.rs +0 -247
- package/crates/team-agent/src/lifecycle/tests/grok_mcp_overlay_red.rs +0 -507
- package/crates/team-agent/src/lifecycle/tests/grok_restart_resume_red.rs +0 -300
- package/crates/team-agent/src/provider/adapters/codex.rs +0 -101
- package/crates/team-agent/src/provider/adapters/grok.rs +0 -67
- package/crates/team-agent/src/provider/session/context_fork/codex.rs +0 -514
- package/crates/team-agent/src/provider/session_scan/codex.rs +0 -326
- package/crates/team-agent/src/provider/session_scan/grok.rs +0 -288
|
@@ -10,10 +10,8 @@ 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 codex;
|
|
14
13
|
pub(crate) mod common;
|
|
15
14
|
pub(crate) mod copilot;
|
|
16
|
-
pub(crate) mod grok;
|
|
17
15
|
pub(crate) mod pi;
|
|
18
16
|
|
|
19
17
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
@@ -42,29 +40,21 @@ pub(crate) fn scan_session_candidates_once(
|
|
|
42
40
|
if matches!(provider, Provider::Copilot) {
|
|
43
41
|
return Ok(copilot::scan_session_store(context));
|
|
44
42
|
}
|
|
45
|
-
if matches!(provider, Provider::Grok) {
|
|
46
|
-
return Ok(grok::scan_session_store(context));
|
|
47
|
-
}
|
|
48
43
|
if matches!(provider, Provider::Pi) {
|
|
49
44
|
return pi::scan_session_store(context);
|
|
50
45
|
}
|
|
51
|
-
// Claude Code workers run only through
|
|
52
|
-
// legacy row has nothing left to capture.
|
|
53
|
-
if matches!(
|
|
46
|
+
// Claude Code, Codex and Grok workers run only through their contract
|
|
47
|
+
// leaves; a pre-upgrade legacy row has nothing left to capture.
|
|
48
|
+
if matches!(
|
|
49
|
+
provider,
|
|
50
|
+
Provider::Claude | Provider::ClaudeCode | Provider::Codex | Provider::Grok
|
|
51
|
+
) {
|
|
54
52
|
return Ok(Vec::new());
|
|
55
53
|
}
|
|
56
54
|
|
|
57
55
|
let candidates = common::candidate_session_files(provider, context)?;
|
|
58
56
|
let mut out = common::parse_candidate_files(provider, context, candidates);
|
|
59
|
-
if matches!(provider, Provider::Codex) {
|
|
60
|
-
codex::retain_spawn_cwd(context, &mut out);
|
|
61
|
-
}
|
|
62
57
|
common::apply_spawned_at_filter(provider, context, &mut out);
|
|
63
|
-
|
|
64
|
-
if matches!(provider, Provider::Codex) {
|
|
65
|
-
out = codex::apply_expected_session_filter(context, out);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
58
|
common::apply_spawn_time_window_if_unique(provider, context, &mut out);
|
|
69
59
|
common::sort_expected_first_if_needed(context, &mut out);
|
|
70
60
|
Ok(out)
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
#[test]
|
|
2
2
|
fn trimmed_provider_builders_preserve_fresh_and_resume_argv() {
|
|
3
3
|
for (provider, base) in [
|
|
4
|
-
(
|
|
5
|
-
Provider::Grok,
|
|
6
|
-
vec!["grok", "--model", "test-model", "--rules", "role"],
|
|
7
|
-
),
|
|
8
4
|
(
|
|
9
5
|
Provider::Copilot,
|
|
10
6
|
vec![
|
|
@@ -170,10 +166,11 @@ fn capture_session_id_no_match_returns_none() {
|
|
|
170
166
|
// ---- resume / fork / build_command / caps — command-build core ----
|
|
171
167
|
|
|
172
168
|
#[test]
|
|
173
|
-
fn
|
|
174
|
-
// Claude Code workers run only through
|
|
175
|
-
// legacy row must never become capture-pending or
|
|
176
|
-
|
|
169
|
+
fn retired_worker_caps_are_neither_resumable_nor_forkable() {
|
|
170
|
+
// Claude Code, Codex and Grok workers run only through their contract
|
|
171
|
+
// leaves; a pre-upgrade legacy row must never become capture-pending or
|
|
172
|
+
// resumable.
|
|
173
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok] {
|
|
177
174
|
let adapter = get_adapter(provider);
|
|
178
175
|
assert_eq!(
|
|
179
176
|
adapter.caps(),
|
|
@@ -190,6 +187,38 @@ fn retired_claude_worker_caps_are_neither_resumable_nor_forkable() {
|
|
|
190
187
|
adapter.build_command(AuthMode::Subscription, None, Some("worker"), Some("opus")),
|
|
191
188
|
Err(ProviderError::Command(_))
|
|
192
189
|
));
|
|
190
|
+
let ctx = ProviderCommandContext {
|
|
191
|
+
auth_mode: AuthMode::Subscription,
|
|
192
|
+
mcp_config: None,
|
|
193
|
+
system_prompt: Some("worker"),
|
|
194
|
+
model: Some("opus"),
|
|
195
|
+
dangerously_skip_permissions: false,
|
|
196
|
+
profile_launch: None,
|
|
197
|
+
agent_id_hint: Some("worker"),
|
|
198
|
+
effort: None,
|
|
199
|
+
};
|
|
200
|
+
match adapter.build_command_plan(ctx) {
|
|
201
|
+
Err(ProviderError::Command(text)) => assert!(
|
|
202
|
+
text.contains("worker runtime was excised"),
|
|
203
|
+
"{provider:?}: {text}"
|
|
204
|
+
),
|
|
205
|
+
other => panic!("{provider:?} legacy plan must be refused, got {other:?}"),
|
|
206
|
+
}
|
|
207
|
+
let session = SessionId::new("legacy-session");
|
|
208
|
+
assert!(
|
|
209
|
+
matches!(
|
|
210
|
+
adapter.build_resume_command(Some(&session), AuthMode::Subscription, None),
|
|
211
|
+
Err(ProviderError::ResumeUnavailable(_))
|
|
212
|
+
),
|
|
213
|
+
"{provider:?} resume"
|
|
214
|
+
);
|
|
215
|
+
assert!(
|
|
216
|
+
matches!(
|
|
217
|
+
adapter.fork(Some(&session), AuthMode::Subscription, None),
|
|
218
|
+
Err(ProviderError::CapabilityUnsupported(_))
|
|
219
|
+
),
|
|
220
|
+
"{provider:?} fork"
|
|
221
|
+
);
|
|
193
222
|
}
|
|
194
223
|
}
|
|
195
224
|
|
|
@@ -222,15 +251,6 @@ fn session_is_resumable_none_session_is_false_not_panic() {
|
|
|
222
251
|
assert!(matches!(res, Ok(false)), "None session → Ok(false), never panic (bug-085)");
|
|
223
252
|
}
|
|
224
253
|
|
|
225
|
-
/// true iff `needle` (e.g. ["--model","opus"]) appears as a contiguous run in `hay`.
|
|
226
|
-
fn argv_contains_adjacent(hay: &[String], needle: &[&str]) -> bool {
|
|
227
|
-
if needle.is_empty() {
|
|
228
|
-
return true;
|
|
229
|
-
}
|
|
230
|
-
hay.windows(needle.len())
|
|
231
|
-
.any(|w| w.iter().zip(needle).all(|(a, b)| a == b))
|
|
232
|
-
}
|
|
233
|
-
|
|
234
254
|
#[test]
|
|
235
255
|
fn unsupported_provider_capability_error_message_shape() {
|
|
236
256
|
// unsupported.py:31 ProviderCapabilityError — placeholder providers reject
|
|
@@ -253,107 +273,6 @@ fn unsupported_provider_capability_error_message_shape() {
|
|
|
253
273
|
// Lock the CORRECT Python v0.2.11 behavior the strengthened contracts missed.
|
|
254
274
|
// Golden re-probed via /tmp/probe_p2_provider.py vs team-agent-public @ 439bef8.
|
|
255
275
|
|
|
256
|
-
// ═══════════════ 0.5.67 provider-adapter (Grok) ═══════════════
|
|
257
|
-
// 不跑 cargo (禁 cargo 红线), 静态编码 + leader verify 时执行。
|
|
258
|
-
|
|
259
|
-
#[test]
|
|
260
|
-
fn test_grok_build_command_includes_rules_flag_when_system_prompt_set() {
|
|
261
|
-
let adapter = get_adapter(Provider::Grok);
|
|
262
|
-
let argv = adapter
|
|
263
|
-
.build_command(AuthMode::Subscription, None, Some("be helpful"), Some("grok-4"))
|
|
264
|
-
.expect("build_command ok");
|
|
265
|
-
assert!(
|
|
266
|
-
argv_contains_adjacent(&argv, &["--model", "grok-4"]),
|
|
267
|
-
"argv must contain `--model grok-4` adjacency: {argv:?}"
|
|
268
|
-
);
|
|
269
|
-
assert!(
|
|
270
|
-
argv_contains_adjacent(&argv, &["--rules", "be helpful"]),
|
|
271
|
-
"grok append-system-prompt must be `--rules 'be helpful'`: {argv:?}"
|
|
272
|
-
);
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
#[test]
|
|
276
|
-
fn test_grok_build_command_bypass_flag_when_dangerous() {
|
|
277
|
-
let adapter = get_adapter(Provider::Grok);
|
|
278
|
-
let dangerous = adapter
|
|
279
|
-
.build_command_with_permissions(
|
|
280
|
-
AuthMode::Subscription,
|
|
281
|
-
None,
|
|
282
|
-
None,
|
|
283
|
-
Some("grok-4"),
|
|
284
|
-
true,
|
|
285
|
-
)
|
|
286
|
-
.expect("dangerous build_command ok");
|
|
287
|
-
assert!(
|
|
288
|
-
argv_contains_adjacent(&dangerous, &["--always-approve"]),
|
|
289
|
-
"dangerous grok must include `--always-approve`: {dangerous:?}"
|
|
290
|
-
);
|
|
291
|
-
let safe = adapter
|
|
292
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4"))
|
|
293
|
-
.expect("safe build_command ok");
|
|
294
|
-
assert!(
|
|
295
|
-
!safe.iter().any(|a| a == "--always-approve"),
|
|
296
|
-
"non-dangerous grok must not include --always-approve: {safe:?}"
|
|
297
|
-
);
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
#[test]
|
|
301
|
-
fn test_grok_build_command_omits_missing_model() {
|
|
302
|
-
let adapter = get_adapter(Provider::Grok);
|
|
303
|
-
let argv = adapter
|
|
304
|
-
.build_command(AuthMode::Subscription, None, None, None)
|
|
305
|
-
.expect("missing model preserves the provider-native default");
|
|
306
|
-
assert!(
|
|
307
|
-
!argv.iter().any(|arg| arg == "--model"),
|
|
308
|
-
"missing model must not fabricate a --model argument: {argv:?}"
|
|
309
|
-
);
|
|
310
|
-
assert!(
|
|
311
|
-
argv_contains_adjacent(
|
|
312
|
-
&adapter
|
|
313
|
-
.build_command(AuthMode::Subscription, None, None, Some("grok-4.6"))
|
|
314
|
-
.expect("explicit model must build"),
|
|
315
|
-
&["--model", "grok-4.6"]
|
|
316
|
-
),
|
|
317
|
-
"explicit model must still become adjacent `--model grok-4.6`"
|
|
318
|
-
);
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
#[test]
|
|
322
|
-
fn test_grok_build_command_plan_binds_expected_session_id_to_argv() {
|
|
323
|
-
let adapter = get_adapter(Provider::Grok);
|
|
324
|
-
let plan = adapter
|
|
325
|
-
.build_command_plan(ProviderCommandContext {
|
|
326
|
-
auth_mode: AuthMode::Subscription,
|
|
327
|
-
mcp_config: None,
|
|
328
|
-
system_prompt: None,
|
|
329
|
-
model: Some("grok-4.6"),
|
|
330
|
-
dangerously_skip_permissions: false,
|
|
331
|
-
profile_launch: None,
|
|
332
|
-
agent_id_hint: Some("w1"),
|
|
333
|
-
effort: None,
|
|
334
|
-
})
|
|
335
|
-
.expect("grok plan");
|
|
336
|
-
let sid = plan
|
|
337
|
-
.expected_session_id
|
|
338
|
-
.as_ref()
|
|
339
|
-
.map(|s| s.as_str())
|
|
340
|
-
.expect("grok fresh plan must carry expected_session_id");
|
|
341
|
-
assert!(
|
|
342
|
-
!sid.is_empty(),
|
|
343
|
-
"expected_session_id must be a non-empty uuid"
|
|
344
|
-
);
|
|
345
|
-
assert!(
|
|
346
|
-
argv_contains_adjacent(&plan.argv, &["--session-id", sid]),
|
|
347
|
-
"argv --session-id must match expected_session_id; argv={:?}",
|
|
348
|
-
plan.argv
|
|
349
|
-
);
|
|
350
|
-
assert!(
|
|
351
|
-
!plan.argv.iter().any(|a| a == "--resume"),
|
|
352
|
-
"fresh grok plan must not include --resume; argv={:?}",
|
|
353
|
-
plan.argv
|
|
354
|
-
);
|
|
355
|
-
}
|
|
356
|
-
|
|
357
276
|
#[test]
|
|
358
277
|
fn pi_wire_roundtrip_requires_backing() {
|
|
359
278
|
use crate::provider::wire::{
|
|
@@ -3,29 +3,15 @@
|
|
|
3
3
|
use super::*;
|
|
4
4
|
use crate::lifecycle::launch::pi_mcp as pi;
|
|
5
5
|
use crate::model::enums::ProviderEffort;
|
|
6
|
-
use crate::provider::adapters::
|
|
7
|
-
use crate::provider::ProviderCommandOverrides;
|
|
6
|
+
use crate::provider::adapters::copilot;
|
|
8
7
|
|
|
9
8
|
#[test]
|
|
10
9
|
fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
11
10
|
let raw = " \"'\\\n ";
|
|
12
11
|
let mcp = McpConfig { raw: serde_json::json!({}) };
|
|
13
|
-
let overrides = ProviderCommandOverrides {
|
|
14
|
-
codex_profile: Some("".to_string()),
|
|
15
|
-
codex_config: vec!["model_reasoning_effort=low".to_string()],
|
|
16
|
-
..Default::default()
|
|
17
|
-
};
|
|
18
|
-
assert_eq!(codex::codex_base_command(
|
|
19
|
-
Some("resume"), AuthMode::Subscription, Some(&mcp), Some(raw), Some(""),
|
|
20
|
-
true, Some(&overrides), Some(ProviderEffort::Max),
|
|
21
|
-
), ["codex", "resume", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps", "--profile", "", "--dangerously-bypass-approvals-and-sandbox", "--model", "", "-c", "model_reasoning_effort=low", "-c", "model_reasoning_effort=max", "-c", "developer_instructions=\" \\\"'\\\\\\n \""]);
|
|
22
|
-
|
|
23
12
|
assert_eq!(copilot::copilot_base_command(
|
|
24
13
|
AuthMode::Subscription, Some(&mcp), Some(raw), Some(""), true,
|
|
25
14
|
), ["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-all", "--allow-tool", "team_orchestrator", "--model", "", "--additional-mcp-config", "{}"]);
|
|
26
|
-
assert_eq!(grok::grok_base_command(Some(raw), Some(" model-id "), true, Some(ProviderEffort::Medium)).expect("grok"),
|
|
27
|
-
["grok", "--always-approve", "--model", "model-id", "--effort", "medium", "--rules", raw]);
|
|
28
|
-
assert_eq!(grok::grok_base_command(Some(""), Some(" "), false, None).expect("grok empty"), ["grok", "--rules", ""]);
|
|
29
15
|
assert_eq!(pi::build_pi_command_argv(pi::PiCommandRequest {
|
|
30
16
|
extension: std::path::Path::new("extension.ts"), model: Some("vendor/model"),
|
|
31
17
|
effort: Some(ProviderEffort::XHigh), system_prompt: raw,
|
|
@@ -35,9 +21,6 @@ fn command_helpers_keep_provider_argv_bytes_and_order() {
|
|
|
35
21
|
|
|
36
22
|
#[test]
|
|
37
23
|
fn command_helpers_keep_absent_options_and_safe_defaults() {
|
|
38
|
-
assert_eq!(codex::codex_base_command(None, AuthMode::Subscription, None, None, None, false, None, None),
|
|
39
|
-
["codex", "--no-alt-screen", "--disable", "shell_snapshot", "--disable", "apps"]);
|
|
40
24
|
assert_eq!(copilot::copilot_base_command(AuthMode::Subscription, None, None, None, false),
|
|
41
25
|
["copilot", "--no-color", "--no-auto-update", "--no-remote", "--disable-builtin-mcps", "--allow-tool", "team_orchestrator"]);
|
|
42
|
-
assert_eq!(grok::grok_base_command(None, None, false, None).expect("grok"), ["grok"]);
|
|
43
26
|
}
|
|
@@ -133,49 +133,6 @@ 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 CODEX_IDLE_FIXTURE: &str = include_str!(concat!(
|
|
145
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
146
|
-
"/../../snapshot/fixtures/idle_prompts/codex_idle.txt"
|
|
147
|
-
));
|
|
148
|
-
const CODEX_WORKING_FIXTURE: &str = include_str!(concat!(
|
|
149
|
-
env!("CARGO_MANIFEST_DIR"),
|
|
150
|
-
"/../../snapshot/fixtures/idle_prompts/codex_working.txt"
|
|
151
|
-
));
|
|
152
|
-
|
|
153
|
-
fn fixture_matches(re: ®ex::Regex, fixture: &str) -> bool {
|
|
154
|
-
fixture.lines().any(|l| re.is_match(l))
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
#[test]
|
|
158
|
-
fn codex_status_patterns_compile() {
|
|
159
|
-
// provider_cli/codex.py:140 idle=r"(›|❯|codex>)" processing=r"•.*esc to interrupt".
|
|
160
|
-
// codex_idle.txt has a "› Find and fix a bug…" prompt → idle matches.
|
|
161
|
-
// codex_working.txt has a "• …esc to interrupt" spinner → processing matches.
|
|
162
|
-
let adapter = get_adapter(Provider::Codex);
|
|
163
|
-
let pats = adapter.status_patterns().expect("status_patterns ok");
|
|
164
|
-
assert!(
|
|
165
|
-
fixture_matches(&pats.idle, CODEX_IDLE_FIXTURE),
|
|
166
|
-
"codex idle pattern must match a '›' prompt line"
|
|
167
|
-
);
|
|
168
|
-
assert!(
|
|
169
|
-
CODEX_WORKING_FIXTURE.lines().any(|l| pats.processing.is_match(l)),
|
|
170
|
-
"codex processing pattern must match the 'esc to interrupt' spinner"
|
|
171
|
-
);
|
|
172
|
-
// The discriminator: a pure working-status footer line carries no prompt char.
|
|
173
|
-
assert!(
|
|
174
|
-
!pats.idle.is_match(" gpt-5.5 medium · /private/tmp/working"),
|
|
175
|
-
"codex idle pattern must NOT match a bare status footer"
|
|
176
|
-
);
|
|
177
|
-
}
|
|
178
|
-
|
|
179
136
|
// ---- (d) abnormal dedup key (signature, Option<TurnId>) ----
|
|
180
137
|
//
|
|
181
138
|
// NOTE: read_fault_facts lives in provider_state; not on the skeleton trait.
|
|
@@ -321,10 +321,6 @@ pub struct ProviderCaps {
|
|
|
321
321
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
|
|
322
322
|
pub struct ProviderCommandOverrides {
|
|
323
323
|
pub model: Option<String>,
|
|
324
|
-
/// Python `provider_env.py:62-65` — profile CODEX_PROFILE/NATIVE_PROFILE → `--profile <x>`.
|
|
325
|
-
pub codex_profile: Option<String>,
|
|
326
|
-
/// Python `provider_env.py:66-79` — compatible_api model_provider `-c` items, verbatim.
|
|
327
|
-
pub codex_config: Vec<String>,
|
|
328
324
|
}
|
|
329
325
|
|
|
330
326
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
|
|
@@ -25,22 +25,36 @@
|
|
|
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`, Claude Code's `claude`/`claude_code
|
|
29
|
-
/// Pi's `pi`. No legacy worker
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
/// not an `agents` row, so
|
|
28
|
+
/// Cursor's `cursor_agent`/`agent`, Claude Code's `claude`/`claude_code`,
|
|
29
|
+
/// Codex's `codex`/`codex_cli`, Grok's `grok` or Pi's `pi`. No legacy worker
|
|
30
|
+
/// runtime exists for it now; it must never fall back to another provider.
|
|
31
|
+
/// Role and CLI declarations of these names select the contract leaf, whose
|
|
32
|
+
/// state row carries the leaf id instead. A leader is not an `agents` row, so
|
|
33
|
+
/// its own provider key is unaffected.
|
|
33
34
|
pub(crate) const RETIRED_PROVIDER_ERROR: &str =
|
|
34
35
|
"legacy cursor_agent seat has no runtime in this release; stop or remove it, then add it again (provider: cursor)";
|
|
35
36
|
const RETIRED_CLAUDE_ERROR: &str =
|
|
36
37
|
"legacy claude seat has no runtime in this release; stop or remove it, then add it again (provider: claude)";
|
|
38
|
+
const RETIRED_CODEX_ERROR: &str =
|
|
39
|
+
"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)";
|
|
37
42
|
const RETIRED_PI_ERROR: &str =
|
|
38
43
|
"legacy pi seat has no runtime in this release; stop or remove it, then add it again (provider: pi)";
|
|
39
44
|
|
|
40
45
|
pub(crate) fn is_retired_provider(raw: &str) -> bool {
|
|
41
46
|
matches!(
|
|
42
47
|
raw.trim().to_ascii_lowercase().as_str(),
|
|
43
|
-
"cursor_agent"
|
|
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"
|
|
44
58
|
)
|
|
45
59
|
}
|
|
46
60
|
|
|
@@ -48,6 +62,8 @@ pub(crate) fn is_retired_provider(raw: &str) -> bool {
|
|
|
48
62
|
pub(crate) fn retired_provider_error(raw: &str) -> &'static str {
|
|
49
63
|
match raw.trim().to_ascii_lowercase().as_str() {
|
|
50
64
|
"claude" | "claude_code" | "claude-code" => RETIRED_CLAUDE_ERROR,
|
|
65
|
+
"codex" | "codex_cli" | "codex-cli" => RETIRED_CODEX_ERROR,
|
|
66
|
+
"grok" => RETIRED_GROK_ERROR,
|
|
51
67
|
"pi" => RETIRED_PI_ERROR,
|
|
52
68
|
_ => RETIRED_PROVIDER_ERROR,
|
|
53
69
|
}
|
|
@@ -339,20 +355,30 @@ mod tests {
|
|
|
339
355
|
"copilot": {"provider": "copilot"},
|
|
340
356
|
"retired": {"provider": "cursor_agent"},
|
|
341
357
|
"legacy_claude": {"provider": "claude_code"},
|
|
342
|
-
"legacy_pi": {"provider": "pi"}
|
|
358
|
+
"legacy_pi": {"provider": "pi"},
|
|
359
|
+
"codex": {"provider": "codex_tui"},
|
|
360
|
+
"grok": {"provider": "grok_build"},
|
|
361
|
+
"legacy_codex": {"provider": "codex"},
|
|
362
|
+
"legacy_codex_cli": {"provider": "codex-cli"},
|
|
363
|
+
"legacy_grok": {"provider": "grok"}
|
|
343
364
|
}});
|
|
344
365
|
assert!(require_active_state_providers(&state, Some("pi")).is_ok());
|
|
345
366
|
assert!(require_active_state_providers(&state, Some("claude")).is_ok());
|
|
346
367
|
assert!(require_active_state_providers(&state, Some("copilot")).is_ok());
|
|
368
|
+
assert!(require_active_state_providers(&state, Some("codex")).is_ok());
|
|
369
|
+
assert!(require_active_state_providers(&state, Some("grok")).is_ok());
|
|
347
370
|
assert_eq!(require_active_state_providers(&state, Some("retired")), Err(RETIRED_PROVIDER_ERROR));
|
|
348
371
|
assert_eq!(require_active_state_providers(&state, Some("legacy_claude")), Err(RETIRED_CLAUDE_ERROR));
|
|
349
372
|
assert_eq!(require_active_state_providers(&state, Some("legacy_pi")), Err(RETIRED_PI_ERROR));
|
|
373
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_codex")), Err(RETIRED_CODEX_ERROR));
|
|
374
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_codex_cli")), Err(RETIRED_CODEX_ERROR));
|
|
375
|
+
assert_eq!(require_active_state_providers(&state, Some("legacy_grok")), Err(RETIRED_GROK_ERROR));
|
|
350
376
|
assert!(require_active_state_providers(&state, None).is_err());
|
|
351
377
|
for retired in ["cursor_agent", "agent"] {
|
|
352
378
|
assert_eq!(parse_provider(retired), None, "no legacy engine to parse into");
|
|
353
379
|
}
|
|
354
380
|
// The leader keys still parse: a leader is never an `agents` row.
|
|
355
|
-
for leader in ["claude", "claude_code", "pi"] {
|
|
381
|
+
for leader in ["claude", "claude_code", "codex", "grok", "pi"] {
|
|
356
382
|
assert!(is_retired_provider(leader), "{leader}");
|
|
357
383
|
assert!(parse_provider(leader).is_some(), "{leader}");
|
|
358
384
|
}
|
|
@@ -1694,7 +1694,8 @@ fn inject_verification_for_payload(payload: &InjectPayload) -> InjectVerificatio
|
|
|
1694
1694
|
/// scrollback token cannot verify a new message.
|
|
1695
1695
|
/// Measured cursor-agent 2026.08.11 floor: text and first Enter ≥1s apart
|
|
1696
1696
|
/// (phase0 M2-5/M2-6; `.team/scripts/cursor_send.sh`).
|
|
1697
|
-
/// Grok
|
|
1697
|
+
/// The legacy Grok worker used the same 1s floor (悬案B:零地板时 Enter 落在折叠窗口内被吞);
|
|
1698
|
+
/// contract leaves own their own paste timing.
|
|
1698
1699
|
pub const CURSOR_PASTE_TO_SUBMIT_FLOOR: Duration = Duration::from_secs(1);
|
|
1699
1700
|
|
|
1700
1701
|
thread_local! {
|
|
@@ -1702,7 +1703,7 @@ thread_local! {
|
|
|
1702
1703
|
static CURSOR_SINGLE_ENTER: Cell<bool> = const { Cell::new(false) };
|
|
1703
1704
|
}
|
|
1704
1705
|
|
|
1705
|
-
/// Run `f` with a paste→Enter floor.
|
|
1706
|
+
/// Run `f` with a paste→Enter floor. No legacy recipient sets one now.
|
|
1706
1707
|
/// Tests pass a small non-zero Duration to cover the sleep branch.
|
|
1707
1708
|
/// Default is ZERO — claude/codex and unset callers pay nothing.
|
|
1708
1709
|
/// This is not TEAM_AGENT_TEST_TMP (that var is a path, always set in seats).
|
|
@@ -1712,7 +1713,7 @@ thread_local! {
|
|
|
1712
1713
|
/// floor: 本次生效的最小间隔;ZERO 表示不等
|
|
1713
1714
|
/// f: 在该地板下执行的闭包
|
|
1714
1715
|
/// returns: 原样返回 f 的返回值
|
|
1715
|
-
/// boundary: thread_local 作用域,不跨线程;只设阈值,真正的等待发生在 sleep_remaining_paste_to_submit_floor;默认 ZERO
|
|
1716
|
+
/// boundary: thread_local 作用域,不跨线程;只设阈值,真正的等待发生在 sleep_remaining_paste_to_submit_floor;默认 ZERO(legacy grok worker 退役后 delivery 不再设地板)
|
|
1716
1717
|
/// ---
|
|
1717
1718
|
pub fn with_paste_to_submit_floor<R>(floor: Duration, f: impl FnOnce() -> R) -> R {
|
|
1718
1719
|
PASTE_TO_SUBMIT_FLOOR.with(|cell| {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@team-agent/installer",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.127",
|
|
4
4
|
"description": "npx installer for Team Agent",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"codex",
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"team-agent-installer": "npm/install.mjs"
|
|
21
21
|
},
|
|
22
22
|
"optionalDependencies": {
|
|
23
|
-
"@team-agent/cli-darwin-arm64": "0.5.
|
|
24
|
-
"@team-agent/cli-darwin-x64": "0.5.
|
|
25
|
-
"@team-agent/cli-linux-x64": "0.5.
|
|
23
|
+
"@team-agent/cli-darwin-arm64": "0.5.127",
|
|
24
|
+
"@team-agent/cli-darwin-x64": "0.5.127",
|
|
25
|
+
"@team-agent/cli-linux-x64": "0.5.127"
|
|
26
26
|
},
|
|
27
27
|
"scripts": {
|
|
28
28
|
"postinstall": "node npm/bincheck.mjs",
|
|
@@ -21,7 +21,8 @@ Use existing resources rather than establishing accounts. `team-agent doctor --w
|
|
|
21
21
|
|---|---|
|
|
22
22
|
| Pi | Several model catalogs; every Pi worker needs an exact qualified model ID such as `openai-codex/gpt-6-luna` from `team-agent models --provider pi`; Pi has no permission prompt to bypass, so keep bypass `false` |
|
|
23
23
|
| Claude | Every Claude worker needs an exact model ID from `team-agent models --provider claude`; existing subscription login only |
|
|
24
|
-
| Codex /
|
|
24
|
+
| Codex / Grok | Every Codex or Grok worker needs an exact model ID from `team-agent models --provider codex` or `team-agent models --provider grok`; existing subscription login only |
|
|
25
|
+
| Other native CLIs | The user's existing workflow, native permissions, model catalog and supported session capabilities |
|
|
25
26
|
| Bypass `true` | Fewer interruptions, broader automatic authority |
|
|
26
27
|
| Bypass `false` | Native permissions remain; human confirmation may interrupt unattended work |
|
|
27
28
|
|
|
@@ -97,7 +98,7 @@ team-agent start reviewer --effort high --bypass false
|
|
|
97
98
|
|
|
98
99
|
The Pi/false example above still requires the user's explicit choices. File/CLI conflicts are rejected before writing or startup. Omitted settings/body are preserved; `--prompt` replaces the permanent role body, not a one-time task. Stop a running worker before changing settings or instructions. Provider changes are refused. Startup failure restores role/spec bytes and reports failure, not an applied update.
|
|
99
100
|
|
|
100
|
-
Use `agent add/remove/reset/clone/fork` only for those explicit operations. Reset needs intentional approval and `--discard-session
|
|
101
|
+
Use `agent add/remove/reset/clone/fork` only for those explicit operations. Reset needs intentional approval and `--discard-session`. Remove and reset refuse a seat that is still working: wait for it or `stop` it first (remove also needs `--force` for a running idle seat). Fork requires `--as NEW_ID`, and `--in-place` is not supported. See [the operator reference](references/team-agent-operator.md) for capability, profile, force and import boundaries. Never put secrets in role text or copy authentication from another directory.
|
|
101
102
|
|
|
102
103
|
## Optional native CLI argv routing
|
|
103
104
|
|
|
@@ -497,6 +497,20 @@
|
|
|
497
497
|
"owner": "runtime-owner:public-cli",
|
|
498
498
|
"plan": "Bind this exact documented argv to an isolated HermeticTestEnv result and an assertion/negative-twin pair before promotion. For lifecycle use an authorized owned team and verify scope, identity, outcome and cleanup; help or readonly plans alone do not establish lifecycle coverage."
|
|
499
499
|
},
|
|
500
|
+
{
|
|
501
|
+
"command": "team-agent models --provider codex",
|
|
502
|
+
"bucket": "declared_gap",
|
|
503
|
+
"covered": false,
|
|
504
|
+
"owner": "runtime-owner:public-cli",
|
|
505
|
+
"plan": "Bind this exact documented argv to an isolated HermeticTestEnv result and an assertion/negative-twin pair before promotion. For lifecycle use an authorized owned team and verify scope, identity, outcome and cleanup; help or readonly plans alone do not establish lifecycle coverage."
|
|
506
|
+
},
|
|
507
|
+
{
|
|
508
|
+
"command": "team-agent models --provider grok",
|
|
509
|
+
"bucket": "declared_gap",
|
|
510
|
+
"covered": false,
|
|
511
|
+
"owner": "runtime-owner:public-cli",
|
|
512
|
+
"plan": "Bind this exact documented argv to an isolated HermeticTestEnv result and an assertion/negative-twin pair before promotion. For lifecycle use an authorized owned team and verify scope, identity, outcome and cleanup; help or readonly plans alone do not establish lifecycle coverage."
|
|
513
|
+
},
|
|
500
514
|
{
|
|
501
515
|
"command": "team-agent models --provider pi",
|
|
502
516
|
"bucket": "declared_gap",
|
|
@@ -19,6 +19,8 @@ team-agent doctor --workspace . --json
|
|
|
19
19
|
team-agent inbox leader --workspace . --team project-team -n 3
|
|
20
20
|
team-agent models --provider NAME
|
|
21
21
|
team-agent models --provider claude
|
|
22
|
+
team-agent models --provider codex
|
|
23
|
+
team-agent models --provider grok
|
|
22
24
|
team-agent models --provider pi
|
|
23
25
|
team-agent profile init my-api --auth-mode compatible_api --workspace .
|
|
24
26
|
team-agent restart reviewer --workspace . --team project-team
|
|
@@ -142,7 +144,7 @@ Creation needs complete configuration; start is not automatic template generatio
|
|
|
142
144
|
|
|
143
145
|
Do not silently pick provider, model, effort or bypass. False preserves native permissions; it is not a read-only or sandbox guarantee. Use supported `models --provider NAME` discovery and retain exact model IDs.
|
|
144
146
|
|
|
145
|
-
Traditional minimal Markdown remains accepted by the original compiler. Its compatibility interpretation is **not a default for a new user plan**: provider defaults to Pi, bypass to false, and unset effort is left to the provider. Claude and Pi workers run only through their contract leaves, which require an exact model ID from `team-agent models --provider claude|pi`; an unset model is refused, never guessed. Team Agent does not infer a role model from TEAM defaults.
|
|
147
|
+
Traditional minimal Markdown remains accepted by the original compiler. Its compatibility interpretation is **not a default for a new user plan**: provider defaults to Pi, bypass to false, and unset effort is left to the provider. Claude, Codex, Grok and Pi workers run only through their contract leaves, which require an exact model ID from `team-agent models --provider claude|codex|grok|pi`; an unset model is refused, never guessed. Team Agent does not infer a role model from TEAM defaults. Contract leaves use only an explicit role effort; legacy explicit TEAM provider_effort remains supported for the remaining legacy roles (Copilot, Gemini); do not invent an effort for unspecified roles.
|
|
146
148
|
|
|
147
149
|
Supported role metadata:
|
|
148
150
|
- `agent_id` (legacy `name`) and `role` identify the seat.
|
|
@@ -19,6 +19,8 @@ team-agent doctor --workspace . --json
|
|
|
19
19
|
team-agent inbox leader --workspace . --team project-team -n 3
|
|
20
20
|
team-agent models --provider NAME
|
|
21
21
|
team-agent models --provider claude
|
|
22
|
+
team-agent models --provider codex
|
|
23
|
+
team-agent models --provider grok
|
|
22
24
|
team-agent models --provider pi
|
|
23
25
|
team-agent profile init my-api --auth-mode compatible_api --workspace .
|
|
24
26
|
team-agent restart reviewer --workspace . --team project-team
|
|
@@ -142,7 +144,7 @@ Creation needs complete configuration; start is not automatic template generatio
|
|
|
142
144
|
|
|
143
145
|
Do not silently pick provider, model, effort or bypass. False preserves native permissions; it is not a read-only or sandbox guarantee. Use supported `models --provider NAME` discovery and retain exact model IDs.
|
|
144
146
|
|
|
145
|
-
Traditional minimal Markdown remains accepted by the original compiler. Its compatibility interpretation is **not a default for a new user plan**: provider defaults to Pi, bypass to false, and unset effort is left to the provider. Claude and Pi workers run only through their contract leaves, which require an exact model ID from `team-agent models --provider claude|pi`; an unset model is refused, never guessed. Team Agent does not infer a role model from TEAM defaults.
|
|
147
|
+
Traditional minimal Markdown remains accepted by the original compiler. Its compatibility interpretation is **not a default for a new user plan**: provider defaults to Pi, bypass to false, and unset effort is left to the provider. Claude, Codex, Grok and Pi workers run only through their contract leaves, which require an exact model ID from `team-agent models --provider claude|codex|grok|pi`; an unset model is refused, never guessed. Team Agent does not infer a role model from TEAM defaults. Contract leaves use only an explicit role effort; legacy explicit TEAM provider_effort remains supported for the remaining legacy roles (Copilot, Gemini); do not invent an effort for unspecified roles.
|
|
146
148
|
|
|
147
149
|
Supported role metadata:
|
|
148
150
|
- `agent_id` (legacy `name`) and `role` identify the seat.
|