@cc-claw/code 0.6.122 → 0.6.124

package/install.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 
-const { createWriteStream, mkdirSync, chmodSync, existsSync, renameSync, unlinkSync, writeFileSync } = require("fs");
-const { join } = require("path");
+const fs = require("fs");
+const { createWriteStream, mkdirSync, chmodSync, existsSync, renameSync, unlinkSync, writeFileSync, readdirSync } = fs;
+const { join, basename, dirname } = require("path");
 const { execSync } = require("child_process");
 const crypto = require("crypto");
 
@@ -432,6 +433,57 @@ function overwriteNpmGlobalWrapper(binDirPath) {
   }
 }
 
+// 清理历史残留的 .old.* 备份文件（旧进程已退出则删除，仍占用则静默忽略）
+function cleanOldBinaries(binDir) {
+  try {
+    const files = fs.readdirSync(binDir);
+    for (const file of files) {
+      if (file.includes(".old.")) {
+        try {
+          fs.unlinkSync(join(binDir, file));
+        } catch {
+          // 进程可能仍持有文件句柄，忽略
+        }
+      }
+    }
+  } catch {
+    // 忽略目录读取错误
+  }
+}
+
+// 安全替换二进制文件，支持 Windows 进程运行中热替换（文件锁退避）
+function replaceBinary(extractedPath, finalPath) {
+  if (!fs.existsSync(finalPath)) {
+    fs.renameSync(extractedPath, finalPath);
+    return;
+  }
+
+  // 1. 尝试常规删除（未运行或 POSIX 平台）
+  try {
+    fs.unlinkSync(finalPath);
+    fs.renameSync(extractedPath, finalPath);
+    return;
+  } catch (err) {
+    // 若非文件占用错误（EBUSY / EPERM / EACCES），直接抛出
+    if (err.code !== "EBUSY" && err.code !== "EPERM" && err.code !== "EACCES") {
+      throw err;
+    }
+  }
+
+  // 2. Windows 文件锁退避：运行中 exe 无法 unlink，但允许在同目录下重命名
+  const oldPath = `${finalPath}.old.${Date.now()}`;
+  try {
+    fs.renameSync(finalPath, oldPath);
+    fs.renameSync(extractedPath, finalPath);
+    console.log(`  (Note: Replaced running binary, old binary renamed to ${basename(oldPath)})`);
+  } catch (err) {
+    throw new Error(`无法替换正在运行的二进制文件 ${basename(finalPath)}: ${err.message}`);
+  }
+
+  // 3. 尝试清理已释放的历史旧二进制备份
+  cleanOldBinaries(dirname(finalPath));
+}
+
 async function main() {
   const key = getPlatformKey();
   const platform = PLATFORMS[key];
@@ -465,8 +517,7 @@ async function main() {
   const finalPath = join(binDir, finalName);
 
   if (existsSync(extractedPath)) {
-    if (existsSync(finalPath)) unlinkSync(finalPath);
-    renameSync(extractedPath, finalPath);
+    replaceBinary(extractedPath, finalPath);
   }
 
   if (platform.os !== "win32") {
@@ -542,4 +593,11 @@ if (require.main === module) {
   });
 }
 
-module.exports = { migrateFromClaudeCode, maybeMigrateFromClaudeCode, wouldCopyKeys, verifyChecksum };
+module.exports = {
+  migrateFromClaudeCode,
+  maybeMigrateFromClaudeCode,
+  wouldCopyKeys,
+  verifyChecksum,
+  replaceBinary,
+  cleanOldBinaries,
+};

package/install.test.js

@@ -237,5 +237,110 @@ test("maybeMigrateFromClaudeCode still backfills without consent", async (home)
   if (cfg.config.providers[0].models.fable !== "claude-fable-5") throw new Error("expected fable backfilled");
 });
 
+// ─────────────────────────────────────────────
+// Windows 进程文件锁热替换与旧备份清理
+// ─────────────────────────────────────────────
+const { replaceBinary, cleanOldBinaries } = require("./install");
+
+test("replaceBinary moves extracted file to finalPath when finalPath does not exist", (home) => {
+  const binDir = join(home, "bin");
+  fs.mkdirSync(binDir, { recursive: true });
+  const extracted = join(binDir, "cc-code-new.exe");
+  const finalPath = join(binDir, "cc-code.exe");
+  fs.writeFileSync(extracted, "new-binary-content");
+
+  replaceBinary(extracted, finalPath);
+
+  if (!fs.existsSync(finalPath)) throw new Error("finalPath must exist");
+  if (fs.existsSync(extracted)) throw new Error("extractedPath must have been moved");
+  if (fs.readFileSync(finalPath, "utf-8") !== "new-binary-content") throw new Error("content mismatch");
+});
+
+test("replaceBinary overwrites finalPath normally when not locked", (home) => {
+  const binDir = join(home, "bin");
+  fs.mkdirSync(binDir, { recursive: true });
+  const extracted = join(binDir, "cc-code-new.exe");
+  const finalPath = join(binDir, "cc-code.exe");
+  fs.writeFileSync(finalPath, "old-binary-content");
+  fs.writeFileSync(extracted, "new-binary-content");
+
+  replaceBinary(extracted, finalPath);
+
+  if (!fs.existsSync(finalPath)) throw new Error("finalPath must exist");
+  if (fs.readFileSync(finalPath, "utf-8") !== "new-binary-content") throw new Error("content mismatch");
+  // 正常未锁定删除时，不应产生 .old 备份文件
+  const files = fs.readdirSync(binDir);
+  if (files.some((f) => f.includes(".old."))) throw new Error("should not create .old file when not locked");
+});
+
+test("replaceBinary falls back to renaming old file when finalPath is locked (EBUSY/EPERM)", (home) => {
+  const binDir = join(home, "bin");
+  fs.mkdirSync(binDir, { recursive: true });
+  const extracted = join(binDir, "cc-code-new.exe");
+  const finalPath = join(binDir, "cc-code.exe");
+  fs.writeFileSync(finalPath, "running-binary-content");
+  fs.writeFileSync(extracted, "new-binary-content");
+
+  // 模拟 Windows 运行中 exe 无法 unlinkSync（抛 EPERM/EBUSY，包括重命名后的 .old 文件仍然被进程句柄占用）
+  const originalUnlink = fs.unlinkSync;
+  try {
+    fs.unlinkSync = (target) => {
+      if (target === finalPath || target.includes("cc-code.exe.old.")) {
+        const err = new Error("resource busy or locked");
+        err.code = "EBUSY";
+        throw err;
+      }
+      return originalUnlink(target);
+    };
+
+    replaceBinary(extracted, finalPath);
+  } finally {
+    fs.unlinkSync = originalUnlink;
+  }
+
+  // 验证：新文件成功放至 finalPath
+  if (!fs.existsSync(finalPath)) throw new Error("finalPath must exist");
+  if (fs.readFileSync(finalPath, "utf-8") !== "new-binary-content") throw new Error("new content mismatch");
+
+  // 验证：旧文件被成功重命名为 .old.* 备份
+  const files = fs.readdirSync(binDir);
+  const oldFiles = files.filter((f) => f.startsWith("cc-code.exe.old."));
+  if (oldFiles.length !== 1) throw new Error(`expected 1 old backup file, found ${oldFiles.length}`);
+  if (fs.readFileSync(join(binDir, oldFiles[0]), "utf-8") !== "running-binary-content") {
+    throw new Error("old backup content mismatch");
+  }
+});
+
+test("cleanOldBinaries unlinks released .old files and ignores still-locked ones", (home) => {
+  const binDir = join(home, "bin");
+  fs.mkdirSync(binDir, { recursive: true });
+  const activeOld = join(binDir, "cc-code.exe.old.1001");
+  const inactiveOld = join(binDir, "cc-code.exe.old.1002");
+  const normalFile = join(binDir, "cc-code.exe");
+  fs.writeFileSync(activeOld, "active");
+  fs.writeFileSync(inactiveOld, "inactive");
+  fs.writeFileSync(normalFile, "normal");
+
+  const originalUnlink = fs.unlinkSync;
+  try {
+    fs.unlinkSync = (target) => {
+      if (target === activeOld) {
+        const err = new Error("file is locked");
+        err.code = "EBUSY";
+        throw err;
+      }
+      return originalUnlink(target);
+    };
+
+    cleanOldBinaries(binDir);
+  } finally {
+    fs.unlinkSync = originalUnlink;
+  }
+
+  if (!fs.existsSync(normalFile)) throw new Error("normalFile must not be deleted");
+  if (!fs.existsSync(activeOld)) throw new Error("activeOld should be kept because it is locked");
+  if (fs.existsSync(inactiveOld)) throw new Error("inactiveOld should be unlinked");
+});
+
 // 由 runTests() 顺序执行（支持 async 用例）
 runTests();

package/package.json

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