@okclaw-build/cli 1.0.0-beta.50 → 1.0.0-beta.52

package/dist/installers/openclaw.js

@@ -1,5 +1,5 @@
 import { existsSync, cpSync, mkdirSync, rmSync } from 'node:fs';
-import { shell, shellRetry, shellCapture } from '../utils/shell.js';
+import { runCommand, runCommandRetry, shell, shellCapture } from '../utils/shell.js';
 import { ensureNodeVersion, checkDiskSpace } from '../utils/deps.js';
 import { info, warn } from '../utils/logger.js';
 import { stopDaemonForExclusiveAccess, stopGateway, cleanupGatewayServiceFiles, } from '../utils/openclaw-daemon.js';
@@ -24,7 +24,16 @@ export class OpenclawInstaller {
         info(`Installing openclaw@${version}...`);
         // --ignore-scripts: skip postinstall to avoid @matrix-org/matrix-sdk-crypto-nodejs
         // which downloads ~40MB binary from GitHub (blocked/slow in China)
-        await shellRetry(`npm install -g openclaw@${version} --registry ${NPM_REGISTRY} --no-audit --no-fund --ignore-scripts`);
+        await runCommandRetry('npm', [
+            'install',
+            '-g',
+            `openclaw@${version}`,
+            '--registry',
+            NPM_REGISTRY,
+            '--no-audit',
+            '--no-fund',
+            '--ignore-scripts',
+        ]);
         // Remove the problematic postinstall script, then rebuild everything else
         info('Running native module builds...');
         await shell(`rm -f $(npm root -g)/openclaw/node_modules/@matrix-org/matrix-sdk-crypto-nodejs/download-lib.js 2>/dev/null || true`);
@@ -53,7 +62,7 @@ export class OpenclawInstaller {
         // after the full install pipeline completes.
         await stopDaemonForExclusiveAccess('openclaw deployment defaults');
         info('Applying openclaw deployment defaults...');
-        await shell('openclaw config unset plugins.slots.contextEngine').catch(() => {
+        await runCommand('openclaw', ['config', 'unset', 'plugins.slots.contextEngine']).catch(() => {
             warn('Failed to unset legacy contextEngine slot, continuing...');
         });
         // openclaw 2026.4.26 起，bundled plugin 注册路径变了：dist/extensions/memory-core
@@ -61,15 +70,15 @@ export class OpenclawInstaller {
         // "plugin not found: memory-core" 失败。当前没找到 v2026.4.26 下注册它的官方手段
         // （doctor/onboard/postinstall 都不补），先 catch 住不让整个安装挂掉，让 onboard
         // 留下的默认 memory slot 跑起来；后续找到正解再去掉这层兜底。
-        await shell('openclaw config set plugins.slots.memory memory-core').catch(() => {
+        await runCommand('openclaw', ['config', 'set', 'plugins.slots.memory', '--', 'memory-core']).catch(() => {
             warn('Failed to set memory slot to memory-core (plugin not registered), continuing...');
         });
         // OKClaw 部署的 OpenClaw 实例不需要主动 agent heartbeat；设为 0m
         // 是持久关闭，必须在 gateway 启动前写入配置。
-        await shell('openclaw config set agents.defaults.heartbeat.every "0m"').catch(() => {
+        await runCommand('openclaw', ['config', 'set', 'agents.defaults.heartbeat.every', '--', '0m']).catch(() => {
             warn('Failed to disable OpenClaw heartbeat, continuing...');
         });
-        await shell('openclaw config set tools.profile full');
+        await runCommand('openclaw', ['config', 'set', 'tools.profile', '--', 'full']);
         info(`openclaw@${version} installed.`);
     }
     /**
@@ -113,14 +122,18 @@ export class OpenclawInstaller {
             }
         }
         // Full replace via `openclaw config set ... --replace`. --strict-json
-        // forces JSON parsing (no raw-string fallback). Single quotes are
-        // escaped using the standard '\'' pattern so an apiKey containing a
-        // single quote doesn't break out of the shell argument.
-        const providersJson = JSON.stringify(config).replace(/'/g, `'\\''`);
-        await shell(`openclaw config set models.providers '${providersJson}' --strict-json --replace`);
+        // forces JSON parsing (no raw-string fallback).
+        await runCommand('openclaw', [
+            'config',
+            'set',
+            'models.providers',
+            JSON.stringify(config),
+            '--strict-json',
+            '--replace',
+        ]);
         info(`Replaced models.providers with: ${Object.keys(config).join(', ')}`);
         if (defaultModel) {
-            await shell(`openclaw config set agents.defaults.model.primary '${defaultModel}'`);
+            await runCommand('openclaw', ['config', 'set', 'agents.defaults.model.primary', '--', defaultModel]);
             info(`Default model: ${defaultModel}`);
         }
         info('openclaw configured.');

package/dist/installers/openclaw.js.map

@@ -1 +1 @@
-{"version":3,"file":"openclaw.js","sourceRoot":"","sources":["../../src/installers/openclaw.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openclaw.js","sourceRoot":"","sources":["../../src/installers/openclaw.ts"],"names":[],"mappings":"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"}

package/dist/installers/skill.d.ts

@@ -1,10 +1,11 @@
 import type { Installer } from './base.js';
+import type { PackageSource } from '../utils/install-safety.js';
 export declare function findEffectiveSkillRoot(extractDir: string): string;
 export declare class SkillInstaller implements Installer {
-    private skillName;
+    private readonly skillName;
     constructor(skillName: string);
     checkDeps(): Promise<void>;
-    install(_version: string, packageUrl?: string): Promise<void>;
+    install(_version: string, packageSource?: PackageSource): Promise<void>;
     configure(_config: Record<string, unknown>): Promise<void>;
     uninstall(): Promise<void>;
 }

package/dist/installers/skill.js

@@ -1,8 +1,10 @@
-import { existsSync, mkdirSync, readdirSync, rmSync, statSync } from 'node:fs';
-import { shell, shellCapture } from '../utils/shell.js';
+import { copyFileSync, cpSync, existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from 'node:fs';
+import { join } from 'node:path';
+import { runCommand, runCommandCapture } from '../utils/shell.js';
 import { checkDiskSpace, ensureCommand } from '../utils/deps.js';
 import { info, warn } from '../utils/logger.js';
 import { OKCLAW_TMP_DIR, OPENCLAW_WORKSPACE } from '../utils/constants.js';
+import { assertSafeInstallName, skillInstallDir, tmpInstallPath } from '../utils/install-safety.js';
 const SKILLS_DIR = `${OPENCLAW_WORKSPACE}/skills`;
 // 与 okclaw-skill-api SkillUploadServiceImpl.hasSkillMdAtAcceptedRoot 对齐：上传端接受
 // (a) SKILL.md 在 zip 根；(b) SKILL.md 在唯一顶层目录下。CLI 解压必须同样支持，
@@ -10,8 +12,8 @@ const SKILLS_DIR = `${OPENCLAW_WORKSPACE}/skills`;
 export function findEffectiveSkillRoot(extractDir) {
     const entries = readdirSync(extractDir);
     if (entries.length === 1) {
-        const candidate = `${extractDir}/${entries[0]}`;
-        if (statSync(candidate).isDirectory() && existsSync(`${candidate}/SKILL.md`)) {
+        const candidate = join(extractDir, entries[0]);
+        if (statSync(candidate).isDirectory() && existsSync(join(candidate, 'SKILL.md'))) {
             return candidate;
         }
     }
@@ -20,59 +22,59 @@ export function findEffectiveSkillRoot(extractDir) {
 export class SkillInstaller {
     skillName;
     constructor(skillName) {
-        this.skillName = skillName;
+        this.skillName = assertSafeInstallName('skill', skillName);
     }
     async checkDeps() {
         await checkDiskSpace(100);
         await ensureCommand('unzip');
     }
-    async install(_version, packageUrl) {
-        if (!packageUrl) {
+    async install(_version, packageSource) {
+        if (!packageSource) {
             throw new Error('--package-url is required for skill installation');
         }
         mkdirSync(OKCLAW_TMP_DIR, { recursive: true });
         mkdirSync(SKILLS_DIR, { recursive: true });
-        const archive = `${OKCLAW_TMP_DIR}/${this.skillName}-skill.zip`;
+        const archive = tmpInstallPath(`${this.skillName}-skill.zip`);
         // Download
-        if (packageUrl.startsWith('http')) {
-            info(`Downloading skill ${this.skillName} from ${packageUrl}...`);
-            await shell(`curl -fsSL --connect-timeout 30 --retry 3 -o "${archive}" "${packageUrl}"`);
+        if (packageSource.kind === 'remote') {
+            info(`Downloading skill ${this.skillName} from ${packageSource.url}...`);
+            await runCommand('curl', ['-fsSL', '--connect-timeout', '30', '--retry', '3', '-o', archive, packageSource.url]);
         }
-        else if (existsSync(packageUrl)) {
-            await shell(`cp "${packageUrl}" "${archive}"`);
+        else if (existsSync(packageSource.path)) {
+            copyFileSync(packageSource.path, archive);
         }
         else {
-            throw new Error(`Package not found: ${packageUrl}`);
+            throw new Error(`Package not found: ${packageSource.path}`);
         }
         // Remove existing skill directory if present (overwrite)
-        const skillDir = `${SKILLS_DIR}/${this.skillName}`;
+        const skillDir = skillInstallDir(this.skillName);
         if (existsSync(skillDir)) {
             info(`Overwriting existing skill at ${skillDir}...`);
             rmSync(skillDir, { recursive: true, force: true });
         }
         // Extract to staging dir, then move effective root into skillDir
         // (handles ClaudeCode-style 和 ClawHub-style 两种布局，与后端上传接受范围一致)
-        const stageDir = `${OKCLAW_TMP_DIR}/${this.skillName}-extract`;
+        const stageDir = tmpInstallPath(`${this.skillName}-extract`);
         rmSync(stageDir, { recursive: true, force: true });
         mkdirSync(stageDir, { recursive: true });
         info(`Extracting skill to ${skillDir}...`);
-        const unzipResult = await shellCapture(`unzip -o "${archive}" -d "${stageDir}"`);
+        const unzipResult = await runCommandCapture('unzip', ['-o', archive, '-d', stageDir]);
         if (unzipResult.code > 1) {
             throw new Error(`unzip failed (exit ${unzipResult.code}): ${unzipResult.stderr}`);
         }
         const sourceDir = findEffectiveSkillRoot(stageDir);
         mkdirSync(skillDir, { recursive: true });
-        await shell(`find "${sourceDir}" -mindepth 1 -maxdepth 1 -exec mv {} "${skillDir}/" \\;`);
+        moveDirectoryContents(sourceDir, skillDir);
         rmSync(stageDir, { recursive: true, force: true });
         // Cleanup
-        await shell(`rm -f "${archive}"`).catch(() => { });
+        rmSync(archive, { force: true });
         info(`Skill ${this.skillName} installed at ${skillDir}`);
     }
     async configure(_config) {
         // Skills don't need extra configuration
     }
     async uninstall() {
-        const skillDir = `${SKILLS_DIR}/${this.skillName}`;
+        const skillDir = skillInstallDir(this.skillName);
         if (!existsSync(skillDir)) {
             warn(`Skill ${this.skillName} not found at ${skillDir}, skipping`);
             return;
@@ -82,4 +84,21 @@ export class SkillInstaller {
         info(`Skill ${this.skillName} uninstalled`);
     }
 }
+function moveDirectoryContents(sourceDir, targetDir) {
+    for (const entry of readdirSync(sourceDir)) {
+        const src = join(sourceDir, entry);
+        const dest = join(targetDir, entry);
+        rmSync(dest, { recursive: true, force: true });
+        try {
+            renameSync(src, dest);
+        }
+        catch (e) {
+            if (e.code !== 'EXDEV') {
+                throw e;
+            }
+            cpSync(src, dest, { recursive: true, force: true });
+            rmSync(src, { recursive: true, force: true });
+        }
+    }
+}
 //# sourceMappingURL=skill.js.map

package/dist/installers/skill.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/installers/skill.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/installers/skill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAGpG,MAAM,UAAU,GAAG,GAAG,kBAAkB,SAAS,CAAC;AAElD,8EAA8E;AAC9E,2DAA2D;AAC3D,gFAAgF;AAChF,MAAM,UAAU,sBAAsB,CAAC,UAAkB;IACvD,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACjF,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,OAAO,cAAc;IACR,SAAS,CAAS;IAEnC,YAAY,SAAiB;QAC3B,IAAI,CAAC,SAAS,GAAG,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;QAC1B,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,aAA6B;QAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,YAAY,CAAC,CAAC;QAE9D,WAAW;QACX,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,qBAAqB,IAAI,CAAC,SAAS,SAAS,aAAa,CAAC,GAAG,KAAK,CAAC,CAAC;YACzE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;QACnH,CAAC;aAAM,IAAI,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,yDAAyD;QACzD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,iCAAiC,QAAQ,KAAK,CAAC,CAAC;YACrD,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,iEAAiE;QACjE,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,CAAC;QAC7D,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,uBAAuB,QAAQ,KAAK,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtF,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,sBAAsB,WAAW,CAAC,IAAI,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,SAAS,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACnD,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,qBAAqB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnD,UAAU;QACV,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,iBAAiB,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAgC;QAC9C,wCAAwC;IAC1C,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,iBAAiB,QAAQ,YAAY,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,kBAAkB,IAAI,CAAC,SAAS,SAAS,QAAQ,KAAK,CAAC,CAAC;QAC7D,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,cAAc,CAAC,CAAC;IAC9C,CAAC;CACF;AAED,SAAS,qBAAqB,CAAC,SAAiB,EAAE,SAAiB;IACjE,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC;YACH,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAK,CAA2B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClD,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/openclaw-user-data.d.ts

@@ -1,5 +1,13 @@
 export declare const OPENCLAW_USER_DATA_FILES: readonly ["MEMORY.md", "USER.md", "IDENTITY.md", "SOUL.md", "TOOLS.md", "AGENTS.md", "HEARTBEAT.md"];
 export declare const LEGACY_OPENCLAW_WORKSPACE = "/root/openclaw/workspace";
+type SkipReporter = (relativePath: string, reason: string) => void;
+type BackupOptions = {
+    includeWorkspaceExtra?: boolean;
+    onSkip?: SkipReporter;
+};
+type RestoreOptions = {
+    includeWorkspaceExtra?: boolean;
+};
 export type BackupFs = {
     existsSync(path: string): boolean;
     mkdirSync(path: string, options?: {
@@ -11,6 +19,10 @@ export type BackupFs = {
     statSync(path: string): {
         isDirectory(): boolean;
     };
+    readdirSync?: (path: string, options?: {
+        withFileTypes?: boolean;
+    }) => Array<DirentLike>;
+    readlinkSync?: (path: string) => string;
 };
 export type ArchiveFs = BackupFs & {
     readdirSync(path: string, options?: {
@@ -34,6 +46,7 @@ type DirentLike = {
     name: string;
     isDirectory(): boolean;
     isFile(): boolean;
+    isSymbolicLink?(): boolean;
 };
 export type ArchiveResult = {
     backupDir: string | null;
@@ -50,17 +63,19 @@ type ShellOps = {
     capture?(command: string): Promise<string>;
 };
 export declare function formatBackupTimestamp(now: Date): string;
-export declare function backupOpenclawUserData(now?: Date, fsOps?: BackupFs): string | null;
+export declare function backupOpenclawUserData(now?: Date, fsOps?: BackupFs, options?: BackupOptions): string | null;
 export declare function createOpenclawUserDataArchive(options?: {
     archivePath?: string;
     now?: Date;
     fsOps?: ArchiveFs;
     shellOps?: ShellOps;
+    includeWorkspaceExtra?: boolean;
+    onSkip?: SkipReporter;
 }): Promise<ArchiveResult>;
 export declare function restoreOpenclawUserDataArchive(options: {
     archivePath: string;
     now?: Date;
     fsOps?: RestoreFs;
     shellOps?: ShellOps;
-}): Promise<RestoreResult>;
+} & RestoreOptions): Promise<RestoreResult>;
 export {};

package/dist/openclaw-user-data.js

@@ -1,6 +1,7 @@
-import { existsSync, cpSync, mkdirSync, rmSync, statSync, lstatSync, chmodSync, readdirSync, } from 'node:fs';
+import { existsSync, cpSync, mkdirSync, rmSync, statSync, lstatSync, chmodSync, readdirSync, readlinkSync, } from 'node:fs';
 import { posix as pathPosix } from 'node:path';
 import { shell, shellCapture } from './utils/shell.js';
+import { warn } from './utils/logger.js';
 import { OKCLAW_BACKUP_DIR, OPENCLAW_WORKSPACE } from './utils/constants.js';
 export const OPENCLAW_USER_DATA_FILES = [
     'MEMORY.md',
@@ -15,8 +16,14 @@ export const LEGACY_OPENCLAW_WORKSPACE = '/root/openclaw/workspace';
 const WORKSPACE_BACKUP_DIR = 'workspace';
 const LEGACY_WORKSPACE_BACKUP_DIR = 'workspace-root-openclaw';
 const SKILLS_DIR = 'skills';
-const OPENCLAW_CONFIG_FILE = 'openclaw.json';
-const realBackupFs = { existsSync, mkdirSync, cpSync, statSync };
+const realBackupFs = {
+    existsSync,
+    mkdirSync,
+    cpSync,
+    statSync,
+    readdirSync: readdirSync,
+    readlinkSync,
+};
 const realArchiveFs = { ...realBackupFs, readdirSync: readdirSync };
 const realRestoreFs = {
     ...realBackupFs,
@@ -34,7 +41,7 @@ function copyIfExists(fsOps, src, dest, recursive = false) {
     fsOps.cpSync(src, dest, recursive ? { recursive: true } : undefined);
     return true;
 }
-export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs) {
+export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs, options = {}) {
     const backupDir = `${OKCLAW_BACKUP_DIR}/openclaw-user-data-${formatBackupTimestamp(now)}`;
     const workspaces = Array.from(new Set([OPENCLAW_WORKSPACE, LEGACY_OPENCLAW_WORKSPACE]));
     let copiedItems = 0;
@@ -42,9 +49,12 @@ export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs) {
     for (const workspace of workspaces) {
         if (!fsOps.existsSync(workspace))
             continue;
-        const workspaceBackupName = copiedWorkspaces === 0 ? WORKSPACE_BACKUP_DIR : LEGACY_WORKSPACE_BACKUP_DIR;
+        const workspaceBackupName = options.includeWorkspaceExtra
+            ? (workspace === OPENCLAW_WORKSPACE ? WORKSPACE_BACKUP_DIR : LEGACY_WORKSPACE_BACKUP_DIR)
+            : (copiedWorkspaces === 0 ? WORKSPACE_BACKUP_DIR : LEGACY_WORKSPACE_BACKUP_DIR);
         const workspaceBackupDir = `${backupDir}/${workspaceBackupName}`;
         let workspaceDirCreated = false;
+        const copiedRootEntries = new Set();
         const ensureWorkspaceBackupDir = () => {
             if (workspaceDirCreated)
                 return;
@@ -58,6 +68,7 @@ export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs) {
             ensureWorkspaceBackupDir();
             if (copyIfExists(fsOps, src, `${workspaceBackupDir}/${file}`)) {
                 copiedItems += 1;
+                copiedRootEntries.add(file);
             }
         }
         const skillsDir = `${workspace}/${SKILLS_DIR}`;
@@ -65,19 +76,107 @@ export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs) {
             ensureWorkspaceBackupDir();
             if (copyIfExists(fsOps, skillsDir, `${workspaceBackupDir}/${SKILLS_DIR}`, true)) {
                 copiedItems += 1;
+                copiedRootEntries.add(SKILLS_DIR);
             }
         }
+        if (options.includeWorkspaceExtra) {
+            copiedItems += copyWorkspaceExtraEntries(fsOps, workspace, workspaceBackupDir, copiedRootEntries, ensureWorkspaceBackupDir, options.onSkip ?? defaultBackupSkip);
+        }
         if (workspaceDirCreated) {
             copiedWorkspaces += 1;
         }
     }
     return copiedItems > 0 ? backupDir : null;
 }
+function defaultBackupSkip(relativePath, reason) {
+    warn(`全量迁移跳过不可移植条目 ${relativePath}: ${reason}`);
+}
+// 全量模式只把"可移植"条目纳入归档，让归档天生可在目标主机还原：
+// 普通文件、目录、以及目标仍落在 workspace 内的软链都保留；指向 workspace 之外的软链
+// 和 socket/fifo 等特殊文件在 backup 阶段就跳过并告警，而不是搬进去等 restore 整包失败。
+function copyWorkspaceExtraEntries(fsOps, workspace, workspaceBackupDir, copiedRootEntries, ensureWorkspaceBackupDir, onSkip) {
+    if (!fsOps.readdirSync) {
+        throw new Error('backup fs does not support readdirSync for full workspace backup');
+    }
+    let copied = 0;
+    for (const entry of fsOps.readdirSync(workspace, { withFileTypes: true })) {
+        if (copiedRootEntries.has(entry.name))
+            continue;
+        const src = `${workspace}/${entry.name}`;
+        const dest = `${workspaceBackupDir}/${entry.name}`;
+        const rel = entry.name;
+        if (entry.isSymbolicLink?.()) {
+            if (!isPortableSymlink(fsOps, src, rel, onSkip))
+                continue;
+            ensureWorkspaceBackupDir();
+            fsOps.cpSync(src, dest);
+            copied += 1;
+            copiedRootEntries.add(entry.name);
+            continue;
+        }
+        if (entry.isDirectory()) {
+            ensureWorkspaceBackupDir();
+            copyPortableTree(fsOps, src, dest, rel, onSkip);
+            copied += 1;
+            copiedRootEntries.add(entry.name);
+            continue;
+        }
+        if (entry.isFile()) {
+            ensureWorkspaceBackupDir();
+            fsOps.cpSync(src, dest);
+            copied += 1;
+            copiedRootEntries.add(entry.name);
+            continue;
+        }
+        onSkip(rel, '不支持的文件类型');
+    }
+    return copied;
+}
+// 递归拷贝目录，逐项套用与 restore 校验一致的"可移植"判定，使嵌套软链/特殊文件也被过滤。
+function copyPortableTree(fsOps, srcDir, destDir, relDir, onSkip) {
+    if (!fsOps.readdirSync) {
+        throw new Error('backup fs does not support readdirSync for full workspace backup');
+    }
+    fsOps.mkdirSync(destDir, { recursive: true });
+    for (const entry of fsOps.readdirSync(srcDir, { withFileTypes: true })) {
+        const src = `${srcDir}/${entry.name}`;
+        const dest = `${destDir}/${entry.name}`;
+        const rel = relDir ? `${relDir}/${entry.name}` : entry.name;
+        if (entry.isSymbolicLink?.()) {
+            if (isPortableSymlink(fsOps, src, rel, onSkip)) {
+                fsOps.cpSync(src, dest);
+            }
+            continue;
+        }
+        if (entry.isDirectory()) {
+            copyPortableTree(fsOps, src, dest, rel, onSkip);
+            continue;
+        }
+        if (entry.isFile()) {
+            fsOps.cpSync(src, dest);
+            continue;
+        }
+        onSkip(rel, '不支持的文件类型');
+    }
+}
+function isPortableSymlink(fsOps, src, rel, onSkip) {
+    if (!fsOps.readlinkSync) {
+        throw new Error('backup fs does not support readlinkSync for full workspace backup');
+    }
+    const target = fsOps.readlinkSync(src);
+    if (symlinkTargetWithinWorkspace(rel, target))
+        return true;
+    onSkip(rel, `软链目标逃逸 workspace: ${target}`);
+    return false;
+}
 export async function createOpenclawUserDataArchive(options = {}) {
     const now = options.now ?? new Date();
     const fsOps = options.fsOps ?? realArchiveFs;
     const shellOps = options.shellOps ?? { shell };
-    const backupDir = backupOpenclawUserData(now, fsOps);
+    const backupDir = backupOpenclawUserData(now, fsOps, {
+        includeWorkspaceExtra: options.includeWorkspaceExtra,
+        onSkip: options.onSkip,
+    });
     if (!backupDir) {
         return { backupDir: null, archivePath: null, includedFiles: [] };
     }
@@ -109,16 +208,21 @@ export async function restoreOpenclawUserDataArchive(options) {
         validateArchiveEntries(entries);
         fsOps.mkdirSync(OPENCLAW_WORKSPACE, { recursive: true });
         fsOps.chmodSync(OPENCLAW_WORKSPACE, 0o755);
-        const restored = new Set();
+        const restored = new Map();
         restoreWorkspaceBackup(fsOps, `${stagingDir}/${WORKSPACE_BACKUP_DIR}`, restored);
         restoreWorkspaceBackup(fsOps, `${stagingDir}/${LEGACY_WORKSPACE_BACKUP_DIR}`, restored);
-        const restoredFiles = Array.from(restored).sort();
+        if (options.includeWorkspaceExtra) {
+            restoreWorkspaceExtraEntries(fsOps, `${stagingDir}/${WORKSPACE_BACKUP_DIR}`, restored);
+            restoreWorkspaceExtraEntries(fsOps, `${stagingDir}/${LEGACY_WORKSPACE_BACKUP_DIR}`, restored);
+        }
+        const restoredFiles = Array.from(restored.keys()).sort();
         for (const file of restoredFiles) {
             const path = `${OPENCLAW_WORKSPACE}/${file}`;
-            if (file === SKILLS_DIR) {
+            const type = restored.get(file);
+            if (type === 'directory') {
                 applyRestoredPermissions(fsOps, path);
             }
-            else {
+            else if (type === 'file') {
                 fsOps.chmodSync(path, 0o644);
             }
         }
@@ -149,13 +253,13 @@ function parseTarVerboseEntries(stdout) {
         const modeType = line[0];
         const tokens = line.split(/\s+/);
         const rawPath = tokens.slice(5).join(' ');
-        const linkIndex = rawPath.indexOf(' -> ');
-        const path = linkIndex >= 0 ? rawPath.slice(0, linkIndex) : rawPath;
-        const linkTarget = linkIndex >= 0 ? rawPath.slice(linkIndex + ' -> '.length) : undefined;
         const type = modeType === '-' ? 'file'
             : modeType === 'd' ? 'directory'
                 : modeType === 'l' ? 'symlink'
                     : 'unsupported';
+        const linkIndex = type === 'symlink' ? rawPath.indexOf(' -> ') : -1;
+        const path = linkIndex >= 0 ? rawPath.slice(0, linkIndex) : rawPath;
+        const linkTarget = linkIndex >= 0 ? rawPath.slice(linkIndex + ' -> '.length) : undefined;
         return { type, path, linkTarget, raw: line };
     });
 }
@@ -177,13 +281,20 @@ function assertSymlinkWithinWorkspace(entry) {
     if (relative === null || !target) {
         throw new Error(`unsafe archive symlink: ${entry.raw}`);
     }
-    const linkDir = pathPosix.dirname(`${OPENCLAW_WORKSPACE}/${relative}`);
+    if (!symlinkTargetWithinWorkspace(relative, target)) {
+        throw new Error(`unsafe archive symlink target: ${entry.raw}`);
+    }
+}
+// backup 过滤与 restore 校验共用的判定：软链在还原到 OPENCLAW_WORKSPACE 后，
+// 其目标是否仍落在 workspace 内。relativePath 是软链相对 workspace 根的路径。
+function symlinkTargetWithinWorkspace(relativePath, target) {
+    if (!target)
+        return false;
+    const linkDir = pathPosix.dirname(`${OPENCLAW_WORKSPACE}/${relativePath}`);
     const resolvedTarget = target.startsWith('/')
         ? pathPosix.normalize(target)
         : pathPosix.normalize(pathPosix.join(linkDir, target));
-    if (resolvedTarget !== OPENCLAW_WORKSPACE && !resolvedTarget.startsWith(`${OPENCLAW_WORKSPACE}/`)) {
-        throw new Error(`unsafe archive symlink target: ${entry.raw}`);
-    }
+    return resolvedTarget === OPENCLAW_WORKSPACE || resolvedTarget.startsWith(`${OPENCLAW_WORKSPACE}/`);
 }
 function workspaceRelativePath(entryPath) {
     const normalized = normalizeArchiveEntry(entryPath);
@@ -205,13 +316,31 @@ function restoreWorkspaceBackup(fsOps, backupWorkspaceDir, restored) {
         if (!fsOps.existsSync(src))
             continue;
         fsOps.cpSync(src, `${OPENCLAW_WORKSPACE}/${file}`);
-        restored.add(file);
+        restored.set(file, 'file');
     }
     const skillsSrc = `${backupWorkspaceDir}/${SKILLS_DIR}`;
     if (!restored.has(SKILLS_DIR) && fsOps.existsSync(skillsSrc) && fsOps.statSync(skillsSrc).isDirectory()) {
         fsOps.rmSync(`${OPENCLAW_WORKSPACE}/${SKILLS_DIR}`, { recursive: true, force: true });
         fsOps.cpSync(skillsSrc, `${OPENCLAW_WORKSPACE}/${SKILLS_DIR}`, { recursive: true });
-        restored.add(SKILLS_DIR);
+        restored.set(SKILLS_DIR, 'directory');
+    }
+}
+function restoreWorkspaceExtraEntries(fsOps, backupWorkspaceDir, restored) {
+    if (!fsOps.existsSync(backupWorkspaceDir))
+        return;
+    for (const entry of fsOps.readdirSync(backupWorkspaceDir, { withFileTypes: true })) {
+        if (restored.has(entry.name))
+            continue;
+        const src = `${backupWorkspaceDir}/${entry.name}`;
+        const dest = `${OPENCLAW_WORKSPACE}/${entry.name}`;
+        fsOps.rmSync(dest, { recursive: true, force: true });
+        if (entry.isDirectory()) {
+            fsOps.cpSync(src, dest, { recursive: true });
+            restored.set(entry.name, 'directory');
+            continue;
+        }
+        fsOps.cpSync(src, dest);
+        restored.set(entry.name, entry.isSymbolicLink?.() ? 'symlink' : 'file');
     }
 }
 function applyRestoredPermissions(fsOps, path) {
@@ -256,8 +385,7 @@ function validateArchiveEntries(entries) {
             continue;
         const parts = normalized.split('/');
         if (entry.startsWith('/') ||
-            parts.includes('..') ||
-            parts.includes(OPENCLAW_CONFIG_FILE)) {
+            parts.includes('..')) {
             throw new Error(`unsafe archive entry: ${entry}`);
         }
     }