@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
|
@@ -22,19 +22,18 @@ use team_agent_contract::runtime::{
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
const DESCRIPTORS: &[&ProviderDescriptor] = &[&KIRO_DESCRIPTOR, &CURSOR_DESCRIPTOR, &GROK_BUILD_DESCRIPTOR, &CODEX_DESCRIPTOR, &PI_DESCRIPTOR, &CLAUDE_DESCRIPTOR];
|
|
25
|
-
///
|
|
26
|
-
///
|
|
27
|
-
///
|
|
28
|
-
///
|
|
29
|
-
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
/// names (`pi` is also the default role provider). The leaf's distinct id is
|
|
33
|
-
/// what compiled specs and state carry. A persisted legacy state row keeps its
|
|
34
|
-
/// key and is never reclassified ([`descriptor`] does not match it).
|
|
25
|
+
/// Declaration names that select a leaf: Cursor's legacy key, its npm
|
|
26
|
+
/// package/public command and its binary; the public names of Claude Code,
|
|
27
|
+
/// Codex, Grok Build and Pi (`pi` is also the default role provider). The
|
|
28
|
+
/// leaf's distinct id is what compiled specs and state carry. A persisted
|
|
29
|
+
/// legacy state row keeps its key and is never reclassified ([`descriptor`]
|
|
30
|
+
/// does not match it). Leaders are not leaves: `team-agent codex|grok|claude|pi`
|
|
31
|
+
/// keep their own launchers.
|
|
35
32
|
const TRANSITION: &[(&str, &ProviderDescriptor)] = &[
|
|
36
33
|
("cursor_agent", &CURSOR_DESCRIPTOR), ("cursor-agent", &CURSOR_DESCRIPTOR), ("agent", &CURSOR_DESCRIPTOR),
|
|
37
34
|
("claude", &CLAUDE_DESCRIPTOR), ("claude_code", &CLAUDE_DESCRIPTOR), ("claude-code", &CLAUDE_DESCRIPTOR),
|
|
35
|
+
("codex", &CODEX_DESCRIPTOR), ("codex_cli", &CODEX_DESCRIPTOR), ("codex-cli", &CODEX_DESCRIPTOR),
|
|
36
|
+
("grok", &GROK_BUILD_DESCRIPTOR),
|
|
38
37
|
("pi", &PI_DESCRIPTOR),
|
|
39
38
|
];
|
|
40
39
|
|
|
@@ -360,23 +359,23 @@ pub fn descriptor(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
|
360
359
|
})
|
|
361
360
|
}
|
|
362
361
|
|
|
363
|
-
/// The leaf a role document selects
|
|
364
|
-
///
|
|
365
|
-
///
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
OPT_IN.iter().find(|(shared, _)| contract_runtime && *shared == key)
|
|
369
|
-
.or_else(|| TRANSITION.iter().find(|(retired, _)| *retired == key))
|
|
362
|
+
/// The leaf a role document or CLI value selects: a canonical contract key or
|
|
363
|
+
/// a transition name (Cursor, Claude Code, Codex, Grok Build, Pi). No flag is
|
|
364
|
+
/// needed; `contract_runtime: true` is accepted but selects nothing extra.
|
|
365
|
+
pub fn declared(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
366
|
+
TRANSITION.iter().find(|(retired, _)| *retired == key)
|
|
370
367
|
.map(|(_, descriptor)| *descriptor)
|
|
371
368
|
.or_else(|| descriptor(key))
|
|
372
369
|
}
|
|
373
370
|
|
|
374
371
|
/// The provider name a generated role document records for a leaf. Claude
|
|
375
|
-
/// Code and Pi keep their public command names
|
|
376
|
-
/// the leaf; every other leaf is named by its canonical id.
|
|
372
|
+
/// Code, Codex, Grok Build and Pi keep their public command names, which
|
|
373
|
+
/// declare the leaf; every other leaf is named by its canonical id.
|
|
377
374
|
pub fn public_name(descriptor: &ProviderDescriptor) -> &'static str {
|
|
378
375
|
match descriptor.identity.id {
|
|
379
376
|
"claude_tui" => "claude",
|
|
377
|
+
"codex_tui" => "codex",
|
|
378
|
+
"grok_build" => "grok",
|
|
380
379
|
"pi_tui" => "pi",
|
|
381
380
|
id => id,
|
|
382
381
|
}
|
|
@@ -384,11 +383,9 @@ pub fn public_name(descriptor: &ProviderDescriptor) -> &'static str {
|
|
|
384
383
|
|
|
385
384
|
/// Recognize a misspelled/case-modified contract declaration so it can fail
|
|
386
385
|
/// explicitly instead of accidentally selecting a legacy default provider.
|
|
387
|
-
|
|
388
|
-
pub fn recognizes(key: &str, contract_runtime: bool) -> bool {
|
|
386
|
+
pub fn recognizes(key: &str) -> bool {
|
|
389
387
|
let key = key.trim();
|
|
390
|
-
|
|
391
|
-
|| TRANSITION.iter().any(|(retired, _)| retired.eq_ignore_ascii_case(key))
|
|
388
|
+
TRANSITION.iter().any(|(retired, _)| retired.eq_ignore_ascii_case(key))
|
|
392
389
|
|| DESCRIPTORS.iter().any(|descriptor| {
|
|
393
390
|
descriptor.identity.id.eq_ignore_ascii_case(key)
|
|
394
391
|
|| descriptor
|
|
@@ -407,27 +404,21 @@ mod tests {
|
|
|
407
404
|
fn canonical_cursor_does_not_reclassify_legacy_names() {
|
|
408
405
|
assert_eq!(provider("cursor").unwrap(), NativeProvider::Cursor);
|
|
409
406
|
assert_eq!(provider("kiro").unwrap(), NativeProvider::Kiro);
|
|
410
|
-
|
|
411
|
-
assert!(descriptor(legacy).is_none());
|
|
412
|
-
assert!(!recognizes(legacy, false));
|
|
413
|
-
assert!(provider(legacy).is_err());
|
|
414
|
-
}
|
|
415
|
-
// Every Cursor name declares the leaf; a persisted legacy row keeps its runtime.
|
|
407
|
+
// Every Cursor name declares the leaf; a persisted legacy row is never reclassified.
|
|
416
408
|
for name in ["cursor", "cursor_agent", "cursor-agent", "agent"] {
|
|
417
|
-
assert_eq!(declared(name
|
|
418
|
-
assert_eq!(declared(name, true).unwrap().identity.id, "cursor");
|
|
409
|
+
assert_eq!(declared(name).unwrap().identity.id, "cursor");
|
|
419
410
|
}
|
|
420
411
|
for legacy in ["cursor_agent", "cursor-agent", "agent"] {
|
|
421
412
|
assert!(descriptor(legacy).is_none());
|
|
422
413
|
assert!(provider(legacy).is_err());
|
|
423
414
|
}
|
|
424
|
-
assert!(recognizes(" Cursor_Agent "
|
|
425
|
-
assert!(declared("Cursor_Agent"
|
|
415
|
+
assert!(recognizes(" Cursor_Agent "));
|
|
416
|
+
assert!(declared("Cursor_Agent").is_none());
|
|
426
417
|
assert_eq!(provider("grok_build").unwrap(), NativeProvider::GrokBuild);
|
|
427
|
-
assert!(recognizes(" Grok_Build "
|
|
418
|
+
assert!(recognizes(" Grok_Build "));
|
|
428
419
|
assert!(descriptor("Grok_Build").is_none());
|
|
429
420
|
assert!(GROK_BUILD_DESCRIPTOR.identity.aliases.is_empty());
|
|
430
|
-
assert!(recognizes(" Cursor "
|
|
421
|
+
assert!(recognizes(" Cursor "));
|
|
431
422
|
assert!(descriptor("Cursor").is_none());
|
|
432
423
|
for descriptor in descriptors() {
|
|
433
424
|
assert_eq!(provider(descriptor.identity.id).unwrap().descriptor(), *descriptor);
|
|
@@ -435,24 +426,28 @@ mod tests {
|
|
|
435
426
|
}
|
|
436
427
|
|
|
437
428
|
#[test]
|
|
438
|
-
fn
|
|
429
|
+
fn every_public_codex_name_selects_the_leaf_and_a_legacy_row_is_never_reclassified() {
|
|
439
430
|
assert_eq!(CODEX_DESCRIPTOR.identity.id, "codex_tui");
|
|
440
431
|
assert_eq!(CODEX_DESCRIPTOR.identity.binary, "codex");
|
|
441
432
|
assert_eq!(provider("codex_tui").unwrap(), NativeProvider::Codex);
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
assert!(
|
|
450
|
-
|
|
433
|
+
assert_eq!(declared("codex_tui"), Some(&CODEX_DESCRIPTOR));
|
|
434
|
+
// Every public Codex name declares the leaf without opt-in; a persisted
|
|
435
|
+
// legacy `codex` row keeps its key and is never reclassified.
|
|
436
|
+
for name in ["codex", "codex_cli", "codex-cli"] {
|
|
437
|
+
assert_eq!(declared(name), Some(&CODEX_DESCRIPTOR), "{name}");
|
|
438
|
+
assert!(recognizes(name), "{name}");
|
|
439
|
+
assert!(descriptor(name).is_none(), "{name}");
|
|
440
|
+
assert!(provider(name).is_err(), "{name}");
|
|
441
|
+
}
|
|
442
|
+
for spelling in [" Codex ", "CODEX", "Codex_CLI"] {
|
|
443
|
+
assert!(recognizes(spelling), "{spelling:?}");
|
|
451
444
|
}
|
|
452
|
-
// A case variant
|
|
453
|
-
assert!(declared("Codex"
|
|
454
|
-
assert_eq!(
|
|
455
|
-
assert_eq!(declared(
|
|
445
|
+
// A case variant is recognized (to fail explicitly), never selected.
|
|
446
|
+
assert!(declared("Codex").is_none());
|
|
447
|
+
assert_eq!(public_name(&CODEX_DESCRIPTOR), "codex");
|
|
448
|
+
assert_eq!(declared(public_name(&CODEX_DESCRIPTOR)), Some(&CODEX_DESCRIPTOR));
|
|
449
|
+
assert_eq!(declared("claude"), Some(&CLAUDE_DESCRIPTOR));
|
|
450
|
+
assert_eq!(declared("grok_build"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
456
451
|
let mut identity = InstanceIdentity {
|
|
457
452
|
scope: team_agent_contract::contract::types::ScopeId::new("scope").unwrap(),
|
|
458
453
|
seat: team_agent_contract::contract::types::SeatId::new("worker").unwrap(),
|
|
@@ -479,21 +474,20 @@ mod tests {
|
|
|
479
474
|
assert_eq!(CLAUDE_DESCRIPTOR.identity.id, "claude_tui");
|
|
480
475
|
assert_eq!(CLAUDE_DESCRIPTOR.identity.binary, "claude");
|
|
481
476
|
assert_eq!(provider("claude_tui").unwrap(), NativeProvider::Claude);
|
|
482
|
-
assert_eq!(declared("claude_tui"
|
|
483
|
-
// Every public Claude name declares the leaf
|
|
484
|
-
//
|
|
477
|
+
assert_eq!(declared("claude_tui"), Some(&CLAUDE_DESCRIPTOR));
|
|
478
|
+
// Every public Claude name declares the leaf; a persisted legacy row
|
|
479
|
+
// keeps its key and is never reclassified.
|
|
485
480
|
for name in ["claude", "claude_code", "claude-code"] {
|
|
486
|
-
assert_eq!(declared(name
|
|
487
|
-
|
|
488
|
-
assert!(recognizes(name, false), "{name}");
|
|
481
|
+
assert_eq!(declared(name), Some(&CLAUDE_DESCRIPTOR), "{name}");
|
|
482
|
+
assert!(recognizes(name), "{name}");
|
|
489
483
|
assert!(descriptor(name).is_none(), "{name}");
|
|
490
484
|
assert!(provider(name).is_err(), "{name}");
|
|
491
485
|
}
|
|
492
|
-
assert!(declared("Claude"
|
|
486
|
+
assert!(declared("Claude").is_none());
|
|
493
487
|
assert_eq!(public_name(&CLAUDE_DESCRIPTOR), "claude");
|
|
494
|
-
assert_eq!(declared(public_name(&CLAUDE_DESCRIPTOR)
|
|
495
|
-
assert!(recognizes(" Claude "
|
|
496
|
-
assert!(recognizes(" Claude_TUI "
|
|
488
|
+
assert_eq!(declared(public_name(&CLAUDE_DESCRIPTOR)), Some(&CLAUDE_DESCRIPTOR));
|
|
489
|
+
assert!(recognizes(" Claude "));
|
|
490
|
+
assert!(recognizes(" Claude_TUI "));
|
|
497
491
|
let mut identity = InstanceIdentity {
|
|
498
492
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
499
493
|
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
@@ -521,18 +515,16 @@ mod tests {
|
|
|
521
515
|
assert_eq!(PI_DESCRIPTOR.identity.id, "pi_tui");
|
|
522
516
|
assert_eq!(PI_DESCRIPTOR.identity.binary, "pi");
|
|
523
517
|
assert_eq!(provider("pi_tui").unwrap(), NativeProvider::Pi);
|
|
524
|
-
// `pi` (also the default role provider) declares the leaf
|
|
525
|
-
//
|
|
518
|
+
// `pi` (also the default role provider) declares the leaf; a
|
|
519
|
+
// persisted legacy `pi` row is never reclassified.
|
|
526
520
|
assert!(descriptor("pi").is_none());
|
|
527
521
|
assert!(provider("pi").is_err());
|
|
528
|
-
assert_eq!(declared("pi"
|
|
529
|
-
assert_eq!(declared("
|
|
530
|
-
assert_eq!(declared("pi_tui", false), Some(&PI_DESCRIPTOR));
|
|
522
|
+
assert_eq!(declared("pi"), Some(&PI_DESCRIPTOR));
|
|
523
|
+
assert_eq!(declared("pi_tui"), Some(&PI_DESCRIPTOR));
|
|
531
524
|
for spelling in ["pi", " Pi ", "PI"] {
|
|
532
|
-
assert!(recognizes(spelling
|
|
533
|
-
assert!(recognizes(spelling, true), "{spelling:?}");
|
|
525
|
+
assert!(recognizes(spelling), "{spelling:?}");
|
|
534
526
|
}
|
|
535
|
-
assert!(declared("Pi"
|
|
527
|
+
assert!(declared("Pi").is_none());
|
|
536
528
|
assert_eq!(public_name(&PI_DESCRIPTOR), "pi");
|
|
537
529
|
assert_eq!(public_name(&CURSOR_DESCRIPTOR), "cursor");
|
|
538
530
|
let mut identity = InstanceIdentity {
|
|
@@ -558,6 +550,13 @@ mod tests {
|
|
|
558
550
|
#[test]
|
|
559
551
|
fn grok_server_key_is_generation_bound_and_has_no_inspector_fallback() {
|
|
560
552
|
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
553
|
+
// The public `grok` name declares the leaf; a legacy `grok` row is never reclassified.
|
|
554
|
+
assert_eq!(declared("grok"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
555
|
+
assert!(recognizes(" Grok "));
|
|
556
|
+
assert!(declared("Grok").is_none());
|
|
557
|
+
assert!(descriptor("grok").is_none());
|
|
558
|
+
assert!(provider("grok").is_err());
|
|
559
|
+
assert_eq!(public_name(&GROK_BUILD_DESCRIPTOR), "grok");
|
|
561
560
|
let mut identity = InstanceIdentity {
|
|
562
561
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
563
562
|
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
@@ -219,11 +219,8 @@ pub(crate) fn detect_abnormal_exits(
|
|
|
219
219
|
{
|
|
220
220
|
continue;
|
|
221
221
|
}
|
|
222
|
-
let
|
|
223
|
-
|
|
224
|
-
let manual_recovery_hint = format!(
|
|
225
|
-
"No automatic restart was performed.\nTo recover manually, run: {manual_command}"
|
|
226
|
-
);
|
|
222
|
+
let manual_recovery_hint =
|
|
223
|
+
recovery_hint(agent.agent_id.as_str(), agent.provider, workspace, team.as_str());
|
|
227
224
|
let content = format_abnormal_exit_message(
|
|
228
225
|
&team,
|
|
229
226
|
&agent,
|
|
@@ -1392,6 +1389,27 @@ pid_status: {pid_status}\n\n\
|
|
|
1392
1389
|
)
|
|
1393
1390
|
}
|
|
1394
1391
|
|
|
1392
|
+
/// A pre-upgrade legacy Claude Code, Codex, Grok or Pi seat has no runtime, so
|
|
1393
|
+
/// `start-agent` would be refused; it is stopped/removed and added again.
|
|
1394
|
+
fn recovery_hint(
|
|
1395
|
+
agent_id: &str,
|
|
1396
|
+
provider: crate::model::enums::Provider,
|
|
1397
|
+
workspace: &Path,
|
|
1398
|
+
team: &str,
|
|
1399
|
+
) -> String {
|
|
1400
|
+
let wire = provider_wire(provider);
|
|
1401
|
+
if crate::provider::wire::is_retired_provider(wire) {
|
|
1402
|
+
return format!(
|
|
1403
|
+
"No automatic restart was performed.\n{}",
|
|
1404
|
+
crate::provider::wire::retired_provider_error(wire)
|
|
1405
|
+
);
|
|
1406
|
+
}
|
|
1407
|
+
format!(
|
|
1408
|
+
"No automatic restart was performed.\nTo recover manually, run: {}",
|
|
1409
|
+
recovery_manual_command(agent_id, workspace, team)
|
|
1410
|
+
)
|
|
1411
|
+
}
|
|
1412
|
+
|
|
1395
1413
|
fn recovery_manual_command(agent_id: &str, workspace: &Path, team: &str) -> String {
|
|
1396
1414
|
let workspace_str = workspace.to_string_lossy();
|
|
1397
1415
|
let shell_workspace = workspace_str.replace('\'', "'\\''");
|
|
@@ -2266,4 +2284,26 @@ mod tests {
|
|
|
2266
2284
|
current_command: None,
|
|
2267
2285
|
}
|
|
2268
2286
|
}
|
|
2287
|
+
|
|
2288
|
+
#[test]
|
|
2289
|
+
fn retired_legacy_rows_get_a_remove_and_re_add_hint_not_a_refused_start_agent() {
|
|
2290
|
+
use crate::model::enums::Provider;
|
|
2291
|
+
let workspace = std::path::Path::new("/tmp/ws");
|
|
2292
|
+
for provider in [Provider::Claude, Provider::ClaudeCode, Provider::Codex, Provider::Grok, Provider::Pi] {
|
|
2293
|
+
let hint = recovery_hint("w1", provider, workspace, "research");
|
|
2294
|
+
assert!(hint.starts_with("No automatic restart was performed.\n"), "{hint}");
|
|
2295
|
+
assert!(
|
|
2296
|
+
hint.contains("seat has no runtime in this release; stop or remove it, then add it again"),
|
|
2297
|
+
"{hint}"
|
|
2298
|
+
);
|
|
2299
|
+
assert!(!hint.contains("start-agent"), "{hint}");
|
|
2300
|
+
}
|
|
2301
|
+
assert!(recovery_hint("w1", Provider::Codex, workspace, "research").ends_with("(provider: codex)"));
|
|
2302
|
+
assert!(recovery_hint("w1", Provider::Grok, workspace, "research").ends_with("(provider: grok)"));
|
|
2303
|
+
let hint = recovery_hint("w1", Provider::Copilot, workspace, "research");
|
|
2304
|
+
assert!(
|
|
2305
|
+
hint.ends_with("To recover manually, run: team-agent start-agent w1 --workspace '/tmp/ws' --team research --force --json"),
|
|
2306
|
+
"{hint}"
|
|
2307
|
+
);
|
|
2308
|
+
}
|
|
2269
2309
|
}
|
|
@@ -3,8 +3,9 @@ use super::*;
|
|
|
3
3
|
use crate::transport::test_support::OfflineTransport;
|
|
4
4
|
|
|
5
5
|
// Removal contract for the retired abnormal-exit automatic recovery path.
|
|
6
|
-
// Abnormal exits remain visible
|
|
7
|
-
//
|
|
6
|
+
// Abnormal exits remain visible with a manual recovery hint (a pre-upgrade
|
|
7
|
+
// legacy row is told to stop/remove and add again, since start-agent refuses
|
|
8
|
+
// it), but coordinator ticks must never schedule or execute lifecycle work.
|
|
8
9
|
|
|
9
10
|
#[test]
|
|
10
11
|
fn abnormal_exit_is_reported_without_auto_recovery_intent_or_action() {
|
|
@@ -47,22 +48,25 @@ fn abnormal_exit_is_reported_without_auto_recovery_intent_or_action() {
|
|
|
47
48
|
transport.spawn_records()
|
|
48
49
|
);
|
|
49
50
|
|
|
51
|
+
// The claude_code row is a pre-upgrade legacy seat: start-agent would be
|
|
52
|
+
// refused, so the hint names the stop/remove + re-add recovery instead.
|
|
50
53
|
let content = case.latest_leader_notification();
|
|
51
54
|
assert!(
|
|
52
55
|
content.contains("No automatic restart was performed.")
|
|
53
|
-
&& content.contains(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
&& content.contains("
|
|
57
|
-
|
|
58
|
-
"abnormal notification must remain visible and keep the copyable manual recovery command; content={content}"
|
|
56
|
+
&& content.contains(
|
|
57
|
+
"legacy claude seat has no runtime in this release; stop or remove it, then add it again (provider: claude)"
|
|
58
|
+
)
|
|
59
|
+
&& !content.contains("start-agent"),
|
|
60
|
+
"abnormal notification must remain visible and never suggest a refused start-agent; content={content}"
|
|
59
61
|
);
|
|
60
62
|
}
|
|
61
63
|
|
|
62
64
|
#[test]
|
|
63
65
|
fn first_turn_death_cannot_enter_auto_respawn_loop_and_manual_start_still_recovers() {
|
|
64
|
-
//
|
|
65
|
-
//
|
|
66
|
+
// No surviving legacy worker has both an explicit failed-turn fact and a
|
|
67
|
+
// startable runtime: a pre-upgrade codex row keeps its fault reader but
|
|
68
|
+
// has no runtime. Detection runs on that row; manual recovery re-adds the
|
|
69
|
+
// seat on a startable (fake) worker.
|
|
66
70
|
let case = RecoveryCase::new("first-turn-death-no-loop", "codex");
|
|
67
71
|
case.seed_agent("baseline-429");
|
|
68
72
|
let transport = OfflineTransport::new().with_session_present(true);
|
|
@@ -108,6 +112,7 @@ fn first_turn_death_cannot_enter_auto_respawn_loop_and_manual_start_still_recove
|
|
|
108
112
|
);
|
|
109
113
|
|
|
110
114
|
case.seed_healthy_coordinator();
|
|
115
|
+
case.readd_as_fake_worker();
|
|
111
116
|
let manual_transport = OfflineTransport::new().with_session_present(true);
|
|
112
117
|
let outcome = crate::lifecycle::start_agent_with_transport(
|
|
113
118
|
&case.root,
|
|
@@ -226,6 +231,18 @@ impl RecoveryCase {
|
|
|
226
231
|
crate::state::persist::save_runtime_state(&self.root, &state).unwrap();
|
|
227
232
|
}
|
|
228
233
|
|
|
234
|
+
fn readd_as_fake_worker(&self) {
|
|
235
|
+
let mut state = self.state();
|
|
236
|
+
let agent = &mut state["agents"]["fe-admin"];
|
|
237
|
+
agent["provider"] = serde_json::json!("fake");
|
|
238
|
+
agent["model"] = serde_json::json!("fake");
|
|
239
|
+
// A fake worker has no resume; the re-added seat starts fresh.
|
|
240
|
+
if let Some(agent) = agent.as_object_mut() {
|
|
241
|
+
agent.remove("session_id");
|
|
242
|
+
}
|
|
243
|
+
crate::state::persist::save_runtime_state(&self.root, &state).unwrap();
|
|
244
|
+
}
|
|
245
|
+
|
|
229
246
|
fn seed_healthy_coordinator(&self) {
|
|
230
247
|
let workspace = WorkspacePath::new(self.root.clone());
|
|
231
248
|
let _ = crate::message_store::MessageStore::open(&self.root).unwrap();
|
|
@@ -25,13 +25,13 @@ fn slice1_stopped_or_missing_agents_do_not_probe_or_emit_capture_failures() {
|
|
|
25
25
|
"session_name": "team-energy",
|
|
26
26
|
"agents": {
|
|
27
27
|
"stopped": {
|
|
28
|
-
"provider": "
|
|
28
|
+
"provider": "copilot",
|
|
29
29
|
"status": "stopped",
|
|
30
30
|
"window": "stopped",
|
|
31
31
|
"pane_id": "%stopped"
|
|
32
32
|
},
|
|
33
33
|
"missing": {
|
|
34
|
-
"provider": "
|
|
34
|
+
"provider": "copilot",
|
|
35
35
|
"status": "running",
|
|
36
36
|
"window": "missing",
|
|
37
37
|
"pane_id": "%missing"
|
|
@@ -306,7 +306,7 @@ fn coordinator(workspace: &Path, transport: EnergyTransport) -> Coordinator {
|
|
|
306
306
|
|
|
307
307
|
fn running_agent(extra: Value) -> Value {
|
|
308
308
|
let mut agent = json!({
|
|
309
|
-
"provider": "
|
|
309
|
+
"provider": "copilot",
|
|
310
310
|
"status": "running",
|
|
311
311
|
"window": "w1",
|
|
312
312
|
"pane_id": "%1",
|
|
@@ -337,7 +337,7 @@ fn pane(pane_id: &str, window: &str) -> PaneInfo {
|
|
|
337
337
|
window_name: Some(WindowName::new(window)),
|
|
338
338
|
pane_index: Some(0),
|
|
339
339
|
tty: None,
|
|
340
|
-
current_command: Some("
|
|
340
|
+
current_command: Some("copilot".to_string()),
|
|
341
341
|
current_path: None,
|
|
342
342
|
active: true,
|
|
343
343
|
pane_pid: Some(1001),
|
|
@@ -236,7 +236,7 @@ fn spine2_sync_health_records_last_output_at() {
|
|
|
236
236
|
#[test]
|
|
237
237
|
fn spine2_sync_health_working_status_delivers_same_tick() {
|
|
238
238
|
let (coord, dir) = seeded_health_coord_with_readiness(
|
|
239
|
-
one_agent("
|
|
239
|
+
one_agent("fake"), "Working (5s · esc to interrupt)", true,
|
|
240
240
|
);
|
|
241
241
|
let store = MessageStore::open(&dir).unwrap();
|
|
242
242
|
let mid = store
|
|
@@ -283,7 +283,7 @@ fn spine2_sync_health_working_status_delivers_same_tick() {
|
|
|
283
283
|
// must be reconciled to this contract.)
|
|
284
284
|
#[test]
|
|
285
285
|
fn contract_working_worker_stays_alive_and_deliverable_in_real_tick() {
|
|
286
|
-
let (coord, dir) = seeded_health_coord(one_agent("
|
|
286
|
+
let (coord, dir) = seeded_health_coord(one_agent("fake"), "Working (5s · esc to interrupt)");
|
|
287
287
|
let store = MessageStore::open(&dir).unwrap();
|
|
288
288
|
let _mid = store
|
|
289
289
|
.create_message(Some("t"), "leader", "w1", "hi", None, true, None)
|
|
@@ -128,8 +128,8 @@ fn tick_swallows_capture_failure_and_still_delivers_to_other_agent() {
|
|
|
128
128
|
&serde_json::json!({
|
|
129
129
|
"session_name": "team-spine",
|
|
130
130
|
"agents": {
|
|
131
|
-
"w1": { "provider": "
|
|
132
|
-
"w2": { "provider": "
|
|
131
|
+
"w1": { "provider": "fake", "status": "stopped", "window": "w1" },
|
|
132
|
+
"w2": { "provider": "fake", "status": "running", "window": "w2" }
|
|
133
133
|
}
|
|
134
134
|
}),
|
|
135
135
|
)
|
|
@@ -170,7 +170,7 @@ fn slice2b_detect_stuck_no_longer_synthesized_by_framework_n35() {
|
|
|
170
170
|
let stale = (chrono::Utc::now() - chrono::Duration::seconds(1000)).to_rfc3339();
|
|
171
171
|
let (coord, dir, _inj) = takeover_coord(serde_json::json!({
|
|
172
172
|
"session_name": "team-h",
|
|
173
|
-
"agents": { "w1": { "provider": "
|
|
173
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
174
174
|
}));
|
|
175
175
|
seed_agent_health(&dir, "w1", "RUNNING", &stale, Some("team-h"));
|
|
176
176
|
let store = MessageStore::open(&dir).unwrap();
|
|
@@ -197,7 +197,7 @@ fn slice2b_detect_deadlocks_no_longer_synthesized_by_framework_n35() {
|
|
|
197
197
|
let now = chrono::Utc::now().to_rfc3339();
|
|
198
198
|
let (coord, dir, _inj) = takeover_coord(serde_json::json!({
|
|
199
199
|
"session_name": "team-h",
|
|
200
|
-
"agents": { "w1": { "provider": "
|
|
200
|
+
"agents": { "w1": { "provider": "copilot" }, "w2": { "provider": "copilot" } },
|
|
201
201
|
}));
|
|
202
202
|
seed_agent_health(&dir, "w1", "IDLE", &now, Some("team-h"));
|
|
203
203
|
let store = MessageStore::open(&dir).unwrap();
|
|
@@ -274,7 +274,7 @@ fn slice2b_takeover_unarmed_idle_worker_is_never_pinged() {
|
|
|
274
274
|
fn slice2b_unknown_persistent_no_longer_emitted_at_threshold_tick_n35() {
|
|
275
275
|
let (coord, dir, _inj) = takeover_coord(serde_json::json!({
|
|
276
276
|
"session_name": "team-h",
|
|
277
|
-
"agents": { "w1": { "provider": "
|
|
277
|
+
"agents": { "w1": { "provider": "copilot" } },
|
|
278
278
|
"coordinator": { "unknown_ticks": { "w1": 59 } }
|
|
279
279
|
}));
|
|
280
280
|
coord.tick().expect("tick");
|