@team-agent/installer 0.5.124 → 0.5.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +1 -8
- package/Cargo.toml +1 -1
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/crates/team-agent/Cargo.toml +0 -1
- package/crates/team-agent/src/cli/diagnose.rs +39 -69
- package/crates/team-agent/src/cli/emit.rs +45 -15
- package/crates/team-agent/src/cli/intent/runtime.rs +5 -53
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -130
- package/crates/team-agent/src/cli/leader.rs +2 -3
- package/crates/team-agent/src/cli/leader_prompt.rs +1 -1
- package/crates/team-agent/src/cli/mod.rs +28 -33
- package/crates/team-agent/src/cli/models.rs +44 -880
- package/crates/team-agent/src/cli/route.rs +1 -1
- package/crates/team-agent/src/cli/send/persist.rs +36 -0
- package/crates/team-agent/src/cli/send/presentation.rs +7 -1
- package/crates/team-agent/src/cli/send.rs +3 -1
- package/crates/team-agent/src/cli/spec.rs +1 -2
- package/crates/team-agent/src/cli/status_port/brief.rs +66 -0
- package/crates/team-agent/src/cli/tests/base.rs +4 -11
- package/crates/team-agent/src/cli/tests/mod.rs +1 -1
- package/crates/team-agent/src/cli/tests/run_delegation.rs +5 -4
- package/crates/team-agent/src/cli/tests/status_send.rs +17 -0
- package/crates/team-agent/src/compiler/tests.rs +39 -8
- package/crates/team-agent/src/compiler.rs +28 -204
- package/crates/team-agent/src/contract_runtime/backend.rs +79 -40
- package/crates/team-agent/src/contract_runtime/config.rs +37 -24
- package/crates/team-agent/src/contract_runtime/discovery.rs +33 -0
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +87 -34
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +299 -21
- package/crates/team-agent/src/coordinator/runtime_detectors.rs +0 -1
- package/crates/team-agent/src/coordinator/tests/api_error_recovery.rs +29 -8
- package/crates/team-agent/src/coordinator/tests/health_sync.rs +0 -42
- package/crates/team-agent/src/coordinator/tick.rs +89 -1
- package/crates/team-agent/src/db/message_store.rs +78 -3
- package/crates/team-agent/src/layout/worker_window_helpers.rs +0 -1
- package/crates/team-agent/src/leader/prompt.rs +1 -2
- package/crates/team-agent/src/leader/provider_attribution.rs +0 -52
- package/crates/team-agent/src/leader/start.rs +1 -2
- package/crates/team-agent/src/leader/tests/prompt_contract.rs +2 -3
- package/crates/team-agent/src/lifecycle/launch/add_agent.rs +91 -0
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +15 -195
- package/crates/team-agent/src/lifecycle/launch/agent_state.rs +0 -9
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -29
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +3 -11
- package/crates/team-agent/src/lifecycle/launch/pi_mcp.rs +74 -244
- package/crates/team-agent/src/lifecycle/launch/quick_start.rs +0 -24
- package/crates/team-agent/src/lifecycle/launch/role_source.rs +5 -0
- package/crates/team-agent/src/lifecycle/launch/spawn.rs +21 -61
- package/crates/team-agent/src/lifecycle/launch/spec_state.rs +0 -1
- package/crates/team-agent/src/lifecycle/launch/worker_env.rs +0 -108
- package/crates/team-agent/src/lifecycle/launch.rs +2 -43
- package/crates/team-agent/src/lifecycle/profile_launch.rs +21 -348
- package/crates/team-agent/src/lifecycle/profile_smoke.rs +1 -2
- package/crates/team-agent/src/lifecycle/restart/common.rs +43 -378
- package/crates/team-agent/src/lifecycle/restart/selection.rs +5 -5
- package/crates/team-agent/src/lifecycle/restart.rs +0 -2
- package/crates/team-agent/src/lifecycle/role_config.rs +42 -3
- package/crates/team-agent/src/lifecycle/tests/behavioral_diff_264_red.rs +11 -6
- package/crates/team-agent/src/lifecycle/tests/claude_profile_launch_red.rs +8 -320
- package/crates/team-agent/src/lifecycle/tests/cli_argv_routing_red.rs +60 -145
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +8 -334
- package/crates/team-agent/src/lifecycle/tests/communication_mode_runtime_contract_red.rs +30 -11
- package/crates/team-agent/src/lifecycle/tests/copilot_provider_red.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/core.rs +17 -16
- package/crates/team-agent/src/lifecycle/tests/grok_require_explicit_model_red.rs +12 -12
- package/crates/team-agent/src/lifecycle/tests/harvest2_a_batch_red.rs +3 -51
- package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs +26 -28
- package/crates/team-agent/src/lifecycle/tests/pi_catalog_red.rs +6 -18
- package/crates/team-agent/src/lifecycle/tests/pi_command_red.rs +52 -70
- package/crates/team-agent/src/lifecycle/tests/pi_dual_entry_red.rs +4 -157
- package/crates/team-agent/src/lifecycle/tests/pi_executable_mcp_red.rs +10 -302
- package/crates/team-agent/src/lifecycle/tests/pi_lifecycle_doctor_red.rs +1 -68
- package/crates/team-agent/src/lifecycle/tests/pi_native_mcp_capability_red.rs +1 -19
- package/crates/team-agent/src/lifecycle/tests/pi_session_delivery_red.rs +2 -100
- package/crates/team-agent/src/lifecycle/tests/quick_start_worker_readiness_red.rs +11 -10
- package/crates/team-agent/src/lifecycle/tests/restart_rebind_hotfix_252_red.rs +0 -1
- package/crates/team-agent/src/lifecycle/tests/restart_session_capture_red.rs +2 -106
- package/crates/team-agent/src/lifecycle/tests/status_credential_redaction_contract.rs +2 -2
- package/crates/team-agent/src/lifecycle/tests/swallow_batch4_semantics_red.rs +2 -254
- package/crates/team-agent/src/lifecycle/tests/upgrade_compat_0211_red.rs +4 -4
- package/crates/team-agent/src/lifecycle/tests/verify_rs031_window_consistency_red.rs +6 -5
- package/crates/team-agent/src/lifecycle/tests/worker_spawn_env_red.rs +7 -153
- package/crates/team-agent/src/lifecycle/tests.rs +0 -6
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/lifecycle/worker_command_context.rs +2 -4
- package/crates/team-agent/src/mcp_server/readiness.rs +148 -97
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +115 -16
- package/crates/team-agent/src/messaging/delivery.rs +185 -168
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/enter_rescue_tests.rs +1 -1
- package/crates/team-agent/src/messaging/helpers.rs +19 -0
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +67 -5
- package/crates/team-agent/src/messaging/tests/runtime.rs +110 -4
- package/crates/team-agent/src/messaging/tests/spine.rs +46 -36
- package/crates/team-agent/src/model/enums.rs +1 -8
- package/crates/team-agent/src/provider/adapter.rs +33 -302
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -5
- package/crates/team-agent/src/provider/argv_route.rs +1 -5
- package/crates/team-agent/src/provider/bypass_flags.rs +3 -11
- package/crates/team-agent/src/provider/classify.rs +68 -3
- package/crates/team-agent/src/provider/faults.rs +1 -1
- package/crates/team-agent/src/provider/model_catalog.rs +14 -273
- package/crates/team-agent/src/provider/session/capture.rs +7 -107
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +17 -109
- package/crates/team-agent/src/provider/session_scan/common.rs +11 -36
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -14
- package/crates/team-agent/src/provider/submit_now.rs +5 -28
- package/crates/team-agent/src/provider/tests/adapter.rs +39 -275
- package/crates/team-agent/src/provider/tests/classify.rs +53 -0
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -15
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/types.rs +1 -1
- package/crates/team-agent/src/provider/wire.rs +79 -11
- package/crates/team-agent/src/state/abnormal_watch/tests/mod.rs +1 -1
- package/crates/team-agent/src/state/persist.rs +6 -6
- package/crates/team-agent/src/state/repository/tests.rs +2 -2
- package/crates/team-agent/src/tmux_backend/native_input_tests.rs +2 -178
- package/crates/team-agent/src/tmux_backend/tests.rs +151 -0
- package/crates/team-agent/src/tmux_backend.rs +43 -8
- package/crates/team-agent/src/transport/native_input.rs +2 -231
- package/package.json +4 -4
- package/skills/team-agent/SKILL.md +7 -5
- 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/cursor_create_chat.rs +0 -229
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp.rs +0 -522
- package/crates/team-agent/src/lifecycle/launch/cursor_mcp_iso.rs +0 -282
- package/crates/team-agent/src/lifecycle/restart/avatar.rs +0 -1805
- package/crates/team-agent/src/lifecycle/tests/claude_compatible_config_red.rs +0 -325
- package/crates/team-agent/src/lifecycle/tests/cursor_mcp_overlay.rs +0 -576
- package/crates/team-agent/src/lifecycle/tests/cursor_require_explicit_model_red.rs +0 -222
- package/crates/team-agent/src/lifecycle/tests/cursor_restart_resume_red.rs +0 -511
- package/crates/team-agent/src/lifecycle/tests/pi_compiler_red.rs +0 -210
- package/crates/team-agent/src/lifecycle/tests/pi_fork_session_inheritance_red.rs +0 -1409
- package/crates/team-agent/src/provider/adapters/claude.rs +0 -78
- package/crates/team-agent/src/provider/adapters/claude_fork.rs +0 -131
- package/crates/team-agent/src/provider/adapters/cursor_agent.rs +0 -44
- package/crates/team-agent/src/provider/adapters/pi.rs +0 -100
- package/crates/team-agent/src/provider/session/context_fork/claude.rs +0 -123
- package/crates/team-agent/src/provider/session_scan/claude.rs +0 -523
- package/crates/team-agent/src/provider/session_scan/cursor.rs +0 -538
- package/crates/team-agent/src/provider/testdata/cursor-list-models-native.stdout +0 -250
- package/crates/team-agent/src/test_support/models_timeout_fixture.rs +0 -144
|
@@ -830,7 +830,7 @@ impl Coordinator {
|
|
|
830
830
|
// runs so the CapturedRuntimeFact map stays populated for
|
|
831
831
|
// downstream runtime detectors; only the activity classify
|
|
832
832
|
// happens once.
|
|
833
|
-
let jsonl_first =
|
|
833
|
+
let jsonl_first = native_activity_for_agent(agent);
|
|
834
834
|
if let Some(activity) = jsonl_first.as_ref() {
|
|
835
835
|
remember_idle_capture_schedule(agent, activity);
|
|
836
836
|
write_activity(agent, activity, false);
|
|
@@ -2313,6 +2313,47 @@ fn jsonl_activity_for_agent(agent: &Value) -> Option<crate::messaging::AgentActi
|
|
|
2313
2313
|
activity
|
|
2314
2314
|
}
|
|
2315
2315
|
|
|
2316
|
+
/// #379: for Claude, its live session registry outranks the transcript tail,
|
|
2317
|
+
/// which still reads idle between a submitted prompt and the first assistant
|
|
2318
|
+
/// record. Busy and waiting are decisive; idle yields only to a background
|
|
2319
|
+
/// task the transcript still holds open.
|
|
2320
|
+
fn native_activity_for_agent(agent: &Value) -> Option<crate::messaging::AgentActivity> {
|
|
2321
|
+
use crate::messaging::{ActivityStatus, AgentActivity};
|
|
2322
|
+
let jsonl = jsonl_activity_for_agent(agent);
|
|
2323
|
+
let claude = agent
|
|
2324
|
+
.get("provider")
|
|
2325
|
+
.and_then(Value::as_str)
|
|
2326
|
+
.and_then(parse_provider)
|
|
2327
|
+
.is_some_and(crate::provider::wire::is_claude_family);
|
|
2328
|
+
let registry = crate::provider::claude_registry_key(agent)
|
|
2329
|
+
.filter(|_| claude)
|
|
2330
|
+
.and_then(|(sessions, session_id)| {
|
|
2331
|
+
crate::provider::claude_registry_turn_state(
|
|
2332
|
+
&sessions,
|
|
2333
|
+
&session_id,
|
|
2334
|
+
agent.get("pane_id").and_then(Value::as_str),
|
|
2335
|
+
)
|
|
2336
|
+
});
|
|
2337
|
+
let (status, state) = match registry {
|
|
2338
|
+
Some(TurnState::Working) => (ActivityStatus::Working, "busy"),
|
|
2339
|
+
Some(TurnState::BlockedOnHuman) => (ActivityStatus::Uncertain, "waiting"),
|
|
2340
|
+
Some(TurnState::Idle)
|
|
2341
|
+
if jsonl
|
|
2342
|
+
.as_ref()
|
|
2343
|
+
.is_some_and(|activity| activity.rationale == "provider_jsonl:background_task") =>
|
|
2344
|
+
{
|
|
2345
|
+
return jsonl;
|
|
2346
|
+
}
|
|
2347
|
+
Some(TurnState::Idle) => (ActivityStatus::Idle, "idle"),
|
|
2348
|
+
_ => return jsonl,
|
|
2349
|
+
};
|
|
2350
|
+
Some(AgentActivity {
|
|
2351
|
+
status,
|
|
2352
|
+
confidence: 0.95,
|
|
2353
|
+
rationale: format!("claude_session_registry:{state}"),
|
|
2354
|
+
})
|
|
2355
|
+
}
|
|
2356
|
+
|
|
2316
2357
|
fn runtime_approval_target(
|
|
2317
2358
|
agent: &Value,
|
|
2318
2359
|
session_name: Option<&str>,
|
|
@@ -2908,6 +2949,53 @@ mod u1_tests {
|
|
|
2908
2949
|
use super::*;
|
|
2909
2950
|
use std::io::Write as _;
|
|
2910
2951
|
|
|
2952
|
+
// #379: the registry beside the transcript decides Claude's live turn.
|
|
2953
|
+
#[cfg(unix)]
|
|
2954
|
+
#[test]
|
|
2955
|
+
fn issue379_claude_registry_outranks_an_idle_transcript_tail() {
|
|
2956
|
+
use crate::messaging::ActivityStatus;
|
|
2957
|
+
let config = std::env::temp_dir().join(format!("ta-379-native-activity-{}", std::process::id()));
|
|
2958
|
+
let _ = std::fs::remove_dir_all(&config);
|
|
2959
|
+
let sid = "22222222-3333-4444-8555-666666666666";
|
|
2960
|
+
let projects = config.join("projects").join("-owned-cwd");
|
|
2961
|
+
std::fs::create_dir_all(&projects).unwrap();
|
|
2962
|
+
std::fs::create_dir_all(config.join("sessions")).unwrap();
|
|
2963
|
+
let rollout = projects.join(format!("{sid}.jsonl"));
|
|
2964
|
+
let pid = std::process::id();
|
|
2965
|
+
let registry = |status: &str| {
|
|
2966
|
+
let record = serde_json::json!({"pid": pid, "sessionId": sid, "tmux": "team-x:@1.%7", "status": status});
|
|
2967
|
+
std::fs::write(config.join("sessions").join(format!("{pid}.json")), record.to_string()).unwrap();
|
|
2968
|
+
};
|
|
2969
|
+
let end_turn = r#"{"type":"assistant","requestId":"r1","message":{"stop_reason":"end_turn"}}"#;
|
|
2970
|
+
let agent = serde_json::json!({
|
|
2971
|
+
"provider": "claude", "pane_id": "%7", "rollout_path": rollout, "process_alive": true,
|
|
2972
|
+
});
|
|
2973
|
+
let observe = || native_activity_for_agent(&agent).map(|a| (a.status, a.rationale));
|
|
2974
|
+
|
|
2975
|
+
// A submitted prompt before its first assistant record: the tail still reads idle.
|
|
2976
|
+
std::fs::write(&rollout, format!("{end_turn}\n")).unwrap();
|
|
2977
|
+
registry("busy");
|
|
2978
|
+
assert_eq!(observe(), Some((ActivityStatus::Working, "claude_session_registry:busy".into())));
|
|
2979
|
+
registry("waiting");
|
|
2980
|
+
assert_eq!(observe(), Some((ActivityStatus::Uncertain, "claude_session_registry:waiting".into())));
|
|
2981
|
+
registry("idle");
|
|
2982
|
+
assert_eq!(observe(), Some((ActivityStatus::Idle, "claude_session_registry:idle".into())));
|
|
2983
|
+
// A background shell the transcript holds open keeps the worker busy.
|
|
2984
|
+
let background = r#"{"type":"user","message":{"content":[{"type":"tool_result","content":"Command running in background with ID: bg1"}]}}"#;
|
|
2985
|
+
std::fs::write(&rollout, format!("{background}\n{end_turn}\n")).unwrap();
|
|
2986
|
+
assert_eq!(observe(), Some((ActivityStatus::Working, "provider_jsonl:background_task".into())));
|
|
2987
|
+
// Cold start: no transcript captured yet, only the launch's session id and root.
|
|
2988
|
+
let cold = serde_json::json!({
|
|
2989
|
+
"provider": "claude", "pane_id": "%7", "_pending_session_id": sid,
|
|
2990
|
+
"claude_projects_root": config.join("projects"),
|
|
2991
|
+
});
|
|
2992
|
+
assert_eq!(
|
|
2993
|
+
native_activity_for_agent(&cold).map(|a| (a.status, a.rationale)),
|
|
2994
|
+
Some((ActivityStatus::Idle, "claude_session_registry:idle".into()))
|
|
2995
|
+
);
|
|
2996
|
+
let _ = std::fs::remove_dir_all(&config);
|
|
2997
|
+
}
|
|
2998
|
+
|
|
2911
2999
|
struct CaptureFailureRegistry;
|
|
2912
3000
|
|
|
2913
3001
|
impl ProviderRegistry for CaptureFailureRegistry {
|
|
@@ -87,6 +87,9 @@ pub struct NotificationClaimParams<'a> {
|
|
|
87
87
|
pub pane_id: Option<&'a str>,
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
+
/// Error of a row parked by [`MessageStore::park_delivery_before_input`] (#372).
|
|
91
|
+
pub(crate) const MCP_HANDSHAKE_TIMEOUT: &str = "mcp_handshake_timeout";
|
|
92
|
+
|
|
90
93
|
/// Canonical initial message-row statuses shared by persistence, presentation,
|
|
91
94
|
/// claiming and recovery. New durable dispositions must be added here first.
|
|
92
95
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
@@ -609,6 +612,46 @@ impl MessageStore {
|
|
|
609
612
|
Ok(rows == 1)
|
|
610
613
|
}
|
|
611
614
|
|
|
615
|
+
/// Park an owned pre-input claim whose readiness wait reached its bound.
|
|
616
|
+
/// `queued_until_start` is claimable but never polled by `deliver_pending`;
|
|
617
|
+
/// only [`Self::requeue_parked_deliveries`] or a seat restart resumes it.
|
|
618
|
+
pub(crate) fn park_delivery_before_input(
|
|
619
|
+
&self,
|
|
620
|
+
message_id: &str,
|
|
621
|
+
attempt: u32,
|
|
622
|
+
) -> Result<bool, MessageStoreError> {
|
|
623
|
+
if attempt == 0 {
|
|
624
|
+
return Ok(false);
|
|
625
|
+
}
|
|
626
|
+
let conn = crate::db::schema::open_db(&self.path)?;
|
|
627
|
+
let rows = conn.execute(
|
|
628
|
+
"update messages
|
|
629
|
+
set status = 'queued_until_start',
|
|
630
|
+
delivery_attempts = delivery_attempts - 1,
|
|
631
|
+
error = ?3, updated_at = ?4
|
|
632
|
+
where message_id = ?1 and status = 'target_resolved'
|
|
633
|
+
and error is null and delivery_attempts = ?2",
|
|
634
|
+
params![message_id, attempt, MCP_HANDSHAKE_TIMEOUT, now_ts()],
|
|
635
|
+
)?;
|
|
636
|
+
Ok(rows == 1)
|
|
637
|
+
}
|
|
638
|
+
|
|
639
|
+
/// Return one seat's parked rows to the normal delivery queue.
|
|
640
|
+
pub(crate) fn requeue_parked_deliveries(
|
|
641
|
+
&self,
|
|
642
|
+
recipient: &str,
|
|
643
|
+
owner_team_id: &str,
|
|
644
|
+
) -> Result<usize, MessageStoreError> {
|
|
645
|
+
let conn = crate::db::schema::open_db(&self.path)?;
|
|
646
|
+
Ok(conn.execute(
|
|
647
|
+
"update messages
|
|
648
|
+
set status = 'accepted', error = null, updated_at = ?4
|
|
649
|
+
where recipient = ?1 and status = 'queued_until_start' and error = ?3
|
|
650
|
+
and (owner_team_id = ?2 or owner_team_id is null)",
|
|
651
|
+
params![recipient, owner_team_id, MCP_HANDSHAKE_TIMEOUT, now_ts()],
|
|
652
|
+
)?)
|
|
653
|
+
}
|
|
654
|
+
|
|
612
655
|
/// Read inbox rows through [`Self::inbox`]; recovery transitions below are
|
|
613
656
|
/// separate repository owners and are not claim eligibility.
|
|
614
657
|
pub fn requeue_blocked_leader_messages(
|
|
@@ -657,8 +700,8 @@ impl MessageStore {
|
|
|
657
700
|
let mut stmt = tx.prepare(
|
|
658
701
|
"select message_id from messages
|
|
659
702
|
where recipient = ?1
|
|
660
|
-
and status = ?2
|
|
661
|
-
|
|
703
|
+
and ((status = ?2 and error = 'tmux_target_missing')
|
|
704
|
+
or (status = 'queued_until_start' and error = ?4))
|
|
662
705
|
and (
|
|
663
706
|
(?3 is null and owner_team_id is null)
|
|
664
707
|
or owner_team_id = ?3
|
|
@@ -670,7 +713,8 @@ impl MessageStore {
|
|
|
670
713
|
params![
|
|
671
714
|
agent_id,
|
|
672
715
|
MessageRowStatus::QueuedPaneMissing.as_str(),
|
|
673
|
-
owner_team_id
|
|
716
|
+
owner_team_id,
|
|
717
|
+
MCP_HANDSHAKE_TIMEOUT
|
|
674
718
|
],
|
|
675
719
|
|row| row.get::<_, String>(0),
|
|
676
720
|
)?
|
|
@@ -1233,6 +1277,37 @@ mod tests {
|
|
|
1233
1277
|
}
|
|
1234
1278
|
}
|
|
1235
1279
|
|
|
1280
|
+
#[test]
|
|
1281
|
+
fn issue372_parked_handshake_claim_is_exact_and_resumes_per_seat() {
|
|
1282
|
+
let s = store();
|
|
1283
|
+
let mid = s.create_message(Some("t"), "s", "r", "c", None, true, Some("team-a")).unwrap();
|
|
1284
|
+
assert!(!s.park_delivery_before_input(&mid, 1).unwrap(), "unclaimed rows never park");
|
|
1285
|
+
assert!(s.claim_for_delivery(&mid).unwrap());
|
|
1286
|
+
assert!(!s.park_delivery_before_input(&mid, 2).unwrap(), "a stale claim cannot park");
|
|
1287
|
+
assert!(s.park_delivery_before_input(&mid, 1).unwrap());
|
|
1288
|
+
assert!(!s.park_delivery_before_input(&mid, 1).unwrap(), "single winner");
|
|
1289
|
+
let c = read(&s);
|
|
1290
|
+
assert_eq!(status_of(&c, &mid), "queued_until_start");
|
|
1291
|
+
assert_eq!(col_str(&c, &mid, "error").as_deref(), Some(MCP_HANDSHAKE_TIMEOUT));
|
|
1292
|
+
assert_eq!(col_i64(&c, &mid, "delivery_attempts"), 0, "waiting spends no input attempt");
|
|
1293
|
+
assert_eq!(s.requeue_parked_deliveries("other", "team-a").unwrap(), 0);
|
|
1294
|
+
assert_eq!(s.requeue_parked_deliveries("r", "team-b").unwrap(), 0);
|
|
1295
|
+
assert_eq!(s.requeue_parked_deliveries("r", "team-a").unwrap(), 1);
|
|
1296
|
+
let c = read(&s);
|
|
1297
|
+
assert_eq!(status_of(&c, &mid), "accepted");
|
|
1298
|
+
assert_eq!(col_str(&c, &mid, "error"), None);
|
|
1299
|
+
}
|
|
1300
|
+
|
|
1301
|
+
#[test]
|
|
1302
|
+
fn issue372_seat_restart_also_resumes_parked_handshake_rows() {
|
|
1303
|
+
let s = store();
|
|
1304
|
+
let mid = s.create_message(Some("t"), "s", "r", "c", None, true, Some("team-a")).unwrap();
|
|
1305
|
+
assert!(s.claim_for_delivery(&mid).unwrap());
|
|
1306
|
+
assert!(s.park_delivery_before_input(&mid, 1).unwrap());
|
|
1307
|
+
assert_eq!(s.recover_worker_pane_available("r", Some("team-a")).unwrap(), vec![mid.clone()]);
|
|
1308
|
+
assert_eq!(status_of(&read(&s), &mid), "accepted");
|
|
1309
|
+
}
|
|
1310
|
+
|
|
1236
1311
|
#[test]
|
|
1237
1312
|
fn claim_for_delivery_never_claims_stored_only_presentation() {
|
|
1238
1313
|
let s = store();
|
|
@@ -442,7 +442,7 @@ pub(crate) fn inject(
|
|
|
442
442
|
Some(path),
|
|
443
443
|
)
|
|
444
444
|
.for_provider(provider);
|
|
445
|
-
error.action = "Use pi, claude, codex or grok, or clear leader-prompt
|
|
445
|
+
error.action = "Use pi, claude, codex or grok, or clear leader-prompt";
|
|
446
446
|
return Err(error);
|
|
447
447
|
}
|
|
448
448
|
};
|
|
@@ -890,7 +890,6 @@ mod tests {
|
|
|
890
890
|
fn leader_prompt_unadmitted_providers_fail_without_argv_mutation() {
|
|
891
891
|
let path = Path::new("/home/example/.team-agent/leader-prompt.txt");
|
|
892
892
|
for provider in [
|
|
893
|
-
Provider::CursorAgent,
|
|
894
893
|
Provider::Copilot,
|
|
895
894
|
Provider::GeminiCli,
|
|
896
895
|
Provider::Fake,
|
|
@@ -18,10 +18,6 @@ const COMMAND_GRAMMAR_PROVIDER_COMMANDS: &[(&str, Provider)] = &[
|
|
|
18
18
|
("copilot", Provider::Copilot),
|
|
19
19
|
("gemini", Provider::GeminiCli),
|
|
20
20
|
("grok", Provider::Grok),
|
|
21
|
-
// NOTE: Cursor `agent` binary is NOT added here — command-text attribution
|
|
22
|
-
// is a substring contains() match in table order; `"agent"` would also
|
|
23
|
-
// match the framework's own `team-agent` binary and mis-attribute leader
|
|
24
|
-
// panes. CursorAgent panes need env/argv-based attribution (TODO 0.5.67).
|
|
25
21
|
("fake", Provider::Fake),
|
|
26
22
|
];
|
|
27
23
|
|
|
@@ -99,9 +95,6 @@ fn provider_from_command_text(text: &str) -> Option<Provider> {
|
|
|
99
95
|
if pi_command_text(&lower) {
|
|
100
96
|
return Some(Provider::Pi);
|
|
101
97
|
}
|
|
102
|
-
if cursor_agent_command_text(&lower) {
|
|
103
|
-
return Some(Provider::CursorAgent);
|
|
104
|
-
}
|
|
105
98
|
COMMAND_GRAMMAR_PROVIDER_COMMANDS
|
|
106
99
|
.iter()
|
|
107
100
|
.find_map(|(needle, provider)| lower.contains(needle).then_some(*provider))
|
|
@@ -119,29 +112,6 @@ fn pi_command_text(lower: &str) -> bool {
|
|
|
119
112
|
})
|
|
120
113
|
}
|
|
121
114
|
|
|
122
|
-
/// Cursor 二进制名为 `agent`,不能做 substring contains(会误伤 `team-agent`)。
|
|
123
|
-
/// 认精确 token `cursor-agent` / `…/agent`,且必须带 `--sandbox` 或 `--trust`。
|
|
124
|
-
fn cursor_agent_command_text(lower: &str) -> bool {
|
|
125
|
-
let tokens: Vec<&str> = lower.split_whitespace().collect();
|
|
126
|
-
if tokens.iter().any(|tok| {
|
|
127
|
-
*tok == "team-agent"
|
|
128
|
-
|| tok.ends_with("/team-agent")
|
|
129
|
-
|| tok.ends_with("\\team-agent")
|
|
130
|
-
}) {
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
let is_cursor_bin = tokens.iter().any(|tok| {
|
|
134
|
-
*tok == "cursor-agent"
|
|
135
|
-
|| *tok == "agent"
|
|
136
|
-
|| tok.ends_with("/cursor-agent")
|
|
137
|
-
|| tok.ends_with("/agent")
|
|
138
|
-
|| tok.ends_with("\\cursor-agent")
|
|
139
|
-
|| tok.ends_with("\\agent")
|
|
140
|
-
});
|
|
141
|
-
let has_cursor_flag = tokens.iter().any(|tok| *tok == "--sandbox" || *tok == "--trust");
|
|
142
|
-
is_cursor_bin && has_cursor_flag
|
|
143
|
-
}
|
|
144
|
-
|
|
145
115
|
fn provider_from_env_text(text: &str) -> Option<Provider> {
|
|
146
116
|
text.split(|ch: char| ch == '\0' || ch.is_ascii_whitespace())
|
|
147
117
|
.find_map(|part| part.strip_prefix("TEAM_AGENT_LEADER_PROVIDER="))
|
|
@@ -236,28 +206,6 @@ mod tests {
|
|
|
236
206
|
);
|
|
237
207
|
}
|
|
238
208
|
|
|
239
|
-
#[test]
|
|
240
|
-
fn cursor_agent_basename_with_trust_is_attributed() {
|
|
241
|
-
assert_eq!(
|
|
242
|
-
attribute_command_provider("cursor-agent --trust --sandbox disabled --workspace /ws"),
|
|
243
|
-
Some(Provider::CursorAgent)
|
|
244
|
-
);
|
|
245
|
-
assert_eq!(
|
|
246
|
-
attribute_command_provider("agent --trust --sandbox disabled --workspace /ws"),
|
|
247
|
-
Some(Provider::CursorAgent)
|
|
248
|
-
);
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
#[test]
|
|
252
|
-
fn team_agent_binary_is_not_cursor() {
|
|
253
|
-
assert_ne!(
|
|
254
|
-
attribute_command_provider("team-agent --trust claude"),
|
|
255
|
-
Some(Provider::CursorAgent)
|
|
256
|
-
);
|
|
257
|
-
assert_eq!(attribute_command_provider("team-agent status"), None);
|
|
258
|
-
assert_eq!(attribute_command_provider("agent"), None);
|
|
259
|
-
}
|
|
260
|
-
|
|
261
209
|
#[test]
|
|
262
210
|
fn pane_env_provider_wins_over_command() {
|
|
263
211
|
let mut pane = pane("codex", None);
|
|
@@ -2951,7 +2951,6 @@ fn provider_command_name(provider: Provider) -> &'static str {
|
|
|
2951
2951
|
Provider::Copilot => "copilot",
|
|
2952
2952
|
Provider::GeminiCli => "gemini",
|
|
2953
2953
|
Provider::Grok => "grok",
|
|
2954
|
-
Provider::CursorAgent => "agent",
|
|
2955
2954
|
Provider::Pi => "pi",
|
|
2956
2955
|
Provider::Fake => "fake",
|
|
2957
2956
|
}
|
|
@@ -3539,7 +3538,7 @@ mod tests {
|
|
|
3539
3538
|
std::fs::write(&path, serde_json::json!({
|
|
3540
3539
|
"active_team_key":"current", "session_name":"team-existing-workers",
|
|
3541
3540
|
"spec_path":"/fixture/spec.yml", "team_dir":"/fixture/roles",
|
|
3542
|
-
"agents":{"worker":{"agent_id":"worker","provider":"
|
|
3541
|
+
"agents":{"worker":{"agent_id":"worker","provider":"copilot","status":status}},
|
|
3543
3542
|
"tasks":[{"task_id":"existing-task"}],
|
|
3544
3543
|
}).to_string()).unwrap();
|
|
3545
3544
|
persist_exec_provider_leader_binding(&plan, &workspace, &authority, false).unwrap();
|
|
@@ -112,7 +112,7 @@ fn leader_prompt_plans_preserve_absent_baseline_append_only_leaders_and_never_ma
|
|
|
112
112
|
let _routing = h.with_env("TEAM_AGENT_CLI_ARGV_ROUTING", "off");
|
|
113
113
|
let config = crate::leader::prompt::config_path().unwrap();
|
|
114
114
|
let providers = [Provider::Pi, Provider::Claude, Provider::ClaudeCode, Provider::Codex,
|
|
115
|
-
Provider::Grok, Provider::
|
|
115
|
+
Provider::Grok, Provider::Copilot];
|
|
116
116
|
for provider in providers {
|
|
117
117
|
let workspace = h.workspace(&format!("provider-{}", crate::provider::wire::provider_wire(provider)));
|
|
118
118
|
let baseline = plan(provider, &workspace, &[], false).unwrap();
|
|
@@ -122,7 +122,7 @@ fn leader_prompt_plans_preserve_absent_baseline_append_only_leaders_and_never_ma
|
|
|
122
122
|
assert_eq!(stable_argv(&empty), stable_argv(&baseline), "empty configuration changed argv for {provider:?}");
|
|
123
123
|
assert_eq!(empty.leader_env, baseline.leader_env);
|
|
124
124
|
fs::write(&config, SENTINEL).unwrap();
|
|
125
|
-
if matches!(provider, Provider::
|
|
125
|
+
if matches!(provider, Provider::Copilot) {
|
|
126
126
|
let LeaderError::Prompt(error) = plan(provider, &workspace, &[], false).unwrap_err() else { panic!("typed unsupported") };
|
|
127
127
|
assert_eq!(error.reason, "leader_prompt_unsupported");
|
|
128
128
|
} else {
|
|
@@ -177,7 +177,6 @@ fn leader_prompt_attach_skips_corrupt_configuration_and_all_injection_for_every_
|
|
|
177
177
|
Provider::ClaudeCode,
|
|
178
178
|
Provider::Codex,
|
|
179
179
|
Provider::Grok,
|
|
180
|
-
Provider::CursorAgent,
|
|
181
180
|
Provider::Copilot,
|
|
182
181
|
] {
|
|
183
182
|
let workspace = h.workspace(&format!("attach-{provider:?}"));
|
|
@@ -632,6 +632,14 @@ fn add_agent_with_transport_at_paths_reserved(
|
|
|
632
632
|
compiled.id, agent_id
|
|
633
633
|
)));
|
|
634
634
|
}
|
|
635
|
+
// The compiled spec carries a contract leaf's canonical id (`agent` → `cursor`).
|
|
636
|
+
#[cfg(unix)]
|
|
637
|
+
let contract_provider = compiled
|
|
638
|
+
.agent
|
|
639
|
+
.get("provider")
|
|
640
|
+
.and_then(Value::as_str)
|
|
641
|
+
.filter(|provider| crate::contract_runtime::registry::descriptor(provider).is_some())
|
|
642
|
+
.map(str::to_owned);
|
|
635
643
|
let compiled_agent = compiled.agent.clone();
|
|
636
644
|
inject_agent_into_spec(&mut spec, compiled_agent.clone(), &compiled.id)?;
|
|
637
645
|
// E5 spec 迁移:重编译的 spec 原子写到 .team/runtime/<team_key>/(不落用户目录 team_dir)。
|
|
@@ -666,6 +674,20 @@ fn add_agent_with_transport_at_paths_reserved(
|
|
|
666
674
|
inject_agent_into_spec(&mut latest_spec, compiled_agent, &compiled.id)?;
|
|
667
675
|
write_spec_atomic(&spec_path, &latest_spec)?;
|
|
668
676
|
drop(reservation_lock);
|
|
677
|
+
#[cfg(unix)]
|
|
678
|
+
if let Some(provider) = contract_provider {
|
|
679
|
+
return add_contract_seat(
|
|
680
|
+
run_workspace,
|
|
681
|
+
team_dir,
|
|
682
|
+
&spec_path,
|
|
683
|
+
pre_spec_text.as_deref(),
|
|
684
|
+
&canonical_team_key,
|
|
685
|
+
agent_id,
|
|
686
|
+
&provider,
|
|
687
|
+
role_file_path,
|
|
688
|
+
reservation,
|
|
689
|
+
);
|
|
690
|
+
}
|
|
669
691
|
let (meta, _) = crate::compiler::read_front_matter(role_file_path)
|
|
670
692
|
.map_err(|e| LifecycleError::Compile(e.to_string()))?;
|
|
671
693
|
// upsert writes status="starting" (E42) — start_agent_at_paths::mark_agent_started
|
|
@@ -755,3 +777,72 @@ fn add_agent_with_transport_at_paths_reserved(
|
|
|
755
777
|
role_file: role_file_path.to_path_buf(),
|
|
756
778
|
})
|
|
757
779
|
}
|
|
780
|
+
|
|
781
|
+
/// A contract seat starts in the native framework, never the legacy transport:
|
|
782
|
+
/// the seeded row is what the framework's start/publish path projects onto.
|
|
783
|
+
/// Its role must live in `<team_dir>/agents`, where the contract config reads.
|
|
784
|
+
#[cfg(unix)]
|
|
785
|
+
#[allow(clippy::too_many_arguments)]
|
|
786
|
+
fn add_contract_seat(
|
|
787
|
+
run_workspace: &Path,
|
|
788
|
+
team_dir: &Path,
|
|
789
|
+
spec_path: &Path,
|
|
790
|
+
pre_spec_text: Option<&str>,
|
|
791
|
+
team_key: &str,
|
|
792
|
+
agent_id: &AgentId,
|
|
793
|
+
provider: &str,
|
|
794
|
+
role_file_path: &Path,
|
|
795
|
+
reservation: Option<AgentReservation>,
|
|
796
|
+
) -> Result<AddAgentReport, LifecycleError> {
|
|
797
|
+
let rollback = |reason: &str| {
|
|
798
|
+
rollback_add_agent_atomic(
|
|
799
|
+
run_workspace,
|
|
800
|
+
spec_path,
|
|
801
|
+
pre_spec_text,
|
|
802
|
+
None,
|
|
803
|
+
Some(team_key),
|
|
804
|
+
agent_id,
|
|
805
|
+
reason,
|
|
806
|
+
)
|
|
807
|
+
};
|
|
808
|
+
let seed = serde_json::json!({
|
|
809
|
+
"agent_id": agent_id.as_str(), "provider": provider, "runtime_family": "contract",
|
|
810
|
+
"status": "starting", "contract_instance": null, "pane_id": null,
|
|
811
|
+
});
|
|
812
|
+
if let Err(error) = upsert_agent_entry(run_workspace, team_key, agent_id, seed) {
|
|
813
|
+
rollback("state_upsert_failed");
|
|
814
|
+
return Err(error);
|
|
815
|
+
}
|
|
816
|
+
let started = team_agent_contract::contract::types::SeatId::new(agent_id.as_str())
|
|
817
|
+
.map_err(|error| error.to_string())
|
|
818
|
+
.and_then(|seat| {
|
|
819
|
+
crate::contract_runtime::framework::start_new_seat(
|
|
820
|
+
run_workspace,
|
|
821
|
+
team_dir,
|
|
822
|
+
team_key,
|
|
823
|
+
&seat,
|
|
824
|
+
)
|
|
825
|
+
.map_err(|error| error.to_string())
|
|
826
|
+
});
|
|
827
|
+
if let Err(error) = started {
|
|
828
|
+
rollback("start_agent_failed");
|
|
829
|
+
return Err(LifecycleError::Provider(error));
|
|
830
|
+
}
|
|
831
|
+
let coordinator = crate::coordinator::start_coordinator_with_team(
|
|
832
|
+
&crate::coordinator::WorkspacePath::new(run_workspace.to_path_buf()),
|
|
833
|
+
Some(team_key),
|
|
834
|
+
)
|
|
835
|
+
.map_err(|error| LifecycleError::StatePersist(error.to_string()))?;
|
|
836
|
+
if let Some(reservation) = reservation {
|
|
837
|
+
reservation.commit();
|
|
838
|
+
}
|
|
839
|
+
Ok(AddAgentReport {
|
|
840
|
+
env: AgentActionEnvelope {
|
|
841
|
+
agent_id: agent_id.clone(),
|
|
842
|
+
state_file: crate::state::persist::runtime_state_path(run_workspace),
|
|
843
|
+
coordinator_started: coordinator.ok,
|
|
844
|
+
},
|
|
845
|
+
start_mode: StartMode::Fresh,
|
|
846
|
+
role_file: role_file_path.to_path_buf(),
|
|
847
|
+
})
|
|
848
|
+
}
|