mirror of
https://github.com/davila7/claude-code-templates.git
synced 2026-09-19 01:30:23 +08:00
a56202407d
* feat(cli-rust): add Rust port of the CLI core with npm distribution + CI Adds a new `cli-rust/` crate (binary `cct`) that ports the CORE of the claude-code-templates CLI to Rust, alongside the existing Node `cli-tool/`. Native (byte-parity with the Node CLI, verified via `diff -r`): - Component installation: --agent/--command/--mcp/--setting/--hook/--skill and --workflow YAML, replicating the exact GitHub raw/API URLs, target paths (flat dir, category dropped), .mcp.json/settings/hooks merge semantics, .py/.sh sidecars, 2-space JSON + trailing newline. - Fire-and-forget tracking (3 endpoints, detached threads, env opt-out). Delegated to the Node CLI for now (commands/delegate.rs forwards argv via CCT_NODE_BIN or `npx claude-code-templates@latest`): dashboards, sandbox, global agents, stats, health-check, interactive setup. Parity gotcha handled: serde_json Map::remove does swap-remove under preserve_order; switched to shift_remove to match JS `delete` key order. Distribution: npm shim (npm/cct/bin/cct.js) execs a prebuilt binary from optionalDependencies (@davila7/cct-<os>-<arch>, esbuild pattern) so `npx` keeps working; plus Homebrew, cargo-binstall, and install.sh from GitHub Releases. build-rust-cli.yml builds all 5 targets on tag `cli-rust-v*`. Tests: 23 offline unit/integration tests + 2 network integration tests (#[ignore]). fmt + clippy clean. CI: rust-ci.yml runs fmt + clippy + tests only when cli-rust/** changes and posts a sticky PR comment with the results. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(cli-rust): address cubic review (config safety, opt-out, packaging, CI) Fixes from the cubic automated review on PR #640: - install.rs: fail safe on a corrupt/unreadable existing .mcp.json/settings file instead of silently overwriting it (MCP aborts; setting/hook skip the location), matching Node's throw-on-bad-config behavior. - tracking.rs: honor both `=1` and `=true` as opt-out values (the README documents `=1`); Node only checks `=true`, so this is more privacy-safe. - cli.rs/main.rs: implement --dry-run for the native install path (prints the plan, writes nothing) instead of parsing the flag and ignoring it. - main.rs: run_prompt surfaces a non-zero `claude` exit code (a missing `claude` stays a soft warning since the install already succeeded). - delegate.rs: propagate signal-based termination as 128+signal on Unix instead of collapsing to exit code 1. - github.rs: warn when a skill file fails to download (mirrors Node's "Could not download" log) instead of skipping silently. - npm/build-packages.mjs: accept the release `.tgz` artifacts (extract them) in addition to unpacked binaries, matching build-rust-cli.yml output. - npm/cct/package.json: add top-level os/cpu so npm rejects unsupported platforms at install time instead of failing at runtime. - build-rust-cli.yml: add `permissions: contents: write` (gh-release) and Swatinem/rust-cache for the 5-target matrix. - tests/integration.rs: tighten the 2-space-indent assertion. Not changed (intentional parity with the Node CLI): - merge.rs new-hook-type copy: Node copies the incoming value as-is for a previously-absent hook type (no old-format normalization); kept identical. fmt + clippy clean; 23 offline + 2 network tests pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(cli-rust): abort install on corrupt existing settings/hook config Follow-up to the cubic review: a corrupt/unreadable existing settings or hook file now fails the whole component install (returns 0) instead of skipping just that location, matching Node — where readJson throws out of the per-location loop and fails the component. Prevents a multi-location run from reporting success despite a bad target location. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(cli-rust): prep v0.1.0 release via GitHub Releases + cargo-binstall Wire up the two opt-in distribution channels that don't touch the existing `claude-code-templates` npm package: - Cargo.toml: fix cargo-binstall pkg-url to the `cli-rust-v<version>` tag (was `v<version>`), so `cargo binstall --git ...` resolves the release asset. - install.sh: resolve the latest `cli-rust-v*` release instead of the generic /releases/latest, which could otherwise pick a Node-CLI `vX.Y.Z` release. - README: install table now lists the available preview channels (curl|sh, cargo-binstall via --git, from source) and marks Homebrew/npm as planned; Release section documents the merge -> tag cli-rust-v0.1.0 -> verify flow. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
101 lines
2.9 KiB
Rust
101 lines
2.9 KiB
Rust
//! End-to-end tests that drive the compiled `cct` binary.
|
|
//!
|
|
//! Network-dependent tests (real GitHub fetch) are marked `#[ignore]` so the
|
|
//! default `cargo test` stays offline/hermetic. Run them with:
|
|
//!
|
|
//! cargo test -- --ignored
|
|
//!
|
|
//! Cargo exposes the built binary path via `CARGO_BIN_EXE_cct`.
|
|
|
|
use std::path::PathBuf;
|
|
use std::process::Command;
|
|
|
|
fn bin() -> &'static str {
|
|
env!("CARGO_BIN_EXE_cct")
|
|
}
|
|
|
|
#[test]
|
|
fn help_exits_zero_and_shows_usage() {
|
|
let out = Command::new(bin())
|
|
.arg("--help")
|
|
.output()
|
|
.expect("failed to run cct");
|
|
assert!(out.status.success());
|
|
let stdout = String::from_utf8_lossy(&out.stdout);
|
|
assert!(
|
|
stdout.contains("Usage:"),
|
|
"help output missing Usage:\n{stdout}"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn version_flag_works() {
|
|
let out = Command::new(bin())
|
|
.arg("--version")
|
|
.output()
|
|
.expect("failed to run cct");
|
|
assert!(out.status.success());
|
|
}
|
|
|
|
#[test]
|
|
#[ignore = "requires network (GitHub raw)"]
|
|
fn installs_agent_to_flat_dir() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let status = Command::new(bin())
|
|
.args([
|
|
"--agent",
|
|
"deep-research-team/research-synthesizer",
|
|
"-d",
|
|
dir.path().to_str().unwrap(),
|
|
])
|
|
.env("CCT_NO_TRACKING", "1")
|
|
.status()
|
|
.expect("failed to run cct");
|
|
assert!(status.success());
|
|
|
|
// Category dropped: file lands flat under .claude/agents/.
|
|
let expected: PathBuf = dir.path().join(".claude/agents/research-synthesizer.md");
|
|
assert!(
|
|
expected.exists(),
|
|
"expected {} to exist",
|
|
expected.display()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
#[ignore = "requires network (GitHub raw)"]
|
|
fn installs_mcp_with_two_space_json_and_no_description() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let status = Command::new(bin())
|
|
.args([
|
|
"--mcp",
|
|
"devtools/elasticsearch",
|
|
"-d",
|
|
dir.path().to_str().unwrap(),
|
|
])
|
|
.env("CCT_NO_TRACKING", "1")
|
|
.status()
|
|
.expect("failed to run cct");
|
|
assert!(status.success());
|
|
|
|
let mcp = dir.path().join(".mcp.json");
|
|
let text = std::fs::read_to_string(&mcp).unwrap();
|
|
assert!(text.contains("\"mcpServers\""));
|
|
// A pretty-printed 2-space top-level key looks like `\n "key"`.
|
|
assert!(
|
|
text.contains("\n \""),
|
|
"expected a line indented with exactly two spaces"
|
|
);
|
|
// And NOT 4-space indentation at the top level.
|
|
assert!(
|
|
!text.contains("\n \"mcpServers\""),
|
|
"did not expect 4-space indentation"
|
|
);
|
|
assert!(text.ends_with('\n'), "expected trailing newline");
|
|
// description is stripped from each server before merge.
|
|
let v: serde_json::Value = serde_json::from_str(&text).unwrap();
|
|
for (_name, server) in v["mcpServers"].as_object().unwrap() {
|
|
assert!(server.get("description").is_none());
|
|
}
|
|
}
|