@team-agent/installer 0.5.127 → 0.5.128
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -1
- package/Cargo.toml +1 -1
- package/README.md +11 -0
- package/crates/team-agent/src/cli/adapters.rs +3 -13
- package/crates/team-agent/src/cli/arguments.rs +4 -0
- package/crates/team-agent/src/cli/diagnose.rs +68 -22
- package/crates/team-agent/src/cli/emit.rs +58 -26
- package/crates/team-agent/src/cli/intent/runtime.rs +32 -5
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +102 -11
- package/crates/team-agent/src/cli/intent/tests.rs +10 -12
- package/crates/team-agent/src/cli/intent.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +25 -8
- package/crates/team-agent/src/cli/models.rs +764 -7
- package/crates/team-agent/src/cli/schedule.rs +175 -0
- package/crates/team-agent/src/cli/send/persist.rs +0 -36
- package/crates/team-agent/src/cli/send/presentation.rs +1 -1
- package/crates/team-agent/src/cli/send.rs +108 -110
- package/crates/team-agent/src/cli/spec.rs +6 -0
- package/crates/team-agent/src/cli/status_port/brief.rs +5 -67
- package/crates/team-agent/src/cli/tests/leader_watch.rs +12 -62
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +9 -6
- package/crates/team-agent/src/cli/tests/status_send.rs +68 -271
- package/crates/team-agent/src/compiler/tests.rs +3 -18
- package/crates/team-agent/src/compiler.rs +205 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +145 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +7 -7
- package/crates/team-agent/src/contract_runtime/config.rs +26 -16
- package/crates/team-agent/src/contract_runtime/config_tests.rs +24 -4
- package/crates/team-agent/src/contract_runtime/discovery.rs +12 -1
- package/crates/team-agent/src/contract_runtime/fork.rs +3 -10
- package/crates/team-agent/src/contract_runtime/framework.rs +28 -11
- package/crates/team-agent/src/contract_runtime/mcp.rs +19 -24
- package/crates/team-agent/src/contract_runtime/prompt.rs +2 -2
- package/crates/team-agent/src/contract_runtime/registry.rs +56 -92
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +11 -11
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +16 -54
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +42 -0
- package/crates/team-agent/src/coordinator/tick.rs +1 -89
- package/crates/team-agent/src/db/message_store.rs +7 -65
- package/crates/team-agent/src/direct_delivery.rs +368 -0
- package/crates/team-agent/src/inbox_store.rs +169 -0
- package/crates/team-agent/src/leader/registry.rs +5 -0
- package/crates/team-agent/src/leader/start.rs +2 -1
- package/crates/team-agent/src/leader/tests/lease_api.rs +2 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +1 -0
- package/crates/team-agent/src/lib.rs +2 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +33 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +206 -1
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +28 -2
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +38 -13
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +9 -1
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +351 -81
- package/crates/team-agent/src/lifecycle/launch/pi_mcp_extension.js +3 -4
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +24 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +36 -13
- package/crates/team-agent/src/lifecycle/launch.rs +24 -1
- package/crates/team-agent/src/lifecycle/profile_launch.rs +321 -11
- package/crates/team-agent/src/lifecycle/restart/agent.rs +1 -0
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +1798 -0
- package/crates/team-agent/src/lifecycle/restart/claude_fork.rs +163 -0
- package/crates/team-agent/src/lifecycle/restart/common.rs +345 -35
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +4 -0
- package/crates/team-agent/src/lifecycle/role_config.rs +39 -14
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +325 -0
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +320 -8
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +236 -13
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +378 -4
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +5 -4
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +47 -18
- package/crates/team-agent/src/lifecycle/tests/fixtures/pi_native_mcp_host.mjs +2 -1
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +14 -14
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +28 -26
- package/crates/team-agent/src/lifecycle/tests/mcp_tool_name_format_red.rs +6 -6
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +18 -6
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +70 -52
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +210 -0
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +157 -4
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +526 -10
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +1419 -0
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +68 -1
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +34 -12
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +94 -2
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +10 -11
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +5 -6
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +16 -7
- package/crates/team-agent/src/lifecycle/tests.rs +3 -0
- package/crates/team-agent/src/lifecycle/types.rs +18 -2
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +43 -50
- package/crates/team-agent/src/mcp_server/readiness.rs +130 -149
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +98 -119
- package/crates/team-agent/src/mcp_server/tests/scoped.rs +21 -31
- package/crates/team-agent/src/mcp_server/tests/send.rs +72 -107
- package/crates/team-agent/src/mcp_server/tests/tools.rs +10 -12
- package/crates/team-agent/src/mcp_server/tools.rs +70 -196
- package/crates/team-agent/src/messaging/delivery.rs +160 -218
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/helpers.rs +1 -19
- package/crates/team-agent/src/messaging/mod.rs +1 -0
- package/crates/team-agent/src/messaging/reminders.rs +316 -0
- package/crates/team-agent/src/messaging/scheduler.rs +7 -1
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +191 -85
- package/crates/team-agent/src/messaging/tests/runtime.rs +4 -110
- package/crates/team-agent/src/messaging/tests/spine.rs +40 -24
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +303 -51
- package/crates/team-agent/src/provider/adapters/claude.rs +78 -0
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +131 -0
- package/crates/team-agent/src/provider/adapters/mod.rs +7 -5
- package/crates/team-agent/src/provider/adapters/pi.rs +106 -0
- package/crates/team-agent/src/provider/classify.rs +1 -66
- package/crates/team-agent/src/provider/model_catalog.rs +201 -13
- package/crates/team-agent/src/provider/session/capture.rs +106 -6
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +4 -0
- package/crates/team-agent/src/provider/session/context_fork.rs +150 -18
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +44 -8
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +16 -6
- package/crates/team-agent/src/provider/tests/adapter.rs +104 -17
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +12 -3
- package/crates/team-agent/src/provider/tests/idle.rs +37 -0
- package/crates/team-agent/src/provider/wire.rs +22 -34
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/projection.rs +1 -1
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +144 -0
- package/crates/team-agent/src/tmux_backend/tests.rs +0 -151
- package/crates/team-agent/src/tmux_backend.rs +5 -40
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +5 -7
- package/skills/team-agent/command-coverage.json +1 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +3 -3
- package/skills/team-agent/references/team-agent-operator.md +3 -3
|
@@ -19,14 +19,34 @@ impl Fixture {
|
|
|
19
19
|
}
|
|
20
20
|
impl Drop for Fixture { fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.root); } }
|
|
21
21
|
|
|
22
|
+
#[test]
|
|
23
|
+
fn selected_seat_ignores_sibling_native_admission_but_keeps_forwarding_routes() {
|
|
24
|
+
let fixture = Fixture::new();
|
|
25
|
+
std::fs::write(&fixture.role, "---\nprovider: grok\nmodel: grok-4.7\nauth_mode: subscription\ndangerously_skip_permissions: true\n---\nTarget\n").unwrap();
|
|
26
|
+
let roles = fixture.args.agents_dir.join("agents");
|
|
27
|
+
std::fs::write(roles.join("legacy.md"), "---\nprovider: claude\nprofile: claude-default\n---\nLegacy\n").unwrap();
|
|
28
|
+
for rejected in ["profile: codex-default", "auth_mode: compatible_api", "dangerously_skip_permissions: invalid", "contract_runtime: invalid"] {
|
|
29
|
+
std::fs::write(roles.join("retired.md"), format!("---\nprovider: codex\nmodel: native-model\n{rejected}\n---\nRetired sibling\n")).unwrap();
|
|
30
|
+
assert!(read_team_inner(&fixture.args, || Ok(None), None, None).is_err());
|
|
31
|
+
let config = read_team_inner(&fixture.args, || Ok(None), None, Some("worker")).unwrap().unwrap();
|
|
32
|
+
assert_eq!(config.roles.len(), 1);
|
|
33
|
+
assert_eq!(config.roles[0].provider.as_str(), "grok_build");
|
|
34
|
+
assert!(config.roles[0].bypass);
|
|
35
|
+
assert!(config.members.iter().any(|member| member.id == "legacy" && member.runtime == RuntimeFamily::Legacy));
|
|
36
|
+
assert!(read_team_inner(&fixture.args, || Ok(None), None, Some("retired")).is_err());
|
|
37
|
+
}
|
|
38
|
+
assert!(read_team_inner(&fixture.args, || Ok(None), None, Some("missing")).unwrap().is_none());
|
|
39
|
+
assert!(!fixture.root.join(".team").exists());
|
|
40
|
+
}
|
|
41
|
+
|
|
22
42
|
#[test]
|
|
23
43
|
fn virtual_role_change_is_readonly_and_binds_new_instruction_digest() {
|
|
24
44
|
let fixture = Fixture::new();
|
|
25
45
|
let before = std::fs::read(&fixture.role).unwrap();
|
|
26
46
|
let path = fixture.role.canonicalize().unwrap();
|
|
27
47
|
let contents = "---\nprovider: cursor\nmodel: new-model\n---\nNew instructions\n";
|
|
28
|
-
let original = read_team_inner(&fixture.args, || Ok(None), None).unwrap().unwrap();
|
|
29
|
-
let changed = read_team_inner(&fixture.args, || Ok(None), Some((&path, contents))).unwrap().unwrap();
|
|
48
|
+
let original = read_team_inner(&fixture.args, || Ok(None), None, None).unwrap().unwrap();
|
|
49
|
+
let changed = read_team_inner(&fixture.args, || Ok(None), Some((&path, contents)), Some("worker")).unwrap().unwrap();
|
|
30
50
|
assert_eq!(changed.roles[0].model, "new-model");
|
|
31
51
|
assert_eq!(changed.roles[0].body, "New instructions\n");
|
|
32
52
|
assert_ne!(changed.roles[0].prompt.sha256, original.roles[0].prompt.sha256);
|
|
@@ -41,7 +61,7 @@ fn virtual_api_profile_is_refused_without_file_effects() {
|
|
|
41
61
|
let before = std::fs::read(&fixture.role).unwrap();
|
|
42
62
|
let path = fixture.role.canonicalize().unwrap();
|
|
43
63
|
let contents = "---\nprovider: cursor\nmodel: new-model\nprofile: unsupported\n---\nInstructions\n";
|
|
44
|
-
assert!(matches!(read_team_inner(&fixture.args, || Ok(None), Some((&path, contents))), Err(ConfigError::Unsupported(_))));
|
|
64
|
+
assert!(matches!(read_team_inner(&fixture.args, || Ok(None), Some((&path, contents)), Some("worker")), Err(ConfigError::Unsupported(_))));
|
|
45
65
|
assert_eq!(std::fs::read(&fixture.role).unwrap(), before);
|
|
46
66
|
assert!(!fixture.root.join(".team").exists());
|
|
47
67
|
}
|
|
@@ -51,6 +71,6 @@ fn virtual_role_override_cannot_match_a_different_source() {
|
|
|
51
71
|
let fixture = Fixture::new();
|
|
52
72
|
let other = fixture.root.join("other.md");
|
|
53
73
|
let contents = "---\nprovider: cursor\nmodel: wrong-model\n---\nOther\n";
|
|
54
|
-
let config = read_team_inner(&fixture.args, || Ok(None), Some((&other, contents))).unwrap().unwrap();
|
|
74
|
+
let config = read_team_inner(&fixture.args, || Ok(None), Some((&other, contents)), Some("worker")).unwrap().unwrap();
|
|
55
75
|
assert_eq!(config.roles[0].model, "old-model");
|
|
56
76
|
}
|
|
@@ -174,7 +174,7 @@ pub(super) fn discover_runtime(provider: &ProviderId, workspace: &Path) -> Resul
|
|
|
174
174
|
|
|
175
175
|
fn validate_catalog(provider: &ProviderId, discovery: &Discovery) -> Result<(), ContractError> {
|
|
176
176
|
let descriptor = registry::provider(provider.as_str())?.descriptor();
|
|
177
|
-
if discovery.catalog.provider !=
|
|
177
|
+
if discovery.catalog.provider.as_str() != descriptor.identity.id
|
|
178
178
|
|| discovery.catalog.native != discovery.native
|
|
179
179
|
|| discovery.catalog.schema != descriptor.model.catalog.require("native catalog source")?.schema
|
|
180
180
|
{
|
|
@@ -381,6 +381,17 @@ mod tests {
|
|
|
381
381
|
assert!(json["current_role_model"].is_null());
|
|
382
382
|
}
|
|
383
383
|
|
|
384
|
+
#[test]
|
|
385
|
+
fn grok_catalog_alias_uses_the_same_canonical_identity() {
|
|
386
|
+
for provider in ["grok", "grok_build"] {
|
|
387
|
+
let mut discovery = cursor_catalog();
|
|
388
|
+
discovery.catalog.provider = ProviderId::new("grok_build").unwrap();
|
|
389
|
+
discovery.catalog.schema = grok::CATALOG_SOURCE.schema.into();
|
|
390
|
+
let args = ModelsArgs { provider: provider.into(), search: None, json: true };
|
|
391
|
+
assert_eq!(render_models(&args, Ok(discovery)).unwrap().exit, ExitCode::Ok);
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
|
|
384
395
|
#[test]
|
|
385
396
|
fn mismatched_catalog_provider_native_or_schema_is_not_projected() {
|
|
386
397
|
let args = ModelsArgs { provider: "cursor".into(), search: None, json: true };
|
|
@@ -96,7 +96,7 @@ fn fork_locked(
|
|
|
96
96
|
if std::fs::symlink_metadata(&role_path).is_ok() {
|
|
97
97
|
return Err(error(format!("role file already exists: {}", role_path.display())));
|
|
98
98
|
}
|
|
99
|
-
let config = framework::team_config(workspace, &selected.team_dir, team).map_err(error)?
|
|
99
|
+
let config = framework::team_config(workspace, &selected.team_dir, team, Some(source_id.as_str())).map_err(error)?
|
|
100
100
|
.ok_or_else(|| error("contract team configuration is unavailable"))?;
|
|
101
101
|
let source_role = config.roles.iter().find(|role| &role.id == source_id)
|
|
102
102
|
.ok_or_else(|| error("contract source role is no longer configured"))?;
|
|
@@ -116,7 +116,7 @@ fn fork_locked(
|
|
|
116
116
|
role_path: role_path.clone(), role_bytes: role_text.into_bytes(), spec_path: spec_path.clone(), pre_spec,
|
|
117
117
|
};
|
|
118
118
|
let result = (|| -> Result<Value, CliError> {
|
|
119
|
-
let config = framework::team_config(workspace, &selected.team_dir, team).map_err(error)?
|
|
119
|
+
let config = framework::team_config(workspace, &selected.team_dir, team, Some(target_id.as_str())).map_err(error)?
|
|
120
120
|
.ok_or_else(|| error("contract team configuration is unavailable"))?;
|
|
121
121
|
let role = config.roles.iter().find(|role| role.id == target_id)
|
|
122
122
|
.ok_or_else(|| error("forked contract role was not configured"))?;
|
|
@@ -174,13 +174,6 @@ fn native_fork(
|
|
|
174
174
|
let selected = registry::provider(role.provider.as_str())?;
|
|
175
175
|
let descriptor = selected.descriptor();
|
|
176
176
|
let discovered = discovery::discover_runtime(&role.provider, workspace)?;
|
|
177
|
-
if let Some(path) = selected.native_fork_source(discovered.runtime.as_ref(), &session)? {
|
|
178
|
-
// The exact parent backing the native CLI reads must exist before any effect.
|
|
179
|
-
let metadata = std::fs::symlink_metadata(&path)?;
|
|
180
|
-
if !metadata.is_file() || metadata.len() == 0 {
|
|
181
|
-
return Err(ContractError::Invalid("native fork parent backing").into());
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
177
|
backend::publish_framework_routes(&mut backend, members)?;
|
|
185
178
|
let identity = backend.store.propose_identity(&role.id)?;
|
|
186
179
|
let server_key = selected.server_key_for(&identity)?;
|
|
@@ -193,7 +186,7 @@ fn native_fork(
|
|
|
193
186
|
launch.paths.cwd = super::workspace::prepare(&backend.binding, &role.id)?;
|
|
194
187
|
}
|
|
195
188
|
backend::require_private_primary(selected, &launch.paths.cwd)?;
|
|
196
|
-
backend::preassign_session(
|
|
189
|
+
backend::preassign_session(&mut launch, &discovered)?;
|
|
197
190
|
let operation = OperationId::new(format!("fork-{}", launch.identity.instance.as_str()))?;
|
|
198
191
|
let request = ForkRequest {
|
|
199
192
|
mode: ForkMode::NativeNewSeat,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
//! Shared-framework seams.
|
|
2
|
-
//! its
|
|
1
|
+
//! Shared-framework seams. Publish a native pane only with its private endpoint:
|
|
2
|
+
//! its `%0` must never be interpreted on the legacy workspace tmux server.
|
|
3
3
|
use super::{
|
|
4
4
|
backend::{self, Backend, BackendError},
|
|
5
5
|
config,
|
|
@@ -55,7 +55,7 @@ pub fn require_legacy_lifecycle(
|
|
|
55
55
|
return Ok(());
|
|
56
56
|
};
|
|
57
57
|
let row = agent.and_then(|id| selected.state.get("agents").and_then(|agents| agents.get(id)));
|
|
58
|
-
// A pre-upgrade legacy Cursor,
|
|
58
|
+
// A pre-upgrade legacy Cursor, Codex or Grok seat has no engine left; only teardown is admitted.
|
|
59
59
|
let teardown = matches!(operation, "stop-agent" | "remove-agent");
|
|
60
60
|
if let Some(retired) = row
|
|
61
61
|
.and_then(|row| row.get("provider"))
|
|
@@ -82,6 +82,7 @@ pub fn require_legacy_lifecycle(
|
|
|
82
82
|
&selected.run_workspace,
|
|
83
83
|
Path::new(directory),
|
|
84
84
|
&selected.team_key,
|
|
85
|
+
agent,
|
|
85
86
|
)
|
|
86
87
|
.ok()
|
|
87
88
|
.flatten()
|
|
@@ -114,15 +115,17 @@ pub fn declares_contract(path: Option<&Path>, provider: Option<&str>) -> bool {
|
|
|
114
115
|
.and_then(crate::model::yaml::Value::as_str)
|
|
115
116
|
.map(str::to_owned)
|
|
116
117
|
});
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
provider
|
|
119
|
+
.or(declared.as_deref())
|
|
120
|
+
.is_some_and(super::registry::recognizes)
|
|
119
121
|
}
|
|
120
122
|
pub fn team_config(
|
|
121
123
|
workspace: &Path,
|
|
122
124
|
directory: &Path,
|
|
123
125
|
team: &str,
|
|
126
|
+
seat: Option<&str>,
|
|
124
127
|
) -> Result<Option<config::TeamConfig>, config::ConfigError> {
|
|
125
|
-
|
|
128
|
+
let args = crate::cli::QuickStartArgs {
|
|
126
129
|
workspace: workspace.into(),
|
|
127
130
|
agents_dir: directory.into(),
|
|
128
131
|
name: None,
|
|
@@ -131,7 +134,11 @@ pub fn team_config(
|
|
|
131
134
|
json: false,
|
|
132
135
|
detail: false,
|
|
133
136
|
backend: Some("tmux".into()),
|
|
134
|
-
}
|
|
137
|
+
};
|
|
138
|
+
match seat {
|
|
139
|
+
Some(seat) => config::read_seat(&args, seat),
|
|
140
|
+
None => config::read_team(&args),
|
|
141
|
+
}
|
|
135
142
|
}
|
|
136
143
|
pub fn start_role(
|
|
137
144
|
workspace: &Path,
|
|
@@ -161,7 +168,7 @@ pub(crate) fn start_configured(
|
|
|
161
168
|
seat: &SeatId,
|
|
162
169
|
) -> Result<Value, crate::cli::CliError> {
|
|
163
170
|
let error = |error: String| crate::cli::CliError::Runtime(error);
|
|
164
|
-
let config = team_config(workspace, directory, team)
|
|
171
|
+
let config = team_config(workspace, directory, team, Some(seat.as_str()))
|
|
165
172
|
.map_err(|e| error(e.to_string()))?
|
|
166
173
|
.ok_or_else(|| error("contract role no longer configured".into()))?;
|
|
167
174
|
let role = config.roles.iter().find(|role| &role.id == seat)
|
|
@@ -222,7 +229,9 @@ pub fn project_seat(workspace: &Path, team: &str, id: &str) -> Result<Value, Bac
|
|
|
222
229
|
// never turns send_message/get_team_status into invented discoveries.
|
|
223
230
|
let mut observed = Vec::new();
|
|
224
231
|
let mut binding_source = None;
|
|
225
|
-
if super::registry::provider(seat.provider.as_str())?.uses_tool_roundtrips()
|
|
232
|
+
if super::registry::provider(seat.provider.as_str())?.uses_tool_roundtrips()
|
|
233
|
+
&& seat.session.is_some()
|
|
234
|
+
{
|
|
226
235
|
let protocol = super::pump::protocol(&mut backend, &seat, &team_agent_contract::host::clock::RealClock::new())?;
|
|
227
236
|
if let team_agent_contract::contract::probe::ProbeOutcome::Observed(binding) = protocol.binding.outcome {
|
|
228
237
|
binding_source = Some(format!("{:?}", binding.source));
|
|
@@ -242,14 +251,22 @@ pub fn project_seat(workspace: &Path, team: &str, id: &str) -> Result<Value, Bac
|
|
|
242
251
|
} else {
|
|
243
252
|
"unknown"
|
|
244
253
|
};
|
|
254
|
+
let session_warning = if seat.session.is_none() {
|
|
255
|
+
backend.store.creation_receipt(&seat.identity.seat, Some(&seat.identity))?
|
|
256
|
+
.filter(|receipt| receipt.outcome == team_agent_contract::orchestration::store::Outcome::Committed)
|
|
257
|
+
.and_then(|receipt| receipt.failure)
|
|
258
|
+
} else { None };
|
|
245
259
|
Ok(
|
|
246
|
-
json!({"agent_id":id,"provider":seat.provider
|
|
260
|
+
json!({"agent_id":id,"provider":if seat.provider.as_str() == "grok_build" { "grok" } else { seat.provider.as_str() },
|
|
261
|
+
"contract_provider":seat.provider,"status":status,"model":role.model,"effort":role.effort,
|
|
247
262
|
"contract_prompt_sha256":team_agent_contract::host::digest_hex(role.prompt.sha256),
|
|
248
263
|
"runtime_family":"contract","contract_scope":seat.identity.scope,"contract_instance":seat.identity.instance,
|
|
249
264
|
"generation":seat.identity.generation,"owner_team_id":team,"team_key":team,
|
|
265
|
+
"session_observation":if seat.session.is_some() { "observed" } else { "unobserved" },
|
|
266
|
+
"session_warning":session_warning,
|
|
250
267
|
"session_id":seat.session.map(|session| session.native_session),
|
|
251
268
|
"native_endpoint":seat.endpoint,"native_pane":seat.pane,
|
|
252
|
-
"pane_id":
|
|
269
|
+
"pane_id":seat.pane,"tmux_endpoint":seat.endpoint,"window":null,"session_name":null,
|
|
253
270
|
"mcp_binding":binding_status,"mcp_binding_source":binding_source,"mcp_tools":tools,
|
|
254
271
|
"bootstrap_used":seat.bootstrap_used}),
|
|
255
272
|
)
|
|
@@ -239,10 +239,13 @@ fn run_observed(args: &[String], diagnostics: &mut Diagnostics) -> Result<(), Ba
|
|
|
239
239
|
})?;
|
|
240
240
|
// Registration is not an initialize/tools-list/client-consumption fact.
|
|
241
241
|
// Those continue to be recorded only at the existing protocol boundaries.
|
|
242
|
+
let tools = crate::mcp_server::TeamOrchestratorTools::with_identity(
|
|
243
|
+
&backend.binding.workspace.path, Some(crate::model::ids::AgentId::new(identity.seat.as_str())),
|
|
244
|
+
Some(crate::model::ids::TeamKey::new(&team)));
|
|
242
245
|
let result = diagnostics.step("serve", || {
|
|
243
|
-
|
|
246
|
+
serve_with_handler(
|
|
244
247
|
&mut backend.store,
|
|
245
|
-
|store,
|
|
248
|
+
|store, _request| {
|
|
246
249
|
if verify_native_ancestry(&record.process, &record.native_process).is_err() {
|
|
247
250
|
return Err(Error::Fence);
|
|
248
251
|
}
|
|
@@ -256,27 +259,6 @@ fn run_observed(args: &[String], diagnostics: &mut Diagnostics) -> Result<(), Ba
|
|
|
256
259
|
{
|
|
257
260
|
return Err(Error::Fence);
|
|
258
261
|
}
|
|
259
|
-
let business =
|
|
260
|
-
request.get("method").and_then(serde_json::Value::as_str) == Some("tools/call");
|
|
261
|
-
let mut task = String::new();
|
|
262
|
-
if business {
|
|
263
|
-
// A native callback can race the physical receipt's DB commit. Wait
|
|
264
|
-
// for that exact generation's submitted turn, never a queued row.
|
|
265
|
-
let deadline = Instant::now() + Duration::from_secs(5);
|
|
266
|
-
loop {
|
|
267
|
-
match store.submitted_task(&identity) {
|
|
268
|
-
Ok(Some(bound)) => {
|
|
269
|
-
task = bound;
|
|
270
|
-
break;
|
|
271
|
-
}
|
|
272
|
-
Ok(None) | Err(Error::Conflict) if Instant::now() < deadline => {
|
|
273
|
-
std::thread::sleep(Duration::from_millis(20))
|
|
274
|
-
}
|
|
275
|
-
Ok(None) => return Err(Error::Invalid("no submitted native turn")),
|
|
276
|
-
Err(error) => return Err(error),
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
}
|
|
280
262
|
if verify_native_ancestry(&record.process, &record.native_process).is_err() {
|
|
281
263
|
return Err(Error::Fence);
|
|
282
264
|
}
|
|
@@ -284,7 +266,7 @@ fn run_observed(args: &[String], diagnostics: &mut Diagnostics) -> Result<(), Ba
|
|
|
284
266
|
identity: identity.clone(),
|
|
285
267
|
binding_key: record.binding_key.clone(),
|
|
286
268
|
connection_id: connection.clone(),
|
|
287
|
-
task_id:
|
|
269
|
+
task_id: String::new(),
|
|
288
270
|
})
|
|
289
271
|
},
|
|
290
272
|
std::io::stdin().lock(),
|
|
@@ -299,6 +281,7 @@ fn run_observed(args: &[String], diagnostics: &mut Diagnostics) -> Result<(), Ba
|
|
|
299
281
|
Some(error),
|
|
300
282
|
);
|
|
301
283
|
},
|
|
284
|
+
|store, context, request| direct_request(store, context, request, &tools),
|
|
302
285
|
)
|
|
303
286
|
});
|
|
304
287
|
let closed = diagnostics.step("close_connection", || {
|
|
@@ -309,6 +292,18 @@ fn run_observed(args: &[String], diagnostics: &mut Diagnostics) -> Result<(), Ba
|
|
|
309
292
|
Ok(())
|
|
310
293
|
}
|
|
311
294
|
|
|
295
|
+
pub(super) fn direct_request(
|
|
296
|
+
store: &mut ContractStore, context: &CallContext, request: &Value,
|
|
297
|
+
tools: &crate::mcp_server::TeamOrchestratorTools,
|
|
298
|
+
) -> Result<Option<Value>, Error> {
|
|
299
|
+
if request.get("method").and_then(Value::as_str) == Some("tools/call") {
|
|
300
|
+
authorize_direct_call(store, context, request)?;
|
|
301
|
+
}
|
|
302
|
+
crate::mcp_server::handle_mcp(tools, request)
|
|
303
|
+
.map_err(|_| Error::Invalid("framework MCP request"))?
|
|
304
|
+
.map(|response| serde_json::to_value(response).map_err(Error::from)).transpose()
|
|
305
|
+
}
|
|
306
|
+
|
|
312
307
|
#[cfg(test)]
|
|
313
308
|
mod tests {
|
|
314
309
|
use super::*;
|
|
@@ -174,9 +174,9 @@ pub fn assemble(
|
|
|
174
174
|
) -> Result<Prompt, ConfigError> {
|
|
175
175
|
let mut text = [
|
|
176
176
|
worker_identity_section(id, role_name),
|
|
177
|
-
runtime_contract_section("send_message", "
|
|
177
|
+
runtime_contract_section("send_message", "get_team_status()"),
|
|
178
178
|
mode.runtime_contract("send_message"),
|
|
179
|
-
"The operations above are logical names. Use the bound MCP client's advertised tool names, not guessed prefixes. Original role-template metadata below does not change your bound worker identity or selected native launch parameters.\
|
|
179
|
+
"The operations above are logical names. Use the bound MCP client's advertised tool names, not guessed prefixes. Original role-template metadata below does not change your bound worker identity or selected native launch parameters.\nDurable storage and actual leader presentation are separate facts; do not claim delivery from registration or persistence alone.".into(),
|
|
180
180
|
].join("\n\n");
|
|
181
181
|
let mut ordered = Vec::new();
|
|
182
182
|
if let Some(source) = user {
|
|
@@ -7,12 +7,11 @@ use team_agent_contract::contract::{
|
|
|
7
7
|
types::InstanceIdentity,
|
|
8
8
|
hooks::{PlanHook, ProviderHooks},
|
|
9
9
|
plan::{CatalogObservation, LaunchEntrypoint, LaunchPlan, ResolvedLaunch},
|
|
10
|
-
session::ResumeBinding,
|
|
11
10
|
types::{ContractError, NativeIdentity, Support},
|
|
12
11
|
};
|
|
13
12
|
use team_agent_contract::kiro::{self, KiroAdapter, KIRO_DESCRIPTOR};
|
|
14
|
-
use team_agent_contract::providers::claude::{self, ClaudeAdapter, CLAUDE_DESCRIPTOR};
|
|
15
13
|
use team_agent_contract::providers::codex::{self, CodexAdapter, CODEX_DESCRIPTOR};
|
|
14
|
+
use team_agent_contract::providers::claude::{self, ClaudeAdapter, CLAUDE_DESCRIPTOR};
|
|
16
15
|
use team_agent_contract::providers::cursor::{self, CursorAdapter, CURSOR_DESCRIPTOR};
|
|
17
16
|
use team_agent_contract::providers::grok_build::{self, GrokAdapter, GROK_BUILD_DESCRIPTOR};
|
|
18
17
|
use team_agent_contract::providers::pi::{self, PiAdapter, PI_DESCRIPTOR};
|
|
@@ -23,18 +22,16 @@ use team_agent_contract::runtime::{
|
|
|
23
22
|
|
|
24
23
|
const DESCRIPTORS: &[&ProviderDescriptor] = &[&KIRO_DESCRIPTOR, &CURSOR_DESCRIPTOR, &GROK_BUILD_DESCRIPTOR, &CODEX_DESCRIPTOR, &PI_DESCRIPTOR, &CLAUDE_DESCRIPTOR];
|
|
25
24
|
/// Declaration names that select a leaf: Cursor's legacy key, its npm
|
|
26
|
-
/// package/public command and its binary; the public names of
|
|
27
|
-
///
|
|
28
|
-
///
|
|
29
|
-
///
|
|
30
|
-
///
|
|
31
|
-
/// keep their own launchers.
|
|
25
|
+
/// package/public command and its binary; the public names of Codex.
|
|
26
|
+
/// Grok is a runtime alias of grok_build. Compiled specs and new state carry
|
|
27
|
+
/// canonical ids. Persisted legacy Cursor/Codex rows keep their keys and are
|
|
28
|
+
/// never reclassified ([`descriptor`] does not match them). Leaders are not
|
|
29
|
+
/// leaves: `team-agent
|
|
30
|
+
/// codex|grok` keep their own launchers. Claude Code and Pi names keep their
|
|
31
|
+
/// legacy runtimes and select no leaf.
|
|
32
32
|
const TRANSITION: &[(&str, &ProviderDescriptor)] = &[
|
|
33
33
|
("cursor_agent", &CURSOR_DESCRIPTOR), ("cursor-agent", &CURSOR_DESCRIPTOR), ("agent", &CURSOR_DESCRIPTOR),
|
|
34
|
-
("claude", &CLAUDE_DESCRIPTOR), ("claude_code", &CLAUDE_DESCRIPTOR), ("claude-code", &CLAUDE_DESCRIPTOR),
|
|
35
34
|
("codex", &CODEX_DESCRIPTOR), ("codex_cli", &CODEX_DESCRIPTOR), ("codex-cli", &CODEX_DESCRIPTOR),
|
|
36
|
-
("grok", &GROK_BUILD_DESCRIPTOR),
|
|
37
|
-
("pi", &PI_DESCRIPTOR),
|
|
38
35
|
];
|
|
39
36
|
|
|
40
37
|
/// One provider's public command route: the PATH-selected entry the pane execs
|
|
@@ -135,10 +132,12 @@ impl NativeProvider {
|
|
|
135
132
|
}
|
|
136
133
|
}
|
|
137
134
|
|
|
138
|
-
/// A
|
|
139
|
-
///
|
|
135
|
+
/// A tool-roundtrip client needs one durable, authorized first packet before
|
|
136
|
+
/// it can demonstrate its Team-tool registry. This is independent of whether
|
|
137
|
+
/// instructions were already supplied at launch.
|
|
140
138
|
pub fn first_business_bootstrap(self) -> bool {
|
|
141
|
-
|
|
139
|
+
self.uses_tool_roundtrips()
|
|
140
|
+
|| matches!(self.descriptor().prompt.carrier, Support::Supported(PromptCarrier::RuntimeBridge))
|
|
142
141
|
}
|
|
143
142
|
|
|
144
143
|
/// These providers use the separately fenced native tool-roundtrip ledger,
|
|
@@ -150,7 +149,6 @@ impl NativeProvider {
|
|
|
150
149
|
pub fn startup(self) -> Option<&'static StartupDefinition> {
|
|
151
150
|
match self {
|
|
152
151
|
Self::GrokBuild => Some(&grok_build::interaction::STARTUP),
|
|
153
|
-
// Claude's folder-trust screen is never answered (focus: No, exit).
|
|
154
152
|
Self::Kiro | Self::Cursor | Self::Codex | Self::Pi | Self::Claude => None,
|
|
155
153
|
}
|
|
156
154
|
}
|
|
@@ -159,7 +157,6 @@ impl NativeProvider {
|
|
|
159
157
|
match self {
|
|
160
158
|
Self::GrokBuild => Some(&grok_build::interaction::SESSION_PANEL),
|
|
161
159
|
// `/status` and `/session` print history cards, not modals: nothing to close.
|
|
162
|
-
// Claude's fresh session ID is preassigned by argv; nothing to close.
|
|
163
160
|
Self::Kiro | Self::Cursor | Self::Codex | Self::Pi | Self::Claude => None,
|
|
164
161
|
}
|
|
165
162
|
}
|
|
@@ -184,27 +181,12 @@ impl NativeProvider {
|
|
|
184
181
|
reason: pi::UNVERIFIED,
|
|
185
182
|
}),
|
|
186
183
|
Self::Claude => Err(ContractError::Unverified {
|
|
187
|
-
field: "Claude
|
|
184
|
+
field: "Claude native Team-tool inspector",
|
|
188
185
|
reason: claude::UNVERIFIED,
|
|
189
186
|
}),
|
|
190
187
|
}
|
|
191
188
|
}
|
|
192
189
|
|
|
193
|
-
/// The exact local backing a native new-seat fork reads, for a leaf that
|
|
194
|
-
/// addresses its parent by path (Claude's transcript). None: the native
|
|
195
|
-
/// CLI resolves the parent by ID itself. Pure; the caller checks the file.
|
|
196
|
-
pub fn native_fork_source(
|
|
197
|
-
self,
|
|
198
|
-
runtime: Option<&NativeRuntime>,
|
|
199
|
-
source: &ResumeBinding,
|
|
200
|
-
) -> Result<Option<PathBuf>, ContractError> {
|
|
201
|
-
match (self, runtime) {
|
|
202
|
-
(Self::Claude, Some(NativeRuntime::Claude(runtime))) => claude::transcript_path(runtime.home(), source).map(Some),
|
|
203
|
-
(Self::Claude, _) => Err(ContractError::Mismatch("native runtime provider")),
|
|
204
|
-
_ => Ok(None),
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
|
|
208
190
|
pub fn server_key_for(self, identity: &InstanceIdentity) -> Result<String, ContractError> {
|
|
209
191
|
match self {
|
|
210
192
|
Self::GrokBuild => Ok(grok_build::server_key(identity)),
|
|
@@ -359,24 +341,28 @@ pub fn descriptor(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
|
359
341
|
})
|
|
360
342
|
}
|
|
361
343
|
|
|
344
|
+
/// Compare exact runtime aliases without adopting declaration-only transitions.
|
|
345
|
+
pub fn same_provider(left: &str, right: &str) -> bool {
|
|
346
|
+
left == right || descriptor(left).zip(descriptor(right))
|
|
347
|
+
.is_some_and(|(left, right)| left.identity.id == right.identity.id)
|
|
348
|
+
}
|
|
349
|
+
|
|
362
350
|
/// The leaf a role document or CLI value selects: a canonical contract key or
|
|
363
|
-
/// a transition name (Cursor,
|
|
364
|
-
///
|
|
351
|
+
/// a transition name (Cursor, Codex, Grok Build). No flag is needed;
|
|
352
|
+
/// `contract_runtime: true` is accepted but selects nothing extra.
|
|
365
353
|
pub fn declared(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
366
354
|
TRANSITION.iter().find(|(retired, _)| *retired == key)
|
|
367
355
|
.map(|(_, descriptor)| *descriptor)
|
|
368
356
|
.or_else(|| descriptor(key))
|
|
369
357
|
}
|
|
370
358
|
|
|
371
|
-
/// The provider name a generated role document records for a leaf.
|
|
372
|
-
///
|
|
373
|
-
///
|
|
359
|
+
/// The provider name a generated role document records for a leaf. Codex and
|
|
360
|
+
/// Grok Build keep their public command names, which declare the leaf; every
|
|
361
|
+
/// other leaf is named by its canonical id.
|
|
374
362
|
pub fn public_name(descriptor: &ProviderDescriptor) -> &'static str {
|
|
375
363
|
match descriptor.identity.id {
|
|
376
|
-
"claude_tui" => "claude",
|
|
377
364
|
"codex_tui" => "codex",
|
|
378
365
|
"grok_build" => "grok",
|
|
379
|
-
"pi_tui" => "pi",
|
|
380
366
|
id => id,
|
|
381
367
|
}
|
|
382
368
|
}
|
|
@@ -400,10 +386,27 @@ pub fn recognizes(key: &str) -> bool {
|
|
|
400
386
|
mod tests {
|
|
401
387
|
use super::*;
|
|
402
388
|
|
|
389
|
+
#[test]
|
|
390
|
+
fn claude_native_argv_prompt_keeps_first_business_tool_bootstrap() {
|
|
391
|
+
assert_eq!(provider("claude_tui").unwrap(), NativeProvider::Claude);
|
|
392
|
+
assert_eq!(CLAUDE_DESCRIPTOR.prompt.carrier, Support::Supported(PromptCarrier::Argv));
|
|
393
|
+
assert!(CLAUDE_DESCRIPTOR.workspace.shared_cwd);
|
|
394
|
+
assert!(NativeProvider::Claude.first_business_bootstrap());
|
|
395
|
+
assert!(NativeProvider::Claude.uses_tool_roundtrips());
|
|
396
|
+
assert!(NativeProvider::Claude.tool_panel().is_err());
|
|
397
|
+
}
|
|
398
|
+
|
|
403
399
|
#[test]
|
|
404
400
|
fn canonical_cursor_does_not_reclassify_legacy_names() {
|
|
405
401
|
assert_eq!(provider("cursor").unwrap(), NativeProvider::Cursor);
|
|
406
402
|
assert_eq!(provider("kiro").unwrap(), NativeProvider::Kiro);
|
|
403
|
+
// Claude Code and Pi names keep their legacy runtimes: no leaf, no recognition.
|
|
404
|
+
for legacy in ["pi", "claude", "claude_code", "claude-code"] {
|
|
405
|
+
assert!(descriptor(legacy).is_none(), "{legacy}");
|
|
406
|
+
assert!(declared(legacy).is_none(), "{legacy}");
|
|
407
|
+
assert!(!recognizes(legacy), "{legacy}");
|
|
408
|
+
assert!(provider(legacy).is_err(), "{legacy}");
|
|
409
|
+
}
|
|
407
410
|
// Every Cursor name declares the leaf; a persisted legacy row is never reclassified.
|
|
408
411
|
for name in ["cursor", "cursor_agent", "cursor-agent", "agent"] {
|
|
409
412
|
assert_eq!(declared(name).unwrap().identity.id, "cursor");
|
|
@@ -417,7 +420,7 @@ mod tests {
|
|
|
417
420
|
assert_eq!(provider("grok_build").unwrap(), NativeProvider::GrokBuild);
|
|
418
421
|
assert!(recognizes(" Grok_Build "));
|
|
419
422
|
assert!(descriptor("Grok_Build").is_none());
|
|
420
|
-
|
|
423
|
+
assert_eq!(GROK_BUILD_DESCRIPTOR.identity.aliases, &["grok"]);
|
|
421
424
|
assert!(recognizes(" Cursor "));
|
|
422
425
|
assert!(descriptor("Cursor").is_none());
|
|
423
426
|
for descriptor in descriptors() {
|
|
@@ -446,7 +449,9 @@ mod tests {
|
|
|
446
449
|
assert!(declared("Codex").is_none());
|
|
447
450
|
assert_eq!(public_name(&CODEX_DESCRIPTOR), "codex");
|
|
448
451
|
assert_eq!(declared(public_name(&CODEX_DESCRIPTOR)), Some(&CODEX_DESCRIPTOR));
|
|
449
|
-
|
|
452
|
+
assert!(declared("claude").is_none());
|
|
453
|
+
assert!(declared("pi").is_none());
|
|
454
|
+
assert_eq!(public_name(&CURSOR_DESCRIPTOR), "cursor");
|
|
450
455
|
assert_eq!(declared("grok_build"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
451
456
|
let mut identity = InstanceIdentity {
|
|
452
457
|
scope: team_agent_contract::contract::types::ScopeId::new("scope").unwrap(),
|
|
@@ -469,64 +474,20 @@ mod tests {
|
|
|
469
474
|
}
|
|
470
475
|
|
|
471
476
|
#[test]
|
|
472
|
-
fn
|
|
473
|
-
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
474
|
-
assert_eq!(CLAUDE_DESCRIPTOR.identity.id, "claude_tui");
|
|
475
|
-
assert_eq!(CLAUDE_DESCRIPTOR.identity.binary, "claude");
|
|
476
|
-
assert_eq!(provider("claude_tui").unwrap(), NativeProvider::Claude);
|
|
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.
|
|
480
|
-
for name in ["claude", "claude_code", "claude-code"] {
|
|
481
|
-
assert_eq!(declared(name), Some(&CLAUDE_DESCRIPTOR), "{name}");
|
|
482
|
-
assert!(recognizes(name), "{name}");
|
|
483
|
-
assert!(descriptor(name).is_none(), "{name}");
|
|
484
|
-
assert!(provider(name).is_err(), "{name}");
|
|
485
|
-
}
|
|
486
|
-
assert!(declared("Claude").is_none());
|
|
487
|
-
assert_eq!(public_name(&CLAUDE_DESCRIPTOR), "claude");
|
|
488
|
-
assert_eq!(declared(public_name(&CLAUDE_DESCRIPTOR)), Some(&CLAUDE_DESCRIPTOR));
|
|
489
|
-
assert!(recognizes(" Claude "));
|
|
490
|
-
assert!(recognizes(" Claude_TUI "));
|
|
491
|
-
let mut identity = InstanceIdentity {
|
|
492
|
-
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
493
|
-
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
494
|
-
};
|
|
495
|
-
let first = NativeProvider::Claude.server_key_for(&identity).unwrap();
|
|
496
|
-
assert_eq!(first, claude::server_key(&identity));
|
|
497
|
-
assert_ne!(first, grok_build::server_key(&identity));
|
|
498
|
-
assert_ne!(first, codex::server_key(&identity));
|
|
499
|
-
assert_ne!(first, pi::server_key(&identity));
|
|
500
|
-
identity.generation = Generation(2);
|
|
501
|
-
assert_ne!(first, NativeProvider::Claude.server_key_for(&identity).unwrap());
|
|
502
|
-
assert!(NativeProvider::Claude.server_key().is_err());
|
|
503
|
-
assert!(NativeProvider::Claude.tool_panel().is_err());
|
|
504
|
-
assert!(NativeProvider::Claude.startup().is_none(), "folder trust is never keyed");
|
|
505
|
-
assert!(NativeProvider::Claude.session_panel().is_none());
|
|
506
|
-
assert!(NativeProvider::Claude.uses_tool_roundtrips());
|
|
507
|
-
assert!(NativeProvider::Claude.first_business_bootstrap());
|
|
508
|
-
let kinds: Vec<_> = NativeProvider::Claude.controls().iter().map(|control| control.command).collect();
|
|
509
|
-
assert_eq!(kinds, ["/exit"]);
|
|
510
|
-
}
|
|
511
|
-
|
|
512
|
-
#[test]
|
|
513
|
-
fn bare_pi_selects_the_leaf_and_a_legacy_row_is_never_reclassified() {
|
|
477
|
+
fn bare_pi_keeps_its_legacy_meaning_and_canonical_key_selects_the_leaf() {
|
|
514
478
|
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
515
479
|
assert_eq!(PI_DESCRIPTOR.identity.id, "pi_tui");
|
|
516
480
|
assert_eq!(PI_DESCRIPTOR.identity.binary, "pi");
|
|
517
481
|
assert_eq!(provider("pi_tui").unwrap(), NativeProvider::Pi);
|
|
518
|
-
//
|
|
519
|
-
// persisted legacy `pi` row is never reclassified.
|
|
482
|
+
// The default role provider, the Pi leader and legacy state keep `pi`.
|
|
520
483
|
assert!(descriptor("pi").is_none());
|
|
521
484
|
assert!(provider("pi").is_err());
|
|
522
|
-
|
|
485
|
+
assert!(declared("pi").is_none());
|
|
523
486
|
assert_eq!(declared("pi_tui"), Some(&PI_DESCRIPTOR));
|
|
524
487
|
for spelling in ["pi", " Pi ", "PI"] {
|
|
525
|
-
assert!(recognizes(spelling), "{spelling:?}");
|
|
488
|
+
assert!(!recognizes(spelling), "{spelling:?}");
|
|
526
489
|
}
|
|
527
490
|
assert!(declared("Pi").is_none());
|
|
528
|
-
assert_eq!(public_name(&PI_DESCRIPTOR), "pi");
|
|
529
|
-
assert_eq!(public_name(&CURSOR_DESCRIPTOR), "cursor");
|
|
530
491
|
let mut identity = InstanceIdentity {
|
|
531
492
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
532
493
|
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
@@ -550,12 +511,15 @@ mod tests {
|
|
|
550
511
|
#[test]
|
|
551
512
|
fn grok_server_key_is_generation_bound_and_has_no_inspector_fallback() {
|
|
552
513
|
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
553
|
-
// The public
|
|
514
|
+
// The public command is also an exact runtime alias, including persisted rows.
|
|
554
515
|
assert_eq!(declared("grok"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
555
516
|
assert!(recognizes(" Grok "));
|
|
556
517
|
assert!(declared("Grok").is_none());
|
|
557
|
-
|
|
558
|
-
|
|
518
|
+
assert_eq!(descriptor("grok"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
519
|
+
assert_eq!(provider("grok").unwrap(), NativeProvider::GrokBuild);
|
|
520
|
+
assert!(same_provider("grok", "grok_build"));
|
|
521
|
+
assert!(same_provider("grok_build", "grok"));
|
|
522
|
+
assert!(!same_provider("Grok", "grok_build"));
|
|
559
523
|
assert_eq!(public_name(&GROK_BUILD_DESCRIPTOR), "grok");
|
|
560
524
|
let mut identity = InstanceIdentity {
|
|
561
525
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
@@ -2289,21 +2289,21 @@ mod tests {
|
|
|
2289
2289
|
fn retired_legacy_rows_get_a_remove_and_re_add_hint_not_a_refused_start_agent() {
|
|
2290
2290
|
use crate::model::enums::Provider;
|
|
2291
2291
|
let workspace = std::path::Path::new("/tmp/ws");
|
|
2292
|
-
|
|
2292
|
+
let hint = recovery_hint("w1", Provider::Codex, workspace, "research");
|
|
2293
|
+
assert!(hint.starts_with("No automatic restart was performed.\n"), "{hint}");
|
|
2294
|
+
assert!(
|
|
2295
|
+
hint.contains("seat has no runtime in this release; stop or remove it, then add it again"),
|
|
2296
|
+
"{hint}"
|
|
2297
|
+
);
|
|
2298
|
+
assert!(!hint.contains("start-agent"), "{hint}");
|
|
2299
|
+
assert!(hint.ends_with("(provider: codex)"), "{hint}");
|
|
2300
|
+
// `grok` rows are a runtime alias of grok_build, so they restart like any live provider.
|
|
2301
|
+
for provider in [Provider::Grok, Provider::Copilot] {
|
|
2293
2302
|
let hint = recovery_hint("w1", provider, workspace, "research");
|
|
2294
|
-
assert!(hint.starts_with("No automatic restart was performed.\n"), "{hint}");
|
|
2295
2303
|
assert!(
|
|
2296
|
-
hint.
|
|
2304
|
+
hint.ends_with("To recover manually, run: team-agent start-agent w1 --workspace '/tmp/ws' --team research --force --json"),
|
|
2297
2305
|
"{hint}"
|
|
2298
2306
|
);
|
|
2299
|
-
assert!(!hint.contains("start-agent"), "{hint}");
|
|
2300
2307
|
}
|
|
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
2308
|
}
|
|
2309
2309
|
}
|