The PRD's first acceptance gate now holds: grep -RinE '\bx\.ai\b|grok' crates/ --include='*.rs' → 0 matches (exempt: NOTICE and third-party license archives, README provenance, and the required 'Based on Grok Build Open Source' attribution, now sourced from version_attribution.txt). Wire-visible renames (both sides in this repo, changed in lockstep): - Auth method id 'grok.com' → 'kimi-code' (AuthMethodKind::KimiCode). - Every x.ai/* and _x.ai/* ACP ext method and meta key → kigi/* / _kigi/* (~200 names; grokShell → kigiShell). Session-file replay keeps a read-side alias for the legacy '_x.ai/session/update' method so existing updates.jsonl histories load; writes emit only the new name (both directions test-pinned). - Agent types grok-build* → kigi* with a documented legacy-prefix alias at resolution time so persisted sessions keep resolving. - ToolNamespace/BuiltinAgentName GrokBuild* → Kigi* (wire snake_case kigi/kigi_concise/kigi_hashline; schema regenerated); grok_build implementation dirs renamed to kigi*. - x-grok-* headers → x-kigi-*, __GROK_* sentinels → __KIGI_*, themes grokday/groknight → kigiday/kiginight (old persisted values fall back to the default theme), web_fetch allowlist xAI hosts → kimi.com + moonshot platforms, changelog CDN → this repo, grok-build changelog archives deleted. - BYOK default endpoint removed: [endpoints] api_base_url is now truly optional with NO default — consumers fail fast with the flag name when unset (no silent x.ai egress). Mock harnesses inject it explicitly. - System-prompt identity fixed: 'released by xAI' → 'an unofficial community CLI for Kimi' (template + regenerated encrypted form). Also repaired pre-existing grok-era test debt found by the sweep: the stale trace_classify default-model pin, the grok-pager UA label test, pty-harness stale-binary reuse and non-hermetic moonshot routing (a PTY test could previously reach the real api.moonshot.cn), and the outdated oauth fixture scope key. Gates: §9 grep 0; fmt clean; workspace check/clippy 0/0 (-D warnings); FULL cargo test --workspace: 234 suites, 21,961 passed, 0 failed; deny advisories ok.
258 lines
9.5 KiB
Rust
258 lines
9.5 KiB
Rust
//! Session forking functionality
|
|
//!
|
|
//! Forks a saved session to a new working directory with a new session ID.
|
|
//! This creates new session files but does not start the session.
|
|
|
|
const FORK_LOG: &str = "kigi_fork";
|
|
use crate::session::info::Info;
|
|
use crate::session::storage::{CopySessionOptions, JsonlStorageAdapter};
|
|
use crate::util::kigi_home::kigi_home;
|
|
use agent_client_protocol as acp;
|
|
use std::io;
|
|
|
|
#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct ForkSessionRequest {
|
|
pub source_session_id: String,
|
|
pub source_cwd: String,
|
|
pub new_cwd: String,
|
|
/// Client-provided session ID for the forked session.
|
|
/// If None, a new ID will be auto-generated.
|
|
#[serde(default)]
|
|
pub new_session_id: Option<String>,
|
|
/// Optional model ID override for the forked session.
|
|
/// If None, the source session's model will be used.
|
|
#[serde(default)]
|
|
pub new_model_id: Option<String>,
|
|
#[serde(default)]
|
|
pub target_prompt_index: Option<usize>,
|
|
/// Override `session_kind` in the forked summary. Defaults to `"fork"`.
|
|
/// Worktree forks set this to `"worktree"`.
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
pub session_kind: Option<String>,
|
|
/// The original workspace directory this worktree session was spawned from.
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
pub source_workspace_dir: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct ForkSessionResponse {
|
|
pub new_session_id: String,
|
|
pub chat_messages_copied: usize,
|
|
pub updates_copied: usize,
|
|
pub plan_state_copied: bool,
|
|
/// The working directory of the new forked session
|
|
pub new_cwd: String,
|
|
/// The parent session ID (source session that was forked)
|
|
pub parent_session_id: String,
|
|
/// The model ID of the forked session (may differ from source if overridden)
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub new_model_id: Option<String>,
|
|
}
|
|
|
|
/// Generate a forked session ID.
|
|
///
|
|
/// Uses a plain UUIDv7 -- no prefix or source embedding. This keeps IDs
|
|
/// a constant 36 chars regardless of how many fork rounds occur.
|
|
fn generate_fork_session_id(_source_id: &str) -> String {
|
|
uuid::Uuid::now_v7().to_string()
|
|
}
|
|
|
|
/// Fork a saved session to a new working directory.
|
|
pub async fn fork_session(request: ForkSessionRequest) -> io::Result<ForkSessionResponse> {
|
|
let t0 = std::time::Instant::now();
|
|
|
|
let root_dir = kigi_home();
|
|
let storage = JsonlStorageAdapter::with_root(root_dir.clone());
|
|
|
|
// Build source and target Info
|
|
let source_info = Info {
|
|
id: acp::SessionId::new(request.source_session_id.clone()),
|
|
cwd: request.source_cwd.clone(),
|
|
};
|
|
|
|
// Use client-provided session ID or generate one
|
|
let new_session_id = request
|
|
.new_session_id
|
|
.clone()
|
|
.unwrap_or_else(|| generate_fork_session_id(&request.source_session_id));
|
|
|
|
let target_info = Info {
|
|
id: acp::SessionId::new(new_session_id.clone()),
|
|
cwd: request.new_cwd.clone(),
|
|
};
|
|
|
|
// Copy session data with parent tracking.
|
|
// Runs on the blocking thread pool so concurrent fork copies can execute
|
|
// truly in parallel (on a LocalSet, async copy_session_data serializes
|
|
// because the sync disk I/O blocks the single-threaded runtime).
|
|
let options = CopySessionOptions {
|
|
parent_session_id: Some(request.source_session_id.clone()),
|
|
new_model_id: request.new_model_id.clone(),
|
|
target_prompt_index: request.target_prompt_index,
|
|
session_kind: request.session_kind.clone(),
|
|
source_workspace_dir: request.source_workspace_dir.clone(),
|
|
// Carry the parent's compaction segment archive into the fork so the
|
|
// child retains pre-compaction history (the live summary is already
|
|
// copied via chat_history.jsonl).
|
|
copy_compaction_segments: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let result = tokio::task::spawn_blocking(move || {
|
|
storage.copy_session_data_sync(&source_info, &target_info, options)
|
|
})
|
|
.await
|
|
.map_err(|e| io::Error::other(format!("spawn_blocking panicked: {e}")))??;
|
|
|
|
let copy_ms = t0.elapsed().as_millis() as u64;
|
|
|
|
let total_ms = t0.elapsed().as_millis() as u64;
|
|
tracing::info!(
|
|
target: FORK_LOG,
|
|
session_id = %new_session_id,
|
|
source_session = %request.source_session_id,
|
|
copy_ms,
|
|
total_ms,
|
|
chat_copied = result.chat_messages_copied,
|
|
updates_copied = result.updates_copied,
|
|
"FORK_COPY: session data copied"
|
|
);
|
|
|
|
Ok(ForkSessionResponse {
|
|
new_session_id,
|
|
chat_messages_copied: result.chat_messages_copied,
|
|
updates_copied: result.updates_copied,
|
|
plan_state_copied: result.plan_state_copied,
|
|
new_cwd: request.new_cwd,
|
|
parent_session_id: request.source_session_id,
|
|
new_model_id: request.new_model_id,
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_generate_fork_session_id_format() {
|
|
let fork_id = generate_fork_session_id("abc123");
|
|
|
|
// Should be a valid UUIDv7 (36 chars with dashes)
|
|
assert_eq!(
|
|
fork_id.len(),
|
|
36,
|
|
"Fork ID should be a standard UUID length"
|
|
);
|
|
assert!(
|
|
uuid::Uuid::parse_str(&fork_id).is_ok(),
|
|
"Fork ID should be a valid UUID: {}",
|
|
fork_id
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_generate_fork_session_id_uniqueness() {
|
|
// Generate multiple IDs rapidly and ensure they're all unique
|
|
let mut ids = std::collections::HashSet::new();
|
|
for _ in 0..100 {
|
|
let fork_id = generate_fork_session_id("any-source");
|
|
assert_eq!(fork_id.len(), 36);
|
|
ids.insert(fork_id);
|
|
}
|
|
|
|
// All 100 should be unique
|
|
assert_eq!(ids.len(), 100, "All generated IDs should be unique");
|
|
}
|
|
|
|
#[test]
|
|
fn test_generate_fork_session_id_constant_length() {
|
|
// Forking from already-forked sessions should produce same-length IDs
|
|
let id1 = generate_fork_session_id("019c43b5-c4ae-7190-b058-693e24669ba9");
|
|
let id2 = generate_fork_session_id(&id1); // fork of fork
|
|
let id3 = generate_fork_session_id(&id2); // fork of fork of fork
|
|
|
|
assert_eq!(id1.len(), 36);
|
|
assert_eq!(id2.len(), 36);
|
|
assert_eq!(id3.len(), 36);
|
|
}
|
|
|
|
#[test]
|
|
fn test_fork_session_request_serialization() {
|
|
let request = ForkSessionRequest {
|
|
source_session_id: "abc123".to_string(),
|
|
source_cwd: "/old/project".to_string(),
|
|
new_cwd: "/new/project".to_string(),
|
|
new_session_id: Some("custom-session-id".to_string()),
|
|
new_model_id: Some("kigi-3".to_string()),
|
|
target_prompt_index: None,
|
|
..Default::default()
|
|
};
|
|
|
|
let json = serde_json::to_string(&request).unwrap();
|
|
let deserialized: ForkSessionRequest = serde_json::from_str(&json).unwrap();
|
|
|
|
assert_eq!(deserialized.source_session_id, "abc123");
|
|
assert_eq!(deserialized.source_cwd, "/old/project");
|
|
assert_eq!(deserialized.new_cwd, "/new/project");
|
|
assert_eq!(
|
|
deserialized.new_session_id,
|
|
Some("custom-session-id".to_string())
|
|
);
|
|
assert_eq!(deserialized.new_model_id, Some("kigi-3".to_string()));
|
|
}
|
|
|
|
#[test]
|
|
fn test_fork_session_request_without_optional_fields() {
|
|
// Test that optional fields default to None when not provided
|
|
let json = r#"{"sourceSessionId":"abc123","sourceCwd":"/old","newCwd":"/new"}"#;
|
|
let deserialized: ForkSessionRequest = serde_json::from_str(json).unwrap();
|
|
|
|
assert_eq!(deserialized.source_session_id, "abc123");
|
|
assert_eq!(deserialized.new_session_id, None);
|
|
assert_eq!(deserialized.new_model_id, None);
|
|
}
|
|
|
|
#[test]
|
|
fn test_fork_session_response_serialization() {
|
|
let response = ForkSessionResponse {
|
|
new_session_id: "fork-abc123-12345678".to_string(),
|
|
chat_messages_copied: 42,
|
|
updates_copied: 156,
|
|
plan_state_copied: true,
|
|
new_cwd: "/new/project".to_string(),
|
|
parent_session_id: "abc123".to_string(),
|
|
new_model_id: Some("kigi-3".to_string()),
|
|
};
|
|
|
|
let json = serde_json::to_string(&response).unwrap();
|
|
let deserialized: ForkSessionResponse = serde_json::from_str(&json).unwrap();
|
|
|
|
assert_eq!(deserialized.new_session_id, "fork-abc123-12345678");
|
|
assert_eq!(deserialized.chat_messages_copied, 42);
|
|
assert_eq!(deserialized.updates_copied, 156);
|
|
assert!(deserialized.plan_state_copied);
|
|
assert_eq!(deserialized.new_cwd, "/new/project");
|
|
assert_eq!(deserialized.parent_session_id, "abc123");
|
|
assert_eq!(deserialized.new_model_id, Some("kigi-3".to_string()));
|
|
}
|
|
|
|
#[test]
|
|
fn test_fork_session_response_without_model_override() {
|
|
let response = ForkSessionResponse {
|
|
new_session_id: "fork-abc123-12345678".to_string(),
|
|
chat_messages_copied: 42,
|
|
updates_copied: 156,
|
|
plan_state_copied: true,
|
|
new_cwd: "/new/project".to_string(),
|
|
parent_session_id: "abc123".to_string(),
|
|
new_model_id: None,
|
|
};
|
|
|
|
let json = serde_json::to_string(&response).unwrap();
|
|
// new_model_id should not be present in JSON when None
|
|
assert!(!json.contains("new_model_id"));
|
|
}
|
|
}
|