[workspace-split] Phase 0 + 1 (partial): Workspace skeleton, leaf extractions, CI adaptations

.cargo/config.toml

@@ -2,8 +2,19 @@
 LIB = { value = "", force = true }
 INCLUDE = { value = "", force = true }
 
-[build]
-target-dir = "F:/cargo-target/cc-rust"
+# ============================================================
+# target-dir 为什么不在这里
+# ------------------------------------------------------------
+# 绝对路径（如 F:/cargo-target/cc-rust）会污染 CI，报
+#   "failed to create directory F:/cargo-target"
+# 需要把构建产物放到其他盘的话，在你**自己的** ~/.cargo/config.toml
+# 里加：
+#
+#   [build]
+#   target-dir = "F:/cargo-target/cc-rust"
+#
+# 或用环境变量 CARGO_TARGET_DIR。两者都会覆盖仓库级配置。
+# ============================================================
 
 # ============================================================
 # 链接器加速: 使用 rust-lld 替换 MSVC link.exe

Cargo.toml

@@ -1,43 +1,17 @@
-[package]
-name = "claude-code-rs"
-version = "0.1.0"
-edition = "2021"
-description = "Claude Code CLI - Rust implementation (lite)"
+[workspace]
+resolver = "2"
+members = ["crates/*"]
 
 # ============================================================
-# Features
+# Shared dependency versions.
+# ------------------------------------------------------------
+# All member crates declare deps via `dep.workspace = true`, so
+# versions live in one place. Features remain crate-local: a
+# crate adds `features = [...]` on top of the workspace entry.
 # ============================================================
-#
-# default — minimal build: no telemetry, no embedded web assets,
-#           no image/syntect/tree-sitter pulls. Keeps `cargo build`
-#           fast and avoids heavy native deps (onig, tonic/prost).
-#
-# Opt-in:
-#   telemetry   — Langfuse + OpenTelemetry export (pulls tonic/prost).
-#   web-ui      — Embed the React SPA (rust-embed) into the binary.
-#   image       — Image decoding (png/jpeg only).
-#   syntect     — Syntax highlighting via fancy-regex (no onig C dep).
-#   tree-sitter — AST parsing.
-
-[features]
-default = []
-telemetry = [
-    "dep:tracing-opentelemetry",
-    "dep:opentelemetry",
-    "dep:opentelemetry_sdk",
-    "dep:opentelemetry-langfuse",
-]
-web-ui = ["dep:rust-embed"]
-image = ["dep:image"]
-syntect = ["dep:syntect"]
-tree-sitter = ["dep:tree-sitter"]
 
-# ============================================================
-# 核心类型 + 状态机
-# ============================================================
-
-[dependencies]
-# 异步运行时 — 按需选择 tokio 子模块，避免 `full` 带来的编译开销
+[workspace.dependencies]
+# 异步运行时
 tokio = { version = "1", default-features = false, features = [
     "rt-multi-thread",
     "macros",
@@ -80,27 +54,21 @@ lru = "0.12"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-appender = "0.2"
-# Telemetry stack (Langfuse + OpenTelemetry) — optional, enable via `telemetry` feature.
-# Pulls in tonic/prost et al., which is why it is off by default.
-tracing-opentelemetry = { version = "0.32.1", optional = true }
-opentelemetry = { version = "0.31", features = ["trace"], optional = true }
-opentelemetry_sdk = { version = "0.31.0", features = ["trace", "rt-tokio", "experimental_trace_batch_span_processor_with_async_runtime"], optional = true }
-opentelemetry-langfuse = { version = "0.6.1", optional = true }
+tracing-opentelemetry = "0.32.1"
+opentelemetry = { version = "0.31", features = ["trace"] }
+opentelemetry_sdk = { version = "0.31.0", features = ["trace", "rt-tokio", "experimental_trace_batch_span_processor_with_async_runtime"] }
+opentelemetry-langfuse = "0.6.1"
 
 # LSP 协议类型
 lsp-types = "0.97"
 
-# ============================================================
-# 本地工具系统
-# ============================================================
-
 # 文件搜索 & 路径
 glob = "0.3"
 ignore = "0.4"
 walkdir = "2"
 dirs = "6"
 
-# 正则表达式
+# 正则
 regex = "1"
 
 # Git 操作
@@ -112,15 +80,12 @@ similar = "2"
 # 进程管理
 shell-words = "1"
 
-# ============================================================
 # 终端 UI
-# ============================================================
-
 ratatui = "0.29"
 crossterm = "0.28"
 
-# 语法高亮 — optional，启用 default-fancy 用 fancy-regex 代替 onig (避免 C 编译)
-syntect = { version = "5", default-features = false, features = ["default-fancy"], optional = true }
+# 语法高亮
+syntect = { version = "5", default-features = false, features = ["default-fancy"] }
 
 # 文本处理
 textwrap = "0.16"
@@ -130,7 +95,7 @@ strip-ansi-escapes = "0.2"
 # Markdown 渲染
 pulldown-cmark = "0.12"
 
-# 哈希 (审计记录完整性)
+# 哈希
 sha2 = "0.10"
 hex = "0.4"
 rand = "0.8"
@@ -142,11 +107,7 @@ url = "2"
 urlencoding = "2"
 semver = "1"
 
-# ============================================================
-# 网络 / API / 认证
-# ============================================================
-
-# 网络 — native-tls works with Clash TUN/fake-ip environments
+# 网络
 reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio-tungstenite = { version = "0.26", features = ["rustls-tls-webpki-roots"] }
 eventsource-stream = "0.2"
@@ -155,47 +116,43 @@ eventsource-stream = "0.2"
 keyring = "3"
 dotenvy = "0.15.7"
 
-# 同步原语 (无 lock poisoning)
+# 同步原语
 parking_lot = "0.12"
 
-# Daemon HTTP server (KAIROS) + Web UI server
+# 内部 crates (workspace split)
+cc-keybindings = { path = "crates/cc-keybindings" }
+cc-observability = { path = "crates/cc-observability" }
+
+# Daemon HTTP server
 axum = { version = "0.8", features = ["ws"] }
 tower = "0.5"
 tower-http = { version = "0.6", features = ["cors", "trace"] }
 hmac = "0.12"
 notify-rust = "4"
 
-# Web UI: embed React SPA dist/ at compile time — optional, enable via `web-ui` feature.
-rust-embed = { version = "8", optional = true }
+# Web UI
+rust-embed = "8"
 mime_guess = "2"
 
-# AST / 图像 — optional，默认不编译 (目前无使用点)
-tree-sitter = { version = "0.24", optional = true }
-image = { version = "0.25", default-features = false, features = ["png", "jpeg"], optional = true }
+# AST / 图像
+tree-sitter = "0.24"
+image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }
 
-# ============================================================
-# E2E 测试
-# ============================================================
+# POSIX syscalls
+libc = "0.2"
 
-[dev-dependencies]
+# Dev / test
 assert_cmd = "2"
 predicates = "3"
 assert_fs = "1"
 tempfile = "3"
-sha2 = "0.10"
-hex = "0.4"
-serde_json = "1"
 portable-pty = "0.9"
 vt100 = "0.15"
 which = "7"
 serial_test = "3"
 
-# POSIX syscalls (Unix socket permissions, PID liveness for Chrome native host #5)
-[target.'cfg(unix)'.dependencies]
-libc = "0.2"
-
 # ============================================================
-# 构建配置 - 压缩 Windows 下 pdb 体积
+# Profiles (apply to the whole workspace)
 # ============================================================
 
 [profile.dev]

Dockerfile.ci

@@ -5,16 +5,15 @@ FROM rust:latest AS builder
 
 WORKDIR /build
 
-# Dependency cache layer: copy only Cargo manifests, build with dummy src
+# Workspace layout (after Phase 0 of the workspace split):
+#   /build/Cargo.toml               — workspace manifest
+#   /build/crates/claude-code-rs/   — the bin crate (src/, tests/)
+#
+# The old "empty-shell src cache layer" trick doesn't fit a workspace
+# cleanly (would need every crate's Cargo.toml + dummy src). We rely on
+# Docker BuildKit's registry cache / layer cache instead.
 COPY Cargo.toml Cargo.lock ./
-RUN mkdir src && \
-    echo "fn main() {}" > src/main.rs && \
-    cargo build --release 2>/dev/null || true && \
-    rm -rf src
-
-# Full source copy
-COPY src/ src/
-COPY tests/ tests/
+COPY crates/ crates/
 
 # Build binary
 RUN cargo build --release

crates/cc-keybindings/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "cc-keybindings"
+version = "0.1.0"
+edition = "2021"
+description = "Keybinding system for cc-rust: action vocabulary + JSON config + hot reload"
+
+[dependencies]
+serde = { workspace = true }
+serde_json = { workspace = true }
+parking_lot = { workspace = true }
+crossterm = { workspace = true }
+tracing = { workspace = true }
+
+[dev-dependencies]
+tempfile = { workspace = true }

crates/cc-observability/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "cc-observability"
+version = "0.1.0"
+edition = "2021"
+description = "Runtime audit event logging for cc-rust (single source of truth for traceable logs)"
+
+[dependencies]
+serde = { workspace = true }
+serde_json = { workspace = true }
+anyhow = { workspace = true }
+chrono = { workspace = true }
+uuid = { workspace = true }
+parking_lot = { workspace = true }
+tracing = { workspace = true }

src/observability/sink.rs → crates/cc-observability/src/sink.rs

@@ -108,19 +108,26 @@ impl AuditSink {
     /// Initialize the audit sink for a session.
     ///
     /// Creates:
-    /// - `~/.cc-rust/runs/<session_id>/events.ndjson`
-    /// - `~/.cc-rust/runs/<session_id>/meta.json`
-    /// - `~/.cc-rust/runs/<session_id>/artifacts/`
+    /// - `<runs_dir>/events.ndjson`
+    /// - `<runs_dir>/meta.json`
+    /// - `<runs_dir>/artifacts/`
+    ///
+    /// `runs_dir` is the per-session output directory (resolved by the caller,
+    /// typically `~/.cc-rust/runs/<session_id>/`). Injecting it here keeps this
+    /// crate free of any dependency on the root config module.
     ///
     /// Returns `Ok(sink)` even if the directory cannot be created (sink becomes
     /// a no-op so the process can still run).
-    pub fn init(session_id: &str, meta: &SessionMeta, config: AuditConfig) -> Result<Self> {
+    pub fn init(
+        session_id: &str,
+        runs_dir: PathBuf,
+        meta: &SessionMeta,
+        config: AuditConfig,
+    ) -> Result<Self> {
         if !config.enabled {
             return Ok(Self::noop(config));
         }
 
-        let runs_dir = crate::config::paths::runs_dir(session_id);
-
         std::fs::create_dir_all(&runs_dir)
             .with_context(|| format!("Failed to create runs directory {}", runs_dir.display()))?;