@team-agent/installer 0.5.126 → 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 -91
- package/crates/team-agent/src/cli/emit.rs +61 -28
- package/crates/team-agent/src/cli/grok_slot.rs +88 -3
- package/crates/team-agent/src/cli/intent/runtime.rs +38 -9
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +147 -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 +38 -9
- package/crates/team-agent/src/cli/models.rs +789 -186
- 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 +3 -3
- package/crates/team-agent/src/cli/tests/named_address.rs +11 -10
- package/crates/team-agent/src/cli/tests/run_delegation.rs +12 -9
- package/crates/team-agent/src/cli/tests/status_send.rs +70 -273
- package/crates/team-agent/src/compiler/tests.rs +39 -27
- package/crates/team-agent/src/compiler.rs +206 -6
- package/crates/team-agent/src/contract_runtime/backend.rs +181 -11
- package/crates/team-agent/src/contract_runtime/commands.rs +338 -7
- package/crates/team-agent/src/contract_runtime/config.rs +30 -19
- 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 -14
- 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 +93 -130
- package/crates/team-agent/src/coordinator/steps/abnormal.rs +45 -5
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +8 -29
- package/crates/team-agent/src/coordinator/tests/energy.rs +4 -4
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +44 -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/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 +36 -179
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +87 -6
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +13 -488
- 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 +26 -2
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +41 -31
- package/crates/team-agent/src/lifecycle/launch.rs +27 -12
- package/crates/team-agent/src/lifecycle/profile_launch.rs +318 -64
- 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 +298 -133
- package/crates/team-agent/src/lifecycle/restart/remove.rs +129 -0
- 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 +79 -27
- 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/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 +329 -70
- 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 +25 -39
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +7 -11
- package/crates/team-agent/src/lifecycle/tests/core.rs +39 -36
- package/crates/team-agent/src/lifecycle/tests/f032_startup_prompt_best_effort_red.rs +22 -8
- 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 +15 -133
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +60 -20
- 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 +164 -282
- 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/mcp_tool_name_format_red.rs +6 -6
- 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/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 +14 -15
- 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 +7 -7
- package/crates/team-agent/src/lifecycle/tests/subprep_codex_trust_roundtrip_red.rs +67 -313
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +254 -2
- 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 +74 -19
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +38 -39
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +51 -88
- package/crates/team-agent/src/lifecycle/tests.rs +3 -4
- package/crates/team-agent/src/lifecycle/types.rs +18 -5
- 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 +86 -109
- 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 +143 -253
- 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 +255 -150
- package/crates/team-agent/src/messaging/tests/main_preserved.rs +2 -2
- package/crates/team-agent/src/messaging/tests/runtime.rs +9 -115
- package/crates/team-agent/src/messaging/tests/spine.rs +44 -24
- package/crates/team-agent/src/messaging/tests/wave2.rs +13 -20
- package/crates/team-agent/src/messaging/types.rs +1 -0
- package/crates/team-agent/src/provider/adapter.rs +208 -254
- 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 -7
- 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 +111 -111
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +123 -0
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +10 -18
- package/crates/team-agent/src/provider/session/context_fork.rs +87 -74
- package/crates/team-agent/src/provider/session/mod.rs +2 -3
- package/crates/team-agent/src/provider/session_scan/claude.rs +523 -0
- package/crates/team-agent/src/provider/session_scan/common.rs +47 -47
- package/crates/team-agent/src/provider/session_scan/pi.rs +34 -1
- package/crates/team-agent/src/provider/session_scan.rs +13 -13
- package/crates/team-agent/src/provider/tests/adapter.rs +127 -121
- package/crates/team-agent/src/provider/tests/classify.rs +0 -53
- package/crates/team-agent/src/provider/tests/command_helpers.rs +11 -19
- package/crates/team-agent/src/provider/tests/idle.rs +13 -19
- package/crates/team-agent/src/provider/types.rs +0 -4
- package/crates/team-agent/src/provider/wire.rs +34 -20
- 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 +9 -43
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -8
- package/skills/team-agent/command-coverage.json +15 -1
- package/skills/team-agent/docs/reference/team-agent-operator.md +5 -3
- package/skills/team-agent/references/team-agent-operator.md +5 -3
- package/crates/team-agent/src/lifecycle/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
|
@@ -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,18 +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
|
-
|
|
119
|
-
|
|
120
|
-
// An omitted provider is the default `pi`, which declares the Pi leaf.
|
|
121
|
-
super::registry::recognizes(provider.or(declared.as_deref()).unwrap_or("pi"), opted_in)
|
|
118
|
+
provider
|
|
119
|
+
.or(declared.as_deref())
|
|
120
|
+
.is_some_and(super::registry::recognizes)
|
|
122
121
|
}
|
|
123
122
|
pub fn team_config(
|
|
124
123
|
workspace: &Path,
|
|
125
124
|
directory: &Path,
|
|
126
125
|
team: &str,
|
|
126
|
+
seat: Option<&str>,
|
|
127
127
|
) -> Result<Option<config::TeamConfig>, config::ConfigError> {
|
|
128
|
-
|
|
128
|
+
let args = crate::cli::QuickStartArgs {
|
|
129
129
|
workspace: workspace.into(),
|
|
130
130
|
agents_dir: directory.into(),
|
|
131
131
|
name: None,
|
|
@@ -134,7 +134,11 @@ pub fn team_config(
|
|
|
134
134
|
json: false,
|
|
135
135
|
detail: false,
|
|
136
136
|
backend: Some("tmux".into()),
|
|
137
|
-
}
|
|
137
|
+
};
|
|
138
|
+
match seat {
|
|
139
|
+
Some(seat) => config::read_seat(&args, seat),
|
|
140
|
+
None => config::read_team(&args),
|
|
141
|
+
}
|
|
138
142
|
}
|
|
139
143
|
pub fn start_role(
|
|
140
144
|
workspace: &Path,
|
|
@@ -164,7 +168,7 @@ pub(crate) fn start_configured(
|
|
|
164
168
|
seat: &SeatId,
|
|
165
169
|
) -> Result<Value, crate::cli::CliError> {
|
|
166
170
|
let error = |error: String| crate::cli::CliError::Runtime(error);
|
|
167
|
-
let config = team_config(workspace, directory, team)
|
|
171
|
+
let config = team_config(workspace, directory, team, Some(seat.as_str()))
|
|
168
172
|
.map_err(|e| error(e.to_string()))?
|
|
169
173
|
.ok_or_else(|| error("contract role no longer configured".into()))?;
|
|
170
174
|
let role = config.roles.iter().find(|role| &role.id == seat)
|
|
@@ -225,7 +229,9 @@ pub fn project_seat(workspace: &Path, team: &str, id: &str) -> Result<Value, Bac
|
|
|
225
229
|
// never turns send_message/get_team_status into invented discoveries.
|
|
226
230
|
let mut observed = Vec::new();
|
|
227
231
|
let mut binding_source = None;
|
|
228
|
-
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
|
+
{
|
|
229
235
|
let protocol = super::pump::protocol(&mut backend, &seat, &team_agent_contract::host::clock::RealClock::new())?;
|
|
230
236
|
if let team_agent_contract::contract::probe::ProbeOutcome::Observed(binding) = protocol.binding.outcome {
|
|
231
237
|
binding_source = Some(format!("{:?}", binding.source));
|
|
@@ -245,14 +251,22 @@ pub fn project_seat(workspace: &Path, team: &str, id: &str) -> Result<Value, Bac
|
|
|
245
251
|
} else {
|
|
246
252
|
"unknown"
|
|
247
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 };
|
|
248
259
|
Ok(
|
|
249
|
-
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,
|
|
250
262
|
"contract_prompt_sha256":team_agent_contract::host::digest_hex(role.prompt.sha256),
|
|
251
263
|
"runtime_family":"contract","contract_scope":seat.identity.scope,"contract_instance":seat.identity.instance,
|
|
252
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,
|
|
253
267
|
"session_id":seat.session.map(|session| session.native_session),
|
|
254
268
|
"native_endpoint":seat.endpoint,"native_pane":seat.pane,
|
|
255
|
-
"pane_id":
|
|
269
|
+
"pane_id":seat.pane,"tmux_endpoint":seat.endpoint,"window":null,"session_name":null,
|
|
256
270
|
"mcp_binding":binding_status,"mcp_binding_source":binding_source,"mcp_tools":tools,
|
|
257
271
|
"bootstrap_used":seat.bootstrap_used}),
|
|
258
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};
|
|
@@ -22,20 +21,17 @@ use team_agent_contract::runtime::{
|
|
|
22
21
|
};
|
|
23
22
|
|
|
24
23
|
const DESCRIPTORS: &[&ProviderDescriptor] = &[&KIRO_DESCRIPTOR, &CURSOR_DESCRIPTOR, &GROK_BUILD_DESCRIPTOR, &CODEX_DESCRIPTOR, &PI_DESCRIPTOR, &CLAUDE_DESCRIPTOR];
|
|
25
|
-
///
|
|
26
|
-
///
|
|
27
|
-
///
|
|
28
|
-
///
|
|
29
|
-
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
///
|
|
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).
|
|
24
|
+
/// Declaration names that select a leaf: Cursor's legacy key, its npm
|
|
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.
|
|
35
32
|
const TRANSITION: &[(&str, &ProviderDescriptor)] = &[
|
|
36
33
|
("cursor_agent", &CURSOR_DESCRIPTOR), ("cursor-agent", &CURSOR_DESCRIPTOR), ("agent", &CURSOR_DESCRIPTOR),
|
|
37
|
-
("
|
|
38
|
-
("pi", &PI_DESCRIPTOR),
|
|
34
|
+
("codex", &CODEX_DESCRIPTOR), ("codex_cli", &CODEX_DESCRIPTOR), ("codex-cli", &CODEX_DESCRIPTOR),
|
|
39
35
|
];
|
|
40
36
|
|
|
41
37
|
/// One provider's public command route: the PATH-selected entry the pane execs
|
|
@@ -136,10 +132,12 @@ impl NativeProvider {
|
|
|
136
132
|
}
|
|
137
133
|
}
|
|
138
134
|
|
|
139
|
-
/// A
|
|
140
|
-
///
|
|
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.
|
|
141
138
|
pub fn first_business_bootstrap(self) -> bool {
|
|
142
|
-
|
|
139
|
+
self.uses_tool_roundtrips()
|
|
140
|
+
|| matches!(self.descriptor().prompt.carrier, Support::Supported(PromptCarrier::RuntimeBridge))
|
|
143
141
|
}
|
|
144
142
|
|
|
145
143
|
/// These providers use the separately fenced native tool-roundtrip ledger,
|
|
@@ -151,7 +149,6 @@ impl NativeProvider {
|
|
|
151
149
|
pub fn startup(self) -> Option<&'static StartupDefinition> {
|
|
152
150
|
match self {
|
|
153
151
|
Self::GrokBuild => Some(&grok_build::interaction::STARTUP),
|
|
154
|
-
// Claude's folder-trust screen is never answered (focus: No, exit).
|
|
155
152
|
Self::Kiro | Self::Cursor | Self::Codex | Self::Pi | Self::Claude => None,
|
|
156
153
|
}
|
|
157
154
|
}
|
|
@@ -160,7 +157,6 @@ impl NativeProvider {
|
|
|
160
157
|
match self {
|
|
161
158
|
Self::GrokBuild => Some(&grok_build::interaction::SESSION_PANEL),
|
|
162
159
|
// `/status` and `/session` print history cards, not modals: nothing to close.
|
|
163
|
-
// Claude's fresh session ID is preassigned by argv; nothing to close.
|
|
164
160
|
Self::Kiro | Self::Cursor | Self::Codex | Self::Pi | Self::Claude => None,
|
|
165
161
|
}
|
|
166
162
|
}
|
|
@@ -185,27 +181,12 @@ impl NativeProvider {
|
|
|
185
181
|
reason: pi::UNVERIFIED,
|
|
186
182
|
}),
|
|
187
183
|
Self::Claude => Err(ContractError::Unverified {
|
|
188
|
-
field: "Claude
|
|
184
|
+
field: "Claude native Team-tool inspector",
|
|
189
185
|
reason: claude::UNVERIFIED,
|
|
190
186
|
}),
|
|
191
187
|
}
|
|
192
188
|
}
|
|
193
189
|
|
|
194
|
-
/// The exact local backing a native new-seat fork reads, for a leaf that
|
|
195
|
-
/// addresses its parent by path (Claude's transcript). None: the native
|
|
196
|
-
/// CLI resolves the parent by ID itself. Pure; the caller checks the file.
|
|
197
|
-
pub fn native_fork_source(
|
|
198
|
-
self,
|
|
199
|
-
runtime: Option<&NativeRuntime>,
|
|
200
|
-
source: &ResumeBinding,
|
|
201
|
-
) -> Result<Option<PathBuf>, ContractError> {
|
|
202
|
-
match (self, runtime) {
|
|
203
|
-
(Self::Claude, Some(NativeRuntime::Claude(runtime))) => claude::transcript_path(runtime.home(), source).map(Some),
|
|
204
|
-
(Self::Claude, _) => Err(ContractError::Mismatch("native runtime provider")),
|
|
205
|
-
_ => Ok(None),
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
|
|
209
190
|
pub fn server_key_for(self, identity: &InstanceIdentity) -> Result<String, ContractError> {
|
|
210
191
|
match self {
|
|
211
192
|
Self::GrokBuild => Ok(grok_build::server_key(identity)),
|
|
@@ -360,35 +341,37 @@ pub fn descriptor(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
|
360
341
|
})
|
|
361
342
|
}
|
|
362
343
|
|
|
363
|
-
///
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
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
|
+
|
|
350
|
+
/// The leaf a role document or CLI value selects: a canonical contract key or
|
|
351
|
+
/// a transition name (Cursor, Codex, Grok Build). No flag is needed;
|
|
352
|
+
/// `contract_runtime: true` is accepted but selects nothing extra.
|
|
353
|
+
pub fn declared(key: &str) -> Option<&'static ProviderDescriptor> {
|
|
354
|
+
TRANSITION.iter().find(|(retired, _)| *retired == key)
|
|
370
355
|
.map(|(_, descriptor)| *descriptor)
|
|
371
356
|
.or_else(|| descriptor(key))
|
|
372
357
|
}
|
|
373
358
|
|
|
374
|
-
/// The provider name a generated role document records for a leaf.
|
|
375
|
-
///
|
|
376
|
-
///
|
|
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.
|
|
377
362
|
pub fn public_name(descriptor: &ProviderDescriptor) -> &'static str {
|
|
378
363
|
match descriptor.identity.id {
|
|
379
|
-
"
|
|
380
|
-
"
|
|
364
|
+
"codex_tui" => "codex",
|
|
365
|
+
"grok_build" => "grok",
|
|
381
366
|
id => id,
|
|
382
367
|
}
|
|
383
368
|
}
|
|
384
369
|
|
|
385
370
|
/// Recognize a misspelled/case-modified contract declaration so it can fail
|
|
386
371
|
/// explicitly instead of accidentally selecting a legacy default provider.
|
|
387
|
-
|
|
388
|
-
pub fn recognizes(key: &str, contract_runtime: bool) -> bool {
|
|
372
|
+
pub fn recognizes(key: &str) -> bool {
|
|
389
373
|
let key = key.trim();
|
|
390
|
-
|
|
391
|
-
|| TRANSITION.iter().any(|(retired, _)| retired.eq_ignore_ascii_case(key))
|
|
374
|
+
TRANSITION.iter().any(|(retired, _)| retired.eq_ignore_ascii_case(key))
|
|
392
375
|
|| DESCRIPTORS.iter().any(|descriptor| {
|
|
393
376
|
descriptor.identity.id.eq_ignore_ascii_case(key)
|
|
394
377
|
|| descriptor
|
|
@@ -403,31 +386,42 @@ pub fn recognizes(key: &str, contract_runtime: bool) -> bool {
|
|
|
403
386
|
mod tests {
|
|
404
387
|
use super::*;
|
|
405
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
|
+
|
|
406
399
|
#[test]
|
|
407
400
|
fn canonical_cursor_does_not_reclassify_legacy_names() {
|
|
408
401
|
assert_eq!(provider("cursor").unwrap(), NativeProvider::Cursor);
|
|
409
402
|
assert_eq!(provider("kiro").unwrap(), NativeProvider::Kiro);
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
assert!(
|
|
413
|
-
assert!(
|
|
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}");
|
|
414
409
|
}
|
|
415
|
-
// Every Cursor name declares the leaf; a persisted legacy row
|
|
410
|
+
// Every Cursor name declares the leaf; a persisted legacy row is never reclassified.
|
|
416
411
|
for name in ["cursor", "cursor_agent", "cursor-agent", "agent"] {
|
|
417
|
-
assert_eq!(declared(name
|
|
418
|
-
assert_eq!(declared(name, true).unwrap().identity.id, "cursor");
|
|
412
|
+
assert_eq!(declared(name).unwrap().identity.id, "cursor");
|
|
419
413
|
}
|
|
420
414
|
for legacy in ["cursor_agent", "cursor-agent", "agent"] {
|
|
421
415
|
assert!(descriptor(legacy).is_none());
|
|
422
416
|
assert!(provider(legacy).is_err());
|
|
423
417
|
}
|
|
424
|
-
assert!(recognizes(" Cursor_Agent "
|
|
425
|
-
assert!(declared("Cursor_Agent"
|
|
418
|
+
assert!(recognizes(" Cursor_Agent "));
|
|
419
|
+
assert!(declared("Cursor_Agent").is_none());
|
|
426
420
|
assert_eq!(provider("grok_build").unwrap(), NativeProvider::GrokBuild);
|
|
427
|
-
assert!(recognizes(" Grok_Build "
|
|
421
|
+
assert!(recognizes(" Grok_Build "));
|
|
428
422
|
assert!(descriptor("Grok_Build").is_none());
|
|
429
|
-
|
|
430
|
-
assert!(recognizes(" Cursor "
|
|
423
|
+
assert_eq!(GROK_BUILD_DESCRIPTOR.identity.aliases, &["grok"]);
|
|
424
|
+
assert!(recognizes(" Cursor "));
|
|
431
425
|
assert!(descriptor("Cursor").is_none());
|
|
432
426
|
for descriptor in descriptors() {
|
|
433
427
|
assert_eq!(provider(descriptor.identity.id).unwrap().descriptor(), *descriptor);
|
|
@@ -435,24 +429,30 @@ mod tests {
|
|
|
435
429
|
}
|
|
436
430
|
|
|
437
431
|
#[test]
|
|
438
|
-
fn
|
|
432
|
+
fn every_public_codex_name_selects_the_leaf_and_a_legacy_row_is_never_reclassified() {
|
|
439
433
|
assert_eq!(CODEX_DESCRIPTOR.identity.id, "codex_tui");
|
|
440
434
|
assert_eq!(CODEX_DESCRIPTOR.identity.binary, "codex");
|
|
441
435
|
assert_eq!(provider("codex_tui").unwrap(), NativeProvider::Codex);
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
assert!(
|
|
450
|
-
|
|
436
|
+
assert_eq!(declared("codex_tui"), Some(&CODEX_DESCRIPTOR));
|
|
437
|
+
// Every public Codex name declares the leaf without opt-in; a persisted
|
|
438
|
+
// legacy `codex` row keeps its key and is never reclassified.
|
|
439
|
+
for name in ["codex", "codex_cli", "codex-cli"] {
|
|
440
|
+
assert_eq!(declared(name), Some(&CODEX_DESCRIPTOR), "{name}");
|
|
441
|
+
assert!(recognizes(name), "{name}");
|
|
442
|
+
assert!(descriptor(name).is_none(), "{name}");
|
|
443
|
+
assert!(provider(name).is_err(), "{name}");
|
|
444
|
+
}
|
|
445
|
+
for spelling in [" Codex ", "CODEX", "Codex_CLI"] {
|
|
446
|
+
assert!(recognizes(spelling), "{spelling:?}");
|
|
451
447
|
}
|
|
452
|
-
// A case variant
|
|
453
|
-
assert!(declared("Codex"
|
|
454
|
-
assert_eq!(
|
|
455
|
-
assert_eq!(declared(
|
|
448
|
+
// A case variant is recognized (to fail explicitly), never selected.
|
|
449
|
+
assert!(declared("Codex").is_none());
|
|
450
|
+
assert_eq!(public_name(&CODEX_DESCRIPTOR), "codex");
|
|
451
|
+
assert_eq!(declared(public_name(&CODEX_DESCRIPTOR)), Some(&CODEX_DESCRIPTOR));
|
|
452
|
+
assert!(declared("claude").is_none());
|
|
453
|
+
assert!(declared("pi").is_none());
|
|
454
|
+
assert_eq!(public_name(&CURSOR_DESCRIPTOR), "cursor");
|
|
455
|
+
assert_eq!(declared("grok_build"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
456
456
|
let mut identity = InstanceIdentity {
|
|
457
457
|
scope: team_agent_contract::contract::types::ScopeId::new("scope").unwrap(),
|
|
458
458
|
seat: team_agent_contract::contract::types::SeatId::new("worker").unwrap(),
|
|
@@ -474,67 +474,20 @@ mod tests {
|
|
|
474
474
|
}
|
|
475
475
|
|
|
476
476
|
#[test]
|
|
477
|
-
fn
|
|
478
|
-
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
479
|
-
assert_eq!(CLAUDE_DESCRIPTOR.identity.id, "claude_tui");
|
|
480
|
-
assert_eq!(CLAUDE_DESCRIPTOR.identity.binary, "claude");
|
|
481
|
-
assert_eq!(provider("claude_tui").unwrap(), NativeProvider::Claude);
|
|
482
|
-
assert_eq!(declared("claude_tui", false), Some(&CLAUDE_DESCRIPTOR));
|
|
483
|
-
// Every public Claude name declares the leaf, with or without opt-in;
|
|
484
|
-
// a persisted legacy row keeps its key and is never reclassified.
|
|
485
|
-
for name in ["claude", "claude_code", "claude-code"] {
|
|
486
|
-
assert_eq!(declared(name, false), Some(&CLAUDE_DESCRIPTOR), "{name}");
|
|
487
|
-
assert_eq!(declared(name, true), Some(&CLAUDE_DESCRIPTOR), "{name}");
|
|
488
|
-
assert!(recognizes(name, false), "{name}");
|
|
489
|
-
assert!(descriptor(name).is_none(), "{name}");
|
|
490
|
-
assert!(provider(name).is_err(), "{name}");
|
|
491
|
-
}
|
|
492
|
-
assert!(declared("Claude", false).is_none());
|
|
493
|
-
assert_eq!(public_name(&CLAUDE_DESCRIPTOR), "claude");
|
|
494
|
-
assert_eq!(declared(public_name(&CLAUDE_DESCRIPTOR), false), Some(&CLAUDE_DESCRIPTOR));
|
|
495
|
-
assert!(recognizes(" Claude ", false));
|
|
496
|
-
assert!(recognizes(" Claude_TUI ", false));
|
|
497
|
-
let mut identity = InstanceIdentity {
|
|
498
|
-
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
499
|
-
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
500
|
-
};
|
|
501
|
-
let first = NativeProvider::Claude.server_key_for(&identity).unwrap();
|
|
502
|
-
assert_eq!(first, claude::server_key(&identity));
|
|
503
|
-
assert_ne!(first, grok_build::server_key(&identity));
|
|
504
|
-
assert_ne!(first, codex::server_key(&identity));
|
|
505
|
-
assert_ne!(first, pi::server_key(&identity));
|
|
506
|
-
identity.generation = Generation(2);
|
|
507
|
-
assert_ne!(first, NativeProvider::Claude.server_key_for(&identity).unwrap());
|
|
508
|
-
assert!(NativeProvider::Claude.server_key().is_err());
|
|
509
|
-
assert!(NativeProvider::Claude.tool_panel().is_err());
|
|
510
|
-
assert!(NativeProvider::Claude.startup().is_none(), "folder trust is never keyed");
|
|
511
|
-
assert!(NativeProvider::Claude.session_panel().is_none());
|
|
512
|
-
assert!(NativeProvider::Claude.uses_tool_roundtrips());
|
|
513
|
-
assert!(NativeProvider::Claude.first_business_bootstrap());
|
|
514
|
-
let kinds: Vec<_> = NativeProvider::Claude.controls().iter().map(|control| control.command).collect();
|
|
515
|
-
assert_eq!(kinds, ["/exit"]);
|
|
516
|
-
}
|
|
517
|
-
|
|
518
|
-
#[test]
|
|
519
|
-
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() {
|
|
520
478
|
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
521
479
|
assert_eq!(PI_DESCRIPTOR.identity.id, "pi_tui");
|
|
522
480
|
assert_eq!(PI_DESCRIPTOR.identity.binary, "pi");
|
|
523
481
|
assert_eq!(provider("pi_tui").unwrap(), NativeProvider::Pi);
|
|
524
|
-
//
|
|
525
|
-
// without opt-in; a persisted legacy `pi` row is never reclassified.
|
|
482
|
+
// The default role provider, the Pi leader and legacy state keep `pi`.
|
|
526
483
|
assert!(descriptor("pi").is_none());
|
|
527
484
|
assert!(provider("pi").is_err());
|
|
528
|
-
|
|
529
|
-
assert_eq!(declared("
|
|
530
|
-
assert_eq!(declared("pi_tui", false), Some(&PI_DESCRIPTOR));
|
|
485
|
+
assert!(declared("pi").is_none());
|
|
486
|
+
assert_eq!(declared("pi_tui"), Some(&PI_DESCRIPTOR));
|
|
531
487
|
for spelling in ["pi", " Pi ", "PI"] {
|
|
532
|
-
assert!(recognizes(spelling
|
|
533
|
-
assert!(recognizes(spelling, true), "{spelling:?}");
|
|
488
|
+
assert!(!recognizes(spelling), "{spelling:?}");
|
|
534
489
|
}
|
|
535
|
-
assert!(declared("Pi"
|
|
536
|
-
assert_eq!(public_name(&PI_DESCRIPTOR), "pi");
|
|
537
|
-
assert_eq!(public_name(&CURSOR_DESCRIPTOR), "cursor");
|
|
490
|
+
assert!(declared("Pi").is_none());
|
|
538
491
|
let mut identity = InstanceIdentity {
|
|
539
492
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
540
493
|
instance: InstanceId::new("instance").unwrap(), generation: Generation(1),
|
|
@@ -558,6 +511,16 @@ mod tests {
|
|
|
558
511
|
#[test]
|
|
559
512
|
fn grok_server_key_is_generation_bound_and_has_no_inspector_fallback() {
|
|
560
513
|
use team_agent_contract::contract::types::{Generation, InstanceId, ScopeId, SeatId};
|
|
514
|
+
// The public command is also an exact runtime alias, including persisted rows.
|
|
515
|
+
assert_eq!(declared("grok"), Some(&GROK_BUILD_DESCRIPTOR));
|
|
516
|
+
assert!(recognizes(" Grok "));
|
|
517
|
+
assert!(declared("Grok").is_none());
|
|
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"));
|
|
523
|
+
assert_eq!(public_name(&GROK_BUILD_DESCRIPTOR), "grok");
|
|
561
524
|
let mut identity = InstanceIdentity {
|
|
562
525
|
scope: ScopeId::new("scope").unwrap(), seat: SeatId::new("worker").unwrap(),
|
|
563
526
|
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
|
+
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] {
|
|
2302
|
+
let hint = recovery_hint("w1", provider, workspace, "research");
|
|
2303
|
+
assert!(
|
|
2304
|
+
hint.ends_with("To recover manually, run: team-agent start-agent w1 --workspace '/tmp/ws' --team research --force --json"),
|
|
2305
|
+
"{hint}"
|
|
2306
|
+
);
|
|
2307
|
+
}
|
|
2308
|
+
}
|
|
2269
2309
|
}
|