@okclaw-build/cli 1.0.0-beta.41 → 1.0.0-beta.43

package/dist/openclaw-user-data.js

@@ -0,0 +1,246 @@
+import { existsSync, cpSync, mkdirSync, rmSync, statSync, chmodSync, readdirSync, } from 'node:fs';
+import { shell, shellCapture } from './utils/shell.js';
+import { OKCLAW_BACKUP_DIR, OPENCLAW_WORKSPACE } from './utils/constants.js';
+export const OPENCLAW_USER_DATA_FILES = [
+    'MEMORY.md',
+    'USER.md',
+    'IDENTITY.md',
+    'SOUL.md',
+    'TOOLS.md',
+    'AGENTS.md',
+    'HEARTBEAT.md',
+];
+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 realArchiveFs = { ...realBackupFs, readdirSync: readdirSync };
+const realRestoreFs = {
+    ...realBackupFs,
+    rmSync,
+    chmodSync,
+    readdirSync: readdirSync,
+};
+export function formatBackupTimestamp(now) {
+    return now.toISOString().replace(/\.\d{3}Z$/, 'Z').replace(/:/g, '');
+}
+function copyIfExists(fsOps, src, dest, recursive = false) {
+    if (!fsOps.existsSync(src))
+        return false;
+    fsOps.cpSync(src, dest, recursive ? { recursive: true } : undefined);
+    return true;
+}
+export function backupOpenclawUserData(now = new Date(), fsOps = realBackupFs) {
+    const backupDir = `${OKCLAW_BACKUP_DIR}/openclaw-user-data-${formatBackupTimestamp(now)}`;
+    const workspaces = Array.from(new Set([OPENCLAW_WORKSPACE, LEGACY_OPENCLAW_WORKSPACE]));
+    let copiedItems = 0;
+    let copiedWorkspaces = 0;
+    for (const workspace of workspaces) {
+        if (!fsOps.existsSync(workspace))
+            continue;
+        const workspaceBackupName = copiedWorkspaces === 0 ? WORKSPACE_BACKUP_DIR : LEGACY_WORKSPACE_BACKUP_DIR;
+        const workspaceBackupDir = `${backupDir}/${workspaceBackupName}`;
+        let workspaceDirCreated = false;
+        const ensureWorkspaceBackupDir = () => {
+            if (workspaceDirCreated)
+                return;
+            fsOps.mkdirSync(workspaceBackupDir, { recursive: true });
+            workspaceDirCreated = true;
+        };
+        for (const file of OPENCLAW_USER_DATA_FILES) {
+            const src = `${workspace}/${file}`;
+            if (!fsOps.existsSync(src))
+                continue;
+            ensureWorkspaceBackupDir();
+            if (copyIfExists(fsOps, src, `${workspaceBackupDir}/${file}`)) {
+                copiedItems += 1;
+            }
+        }
+        const skillsDir = `${workspace}/${SKILLS_DIR}`;
+        if (fsOps.existsSync(skillsDir) && fsOps.statSync(skillsDir).isDirectory()) {
+            ensureWorkspaceBackupDir();
+            if (copyIfExists(fsOps, skillsDir, `${workspaceBackupDir}/${SKILLS_DIR}`, true)) {
+                copiedItems += 1;
+            }
+        }
+        if (workspaceDirCreated) {
+            copiedWorkspaces += 1;
+        }
+    }
+    return copiedItems > 0 ? backupDir : null;
+}
+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);
+    if (!backupDir) {
+        return { backupDir: null, archivePath: null, includedFiles: [] };
+    }
+    const includedFiles = listRelativeFiles(fsOps, backupDir);
+    validateArchiveEntries(includedFiles);
+    const archivePath = options.archivePath ?? `/tmp/openclaw-user-data-${formatBackupTimestamp(now)}.tar.gz`;
+    try {
+        await shellOps.shell(`tar -czf ${shellSingleQuote(archivePath)} -C ${shellSingleQuote(backupDir)} .`);
+    }
+    catch (error) {
+        attachContext(error, { backupDir, archivePath });
+        throw error;
+    }
+    return { backupDir, archivePath, includedFiles };
+}
+export async function restoreOpenclawUserDataArchive(options) {
+    const now = options.now ?? new Date();
+    const fsOps = options.fsOps ?? realRestoreFs;
+    const shellOps = options.shellOps ?? { shell };
+    const stagingDir = `/tmp/openclaw-user-data-restore-${formatBackupTimestamp(now)}`;
+    try {
+        fsOps.rmSync(stagingDir, { recursive: true, force: true });
+        fsOps.mkdirSync(stagingDir, { recursive: true });
+        const tarEntries = await listArchiveEntries(shellOps, options.archivePath);
+        validateArchiveEntries(tarEntries.map((entry) => entry.path));
+        validateArchiveEntryTypes(tarEntries);
+        await shellOps.shell(`tar -xzf ${shellSingleQuote(options.archivePath)} -C ${shellSingleQuote(stagingDir)}`);
+        const entries = listRelativeFiles(fsOps, stagingDir);
+        validateArchiveEntries(entries);
+        fsOps.mkdirSync(OPENCLAW_WORKSPACE, { recursive: true });
+        fsOps.chmodSync(OPENCLAW_WORKSPACE, 0o755);
+        const restored = new Set();
+        restoreWorkspaceBackup(fsOps, `${stagingDir}/${WORKSPACE_BACKUP_DIR}`, restored);
+        restoreWorkspaceBackup(fsOps, `${stagingDir}/${LEGACY_WORKSPACE_BACKUP_DIR}`, restored);
+        const restoredFiles = Array.from(restored).sort();
+        for (const file of restoredFiles) {
+            const path = `${OPENCLAW_WORKSPACE}/${file}`;
+            if (file === SKILLS_DIR) {
+                applyRestoredPermissions(fsOps, path);
+            }
+            else {
+                fsOps.chmodSync(path, 0o644);
+            }
+        }
+        await shellOps.shell(`chown -R root:root ${shellSingleQuote(OPENCLAW_WORKSPACE)}`);
+        return { stagingDir, archivePath: options.archivePath, restoredFiles };
+    }
+    catch (error) {
+        attachContext(error, { stagingDir, archivePath: options.archivePath });
+        throw error;
+    }
+}
+async function listArchiveEntries(shellOps, archivePath) {
+    if (shellOps.capture) {
+        const stdout = await shellOps.capture(`tar -tvzf ${shellSingleQuote(archivePath)}`);
+        return parseTarVerboseEntries(stdout);
+    }
+    const result = await shellCapture(`tar -tvzf ${shellSingleQuote(archivePath)}`);
+    if (result.code !== 0) {
+        throw new Error(`Command failed (exit ${result.code}): tar -tvzf ${archivePath}`);
+    }
+    return parseTarVerboseEntries(result.stdout);
+}
+function parseTarVerboseEntries(stdout) {
+    return stdout.split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean)
+        .map((line) => {
+        const modeType = line[0];
+        const tokens = line.split(/\s+/);
+        const rawPath = tokens.slice(5).join(' ');
+        const path = rawPath.includes(' -> ') ? rawPath.slice(0, rawPath.indexOf(' -> ')) : rawPath;
+        return {
+            type: modeType === '-' ? 'file' : modeType === 'd' ? 'directory' : 'unsupported',
+            path,
+            raw: line,
+        };
+    });
+}
+function validateArchiveEntryTypes(entries) {
+    for (const entry of entries) {
+        if (entry.type === 'unsupported') {
+            throw new Error(`unsupported archive entry type: ${entry.raw}`);
+        }
+    }
+}
+function restoreWorkspaceBackup(fsOps, backupWorkspaceDir, restored) {
+    if (!fsOps.existsSync(backupWorkspaceDir))
+        return;
+    for (const file of OPENCLAW_USER_DATA_FILES) {
+        if (restored.has(file))
+            continue;
+        const src = `${backupWorkspaceDir}/${file}`;
+        if (!fsOps.existsSync(src))
+            continue;
+        fsOps.cpSync(src, `${OPENCLAW_WORKSPACE}/${file}`);
+        restored.add(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);
+    }
+}
+function applyRestoredPermissions(fsOps, path) {
+    if (!fsOps.existsSync(path))
+        return;
+    if (fsOps.statSync(path).isDirectory()) {
+        fsOps.chmodSync(path, 0o755);
+        for (const entry of fsOps.readdirSync(path, { withFileTypes: true })) {
+            applyRestoredPermissions(fsOps, `${path}/${entry.name}`);
+        }
+        return;
+    }
+    fsOps.chmodSync(path, 0o644);
+}
+function listRelativeFiles(fsOps, root) {
+    if (!fsOps.existsSync(root))
+        return [];
+    const files = [];
+    const visit = (dir, prefix) => {
+        for (const entry of fsOps.readdirSync(dir, { withFileTypes: true })) {
+            const relative = prefix ? `${prefix}/${entry.name}` : entry.name;
+            const path = `${dir}/${entry.name}`;
+            if (entry.isDirectory()) {
+                visit(path, relative);
+            }
+            else if (entry.isFile()) {
+                files.push(relative);
+            }
+        }
+    };
+    visit(root, '');
+    return files.sort();
+}
+function validateArchiveEntries(entries) {
+    for (const entry of entries) {
+        const normalized = normalizeArchiveEntry(entry);
+        if (!normalized)
+            continue;
+        const parts = normalized.split('/');
+        if (entry.startsWith('/') ||
+            parts.includes('..') ||
+            parts.includes(OPENCLAW_CONFIG_FILE)) {
+            throw new Error(`unsafe archive entry: ${entry}`);
+        }
+    }
+}
+function normalizeArchiveEntry(entry) {
+    let normalized = entry.trim();
+    while (normalized.startsWith('./')) {
+        normalized = normalized.slice(2);
+    }
+    while (normalized.endsWith('/')) {
+        normalized = normalized.slice(0, -1);
+    }
+    return normalized === '.' ? '' : normalized;
+}
+function shellSingleQuote(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function attachContext(error, context) {
+    if (error && typeof error === 'object') {
+        Object.assign(error, context);
+    }
+}
+//# sourceMappingURL=openclaw-user-data.js.map

package/dist/openclaw-user-data.js.map

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

package/dist/utils/constants.d.ts

@@ -4,6 +4,7 @@ export declare const OKCLAW_BACKUP_DIR = "/root/okclaw/backup";
 export declare const OKCLAW_TMP_DIR = "/root/okclaw/tmp";
 export declare const OPENCLAW_HOME = "/root/.openclaw";
 export declare const OPENCLAW_WORKSPACE = "/root/.openclaw/workspace";
+export declare const OPENCLAW_GATEWAY_PORT = 18789;
 export declare const OPENVIKING_HOME = "/root/.openviking";
 export declare const OPENVIKING_CONF = "/root/.openviking/ov.conf";
 export declare const OPENVIKING_ENV = "/root/.openclaw/openviking.env";

package/dist/utils/constants.js

@@ -5,6 +5,10 @@ export const OKCLAW_BACKUP_DIR = `${OKCLAW_HOME}/backup`;
 export const OKCLAW_TMP_DIR = `${OKCLAW_HOME}/tmp`;
 export const OPENCLAW_HOME = '/root/.openclaw';
 export const OPENCLAW_WORKSPACE = `${OPENCLAW_HOME}/workspace`;
+// openclaw gateway 默认 WebSocket 端口。gateway 进程名在不同启动方式下不固定
+// （`openclaw gateway run` → `openclaw`，systemd → `node`），所以进程识别一律
+// 按这个监听端口来，不能用 `ps -C` / `pkill -f` 匹配进程名。
+export const OPENCLAW_GATEWAY_PORT = 18789;
 export const OPENVIKING_HOME = '/root/.openviking';
 export const OPENVIKING_CONF = `${OPENVIKING_HOME}/ov.conf`;
 export const OPENVIKING_ENV = `${OPENCLAW_HOME}/openviking.env`;

package/dist/utils/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,MAAM,CAAC,MAAM,WAAW,GAAG,cAAc,CAAC;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,WAAW,SAAS,CAAC;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,WAAW,SAAS,CAAC;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,WAAW,MAAM,CAAC;AAEnD,MAAM,CAAC,MAAM,aAAa,GAAG,iBAAiB,CAAC;AAC/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,aAAa,YAAY,CAAC;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,eAAe,UAAU,CAAC;AAC5D,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,aAAa,iBAAiB,CAAC;AAChE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AAEpC,yEAAyE;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAE9C,gBAAgB;AAChB,MAAM,CAAC,MAAM,YAAY,GAAG,gCAAgC,CAAC;AAC7D,MAAM,CAAC,MAAM,aAAa,GAAG,0CAA0C,CAAC;AACxE,MAAM,CAAC,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;AAC5D,MAAM,CAAC,MAAM,WAAW,GAAG,oCAAoC,CAAC;AAEhE,wEAAwE;AACxE,MAAM,CAAC,MAAM,WAAW,GAAG,6BAA6B,CAAC;AACzD,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAuB,CAAC;AACvD,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAEhE,gDAAgD;AAChD,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AAC1F,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE,WAAW,EAAE,oBAAoB;IACtD,mBAAmB,EAAE,eAAe,EAAE,iBAAiB;IACvD,8BAA8B,EAAE,sBAAsB;IACtD,eAAe;CAChB,CAAC;AAEF,8BAA8B;AAC9B,MAAM,CAAC,MAAM,oBAAoB,GAA2B;IAC1D,QAAQ,EAAE,iBAAiB;IAC3B,MAAM,EAAE,iCAAiC;IACzC,iDAAiD;IACjD,mEAAmE;CACpE,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,MAAM,CAAC,MAAM,WAAW,GAAG,cAAc,CAAC;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,WAAW,SAAS,CAAC;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,WAAW,SAAS,CAAC;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,WAAW,MAAM,CAAC;AAEnD,MAAM,CAAC,MAAM,aAAa,GAAG,iBAAiB,CAAC;AAC/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,aAAa,YAAY,CAAC;AAC/D,0DAA0D;AAC1D,kEAAkE;AAClE,2CAA2C;AAC3C,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAC3C,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,eAAe,UAAU,CAAC;AAC5D,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,aAAa,iBAAiB,CAAC;AAChE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AAEpC,yEAAyE;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAE9C,gBAAgB;AAChB,MAAM,CAAC,MAAM,YAAY,GAAG,gCAAgC,CAAC;AAC7D,MAAM,CAAC,MAAM,aAAa,GAAG,0CAA0C,CAAC;AACxE,MAAM,CAAC,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;AAC5D,MAAM,CAAC,MAAM,WAAW,GAAG,oCAAoC,CAAC;AAEhE,wEAAwE;AACxE,MAAM,CAAC,MAAM,WAAW,GAAG,6BAA6B,CAAC;AACzD,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAuB,CAAC;AACvD,MAAM,CAAC,MAAM,qBAAqB,GAAG,0BAA0B,CAAC;AAEhE,gDAAgD;AAChD,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AAC1F,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE,WAAW,EAAE,oBAAoB;IACtD,mBAAmB,EAAE,eAAe,EAAE,iBAAiB;IACvD,8BAA8B,EAAE,sBAAsB;IACtD,eAAe;CAChB,CAAC;AAEF,8BAA8B;AAC9B,MAAM,CAAC,MAAM,oBAAoB,GAA2B;IAC1D,QAAQ,EAAE,iBAAiB;IAC3B,MAAM,EAAE,iCAAiC;IACzC,iDAAiD;IACjD,mEAAmE;CACpE,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC"}

package/dist/utils/openclaw-daemon.d.ts

@@ -1,8 +1,47 @@
 /**
- * Best-effort stop of the openclaw gateway daemon so cli operations have
- * exclusive write access to openclaw.json + extensions/.
+ * 确保 gateway 的 systemd 服务已安装且能常驻。
+ * - `loginctl enable-linger`:systemd user 服务默认随最后一个登录会话退出而停,
+ *   开 linger 后才能在部署 SSH 断开后 / 主机重启后继续运行。
+ * - `openclaw gateway install --force`:幂等(重装覆盖),顺带在 openclaw 升级后
+ *   刷新 unit 的 ExecStart。
+ */
+export declare function installGatewayService(): Promise<void>;
+/** 启动 gateway(先确保 systemd 服务已装)。 */
+export declare function startGateway(): Promise<void>;
+/** 重启 gateway(先确保 systemd 服务已装)。 */
+export declare function restartGateway(): Promise<void>;
+/**
+ * 停掉 gateway:先停掉所有已知的 systemd unit(新 + 旧 unit 名),再按监听
+ * 端口兜底杀掉非 systemd 托管的残留进程。顺序见 {@link STOP_GATEWAY_UNITS}。
+ */
+export declare function stopGateway(): Promise<void>;
+/** gateway 运行状态。健康的唯一标准是端口已监听。 */
+export type GatewayState = 'listening' | 'starting' | 'down';
+/**
+ * 探测 gateway 状态。**健康的唯一标准是 18789 端口已监听** —— 进程 active
+ * 不等于对外可服务。
+ *
+ * - `listening`:端口已监听,健康。
+ * - `starting` :systemd 服务 active,但端口在 bounded wait 内始终没监听 ——
+ *   配置异常 / 启动卡住 / 仍在初始化,**不算健康**。
+ * - `down`     :systemd 服务非 active 且端口未监听。
  *
- * Why this is needed: the daemon has a config file watcher that writes its
+ * `openclaw gateway restart` 返回后服务立刻是 active,但 gateway 进程还要几秒
+ * 才 bind 端口。所以端口没起来、服务却 active 时给一段 bounded wait 覆盖这个
+ * 启动窗口;服务都不 active 则直接 `down`,不等。
+ */
+export declare function probeGatewayState(): Promise<GatewayState>;
+/**
+ * 清掉 systemd user 目录下的 gateway unit 残留。`openclaw gateway uninstall`
+ * 只删主 `.service` 文件,残留的 `.service.bak` 备份和 `.service.d/` drop-in
+ * 会在下次 install 时被 systemd 自动 merge 进来(注入过时的 env 等),必须一并清。
+ */
+export declare function cleanupGatewayServiceFiles(): Promise<void>;
+/**
+ * Best-effort stop of the openclaw gateway so cli operations have exclusive
+ * write access to openclaw.json + extensions/.
+ *
+ * Why this is needed: the gateway has a config file watcher that writes its
  * own metadata back into openclaw.json on every config change. Concurrent
  * writes during cli's cleanup / `openclaw plugins install` / `openclaw config
  * set` race with that watcher and produce:
@@ -10,12 +49,8 @@
  *   - ConfigMutationConflictError: config changed since last load (hash check
  *     in openclaw plugins install commit / openclaw config set atomic write)
  *
- * Tries every supervisor we know of, each tolerated if absent. Order matters:
- * ask the supervisor (openclaw cli / systemd) first so it doesn't auto-restart
- * on us, then pkill -9 as the last resort.
- *
  * Bootstrap orchestrator (commands/install.ts) is responsible for restarting
- * the daemon after the full component install pipeline finishes.
+ * the gateway after the full component install pipeline finishes.
  *
  * @param context A short label for logs, e.g. "dingtalk install" or
  *                "openclaw deployment defaults".

package/dist/utils/openclaw-daemon.js

@@ -1,10 +1,127 @@
-import { shell } from './shell.js';
+import { shell, shellCapture } from './shell.js';
 import { info } from './logger.js';
+import { OPENCLAW_GATEWAY_PORT } from './constants.js';
 /**
- * Best-effort stop of the openclaw gateway daemon so cli operations have
- * exclusive write access to openclaw.json + extensions/.
+ * openclaw gateway 生命周期管理。
  *
- * Why this is needed: the daemon has a config file watcher that writes its
+ * 关键决策:gateway 交给 openclaw 自带的 systemd 服务管理,cli 不再自己用
+ * nohup + ps + pkill 管进程。
+ *
+ * 为什么:openclaw 2026.5 的 gateway 有自己的单实例 lock、restart-handoff、
+ * 进程改名(`openclaw` / `node`)机制。cli 旧实现按进程名 `openclaw-gateway`
+ * 识别 + nohup 拉起 + 手动 kill,实测都顶不住:
+ *   - 进程名匹配 0 个 → restart 存活检测恒失败,报 E_RESTART_FAILED
+ *     (即使 gateway 其实已经起来了)
+ *   - 改用 `openclaw gateway run --force` + nohup,会和 openclaw 自身的
+ *     lock / handoff 互相赛跑 → 双进程、端口悬空、健康检查 abnormal closure
+ * 而 `openclaw gateway install/start/stop/restart`(systemd user 服务)实测
+ * 连续重启始终单进程、端口干净、状态准确。所以一律走 openclaw 的 service 命令。
+ */
+// systemctl --user 需要 XDG_RUNTIME_DIR;非交互 SSH exec 下通常已由 pam_systemd
+// 注入,这里再兜底一次,防个别主机 sshd PAM 配置不注入。
+const SYSTEMD_ENV = 'export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"; ';
+// gateway 没被 systemd 接管时(老主机残留 / 异常)按监听端口兜底杀进程。
+// 覆盖 `openclaw` / `node` 两种进程名;且绝不会误杀正在执行本 CLI 的进程。
+// 用 awk 解析 `pid=NNN` 而不是 `grep -oP` —— grep 的 -P(PCRE,含 \K)是 GNU
+// 扩展,非 GNU 环境(BSD grep 等)会整条命令报错、兜底路径静默退化成 no-op。
+// awk -F'pid=' 把每个 `pid=` 后的字段数值化($i+0 取前导数字),POSIX 通用。
+const KILL_GATEWAY_BY_PORT = `ss -ltnHp 'sport = :${OPENCLAW_GATEWAY_PORT}' 2>/dev/null` +
+    ` | awk -F'pid=' '{for(i=2;i<=NF;i++){p=$i+0;if(p>0)print p}}'` +
+    ` | sort -u | xargs -r kill 2>/dev/null || true`;
+/**
+ * 确保 gateway 的 systemd 服务已安装且能常驻。
+ * - `loginctl enable-linger`:systemd user 服务默认随最后一个登录会话退出而停,
+ *   开 linger 后才能在部署 SSH 断开后 / 主机重启后继续运行。
+ * - `openclaw gateway install --force`:幂等(重装覆盖),顺带在 openclaw 升级后
+ *   刷新 unit 的 ExecStart。
+ */
+export async function installGatewayService() {
+    await shell(`loginctl enable-linger root 2>/dev/null || true`).catch(() => { });
+    await shell(`${SYSTEMD_ENV}openclaw gateway install --force --port ${OPENCLAW_GATEWAY_PORT}`);
+}
+/** 启动 gateway(先确保 systemd 服务已装)。 */
+export async function startGateway() {
+    await installGatewayService();
+    await shell(`${SYSTEMD_ENV}openclaw gateway start`);
+}
+/** 重启 gateway(先确保 systemd 服务已装)。 */
+export async function restartGateway() {
+    await installGatewayService();
+    await shell(`${SYSTEMD_ENV}openclaw gateway restart`);
+}
+// 停掉所有已知的 gateway systemd unit。新版 openclaw 的 unit 名是
+// openclaw-gateway.service;老主机可能是 openclaw.service(早期 cli 用过的
+// unit 名,--user / system 两种 scope 都覆盖)。
+//
+// **必须在按端口 kill 之前先停 unit**:先停 unit,systemd 视为"主动停止"、
+// 不会触发 Restart=;反过来先 kill 进程,systemd 当成异常退出,会按
+// Restart=always/on-failure 立刻把 gateway 拉回来 —— stopDaemonForExclusiveAccess
+// 就拿不到真正的独占窗口,config watcher 写配置的竞争(ConfigMutationConflict)复现。
+// 按端口 kill 只作为非 systemd 托管残留进程的兜底,不能替代停 supervisor。
+const STOP_GATEWAY_UNITS = `${SYSTEMD_ENV}` +
+    `openclaw gateway stop 2>/dev/null || true; ` +
+    `systemctl --user stop openclaw-gateway.service 2>/dev/null || true; ` +
+    `systemctl --user stop openclaw.service 2>/dev/null || true; ` +
+    `systemctl stop openclaw.service 2>/dev/null || true`;
+/**
+ * 停掉 gateway:先停掉所有已知的 systemd unit(新 + 旧 unit 名),再按监听
+ * 端口兜底杀掉非 systemd 托管的残留进程。顺序见 {@link STOP_GATEWAY_UNITS}。
+ */
+export async function stopGateway() {
+    await shell(STOP_GATEWAY_UNITS).catch(() => { });
+    await shell(KILL_GATEWAY_BY_PORT).catch(() => { });
+}
+// `active 但端口未监听` 的最长等待:覆盖 restart 后进程已 active、端口还没
+// bind 的启动窗口。等满仍未监听就判 starting(配置异常 / 卡住),不再傻等。
+const STATUS_PORT_WAIT_ATTEMPTS = 20;
+async function isPortListening() {
+    const r = await shellCapture(`ss -ltnH 'sport = :${OPENCLAW_GATEWAY_PORT}' 2>/dev/null || true`);
+    return r.stdout.trim().length > 0;
+}
+async function isServiceActive() {
+    const r = await shellCapture(`${SYSTEMD_ENV}systemctl --user is-active openclaw-gateway.service 2>/dev/null || true`);
+    return r.stdout.trim() === 'active';
+}
+/**
+ * 探测 gateway 状态。**健康的唯一标准是 18789 端口已监听** —— 进程 active
+ * 不等于对外可服务。
+ *
+ * - `listening`:端口已监听,健康。
+ * - `starting` :systemd 服务 active,但端口在 bounded wait 内始终没监听 ——
+ *   配置异常 / 启动卡住 / 仍在初始化,**不算健康**。
+ * - `down`     :systemd 服务非 active 且端口未监听。
+ *
+ * `openclaw gateway restart` 返回后服务立刻是 active,但 gateway 进程还要几秒
+ * 才 bind 端口。所以端口没起来、服务却 active 时给一段 bounded wait 覆盖这个
+ * 启动窗口;服务都不 active 则直接 `down`,不等。
+ */
+export async function probeGatewayState() {
+    if (await isPortListening())
+        return 'listening';
+    if (!(await isServiceActive()))
+        return 'down';
+    for (let i = 0; i < STATUS_PORT_WAIT_ATTEMPTS; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        if (await isPortListening())
+            return 'listening';
+    }
+    return 'starting';
+}
+/**
+ * 清掉 systemd user 目录下的 gateway unit 残留。`openclaw gateway uninstall`
+ * 只删主 `.service` 文件,残留的 `.service.bak` 备份和 `.service.d/` drop-in
+ * 会在下次 install 时被 systemd 自动 merge 进来(注入过时的 env 等),必须一并清。
+ */
+export async function cleanupGatewayServiceFiles() {
+    await shell(`${SYSTEMD_ENV}rm -rf /root/.config/systemd/user/openclaw-gateway.service.d` +
+        ` /root/.config/systemd/user/openclaw-gateway.service.bak;` +
+        ` systemctl --user daemon-reload 2>/dev/null || true`).catch(() => { });
+}
+/**
+ * Best-effort stop of the openclaw gateway so cli operations have exclusive
+ * write access to openclaw.json + extensions/.
+ *
+ * Why this is needed: the gateway has a config file watcher that writes its
  * own metadata back into openclaw.json on every config change. Concurrent
  * writes during cli's cleanup / `openclaw plugins install` / `openclaw config
  * set` race with that watcher and produce:
@@ -12,27 +129,16 @@ import { info } from './logger.js';
  *   - ConfigMutationConflictError: config changed since last load (hash check
  *     in openclaw plugins install commit / openclaw config set atomic write)
  *
- * Tries every supervisor we know of, each tolerated if absent. Order matters:
- * ask the supervisor (openclaw cli / systemd) first so it doesn't auto-restart
- * on us, then pkill -9 as the last resort.
- *
  * Bootstrap orchestrator (commands/install.ts) is responsible for restarting
- * the daemon after the full component install pipeline finishes.
+ * the gateway after the full component install pipeline finishes.
  *
  * @param context A short label for logs, e.g. "dingtalk install" or
  *                "openclaw deployment defaults".
  */
 export async function stopDaemonForExclusiveAccess(context) {
     info(`Stopping openclaw gateway for exclusive access during ${context}...`);
-    await shell(`openclaw gateway stop 2>/dev/null || true`).catch(() => { });
-    await shell(`systemctl --user stop openclaw 2>/dev/null || true`).catch(() => { });
-    await shell(`systemctl stop openclaw 2>/dev/null || true`).catch(() => { });
-    // Match `pkill -f 'openclaw-gateway'` exactly the same way as
-    // OpenclawInstaller.uninstall — narrow enough that we don't kill the cli
-    // process running this code, broad enough to catch the gateway daemon.
-    await shell(`pkill -9 -f 'openclaw-gateway' 2>/dev/null || true`).catch(() => { });
-    // 1.5s is enough for systemd's default RestartSec (100ms) to fire if it
-    // would, and short enough not to drag deploy time noticeably.
+    await stopGateway();
+    // `systemctl stop` 是显式停,Restart=always 不会把它拉回来;留 1.5s 兜底观察。
     await new Promise((resolve) => setTimeout(resolve, 1500));
 }
 //# sourceMappingURL=openclaw-daemon.js.map

package/dist/utils/openclaw-daemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"openclaw-daemon.js","sourceRoot":"","sources":["../../src/utils/openclaw-daemon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,OAAe;IAChE,IAAI,CAAC,yDAAyD,OAAO,KAAK,CAAC,CAAC;IAC5E,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACzE,MAAM,KAAK,CAAC,oDAAoD,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAClF,MAAM,KAAK,CAAC,6CAA6C,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC3E,8DAA8D;IAC9D,yEAAyE;IACzE,uEAAuE;IACvE,MAAM,KAAK,CAAC,oDAAoD,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAClF,wEAAwE;IACxE,8DAA8D;IAC9D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"openclaw-daemon.js","sourceRoot":"","sources":["../../src/utils/openclaw-daemon.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okclaw-build/cli",
-  "version": "1.0.0-beta.41",
+  "version": "1.0.0-beta.43",
   "description": "OKClaw deployment CLI - install and manage OpenClaw, OpenViking, and channel plugins",
   "type": "module",
   "main": "dist/index.js",