@cc-claw/code 0.6.161 → 0.6.163

package/install.js

@@ -124,6 +124,47 @@ function extractZip(buffer, dest) {
   zip.extractAllTo(dest, true);
 }
 
+// 解压 ripgrep 的 tar.gz 到 dest。
+// 上游 microsoft/ripgrep-prebuilt 的资产把 rg 直接放在根目录（`rg`），
+// 不带 ripgrep-x.y.z-suffix/ 子目录；早先的实现假定存在该子目录并使用
+// --strip-components=1，导致在所有 Linux/macOS 平台上都解不出 rg，
+// 包内 bin/rg 永不落地、只能降级到系统 rg。此处先列目录判断实际布局，
+// 两种结构都兼容，且把临时文件清理放进 finally 避免失败路径泄漏。
+function extractRgTarGz(buffer, dest) {
+  const tmpFile = join(dest, "rg-download.tar.gz");
+  writeFileSync(tmpFile, buffer);
+  try {
+    let hasRootRg = false;
+    try {
+      const listing = execSync(`tar tzf "${tmpFile}"`, {
+        stdio: ["ignore", "pipe", "ignore"],
+      }).toString();
+      hasRootRg = listing
+        .split("\n")
+        .map((line) => line.trim())
+        // 兼容 "./rg" 前缀与 "rg" 两种写法
+        .some((line) => line === "rg" || line === "./rg");
+    } catch {
+      hasRootRg = false;
+    }
+
+    if (hasRootRg) {
+      execSync(`tar -xzf "${tmpFile}" -C "${dest}"`, { stdio: "ignore" });
+    } else {
+      execSync(
+        `tar -xzf "${tmpFile}" -C "${dest}" --strip-components=1 --wildcards "*/rg"`,
+        { stdio: "ignore" }
+      );
+    }
+  } finally {
+    try {
+      unlinkSync(tmpFile);
+    } catch {
+      // 临时文件清理失败不应影响安装
+    }
+  }
+}
+
 // 校验下载的二进制包（#290）：release 流程会发布 checksums.txt（sha256sum 格式），
 // 此处下载并校验；缺失或不匹配时直接失败（fail-closed），拒绝安装可疑二进制。
 async function verifyChecksum(buffer, fileName) {
@@ -408,11 +449,7 @@ async function downloadRipgrep(platform, binDir) {
 
     // 解压 rg 二进制到 binDir
     if (rgExt === "tar.gz") {
-      const tmpFile = join(binDir, "rg-download.tar.gz");
-      writeFileSync(tmpFile, rgBuffer);
-      // ripgrep tar.gz 内含目录 ripgrep-x.y.z-suffix/rg
-      execSync(`tar -xzf "${tmpFile}" -C "${binDir}" --strip-components=1 --wildcards "*/rg" 2>/dev/null || tar -xzf "${tmpFile}" -C "${binDir}" --strip-components=1 "ripgrep-v${RG_VERSION}-${platform.rgSuffix}/rg"`, { stdio: "ignore" });
-      unlinkSync(tmpFile);
+      extractRgTarGz(rgBuffer, binDir);
     } else {
       const AdmZip = require("adm-zip");
       const zip = new AdmZip(rgBuffer);
@@ -642,4 +679,5 @@ module.exports = {
   verifyChecksum,
   replaceBinary,
   cleanOldBinaries,
+  extractRgTarGz,
 };

package/install.test.js

@@ -1,8 +1,10 @@
-const { migrateFromClaudeCode } = require("./install");
+const { migrateFromClaudeCode, extractRgTarGz } = require("./install");
 
 const fs = require("fs");
 const { join } = require("path");
 const os = require("os");
+const { execSync } = require("child_process");
+const { dirname } = require("path");
 
 function makeTempDir() {
   return fs.mkdtempSync(join(os.tmpdir(), "cc-code-install-test-"));
@@ -401,4 +403,77 @@ test("linkProjectMemories is idempotent and no-ops without project memory", (hom
 });
 
 // 由 runTests() 顺序执行（支持 async 用例）
+// --- extractRgTarGz（#620）---------------------------------------------------
+// 上游 ripgrep-prebuilt 的 tar.gz 把 rg 放在根目录，旧实现用
+// --strip-components=1 导致解不出，bin/rg 永不落地。
+
+function makeTarGz(dir, entries) {
+  // entries: [{ name, content, mode }]
+  const stage = fs.mkdtempSync(join(os.tmpdir(), "cc-code-rg-stage-"));
+  for (const e of entries) {
+    const target = join(stage, e.name);
+    fs.mkdirSync(dirname(target), { recursive: true });
+    fs.writeFileSync(target, e.content);
+    if (e.mode) fs.chmodSync(target, e.mode);
+  }
+  const out = join(dir, "rg-fixture.tar.gz");
+  // 用具体条目名打包（不用 "."），避免引入额外的 "./" 层级，
+  // 与上游 ripgrep-prebuilt 资产的实际结构保持一致。
+  const names = [...new Set(entries.map((e) => e.name.split("/")[0]))].join(" ");
+  execSync(`tar -czf "${out}" -C "${stage}" ${names}`, { stdio: "ignore" });
+  const buf = fs.readFileSync(out);
+  fs.rmSync(out, { force: true });
+  fs.rmSync(stage, { recursive: true, force: true });
+  return buf;
+}
+
+test("extractRgTarGz extracts rg when it sits at archive root", (home) => {
+  const dest = join(home, "bin");
+  fs.mkdirSync(dest, { recursive: true });
+  const buf = makeTarGz(home, [{ name: "rg", content: "#!/bin/sh\necho rg\n", mode: 0o755 }]);
+  extractRgTarGz(buf, dest);
+  const rg = join(dest, "rg");
+  if (!fs.existsSync(rg)) throw new Error("rg was not extracted from root layout");
+  if (fs.readFileSync(rg, "utf-8").indexOf("echo rg") === -1) {
+    throw new Error("extracted rg content mismatch");
+  }
+});
+
+test("extractRgTarGz extracts rg when nested in a subdirectory", (home) => {
+  const dest = join(home, "bin");
+  fs.mkdirSync(dest, { recursive: true });
+  const buf = makeTarGz(home, [
+    { name: "ripgrep-x.y.z/rg", content: "#!/bin/sh\necho nested\n", mode: 0o755 },
+  ]);
+  extractRgTarGz(buf, dest);
+  const rg = join(dest, "rg");
+  if (!fs.existsSync(rg)) throw new Error("rg was not extracted from nested layout");
+  if (fs.readFileSync(rg, "utf-8").indexOf("echo nested") === -1) {
+    throw new Error("extracted rg content mismatch");
+  }
+});
+
+test("extractRgTarGz leaves no temp archive behind on failure", (home) => {
+  const dest = join(home, "bin");
+  fs.mkdirSync(dest, { recursive: true });
+  let threw = false;
+  try {
+    extractRgTarGz(Buffer.from("not a gzip"), dest);
+  } catch {
+    threw = true;
+  }
+  if (!threw) throw new Error("corrupt archive should throw");
+  const leftover = fs.readdirSync(dest).filter((f) => f.startsWith("rg-download"));
+  if (leftover.length) throw new Error(`temp file leaked: ${leftover.join(", ")}`);
+});
+
+test("extractRgTarGz leaves no temp archive behind on success", (home) => {
+  const dest = join(home, "bin");
+  fs.mkdirSync(dest, { recursive: true });
+  const buf = makeTarGz(home, [{ name: "rg", content: "#!/bin/sh\n", mode: 0o755 }]);
+  extractRgTarGz(buf, dest);
+  const leftover = fs.readdirSync(dest).filter((f) => f.startsWith("rg-download"));
+  if (leftover.length) throw new Error(`temp file leaked: ${leftover.join(", ")}`);
+});
+
 runTests();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-claw/code",
-    "version": "0.6.161",
+    "version": "0.6.163",
     "description": "cc-code — Terminal coding agent powered by open-source models — Rust-built, Claude Code compatible",
     "keywords": [
         "agent",