@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
|
@@ -13,11 +13,6 @@ use super::{AuthMode, Provider};
|
|
|
13
13
|
|
|
14
14
|
pub use crate::provider::session_scan::{CaptureSessionContext, CapturedSessionCandidate};
|
|
15
15
|
|
|
16
|
-
pub trait ForkBackingMaterialization {
|
|
17
|
-
fn path(&self) -> &Path;
|
|
18
|
-
fn handoff(&mut self);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
16
|
// ===========================================================================
|
|
22
17
|
// TRAIT: ProviderAdapter (method SIGNATURES only — 无 body)
|
|
23
18
|
// ===========================================================================
|
|
@@ -192,24 +187,6 @@ pub trait ProviderAdapter {
|
|
|
192
187
|
.map(CommandPlan::argv_only)
|
|
193
188
|
}
|
|
194
189
|
|
|
195
|
-
fn materialize_fork_backing(
|
|
196
|
-
&self,
|
|
197
|
-
source_path: &Path,
|
|
198
|
-
source_session_id: &SessionId,
|
|
199
|
-
source_agent_id: &str,
|
|
200
|
-
target_agent_id: &str,
|
|
201
|
-
plan: &mut CommandPlan,
|
|
202
|
-
) -> Result<Option<Box<dyn ForkBackingMaterialization>>, ProviderError> {
|
|
203
|
-
let _ = (
|
|
204
|
-
source_path,
|
|
205
|
-
source_session_id,
|
|
206
|
-
source_agent_id,
|
|
207
|
-
target_agent_id,
|
|
208
|
-
plan,
|
|
209
|
-
);
|
|
210
|
-
Ok(None)
|
|
211
|
-
}
|
|
212
|
-
|
|
213
190
|
/// 计算本 provider 该用的 MCP server 配置(`adapter.py` mcp_config;claude
|
|
214
191
|
/// compatible_api 走 `ensure_compatible_claude_mcp_config`)。
|
|
215
192
|
fn mcp_config(&self, auth_mode: AuthMode) -> Result<McpConfig, ProviderError>;
|
|
@@ -272,28 +249,6 @@ pub trait ProviderAdapter {
|
|
|
272
249
|
}))
|
|
273
250
|
.unwrap_or_default()
|
|
274
251
|
}
|
|
275
|
-
|
|
276
|
-
/// Python launch/core.py:235-237 + tmux_prompt.py:124-129 — `runtime.fast` toggles
|
|
277
|
-
/// codex fast mode by sending `/fast` + Enter to the worker pane after spawn.
|
|
278
|
-
/// Providers without a fast-mode toggle are a no-op so upper layers stay
|
|
279
|
-
/// provider-agnostic (F032). Returns whether a toggle was sent.
|
|
280
|
-
fn enable_fast_mode(
|
|
281
|
-
&self,
|
|
282
|
-
transport: &dyn crate::transport::Transport,
|
|
283
|
-
target: &crate::transport::Target,
|
|
284
|
-
) -> bool {
|
|
285
|
-
match self.provider() {
|
|
286
|
-
Provider::Codex => {
|
|
287
|
-
let keys: Vec<crate::transport::Key> = "/fast"
|
|
288
|
-
.chars()
|
|
289
|
-
.map(crate::transport::Key::Char)
|
|
290
|
-
.chain([crate::transport::Key::Enter])
|
|
291
|
-
.collect();
|
|
292
|
-
transport.send_keys(target, &keys).is_ok()
|
|
293
|
-
}
|
|
294
|
-
_ => false,
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
252
|
}
|
|
298
253
|
|
|
299
254
|
// ===========================================================================
|
|
@@ -323,10 +278,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
323
278
|
|
|
324
279
|
fn caps(&self) -> ProviderCaps {
|
|
325
280
|
match self.provider {
|
|
326
|
-
Provider::
|
|
281
|
+
Provider::Claude | Provider::ClaudeCode => ProviderCaps {
|
|
327
282
|
resume: true,
|
|
328
283
|
fork: true,
|
|
329
|
-
native_mcp_config:
|
|
284
|
+
native_mcp_config: true,
|
|
330
285
|
writes_global_settings: false,
|
|
331
286
|
},
|
|
332
287
|
// Copilot resume 走 --resume <sid>;store fork 在隔离 COPILOT_HOME
|
|
@@ -346,18 +301,16 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
346
301
|
native_mcp_config: false,
|
|
347
302
|
writes_global_settings: true,
|
|
348
303
|
},
|
|
349
|
-
// Grok
|
|
350
|
-
//
|
|
351
|
-
Provider::Grok => ProviderCaps {
|
|
352
|
-
resume:
|
|
353
|
-
fork:
|
|
304
|
+
// Codex and Grok workers run only through their contract leaves. A
|
|
305
|
+
// persisted legacy row is neither resumable nor capture-pending.
|
|
306
|
+
Provider::Codex | Provider::Grok => ProviderCaps {
|
|
307
|
+
resume: false,
|
|
308
|
+
fork: false,
|
|
354
309
|
native_mcp_config: false,
|
|
355
310
|
writes_global_settings: false,
|
|
356
311
|
},
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => ProviderCaps {
|
|
360
|
-
resume: false,
|
|
312
|
+
Provider::Pi => ProviderCaps {
|
|
313
|
+
resume: true,
|
|
361
314
|
fork: false,
|
|
362
315
|
native_mcp_config: false,
|
|
363
316
|
writes_global_settings: false,
|
|
@@ -401,6 +354,7 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
401
354
|
|
|
402
355
|
fn auth_hint(&self, auth_mode: AuthMode) -> AuthHintStatus {
|
|
403
356
|
match self.provider {
|
|
357
|
+
Provider::Claude | Provider::ClaudeCode => claude_auth_hint(auth_mode),
|
|
404
358
|
// C-A-5 cr verdict v2(诚实 MUST-NOT-13) — copilot 无 auth status 子命令
|
|
405
359
|
// (main-help Commands 节仅 completion/help/init/login/mcp/plugin/update/
|
|
406
360
|
// version)。framework 只能弱检测(命令在 PATH + ~/.copilot/config.json
|
|
@@ -408,8 +362,8 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
408
362
|
// 标"weak / no auth-status command available";Compatible/Official 走 BYOK
|
|
409
363
|
// 路径,有 COPILOT_PROVIDER_BASE_URL 时已脱离 GitHub 登录通道。
|
|
410
364
|
Provider::Copilot => copilot_auth_hint(auth_mode),
|
|
411
|
-
// No legacy worker probe remains for
|
|
412
|
-
Provider::
|
|
365
|
+
// No legacy worker probe remains for Codex or Grok.
|
|
366
|
+
Provider::Codex | Provider::Grok | Provider::Pi => AuthHintStatus::Unknown,
|
|
413
367
|
_ => match auth_mode {
|
|
414
368
|
AuthMode::Subscription => AuthHintStatus::Present,
|
|
415
369
|
AuthMode::OfficialApi | AuthMode::CompatibleApi => AuthHintStatus::MissingOrUnknown,
|
|
@@ -436,16 +390,14 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
436
390
|
dangerously_skip_permissions: bool,
|
|
437
391
|
) -> Result<Vec<String>, ProviderError> {
|
|
438
392
|
match self.provider {
|
|
439
|
-
Provider::
|
|
440
|
-
|
|
393
|
+
Provider::Claude | Provider::ClaudeCode => Ok(claude_launch_command(
|
|
394
|
+
self,
|
|
441
395
|
auth_mode,
|
|
442
396
|
mcp_config,
|
|
443
397
|
system_prompt,
|
|
444
398
|
model,
|
|
445
399
|
dangerously_skip_permissions,
|
|
446
|
-
|
|
447
|
-
None,
|
|
448
|
-
)),
|
|
400
|
+
)?),
|
|
449
401
|
// §C1 worker argv 形态 + C-1/C-5/C-6 cr verdict:
|
|
450
402
|
// copilot --no-color --no-auto-update [<dangerous|granular>] [--model]
|
|
451
403
|
// --additional-mcp-config <inline json> --session-id <expected_uuid> -C <cwd>
|
|
@@ -467,14 +419,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
467
419
|
}
|
|
468
420
|
Ok(argv)
|
|
469
421
|
}
|
|
470
|
-
Provider::Grok =>
|
|
471
|
-
system_prompt,
|
|
472
|
-
model,
|
|
473
|
-
dangerously_skip_permissions,
|
|
474
|
-
)?),
|
|
475
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
422
|
+
Provider::Codex | Provider::Grok => {
|
|
476
423
|
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
477
424
|
}
|
|
425
|
+
Provider::Pi => Err(ProviderError::Command(
|
|
426
|
+
"Pi commands require the shared lifecycle materializer".to_string(),
|
|
427
|
+
)),
|
|
478
428
|
Provider::Fake => Ok(fake_worker_command()),
|
|
479
429
|
}
|
|
480
430
|
}
|
|
@@ -484,52 +434,66 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
484
434
|
ctx: ProviderCommandContext<'_>,
|
|
485
435
|
) -> Result<CommandPlan, ProviderError> {
|
|
486
436
|
match self.provider {
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
ctx.effort,
|
|
506
|
-
))),
|
|
507
|
-
// §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
|
|
508
|
-
// * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
|
|
509
|
-
// * `-C <workspace>`(双保险,即便 spawn cwd 漂移也能锚定)
|
|
510
|
-
// mcp_config inline 形态由 build_command 写入,launch 路径会用
|
|
511
|
-
// point_native_mcp_config_at_file 重写为 @<file> 形(§C1 note)。
|
|
512
|
-
Provider::Grok => {
|
|
513
|
-
// Align with Claude/Copilot: the UUID on `--session-id` is
|
|
514
|
-
// also the capture hint. `CommandPlan::argv_only` used to
|
|
515
|
-
// drop expected_session_id, so `_pending_session_id` was
|
|
516
|
-
// never written and restart could not resume.
|
|
437
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
438
|
+
// 0.4.7 (B1 verified, restart partial resume): RESTORE
|
|
439
|
+
// `--session-id <uuid>` on Claude fresh spawn. B1 confirmed
|
|
440
|
+
// Claude ≥ 2.1.185 honours the framework-supplied --session-id
|
|
441
|
+
// and creates a transcript at that id. The earlier 0.4.6
|
|
442
|
+
// P0 removal (commit 9feafc31) is reverted; the actual issue
|
|
443
|
+
// it tried to fix (leader-marker pollution) is addressed
|
|
444
|
+
// separately in commit d39b5104 (leader session exclusion
|
|
445
|
+
// in capture/repair).
|
|
446
|
+
//
|
|
447
|
+
// Fresh path: --session-id <expected> → Claude writes
|
|
448
|
+
// transcript at that id → capture/restart restore use the
|
|
449
|
+
// SAME id we predicted, so apply-time backing-store check
|
|
450
|
+
// passes immediately (no cwd+spawned_at attribution race).
|
|
451
|
+
//
|
|
452
|
+
// Resume path unchanged — `build_resume_command_plan` uses
|
|
453
|
+
// `--resume <existing_id>` on a session id that already has
|
|
454
|
+
// a real transcript.
|
|
517
455
|
let expected = next_session_token();
|
|
518
|
-
let
|
|
456
|
+
let managed = ctx
|
|
457
|
+
.profile_launch
|
|
458
|
+
.is_some_and(|profile| profile.managed_mcp_config);
|
|
459
|
+
let projects_root = ctx
|
|
460
|
+
.profile_launch
|
|
461
|
+
.and_then(|profile| profile.claude_projects_root.clone());
|
|
462
|
+
let model = claude_context_model(ctx);
|
|
463
|
+
let mut argv = claude_base_command(
|
|
464
|
+
self,
|
|
465
|
+
ctx.auth_mode,
|
|
466
|
+
ctx.mcp_config,
|
|
519
467
|
ctx.system_prompt,
|
|
520
|
-
|
|
468
|
+
model,
|
|
521
469
|
ctx.dangerously_skip_permissions,
|
|
470
|
+
managed,
|
|
522
471
|
ctx.effort,
|
|
523
472
|
)?;
|
|
524
473
|
argv.push("--session-id".to_string());
|
|
525
474
|
argv.push(expected.clone());
|
|
475
|
+
// Layer 1 self-healing (architect probe 2026-06-22, claude help
|
|
476
|
+
// `-n, --name <name>`): pass `--name <agent_id>` so the
|
|
477
|
+
// resume picker and on-disk `~/.claude/sessions/*.json name`
|
|
478
|
+
// field carry our role label.
|
|
479
|
+
if let Some(agent_id) = ctx.agent_id_hint {
|
|
480
|
+
if !agent_id.is_empty() {
|
|
481
|
+
argv.push("--name".to_string());
|
|
482
|
+
argv.push(agent_id.to_string());
|
|
483
|
+
}
|
|
484
|
+
}
|
|
526
485
|
Ok(CommandPlan {
|
|
527
486
|
argv,
|
|
528
487
|
expected_session_id: Some(SessionId::new(expected)),
|
|
529
|
-
provider_projects_root:
|
|
530
|
-
managed_mcp_config:
|
|
488
|
+
provider_projects_root: projects_root,
|
|
489
|
+
managed_mcp_config: managed,
|
|
531
490
|
})
|
|
532
491
|
}
|
|
492
|
+
// §C1 + §C4 cr verdict — copilot plan 端预定 UUID + workspace `-C` 双保险:
|
|
493
|
+
// * `--session-id <uuid>`(claude 同法,捕获免目录扫描,sqlite 仅校验)
|
|
494
|
+
// * `-C <workspace>`(双保险,即便 spawn cwd 漂移也能锚定)
|
|
495
|
+
// mcp_config inline 形态由 build_command 写入,launch 路径会用
|
|
496
|
+
// point_native_mcp_config_at_file 重写为 @<file> 形(§C1 note)。
|
|
533
497
|
Provider::Copilot => {
|
|
534
498
|
let expected = next_session_token();
|
|
535
499
|
let mut argv = copilot_base_command(
|
|
@@ -548,9 +512,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
548
512
|
managed_mcp_config: false,
|
|
549
513
|
})
|
|
550
514
|
}
|
|
551
|
-
Provider::
|
|
515
|
+
Provider::Codex | Provider::Grok => {
|
|
552
516
|
Err(ProviderError::Command(retired_worker(self.provider)))
|
|
553
517
|
}
|
|
518
|
+
Provider::Pi => Err(ProviderError::Command(
|
|
519
|
+
"Pi commands require the shared lifecycle materializer".to_string(),
|
|
520
|
+
)),
|
|
554
521
|
_ => self
|
|
555
522
|
.build_command_with_permissions(
|
|
556
523
|
ctx.auth_mode,
|
|
@@ -563,29 +530,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
563
530
|
}
|
|
564
531
|
}
|
|
565
532
|
|
|
566
|
-
fn materialize_fork_backing(
|
|
567
|
-
&self,
|
|
568
|
-
source_path: &Path,
|
|
569
|
-
source_session_id: &SessionId,
|
|
570
|
-
source_agent_id: &str,
|
|
571
|
-
target_agent_id: &str,
|
|
572
|
-
plan: &mut CommandPlan,
|
|
573
|
-
) -> Result<Option<Box<dyn ForkBackingMaterialization>>, ProviderError> {
|
|
574
|
-
match self.provider {
|
|
575
|
-
Provider::Codex => crate::provider::session::materialize_codex_fork(
|
|
576
|
-
source_path,
|
|
577
|
-
source_session_id,
|
|
578
|
-
source_agent_id,
|
|
579
|
-
target_agent_id,
|
|
580
|
-
plan,
|
|
581
|
-
)
|
|
582
|
-
.map(|materialized| {
|
|
583
|
-
Some(Box::new(materialized) as Box<dyn ForkBackingMaterialization>)
|
|
584
|
-
}),
|
|
585
|
-
_ => Ok(None),
|
|
586
|
-
}
|
|
587
|
-
}
|
|
588
|
-
|
|
589
533
|
fn capture_session_id(
|
|
590
534
|
&self,
|
|
591
535
|
agent_id: &str,
|
|
@@ -677,17 +621,18 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
677
621
|
));
|
|
678
622
|
};
|
|
679
623
|
match self.provider {
|
|
680
|
-
Provider::
|
|
681
|
-
let mut argv =
|
|
682
|
-
|
|
624
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
625
|
+
let mut argv = claude_base_command(
|
|
626
|
+
self,
|
|
683
627
|
auth_mode,
|
|
684
628
|
mcp_config,
|
|
685
629
|
system_prompt,
|
|
686
630
|
model,
|
|
687
631
|
dangerously_skip_permissions,
|
|
632
|
+
false,
|
|
688
633
|
None,
|
|
689
|
-
|
|
690
|
-
);
|
|
634
|
+
)?;
|
|
635
|
+
argv.push("--resume".to_string());
|
|
691
636
|
argv.push(session_id.as_str().to_string());
|
|
692
637
|
Ok(argv)
|
|
693
638
|
}
|
|
@@ -700,21 +645,12 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
700
645
|
argv.push(session_id.as_str().to_string());
|
|
701
646
|
Ok(argv)
|
|
702
647
|
}
|
|
703
|
-
|
|
704
|
-
Provider::Grok => {
|
|
705
|
-
let mut argv = grok_base_command(
|
|
706
|
-
system_prompt,
|
|
707
|
-
model,
|
|
708
|
-
dangerously_skip_permissions,
|
|
709
|
-
None,
|
|
710
|
-
)?;
|
|
711
|
-
argv.push("--resume".to_string());
|
|
712
|
-
argv.push(session_id.as_str().to_string());
|
|
713
|
-
Ok(argv)
|
|
714
|
-
}
|
|
715
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
648
|
+
Provider::Codex | Provider::Grok => {
|
|
716
649
|
Err(ProviderError::ResumeUnavailable(retired_worker(self.provider)))
|
|
717
650
|
}
|
|
651
|
+
Provider::Pi => Err(ProviderError::ResumeUnavailable(
|
|
652
|
+
"pi resume requires the captured exact session path".to_string(),
|
|
653
|
+
)),
|
|
718
654
|
Provider::GeminiCli | Provider::Fake => Err(ProviderError::ResumeUnavailable(format!(
|
|
719
655
|
"{} resume requires session_id",
|
|
720
656
|
provider_wire(self.provider)
|
|
@@ -728,46 +664,43 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
728
664
|
ctx: ProviderCommandContext<'_>,
|
|
729
665
|
) -> Result<CommandPlan, ProviderError> {
|
|
730
666
|
match self.provider {
|
|
731
|
-
Provider::
|
|
732
|
-
if !self.session_is_resumable(session_id, ctx.auth_mode)? {
|
|
733
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
734
|
-
"{} resume requires session_id",
|
|
735
|
-
provider_wire(self.provider)
|
|
736
|
-
)));
|
|
737
|
-
}
|
|
667
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
738
668
|
let Some(session_id) = session_id else {
|
|
739
669
|
return Err(ProviderError::ResumeUnavailable(
|
|
740
670
|
"resume requires session_id".to_string(),
|
|
741
671
|
));
|
|
742
672
|
};
|
|
743
|
-
let
|
|
744
|
-
|
|
673
|
+
let managed = ctx
|
|
674
|
+
.profile_launch
|
|
675
|
+
.is_some_and(|profile| profile.managed_mcp_config);
|
|
676
|
+
let model = claude_context_model(ctx);
|
|
677
|
+
let mut argv = claude_base_command(
|
|
678
|
+
self,
|
|
745
679
|
ctx.auth_mode,
|
|
746
680
|
ctx.mcp_config,
|
|
747
681
|
ctx.system_prompt,
|
|
748
|
-
|
|
749
|
-
ctx.dangerously_skip_permissions,
|
|
750
|
-
ctx.profile_launch.map(|profile| &profile.command_overrides),
|
|
751
|
-
ctx.effort,
|
|
752
|
-
);
|
|
753
|
-
argv.push(session_id.as_str().to_string());
|
|
754
|
-
Ok(CommandPlan::argv_only(argv))
|
|
755
|
-
}
|
|
756
|
-
Provider::Grok => {
|
|
757
|
-
let Some(session_id) = session_id else {
|
|
758
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
759
|
-
"resume requires session_id".to_string(),
|
|
760
|
-
));
|
|
761
|
-
};
|
|
762
|
-
let mut argv = grok_base_command(
|
|
763
|
-
ctx.system_prompt,
|
|
764
|
-
ctx.model,
|
|
682
|
+
model,
|
|
765
683
|
ctx.dangerously_skip_permissions,
|
|
684
|
+
managed,
|
|
766
685
|
ctx.effort,
|
|
767
686
|
)?;
|
|
768
687
|
argv.push("--resume".to_string());
|
|
769
688
|
argv.push(session_id.as_str().to_string());
|
|
770
|
-
|
|
689
|
+
// Layer 1 self-healing: keep the role name on resume too —
|
|
690
|
+
// makes resumed sessions findable in the picker by agent_id
|
|
691
|
+
// when state.json drifts.
|
|
692
|
+
if let Some(agent_id) = ctx.agent_id_hint {
|
|
693
|
+
if !agent_id.is_empty() {
|
|
694
|
+
argv.push("--name".to_string());
|
|
695
|
+
argv.push(agent_id.to_string());
|
|
696
|
+
}
|
|
697
|
+
}
|
|
698
|
+
let mut plan = CommandPlan::argv_only(argv);
|
|
699
|
+
plan.provider_projects_root = ctx
|
|
700
|
+
.profile_launch
|
|
701
|
+
.and_then(|profile| profile.claude_projects_root.clone());
|
|
702
|
+
plan.managed_mcp_config = managed;
|
|
703
|
+
Ok(plan)
|
|
771
704
|
}
|
|
772
705
|
_ => self
|
|
773
706
|
.build_resume_command_with_context(
|
|
@@ -812,18 +745,22 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
812
745
|
));
|
|
813
746
|
};
|
|
814
747
|
match self.provider {
|
|
815
|
-
Provider::
|
|
816
|
-
let mut argv =
|
|
817
|
-
|
|
748
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
749
|
+
let mut argv = claude_base_command(
|
|
750
|
+
self,
|
|
818
751
|
auth_mode,
|
|
819
752
|
mcp_config,
|
|
820
753
|
system_prompt,
|
|
821
754
|
model,
|
|
822
755
|
dangerously_skip_permissions,
|
|
756
|
+
false,
|
|
823
757
|
None,
|
|
824
|
-
|
|
825
|
-
);
|
|
758
|
+
)?;
|
|
759
|
+
argv.push("--session-id".to_string());
|
|
760
|
+
argv.push(next_session_token());
|
|
761
|
+
argv.push("--resume".to_string());
|
|
826
762
|
argv.push(session_id.as_str().to_string());
|
|
763
|
+
argv.push("--fork-session".to_string());
|
|
827
764
|
Ok(argv)
|
|
828
765
|
}
|
|
829
766
|
// Context-free adapter calls cannot materialize the Copilot store fork.
|
|
@@ -832,26 +769,10 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
832
769
|
Provider::Copilot => Err(ProviderError::CapabilityUnsupported(
|
|
833
770
|
"copilot CLI 无 fork 旗标,session-store 不支持 branched continuation".to_string(),
|
|
834
771
|
)),
|
|
835
|
-
|
|
836
|
-
// (grok help: --fork-session 需配合 --resume/--continue)。
|
|
837
|
-
Provider::Grok => {
|
|
838
|
-
let mut argv = grok_base_command(
|
|
839
|
-
system_prompt,
|
|
840
|
-
model,
|
|
841
|
-
dangerously_skip_permissions,
|
|
842
|
-
None,
|
|
843
|
-
)?;
|
|
844
|
-
argv.push("--session-id".to_string());
|
|
845
|
-
argv.push(next_session_token());
|
|
846
|
-
argv.push("--resume".to_string());
|
|
847
|
-
argv.push(session_id.as_str().to_string());
|
|
848
|
-
argv.push("--fork-session".to_string());
|
|
849
|
-
Ok(argv)
|
|
850
|
-
}
|
|
851
|
-
Provider::Claude | Provider::ClaudeCode | Provider::Pi => {
|
|
772
|
+
Provider::Codex | Provider::Grok => {
|
|
852
773
|
Err(ProviderError::CapabilityUnsupported(retired_worker(self.provider)))
|
|
853
774
|
}
|
|
854
|
-
Provider::GeminiCli | Provider::Fake => {
|
|
775
|
+
Provider::Pi | Provider::GeminiCli | Provider::Fake => {
|
|
855
776
|
Err(ProviderError::CapabilityUnsupported(format!(
|
|
856
777
|
"{} does not support native session fork",
|
|
857
778
|
provider_wire(self.provider)
|
|
@@ -866,7 +787,7 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
866
787
|
ctx: ProviderCommandContext<'_>,
|
|
867
788
|
) -> Result<CommandPlan, ProviderError> {
|
|
868
789
|
match self.provider {
|
|
869
|
-
Provider::
|
|
790
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
870
791
|
if !self.caps().fork || ctx.auth_mode == AuthMode::CompatibleApi {
|
|
871
792
|
return Err(ProviderError::CapabilityUnsupported(format!(
|
|
872
793
|
"{} does not support native session fork",
|
|
@@ -878,18 +799,45 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
878
799
|
"fork requires session_id".to_string(),
|
|
879
800
|
));
|
|
880
801
|
};
|
|
881
|
-
let
|
|
882
|
-
|
|
802
|
+
let expected = next_session_token();
|
|
803
|
+
let managed = ctx
|
|
804
|
+
.profile_launch
|
|
805
|
+
.is_some_and(|profile| profile.managed_mcp_config);
|
|
806
|
+
let projects_root = ctx
|
|
807
|
+
.profile_launch
|
|
808
|
+
.and_then(|profile| profile.claude_projects_root.clone());
|
|
809
|
+
let model = claude_context_model(ctx);
|
|
810
|
+
let mut argv = claude_base_command(
|
|
811
|
+
self,
|
|
883
812
|
ctx.auth_mode,
|
|
884
813
|
ctx.mcp_config,
|
|
885
814
|
ctx.system_prompt,
|
|
886
|
-
|
|
815
|
+
model,
|
|
887
816
|
ctx.dangerously_skip_permissions,
|
|
888
|
-
|
|
817
|
+
managed,
|
|
889
818
|
ctx.effort,
|
|
890
|
-
)
|
|
819
|
+
)?;
|
|
820
|
+
// Native new-seat fork: Claude copies the parent (only read)
|
|
821
|
+
// into the preassigned child, so capture binds the child
|
|
822
|
+
// exactly as a fresh spawn. `--session-id` with `--resume` is
|
|
823
|
+
// admitted only together with `--fork-session`.
|
|
824
|
+
argv.push("--session-id".to_string());
|
|
825
|
+
argv.push(expected.clone());
|
|
826
|
+
argv.push("--resume".to_string());
|
|
891
827
|
argv.push(session_id.as_str().to_string());
|
|
892
|
-
|
|
828
|
+
argv.push("--fork-session".to_string());
|
|
829
|
+
if let Some(agent_id) = ctx.agent_id_hint {
|
|
830
|
+
if !agent_id.is_empty() {
|
|
831
|
+
argv.push("--name".to_string());
|
|
832
|
+
argv.push(agent_id.to_string());
|
|
833
|
+
}
|
|
834
|
+
}
|
|
835
|
+
Ok(CommandPlan {
|
|
836
|
+
argv,
|
|
837
|
+
expected_session_id: Some(SessionId::new(expected)),
|
|
838
|
+
provider_projects_root: projects_root,
|
|
839
|
+
managed_mcp_config: managed,
|
|
840
|
+
})
|
|
893
841
|
}
|
|
894
842
|
Provider::Copilot => {
|
|
895
843
|
if ctx.auth_mode == AuthMode::CompatibleApi {
|
|
@@ -936,25 +884,6 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
936
884
|
managed_mcp_config: profile.managed_mcp_config,
|
|
937
885
|
})
|
|
938
886
|
}
|
|
939
|
-
Provider::Grok => {
|
|
940
|
-
let Some(session_id) = session_id else {
|
|
941
|
-
return Err(ProviderError::ResumeUnavailable(
|
|
942
|
-
"fork requires session_id".to_string(),
|
|
943
|
-
));
|
|
944
|
-
};
|
|
945
|
-
let mut argv = grok_base_command(
|
|
946
|
-
ctx.system_prompt,
|
|
947
|
-
ctx.model,
|
|
948
|
-
ctx.dangerously_skip_permissions,
|
|
949
|
-
ctx.effort,
|
|
950
|
-
)?;
|
|
951
|
-
argv.push("--session-id".to_string());
|
|
952
|
-
argv.push(next_session_token());
|
|
953
|
-
argv.push("--resume".to_string());
|
|
954
|
-
argv.push(session_id.as_str().to_string());
|
|
955
|
-
argv.push("--fork-session".to_string());
|
|
956
|
-
Ok(CommandPlan::argv_only(argv))
|
|
957
|
-
}
|
|
958
887
|
_ => self
|
|
959
888
|
.fork_with_context(
|
|
960
889
|
session_id,
|
|
@@ -997,25 +926,28 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
997
926
|
|
|
998
927
|
fn status_patterns(&self) -> Result<StatusPatterns, ProviderError> {
|
|
999
928
|
match self.provider {
|
|
1000
|
-
Provider::
|
|
1001
|
-
r"
|
|
1002
|
-
|
|
1003
|
-
r"Error|Traceback|panic",
|
|
1004
|
-
),
|
|
929
|
+
Provider::Claude | Provider::ClaudeCode => {
|
|
930
|
+
patterns(r"[>❯]\s", r"[✶✢✽✻✳·].*…", r"Error|Traceback")
|
|
931
|
+
}
|
|
1005
932
|
Provider::Copilot => patterns(
|
|
1006
933
|
r"(?m)^\s*❯\s*$| / commands · \? help",
|
|
1007
934
|
r"working|processing",
|
|
1008
935
|
r"Error|panic",
|
|
1009
936
|
),
|
|
1010
|
-
//
|
|
937
|
+
// Codex and Grok workers run only through their contract leaves;
|
|
1011
938
|
// these placeholders never match real pane chrome.
|
|
1012
|
-
Provider::
|
|
939
|
+
Provider::Codex | Provider::Grok => patterns(
|
|
1013
940
|
r"legacy-worker-idle-retired",
|
|
1014
941
|
r"legacy-worker-busy-retired",
|
|
1015
942
|
r"legacy-worker-error-retired",
|
|
1016
943
|
),
|
|
1017
|
-
//
|
|
1018
|
-
Provider::
|
|
944
|
+
// Pi: 无已验证 turn-state 检测;占位串不会匹配真实 pane chrome。
|
|
945
|
+
Provider::Pi => patterns(
|
|
946
|
+
r"pi-idle-unset-until-turn-state",
|
|
947
|
+
r"pi-busy-unset-until-turn-state",
|
|
948
|
+
r"pi-error-unset-until-turn-state",
|
|
949
|
+
),
|
|
950
|
+
Provider::GeminiCli | Provider::Fake => {
|
|
1019
951
|
patterns(r">", r"working|processing", r"Error|Traceback")
|
|
1020
952
|
}
|
|
1021
953
|
}
|
|
@@ -1032,9 +964,9 @@ impl ProviderAdapter for BasicProviderAdapter {
|
|
|
1032
964
|
|
|
1033
965
|
use crate::provider::wire::{command_name, provider_wire};
|
|
1034
966
|
|
|
1035
|
-
///
|
|
1036
|
-
/// (`provider:
|
|
1037
|
-
///
|
|
967
|
+
/// Codex and Grok workers run only through their contract leaves
|
|
968
|
+
/// (`provider: codex|grok`); their legacy worker builders were excised. Only a
|
|
969
|
+
/// pre-upgrade state row can still name the legacy key.
|
|
1038
970
|
fn retired_worker(provider: Provider) -> String {
|
|
1039
971
|
format!(
|
|
1040
972
|
"legacy {} worker runtime was excised; workers run only through the contract leaf",
|
|
@@ -1071,6 +1003,38 @@ fn copilot_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
|
1071
1003
|
}
|
|
1072
1004
|
}
|
|
1073
1005
|
|
|
1006
|
+
fn claude_auth_hint(auth_mode: AuthMode) -> AuthHintStatus {
|
|
1007
|
+
if auth_mode != AuthMode::Subscription {
|
|
1008
|
+
return AuthHintStatus::MissingOrUnknown;
|
|
1009
|
+
}
|
|
1010
|
+
if !command_on_path("claude") {
|
|
1011
|
+
return AuthHintStatus::Missing;
|
|
1012
|
+
}
|
|
1013
|
+
let output = match Command::new("claude").args(["auth", "status"]).output() {
|
|
1014
|
+
Ok(output) => output,
|
|
1015
|
+
Err(_) => return AuthHintStatus::MissingOrUnknown,
|
|
1016
|
+
};
|
|
1017
|
+
let text = if output.stdout.is_empty() {
|
|
1018
|
+
String::from_utf8_lossy(&output.stderr).to_string()
|
|
1019
|
+
} else {
|
|
1020
|
+
String::from_utf8_lossy(&output.stdout).to_string()
|
|
1021
|
+
};
|
|
1022
|
+
let status = serde_json::from_str::<serde_json::Value>(text.trim()).unwrap_or_default();
|
|
1023
|
+
if status.get("loggedIn").and_then(serde_json::Value::as_bool) == Some(true)
|
|
1024
|
+
|| output.status.success()
|
|
1025
|
+
{
|
|
1026
|
+
AuthHintStatus::Present
|
|
1027
|
+
} else {
|
|
1028
|
+
AuthHintStatus::Missing
|
|
1029
|
+
}
|
|
1030
|
+
}
|
|
1031
|
+
|
|
1032
|
+
fn claude_context_model(ctx: ProviderCommandContext<'_>) -> Option<&str> {
|
|
1033
|
+
ctx.profile_launch
|
|
1034
|
+
.and_then(|profile| profile.command_overrides.model.as_deref())
|
|
1035
|
+
.or(ctx.model)
|
|
1036
|
+
}
|
|
1037
|
+
|
|
1074
1038
|
fn command_on_path(name: &str) -> bool {
|
|
1075
1039
|
let Some(path) = std::env::var_os("PATH") else {
|
|
1076
1040
|
return false;
|
|
@@ -1078,27 +1042,20 @@ fn command_on_path(name: &str) -> bool {
|
|
|
1078
1042
|
std::env::split_paths(&path).any(|dir| dir.join(name).is_file())
|
|
1079
1043
|
}
|
|
1080
1044
|
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
/// (with quote escape); other values use serde's default Display.
|
|
1084
|
-
pub(crate) fn json_inline(value: &serde_json::Value) -> String {
|
|
1085
|
-
match value {
|
|
1086
|
-
serde_json::Value::String(s) => format!("\"{}\"", s.replace('"', "\\\"")),
|
|
1087
|
-
other => other.to_string(),
|
|
1088
|
-
}
|
|
1045
|
+
pub(crate) fn prompt_needs_native_mcp(prompt: &str) -> bool {
|
|
1046
|
+
prompt.contains('\n') || prompt.contains('"')
|
|
1089
1047
|
}
|
|
1090
1048
|
|
|
1091
1049
|
// 0.4.x decoupling step 2: provider-local command builders moved to provider/adapters/.
|
|
1092
1050
|
// Only the entry points the trait impl actually calls are re-imported here;
|
|
1093
1051
|
// The per-provider command helpers and MCP renderers are called from within
|
|
1094
1052
|
// the extracted base-command functions, not directly by this file.
|
|
1095
|
-
use super::adapters::
|
|
1053
|
+
use super::adapters::claude::{claude_base_command, claude_launch_command};
|
|
1096
1054
|
use super::adapters::copilot::copilot_base_command;
|
|
1097
1055
|
use super::adapters::fake::fake_worker_command;
|
|
1098
|
-
use super::adapters::grok::{grok_base_command, grok_launch_command};
|
|
1099
1056
|
|
|
1100
|
-
/// Contract C / MUST-8: the per-worker Team Agent MCP server config used by
|
|
1101
|
-
/// (`--mcp-config`)
|
|
1057
|
+
/// Contract C / MUST-8: the per-worker Team Agent MCP server config used by the
|
|
1058
|
+
/// remaining legacy workers (Copilot `--additional-mcp-config`). Placeholders
|
|
1102
1059
|
/// `{workspace}` / `{agent_id}` / `{team_id}` are substituted at spawn time by
|
|
1103
1060
|
/// [`crate::lifecycle::launch::fill_spawn_placeholders`]; this template MUST NOT
|
|
1104
1061
|
/// contain hardcoded paths or agent/team ids — the probe5 RED probe burned that.
|
|
@@ -1180,17 +1137,14 @@ pub(crate) fn next_session_token() -> String {
|
|
|
1180
1137
|
#[cfg(test)]
|
|
1181
1138
|
mod fork_materialization_source_guard {
|
|
1182
1139
|
#[test]
|
|
1183
|
-
fn
|
|
1140
|
+
fn legacy_fork_neither_materializes_backing_nor_injects_into_the_source_pane() {
|
|
1184
1141
|
let source = include_str!("../lifecycle/launch/fork_agent.rs");
|
|
1185
1142
|
assert!(
|
|
1186
|
-
source.contains("
|
|
1187
|
-
"fork must
|
|
1143
|
+
source.contains("is_retired_provider") && source.contains("unverified (未验证)"),
|
|
1144
|
+
"legacy fork must refuse retired rows and unverified providers"
|
|
1188
1145
|
);
|
|
1189
|
-
|
|
1190
|
-
!source.contains("
|
|
1191
|
-
|
|
1192
|
-
);
|
|
1193
|
-
assert!(!source.contains("materialize_codex_fork"));
|
|
1194
|
-
assert!(!source.contains("codex_fork"));
|
|
1146
|
+
for gone in [".materialize_fork_backing(", "materialize_codex_fork", "codex_fork", ".inject(", "send_keys"] {
|
|
1147
|
+
assert!(!source.contains(gone), "legacy fork must not use {gone}");
|
|
1148
|
+
}
|
|
1195
1149
|
}
|
|
1196
1150
|
}
|