From 95d63a4c40977dd49fc6388b9720d43bbf2b38ee Mon Sep 17 00:00:00 2001 From: ssw Date: Wed, 15 Jul 2026 17:34:05 +0800 Subject: [PATCH] auto(bfc0cfa2c3a4): session end @ 2026-07-15T17:34:04 (+1f) --- src/commands/app/clear.ts | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/commands/app/clear.ts b/src/commands/app/clear.ts index 0a12abc..be91f27 100644 --- a/src/commands/app/clear.ts +++ b/src/commands/app/clear.ts @@ -24,7 +24,7 @@ */ import { Command } from 'commander' import { spawn } from 'node:child_process' -import { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync, renameSync } from 'node:fs' +import { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync, renameSync, cpSync, rmSync } from 'node:fs' import { dirname, join, relative, resolve } from 'node:path' import { fileURLToPath } from 'node:url' import { createInterface } from 'node:readline/promises' @@ -260,12 +260,12 @@ async function runClear(opts: ClearOpts): Promise { dbResult = await executeDbClear(opts.appCode, dbTs) } - // ---- (8) 文件备份 (renameSync 原子 move) ---- + // ---- (8) 文件备份 (跨 fs 安全 move: renameSync + EXDEV 回退 cp+rm) ---- for (const t of fileTargets) { const rel = relative(layout.workspace, t.path) const dest = join(bakRoot, 'files', rel) mkdirSync(dirname(dest), { recursive: true }) - renameSync(t.path, dest) + crossFsMove(t.path, dest) log.info(`[MOVE] ${rel}${t.isDir ? '/' : ''} (已移到 history-bak)`) } @@ -531,6 +531,24 @@ function nav(root: any, ...keys: string[]): any { } // ---- token ---- +/** + * 跨 fs 安全 move: renameSync 优先 (同 fs 原子), EXDEV 回退 cpSync+rmSync + * 解决 bind-mount / virtiofs / overlay 混合环境 (rename 不能跨 mount 点) + */ +function crossFsMove(src: string, dest: string): void { + try { + renameSync(src, dest) + } catch (e: any) { + if (e?.code === 'EXDEV') { + // cpSync recursive 对单文件/目录都安全 + cpSync(src, dest, { recursive: true }) + rmSync(src, { recursive: true, force: true }) + } else { + throw e + } + } +} + function readTokenAppCode(): string | null { try { const t = loadToken()