@team-agent/installer 0.5.125 → 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 -1
- package/Cargo.toml +1 -1
- package/crates/team-agent/src/cli/diagnose.rs +0 -68
- package/crates/team-agent/src/cli/emit.rs +6 -2
- package/crates/team-agent/src/cli/intent/runtime_tests.rs +10 -10
- package/crates/team-agent/src/cli/mod.rs +22 -28
- package/crates/team-agent/src/cli/models.rs +7 -764
- 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/compiler/tests.rs +18 -3
- package/crates/team-agent/src/compiler.rs +4 -203
- package/crates/team-agent/src/contract_runtime/backend.rs +61 -38
- package/crates/team-agent/src/contract_runtime/config.rs +7 -4
- package/crates/team-agent/src/contract_runtime/fork.rs +368 -0
- package/crates/team-agent/src/contract_runtime/framework.rs +8 -10
- package/crates/team-agent/src/contract_runtime/mod.rs +1 -0
- package/crates/team-agent/src/contract_runtime/registry.rs +60 -19
- 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/leader/start.rs +1 -1
- package/crates/team-agent/src/lifecycle/launch/add_agent_state.rs +2 -195
- package/crates/team-agent/src/lifecycle/launch/clone_agent.rs +11 -27
- package/crates/team-agent/src/lifecycle/launch/fork_agent.rs +18 -28
- package/crates/team-agent/src/lifecycle/launch/fork_entry.rs +6 -87
- package/crates/team-agent/src/lifecycle/launch/mcp_config.rs +1 -9
- 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 -33
- package/crates/team-agent/src/lifecycle/launch.rs +0 -23
- package/crates/team-agent/src/lifecycle/profile_launch.rs +18 -317
- package/crates/team-agent/src/lifecycle/restart/common.rs +42 -315
- 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/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 +22 -138
- package/crates/team-agent/src/lifecycle/tests/clone_fork_copilot_perms_red.rs +4 -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_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 -16
- package/crates/team-agent/src/lifecycle/tests.rs +0 -3
- package/crates/team-agent/src/lifecycle/types.rs +2 -18
- package/crates/team-agent/src/mcp_server/readiness_tests.rs +1 -1
- package/crates/team-agent/src/messaging/delivery.rs +12 -141
- package/crates/team-agent/src/messaging/delivery_consumption_tests.rs +5 -5
- package/crates/team-agent/src/messaging/tests/dup_inject.rs +3 -3
- package/crates/team-agent/src/messaging/tests/spine.rs +26 -32
- package/crates/team-agent/src/provider/adapter.rs +35 -238
- package/crates/team-agent/src/provider/adapters/mod.rs +4 -4
- package/crates/team-agent/src/provider/model_catalog.rs +13 -201
- package/crates/team-agent/src/provider/session/capture.rs +6 -106
- package/crates/team-agent/src/provider/session/context_fork/outcome.rs +0 -4
- package/crates/team-agent/src/provider/session/context_fork.rs +15 -107
- package/crates/team-agent/src/provider/session_scan/common.rs +10 -34
- package/crates/team-agent/src/provider/session_scan/pi.rs +1 -34
- package/crates/team-agent/src/provider/session_scan.rs +4 -10
- package/crates/team-agent/src/provider/tests/adapter.rs +34 -91
- package/crates/team-agent/src/provider/tests/command_helpers.rs +3 -12
- package/crates/team-agent/src/provider/tests/idle.rs +0 -25
- package/crates/team-agent/src/provider/wire.rs +51 -23
- 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/package.json +4 -4
- package/skills/team-agent/SKILL.md +6 -4
- 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/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/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/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/test_support/models_timeout_fixture.rs +0 -144
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
//!
|
|
2
|
-
//! Claude / ClaudeCode provider-local command builders + permission helpers.
|
|
3
|
-
//!
|
|
4
|
-
//! Extracted from `provider/adapter.rs` (0.4.x decoupling step 2). Pure
|
|
5
|
-
//! extraction — byte-identical to the original inline forms. Scope kept
|
|
6
|
-
//! small on purpose: base command + launch wrapper +
|
|
7
|
-
//! launch wrapper. Auth hints (`claude_auth_hint`) and the context-aware model
|
|
8
|
-
//! resolver (`claude_context_model`) stay in `adapter.rs`; capture scanning
|
|
9
|
-
//! helpers now live under `provider/session_scan/claude.rs`.
|
|
10
|
-
|
|
11
|
-
use crate::model::enums::{AuthMode, Provider};
|
|
12
|
-
use crate::provider::adapter::{next_session_token, prompt_needs_native_mcp, BasicProviderAdapter};
|
|
13
|
-
use crate::provider::{McpConfig, ProviderAdapter, ProviderError};
|
|
14
|
-
use crate::provider::command_helpers::{append_opt_pair, append_pair};
|
|
15
|
-
|
|
16
|
-
pub(crate) fn claude_launch_command(
|
|
17
|
-
adapter: &BasicProviderAdapter,
|
|
18
|
-
auth_mode: AuthMode,
|
|
19
|
-
mcp_config: Option<&McpConfig>,
|
|
20
|
-
system_prompt: Option<&str>,
|
|
21
|
-
model: Option<&str>,
|
|
22
|
-
dangerously_skip_permissions: bool,
|
|
23
|
-
) -> Result<Vec<String>, ProviderError> {
|
|
24
|
-
let mut argv = claude_base_command(
|
|
25
|
-
adapter,
|
|
26
|
-
auth_mode,
|
|
27
|
-
mcp_config,
|
|
28
|
-
system_prompt,
|
|
29
|
-
model,
|
|
30
|
-
dangerously_skip_permissions,
|
|
31
|
-
false,
|
|
32
|
-
None,
|
|
33
|
-
)?;
|
|
34
|
-
append_pair(&mut argv, "--session-id", next_session_token());
|
|
35
|
-
Ok(argv)
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
pub(crate) fn claude_base_command(
|
|
39
|
-
adapter: &BasicProviderAdapter,
|
|
40
|
-
auth_mode: AuthMode,
|
|
41
|
-
mcp_config: Option<&McpConfig>,
|
|
42
|
-
system_prompt: Option<&str>,
|
|
43
|
-
model: Option<&str>,
|
|
44
|
-
dangerously_skip_permissions: bool,
|
|
45
|
-
managed_mcp_config: bool,
|
|
46
|
-
// 0.4.x provider effort MVP step 5: when Some, inject `--effort <level>`
|
|
47
|
-
// immediately after the model (before prompt/MCP).
|
|
48
|
-
effort: Option<crate::model::enums::ProviderEffort>,
|
|
49
|
-
) -> Result<Vec<String>, ProviderError> {
|
|
50
|
-
let mut argv = vec!["claude".to_string()];
|
|
51
|
-
if dangerously_skip_permissions {
|
|
52
|
-
// 0.5.66 bypass 单源:flag 由 provider_bypass_flag 表供给(单源)。
|
|
53
|
-
let flag = crate::provider::bypass_flags::provider_bypass_flag(Provider::Claude)
|
|
54
|
-
.expect("claude provider must define a bypass flag");
|
|
55
|
-
argv.push(flag.to_string());
|
|
56
|
-
} else {
|
|
57
|
-
append_pair(&mut argv, "--permission-mode", "default");
|
|
58
|
-
}
|
|
59
|
-
append_opt_pair(&mut argv, "--model", model);
|
|
60
|
-
if let Some(effort) = effort {
|
|
61
|
-
argv.push("--effort".to_string());
|
|
62
|
-
argv.push(effort.as_str().to_string());
|
|
63
|
-
}
|
|
64
|
-
append_opt_pair(&mut argv, "--append-system-prompt", system_prompt);
|
|
65
|
-
if !managed_mcp_config
|
|
66
|
-
&& (mcp_config.is_some()
|
|
67
|
-
|| auth_mode == AuthMode::CompatibleApi
|
|
68
|
-
|| system_prompt.is_some_and(prompt_needs_native_mcp))
|
|
69
|
-
{
|
|
70
|
-
let raw = if let Some(config) = mcp_config {
|
|
71
|
-
serde_json::json!({"mcpServers": config.raw.clone()})
|
|
72
|
-
} else {
|
|
73
|
-
serde_json::json!({"mcpServers": adapter.mcp_config(auth_mode)?.raw})
|
|
74
|
-
};
|
|
75
|
-
append_pair(&mut argv, "--mcp-config", raw.to_string());
|
|
76
|
-
}
|
|
77
|
-
Ok(argv)
|
|
78
|
-
}
|
|
@@ -1,131 +0,0 @@
|
|
|
1
|
-
//!
|
|
2
|
-
use std::path::{Path, PathBuf};
|
|
3
|
-
|
|
4
|
-
use crate::provider::{ProviderError, SessionId};
|
|
5
|
-
|
|
6
|
-
#[derive(Debug)]
|
|
7
|
-
pub(crate) struct ClaudeForkMaterialization {
|
|
8
|
-
path: PathBuf,
|
|
9
|
-
keep: bool,
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
impl ClaudeForkMaterialization {
|
|
13
|
-
pub(crate) fn path(&self) -> &Path {
|
|
14
|
-
&self.path
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
pub(crate) fn keep(&mut self) {
|
|
18
|
-
self.keep = true;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
impl Drop for ClaudeForkMaterialization {
|
|
23
|
-
fn drop(&mut self) {
|
|
24
|
-
if !self.keep {
|
|
25
|
-
let _ = std::fs::remove_file(&self.path);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
pub(crate) fn materialize_claude_fork(
|
|
31
|
-
source_path: &Path,
|
|
32
|
-
source_session_id: &SessionId,
|
|
33
|
-
target_session_id: &SessionId,
|
|
34
|
-
source_agent_id: &str,
|
|
35
|
-
target_agent_id: &str,
|
|
36
|
-
) -> Result<ClaudeForkMaterialization, ProviderError> {
|
|
37
|
-
let parent = source_path.parent().ok_or_else(|| {
|
|
38
|
-
ProviderError::Io(format!(
|
|
39
|
-
"claude source backing has no parent: {}",
|
|
40
|
-
source_path.display()
|
|
41
|
-
))
|
|
42
|
-
})?;
|
|
43
|
-
let target_path = parent.join(format!("{}.jsonl", target_session_id.as_str()));
|
|
44
|
-
if target_path.exists() {
|
|
45
|
-
return Err(ProviderError::Io(format!(
|
|
46
|
-
"claude fork destination already exists: {}",
|
|
47
|
-
target_path.display()
|
|
48
|
-
)));
|
|
49
|
-
}
|
|
50
|
-
let source = std::fs::read_to_string(source_path)
|
|
51
|
-
.map_err(|error| ProviderError::Io(error.to_string()))?;
|
|
52
|
-
let rewritten = source
|
|
53
|
-
.replace(source_session_id.as_str(), target_session_id.as_str())
|
|
54
|
-
.replace(
|
|
55
|
-
&format!("You are Team Agent worker `{source_agent_id}`"),
|
|
56
|
-
&format!("You are Team Agent worker `{target_agent_id}`"),
|
|
57
|
-
);
|
|
58
|
-
validate_jsonl(&rewritten)?;
|
|
59
|
-
let temp = parent.join(format!(
|
|
60
|
-
".{}.tmp-{}",
|
|
61
|
-
target_session_id.as_str(),
|
|
62
|
-
std::process::id()
|
|
63
|
-
));
|
|
64
|
-
let result = std::fs::write(&temp, rewritten)
|
|
65
|
-
.and_then(|_| std::fs::rename(&temp, &target_path))
|
|
66
|
-
.map_err(|error| ProviderError::Io(error.to_string()));
|
|
67
|
-
if let Err(error) = result {
|
|
68
|
-
let _ = std::fs::remove_file(&temp);
|
|
69
|
-
return Err(error);
|
|
70
|
-
}
|
|
71
|
-
Ok(ClaudeForkMaterialization {
|
|
72
|
-
path: target_path,
|
|
73
|
-
keep: false,
|
|
74
|
-
})
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
fn validate_jsonl(text: &str) -> Result<(), ProviderError> {
|
|
78
|
-
let mut rows = 0_usize;
|
|
79
|
-
for (index, line) in text.lines().enumerate() {
|
|
80
|
-
if line.trim().is_empty() {
|
|
81
|
-
continue;
|
|
82
|
-
}
|
|
83
|
-
serde_json::from_str::<serde_json::Value>(line).map_err(|error| {
|
|
84
|
-
ProviderError::Io(format!(
|
|
85
|
-
"claude fork source has invalid JSONL at line {}: {error}",
|
|
86
|
-
index + 1
|
|
87
|
-
))
|
|
88
|
-
})?;
|
|
89
|
-
rows += 1;
|
|
90
|
-
}
|
|
91
|
-
if rows == 0 {
|
|
92
|
-
return Err(ProviderError::Io(
|
|
93
|
-
"claude fork source backing has no JSONL records".to_string(),
|
|
94
|
-
));
|
|
95
|
-
}
|
|
96
|
-
Ok(())
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
#[cfg(test)]
|
|
100
|
-
mod tests {
|
|
101
|
-
use super::*;
|
|
102
|
-
|
|
103
|
-
#[test]
|
|
104
|
-
fn snapshot_rekeys_every_record_and_preserves_source() {
|
|
105
|
-
let dir = std::env::temp_dir().join(format!("ta-claude-fork-copy-{}", std::process::id()));
|
|
106
|
-
let _ = std::fs::remove_dir_all(&dir);
|
|
107
|
-
std::fs::create_dir_all(&dir).unwrap();
|
|
108
|
-
let source_id = SessionId::new("11111111-1111-4111-8111-111111111111");
|
|
109
|
-
let target_id = SessionId::new("22222222-2222-4222-8222-222222222222");
|
|
110
|
-
let source_path = dir.join(format!("{}.jsonl", source_id.as_str()));
|
|
111
|
-
let source = format!(
|
|
112
|
-
"{{\"sessionId\":\"{}\"}}\n{{\"payload\":{{\"session_id\":\"{}\"}}}}\n",
|
|
113
|
-
source_id.as_str(),
|
|
114
|
-
source_id.as_str()
|
|
115
|
-
);
|
|
116
|
-
std::fs::write(&source_path, &source).unwrap();
|
|
117
|
-
|
|
118
|
-
let mut materialized =
|
|
119
|
-
materialize_claude_fork(&source_path, &source_id, &target_id, "source", "target")
|
|
120
|
-
.unwrap();
|
|
121
|
-
let target_path = dir.join(format!("{}.jsonl", target_id.as_str()));
|
|
122
|
-
let target = std::fs::read_to_string(&target_path).unwrap();
|
|
123
|
-
assert!(!target.contains(source_id.as_str()));
|
|
124
|
-
assert!(target.contains(target_id.as_str()));
|
|
125
|
-
assert_eq!(std::fs::read_to_string(&source_path).unwrap(), source);
|
|
126
|
-
materialized.keep();
|
|
127
|
-
drop(materialized);
|
|
128
|
-
assert!(target_path.is_file());
|
|
129
|
-
let _ = std::fs::remove_dir_all(&dir);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
//! ---
|
|
2
|
-
//! purpose: Pi CLI 的纯工具映射与 fresh/resume argv 构造
|
|
3
|
-
//! contract:
|
|
4
|
-
//! provides:
|
|
5
|
-
//! - name: build_pi_command_argv
|
|
6
|
-
//! what: 仅从已验证输入构造保留 direct Pi 配置的 Team Agent argv
|
|
7
|
-
//! boundary:
|
|
8
|
-
//! - 不发现 executable、catalog、adapter 或 MCP 配置
|
|
9
|
-
//! - 除 resume exact backing 存在性外不读文件;不写文件、不启动进程
|
|
10
|
-
//! maturity: wired
|
|
11
|
-
//! ---
|
|
12
|
-
|
|
13
|
-
use std::path::Path;
|
|
14
|
-
|
|
15
|
-
use crate::model::enums::ProviderEffort;
|
|
16
|
-
use crate::provider::ProviderError;
|
|
17
|
-
use crate::provider::command_helpers::{append_opt_pair, append_pair};
|
|
18
|
-
|
|
19
|
-
#[derive(Debug, Clone, Copy)]
|
|
20
|
-
pub(crate) enum PiSessionSelector<'a> {
|
|
21
|
-
/// Pi assigns the session id. Passing `--session-id` makes Pi warn and
|
|
22
|
-
/// then create, because the id is not a project session yet.
|
|
23
|
-
Fresh,
|
|
24
|
-
Resume { path: &'a Path },
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
pub(crate) struct PiCommandRequest<'a> {
|
|
28
|
-
pub extension: &'a Path,
|
|
29
|
-
pub model: Option<&'a str>,
|
|
30
|
-
pub effort: Option<ProviderEffort>,
|
|
31
|
-
pub system_prompt: &'a str,
|
|
32
|
-
/// Team-owned session root for isolated seats; `None` preserves Pi's native default.
|
|
33
|
-
pub session_dir: Option<&'a Path>,
|
|
34
|
-
pub session: PiSessionSelector<'a>,
|
|
35
|
-
pub agent_id: &'a str,
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/// ---
|
|
39
|
-
/// purpose: 从已验证 semantic request 构造仅追加 Team Agent MCP/提示/session 的 Pi argv
|
|
40
|
-
/// returns: exact ordered fresh/resume argv,argv[0] 固定为裸 `pi`
|
|
41
|
-
/// errors: 必需字段时返回 ProviderError
|
|
42
|
-
/// ---
|
|
43
|
-
pub(crate) fn build_pi_command_argv(
|
|
44
|
-
request: PiCommandRequest<'_>,
|
|
45
|
-
) -> Result<Vec<String>, ProviderError> {
|
|
46
|
-
if request.extension.as_os_str().is_empty()
|
|
47
|
-
|| request
|
|
48
|
-
.session_dir
|
|
49
|
-
.is_some_and(|session_dir| session_dir.as_os_str().is_empty())
|
|
50
|
-
|| request.model.is_some_and(|model| model.trim().is_empty())
|
|
51
|
-
|| request.system_prompt.trim().is_empty()
|
|
52
|
-
|| request.agent_id.trim().is_empty()
|
|
53
|
-
{
|
|
54
|
-
return Err(ProviderError::Command(
|
|
55
|
-
"Pi command requires extension, prompt, and agent id".to_string(),
|
|
56
|
-
));
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
// Executable discovery/preflight belongs to the lifecycle materializer;
|
|
60
|
-
// the actual command must remain PATH-resolved at spawn time.
|
|
61
|
-
let mut argv = vec![
|
|
62
|
-
"pi".to_string(),
|
|
63
|
-
"-e".to_string(),
|
|
64
|
-
request.extension.to_string_lossy().into_owned(),
|
|
65
|
-
];
|
|
66
|
-
append_opt_pair(&mut argv, "--model", request.model);
|
|
67
|
-
if let Some(effort) = request.effort {
|
|
68
|
-
argv.push("--thinking".to_string());
|
|
69
|
-
argv.push(effort.as_str().to_string());
|
|
70
|
-
}
|
|
71
|
-
append_pair(&mut argv, "--append-system-prompt", request.system_prompt);
|
|
72
|
-
if let Some(session_dir) = request.session_dir {
|
|
73
|
-
append_pair(&mut argv, "--session-dir", session_dir.to_string_lossy().into_owned());
|
|
74
|
-
}
|
|
75
|
-
// The shared lifecycle materializer always revalidates resume root/path/header.
|
|
76
|
-
// Keep the pure argv builder usable before a fixture root is materialized, while
|
|
77
|
-
// refusing a missing exact file once the recorded path's parent exists.
|
|
78
|
-
match request.session {
|
|
79
|
-
PiSessionSelector::Fresh => {}
|
|
80
|
-
PiSessionSelector::Resume { path }
|
|
81
|
-
if !path.as_os_str().is_empty()
|
|
82
|
-
&& (!path.parent().is_some_and(Path::is_dir) || path.is_file()) =>
|
|
83
|
-
{
|
|
84
|
-
append_pair(&mut argv, "--session", path.to_string_lossy().into_owned());
|
|
85
|
-
}
|
|
86
|
-
PiSessionSelector::Resume { path } if !path.as_os_str().is_empty() => {
|
|
87
|
-
return Err(ProviderError::ResumeUnavailable(format!(
|
|
88
|
-
"Pi exact session backing is missing: {}",
|
|
89
|
-
path.display()
|
|
90
|
-
)));
|
|
91
|
-
}
|
|
92
|
-
_ => {
|
|
93
|
-
return Err(ProviderError::Command(
|
|
94
|
-
"Pi command requires a non-empty session selector".to_string(),
|
|
95
|
-
));
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
append_pair(&mut argv, "--name", request.agent_id);
|
|
99
|
-
Ok(argv)
|
|
100
|
-
}
|
|
@@ -1,123 +0,0 @@
|
|
|
1
|
-
//! ---
|
|
2
|
-
//! purpose: claude 家族的 fork 验证——在预算内轮询「精确快照路径」与「provider 侧 projects 路径」两处,任一处出现可读的新 backing 即出证明
|
|
3
|
-
//! contract:
|
|
4
|
-
//! provides:
|
|
5
|
-
//! - name: verify_claude_fork
|
|
6
|
-
//! what: 双路径轮询验证,成功给 ContextForkProof(captured_via=context_fork_verified)
|
|
7
|
-
//! requires:
|
|
8
|
-
//! - name: crate::provider::session_scan::claude::projects_dir_for_cwd
|
|
9
|
-
//! what: 第二条探测路径由 HOME + spawn_cwd 推导出 ~/.claude/projects 下的目录
|
|
10
|
-
//! - name: super::ContextBackingSnapshot
|
|
11
|
-
//! what: 判「文件变过」的基线
|
|
12
|
-
//! boundary:
|
|
13
|
-
//! - 只服务 Provider::Claude / ClaudeCode
|
|
14
|
-
//! - 文件名必须精确等于 <expected_session_id>.jsonl,不做同目录最新文件回落
|
|
15
|
-
//! - 不解析会话正文语义,只验「首行可解析 JSON」与「sessionId 记录(若有)一致」
|
|
16
|
-
//! - 未在 deadline 内满足条件即 Timeout,不降级放行
|
|
17
|
-
//! maturity: wired
|
|
18
|
-
//! ---
|
|
19
|
-
use super::*;
|
|
20
|
-
|
|
21
|
-
/// ---
|
|
22
|
-
/// purpose: 轮询等待 claude fork 的新 transcript 落盘并验明身份
|
|
23
|
-
/// params:
|
|
24
|
-
/// provider: 写进证明的 provider 标记(Claude 或 ClaudeCode)
|
|
25
|
-
/// source_session_id: 源会话;新会话等于它即不出证明
|
|
26
|
-
/// plan: 必须带 expected_session_id,否则立即拒绝
|
|
27
|
-
/// before: spawn 前基线,用于判 stamp 变化
|
|
28
|
-
/// expected_backing_path: 必需的精确快照路径;文件名不等于 <expected>.jsonl 即拒绝
|
|
29
|
-
/// spawn_cwd: 用于推导第二条 provider 侧探测路径
|
|
30
|
-
/// deadline: 轮询预算,每轮间隔 50ms
|
|
31
|
-
/// returns: 证明中 backing_path 是命中的那一条路径,attribution_confidence 固定 "high"
|
|
32
|
-
/// errors: Rejected(CaptureFailed) 当 plan 缺 expected id / 缺快照路径 / 文件名不匹配;Timeout 当预算内两条路径都没满足
|
|
33
|
-
/// contract:
|
|
34
|
-
/// provides:
|
|
35
|
-
/// - name: verify_claude_fork
|
|
36
|
-
/// what: 只读文件元数据与首行/sessionId 记录,不写任何文件
|
|
37
|
-
/// boundary:
|
|
38
|
-
/// - 两条路径的严格程度不同:快照路径用 is_none_or(无 sessionId 记录时视为匹配),provider 路径用 is_some_and(必须读到 sessionId)
|
|
39
|
-
/// - 不排除 .team/logs/events.jsonl 之外的无关写入方——硬绑定只有「文件名等于 expected uuid」这一条
|
|
40
|
-
/// ---
|
|
41
|
-
pub(super) fn verify_claude_fork(
|
|
42
|
-
provider: Provider,
|
|
43
|
-
source_session_id: &SessionId,
|
|
44
|
-
plan: &CommandPlan,
|
|
45
|
-
before: &ContextBackingSnapshot,
|
|
46
|
-
expected_backing_path: Option<&Path>,
|
|
47
|
-
spawn_cwd: &Path,
|
|
48
|
-
deadline: Duration,
|
|
49
|
-
) -> Result<ContextForkProof, ContextForkTermination> {
|
|
50
|
-
let expected = plan.expected_session_id.as_ref().ok_or_else(|| {
|
|
51
|
-
ProviderError::CaptureFailed(
|
|
52
|
-
"context_fork_unverified: Claude plan has no expected session id".to_string(),
|
|
53
|
-
)
|
|
54
|
-
})?;
|
|
55
|
-
let path = expected_backing_path.ok_or_else(|| {
|
|
56
|
-
ProviderError::CaptureFailed(
|
|
57
|
-
"context_fork_unverified: Claude plan has no exact snapshot backing".to_string(),
|
|
58
|
-
)
|
|
59
|
-
})?;
|
|
60
|
-
let expected_name = format!("{}.jsonl", expected.as_str());
|
|
61
|
-
if path.file_name().and_then(|name| name.to_str()) != Some(expected_name.as_str()) {
|
|
62
|
-
return Err(ProviderError::CaptureFailed(format!(
|
|
63
|
-
"context_fork_unverified: Claude snapshot backing does not match expected session {}",
|
|
64
|
-
expected.as_str()
|
|
65
|
-
))
|
|
66
|
-
.into());
|
|
67
|
-
}
|
|
68
|
-
let started = std::time::Instant::now();
|
|
69
|
-
loop {
|
|
70
|
-
if let Some(stamp) = file_stamp(path) {
|
|
71
|
-
let changed = before.files.get(path).is_none_or(|old| *old != stamp);
|
|
72
|
-
let observed_matches =
|
|
73
|
-
session_id_from_jsonl(path).is_none_or(|observed| observed == expected.as_str());
|
|
74
|
-
if changed && readable_jsonl(path) && observed_matches && expected != source_session_id
|
|
75
|
-
{
|
|
76
|
-
return Ok(ContextForkProof {
|
|
77
|
-
provider,
|
|
78
|
-
source_session_id: source_session_id.clone(),
|
|
79
|
-
new_session_id: expected.clone(),
|
|
80
|
-
backing_path: path.to_path_buf(),
|
|
81
|
-
captured_via: "context_fork_verified".to_string(),
|
|
82
|
-
attribution_confidence: "high".to_string(),
|
|
83
|
-
managed_backing_root: None,
|
|
84
|
-
});
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
if let Some(provider_path) = std::env::var_os("HOME")
|
|
88
|
-
.map(PathBuf::from)
|
|
89
|
-
.and_then(|home| {
|
|
90
|
-
crate::provider::session_scan::claude::projects_dir_for_cwd(&home, spawn_cwd)
|
|
91
|
-
})
|
|
92
|
-
.map(|root| root.join(&expected_name))
|
|
93
|
-
{
|
|
94
|
-
let observed_matches = session_id_from_jsonl(&provider_path)
|
|
95
|
-
.is_some_and(|observed| observed == expected.as_str());
|
|
96
|
-
let changed = file_stamp(&provider_path)
|
|
97
|
-
.is_some_and(|stamp| before.files.get(&provider_path) != Some(&stamp));
|
|
98
|
-
if changed
|
|
99
|
-
&& readable_jsonl(&provider_path)
|
|
100
|
-
&& observed_matches
|
|
101
|
-
&& expected != source_session_id
|
|
102
|
-
{
|
|
103
|
-
return Ok(ContextForkProof {
|
|
104
|
-
provider,
|
|
105
|
-
source_session_id: source_session_id.clone(),
|
|
106
|
-
new_session_id: expected.clone(),
|
|
107
|
-
backing_path: provider_path,
|
|
108
|
-
captured_via: "context_fork_verified".to_string(),
|
|
109
|
-
attribution_confidence: "high".to_string(),
|
|
110
|
-
managed_backing_root: None,
|
|
111
|
-
});
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
if started.elapsed() >= deadline {
|
|
115
|
-
break;
|
|
116
|
-
}
|
|
117
|
-
std::thread::sleep(Duration::from_millis(50));
|
|
118
|
-
}
|
|
119
|
-
Err(ContextForkTermination::Timeout {
|
|
120
|
-
provider,
|
|
121
|
-
deadline_ms: deadline.as_millis(),
|
|
122
|
-
})
|
|
123
|
-
}
|