nextclaw 0.5.5 → 0.6.0

package/dist/cli/index.js

@@ -2,86 +2,164 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { APP_NAME as APP_NAME2, APP_TAGLINE } from "@nextclaw/core";
+import { APP_NAME as APP_NAME5, APP_TAGLINE } from "@nextclaw/core";
 
 // src/cli/runtime.ts
 import {
-  loadConfig,
-  saveConfig,
-  getConfigPath,
-  getDataDir as getDataDir2,
+  loadConfig as loadConfig5,
+  saveConfig as saveConfig3,
+  getConfigPath as getConfigPath3,
+  getDataDir as getDataDir6,
   ConfigSchema as ConfigSchema2,
-  getApiBase,
-  getProvider,
-  getProviderName,
-  buildReloadPlan,
-  diffConfigPaths,
-  getWorkspacePath,
+  getWorkspacePath as getWorkspacePath3,
   expandHome,
-  MessageBus,
-  AgentLoop,
-  LiteLLMProvider,
-  LLMProvider,
-  ProviderManager,
-  ChannelManager,
-  SessionManager,
-  CronService,
-  HeartbeatService,
-  PROVIDERS,
-  APP_NAME,
+  MessageBus as MessageBus2,
+  AgentLoop as AgentLoop2,
+  ProviderManager as ProviderManager2,
+  APP_NAME as APP_NAME4,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
-import {
-  loadOpenClawPlugins,
-  buildPluginStatusReport,
-  enablePluginInConfig,
-  disablePluginInConfig,
-  addPluginLoadPath,
-  recordPluginInstall,
-  installPluginFromPath,
-  installPluginFromNpmSpec,
-  uninstallPlugin,
-  resolveUninstallDirectoryTarget,
-  setPluginRuntimeBridge,
-  getPluginChannelBindings,
-  getPluginUiMetadataFromRegistry,
-  resolvePluginChannelMessageToolHints,
-  startPluginChannelGateways,
-  stopPluginChannelGateways
-} from "@nextclaw/openclaw-compat";
-import { startUiServer } from "@nextclaw/server";
-import {
-  closeSync,
-  cpSync,
-  existsSync as existsSync4,
-  mkdirSync as mkdirSync2,
-  openSync,
-  readdirSync,
-  readFileSync as readFileSync3,
-  rmSync as rmSync2,
-  writeFileSync as writeFileSync2
-} from "fs";
-import { dirname, join as join3, resolve as resolve4 } from "path";
-import { createServer as createNetServer } from "net";
-import { spawn as spawn2, spawnSync as spawnSync3 } from "child_process";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { join as join6, resolve as resolve7 } from "path";
 import { createInterface } from "readline";
-import { createRequire } from "module";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import chokidar from "chokidar";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { spawn as spawn3 } from "child_process";
 
-// src/cli/gateway/controller.ts
-import { createHash } from "crypto";
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import {
-  buildConfigSchema,
-  ConfigSchema,
-  redactConfigObject
-} from "@nextclaw/core";
+// src/cli/restart-coordinator.ts
+var RestartCoordinator = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  restartingService = false;
+  exitScheduled = false;
+  async requestRestart(request) {
+    const reason = request.reason.trim() || "config changed";
+    const strategy = request.strategy ?? "background-service-or-manual";
+    if (strategy !== "exit-process") {
+      const state = this.deps.readServiceState();
+      const serviceRunning = Boolean(state && this.deps.isProcessRunning(state.pid));
+      const managedByCurrentProcess = Boolean(state && state.pid === this.deps.currentPid());
+      if (serviceRunning && !managedByCurrentProcess) {
+        if (this.restartingService) {
+          return {
+            status: "restart-in-progress",
+            message: "Restart already in progress; skipping duplicate request."
+          };
+        }
+        this.restartingService = true;
+        try {
+          const restarted = await this.deps.restartBackgroundService(reason);
+          if (restarted) {
+            return {
+              status: "service-restarted",
+              message: `Restarted background service to apply changes (${reason}).`
+            };
+          }
+        } finally {
+          this.restartingService = false;
+        }
+      }
+    }
+    if (strategy === "background-service-or-exit" || strategy === "exit-process") {
+      if (this.exitScheduled) {
+        return {
+          status: "exit-scheduled",
+          message: "Restart already scheduled; skipping duplicate request."
+        };
+      }
+      const delay = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
+      this.exitScheduled = true;
+      this.deps.scheduleProcessExit(delay, reason);
+      return {
+        status: "exit-scheduled",
+        message: `Restart scheduled (${reason}).`
+      };
+    }
+    return {
+      status: "manual-required",
+      message: request.manualMessage ?? "Restart the gateway to apply changes."
+    };
+  }
+};
+
+// src/cli/skills/clawhub.ts
+import { spawnSync } from "child_process";
+import { existsSync } from "fs";
+import { isAbsolute, join, resolve } from "path";
+async function installClawHubSkill(options) {
+  const slug = options.slug.trim();
+  if (!slug) {
+    throw new Error("Skill slug is required.");
+  }
+  const workdir = resolve(options.workdir);
+  if (!existsSync(workdir)) {
+    throw new Error(`Workdir does not exist: ${workdir}`);
+  }
+  const dirName = options.dir?.trim() || "skills";
+  const destinationDir = isAbsolute(dirName) ? resolve(dirName, slug) : resolve(workdir, dirName, slug);
+  const skillFile = join(destinationDir, "SKILL.md");
+  if (!options.force && existsSync(destinationDir)) {
+    if (existsSync(skillFile)) {
+      return {
+        slug,
+        version: options.version,
+        registry: options.registry,
+        destinationDir,
+        alreadyInstalled: true
+      };
+    }
+    throw new Error(`Skill directory already exists: ${destinationDir} (use --force)`);
+  }
+  const args = buildClawHubArgs(slug, options);
+  const result = spawnSync("npx", args, {
+    cwd: workdir,
+    stdio: "pipe",
+    env: process.env
+  });
+  if (result.error) {
+    throw new Error(`Failed to run npx clawhub: ${String(result.error)}`);
+  }
+  if (result.status !== 0) {
+    const stdout = result.stdout ? String(result.stdout).trim() : "";
+    const stderr = result.stderr ? String(result.stderr).trim() : "";
+    const details = [stderr, stdout].filter(Boolean).join("\n");
+    throw new Error(details || `clawhub install failed with code ${result.status ?? 1}`);
+  }
+  return {
+    slug,
+    version: options.version,
+    registry: options.registry,
+    destinationDir
+  };
+}
+function buildClawHubArgs(slug, options) {
+  const args = ["--yes", "clawhub", "install", slug];
+  if (options.version) {
+    args.push("--version", options.version);
+  }
+  if (options.registry) {
+    args.push("--registry", options.registry);
+  }
+  if (options.workdir) {
+    args.push("--workdir", options.workdir);
+  }
+  if (options.dir) {
+    args.push("--dir", options.dir);
+  }
+  if (options.force) {
+    args.push("--force");
+  }
+  return args;
+}
+
+// src/cli/update/runner.ts
+import { spawnSync as spawnSync2 } from "child_process";
+import { resolve as resolve3 } from "path";
 
 // src/cli/utils.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from "fs";
-import { join, resolve } from "path";
+import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync, rmSync } from "fs";
+import { join as join2, resolve as resolve2 } from "path";
 import { spawn } from "child_process";
 import { isIP } from "net";
 import { fileURLToPath } from "url";
@@ -135,7 +213,7 @@ function buildServeArgs(options) {
 }
 function readServiceState() {
   const path = resolveServiceStatePath();
-  if (!existsSync(path)) {
+  if (!existsSync2(path)) {
     return null;
   }
   try {
@@ -147,20 +225,20 @@ function readServiceState() {
 }
 function writeServiceState(state) {
   const path = resolveServiceStatePath();
-  mkdirSync(resolve(path, ".."), { recursive: true });
+  mkdirSync(resolve2(path, ".."), { recursive: true });
   writeFileSync(path, JSON.stringify(state, null, 2));
 }
 function clearServiceState() {
   const path = resolveServiceStatePath();
-  if (existsSync(path)) {
+  if (existsSync2(path)) {
     rmSync(path, { force: true });
   }
 }
 function resolveServiceStatePath() {
-  return resolve(getDataDir(), "run", "service.json");
+  return resolve2(getDataDir(), "run", "service.json");
 }
 function resolveServiceLogPath() {
-  return resolve(getDataDir(), "logs", "service.log");
+  return resolve2(getDataDir(), "logs", "service.log");
 }
 function isProcessRunning(pid) {
   try {
@@ -176,7 +254,7 @@ async function waitForExit(pid, timeoutMs) {
     if (!isProcessRunning(pid)) {
       return true;
     }
-    await new Promise((resolve5) => setTimeout(resolve5, 200));
+    await new Promise((resolve8) => setTimeout(resolve8, 200));
   }
   return !isProcessRunning(pid);
 }
@@ -186,20 +264,20 @@ function resolveUiStaticDir() {
   if (envDir) {
     candidates.push(envDir);
   }
-  const cliDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
-  const pkgRoot = resolve(cliDir, "..", "..");
-  candidates.push(join(pkgRoot, "ui-dist"));
-  candidates.push(join(pkgRoot, "ui"));
-  candidates.push(join(pkgRoot, "..", "ui-dist"));
-  candidates.push(join(pkgRoot, "..", "ui"));
+  const cliDir = resolve2(fileURLToPath(new URL(".", import.meta.url)));
+  const pkgRoot = resolve2(cliDir, "..", "..");
+  candidates.push(join2(pkgRoot, "ui-dist"));
+  candidates.push(join2(pkgRoot, "ui"));
+  candidates.push(join2(pkgRoot, "..", "ui-dist"));
+  candidates.push(join2(pkgRoot, "..", "ui"));
   const cwd = process.cwd();
-  candidates.push(join(cwd, "packages", "nextclaw-ui", "dist"));
-  candidates.push(join(cwd, "nextclaw-ui", "dist"));
-  candidates.push(join(pkgRoot, "..", "nextclaw-ui", "dist"));
-  candidates.push(join(pkgRoot, "..", "..", "packages", "nextclaw-ui", "dist"));
-  candidates.push(join(pkgRoot, "..", "..", "nextclaw-ui", "dist"));
+  candidates.push(join2(cwd, "packages", "nextclaw-ui", "dist"));
+  candidates.push(join2(cwd, "nextclaw-ui", "dist"));
+  candidates.push(join2(pkgRoot, "..", "nextclaw-ui", "dist"));
+  candidates.push(join2(pkgRoot, "..", "..", "packages", "nextclaw-ui", "dist"));
+  candidates.push(join2(pkgRoot, "..", "..", "nextclaw-ui", "dist"));
   for (const dir of candidates) {
-    if (existsSync(join(dir, "index.html"))) {
+    if (existsSync2(join2(dir, "index.html"))) {
       return dir;
     }
   }
@@ -225,18 +303,18 @@ function openBrowser(url) {
 function which(binary) {
   const paths = (process.env.PATH ?? "").split(":");
   for (const dir of paths) {
-    const full = join(dir, binary);
-    if (existsSync(full)) {
+    const full = join2(dir, binary);
+    if (existsSync2(full)) {
       return true;
     }
   }
   return false;
 }
 function resolveVersionFromPackageTree(startDir, expectedName) {
-  let current = resolve(startDir);
+  let current = resolve2(startDir);
   while (current.length > 0) {
-    const pkgPath = join(current, "package.json");
-    if (existsSync(pkgPath)) {
+    const pkgPath = join2(current, "package.json");
+    if (existsSync2(pkgPath)) {
       try {
         const raw = readFileSync(pkgPath, "utf-8");
         const parsed = JSON.parse(raw);
@@ -248,7 +326,7 @@ function resolveVersionFromPackageTree(startDir, expectedName) {
       } catch {
       }
     }
-    const parent = resolve(current, "..");
+    const parent = resolve2(current, "..");
     if (parent === current) {
       break;
     }
@@ -257,7 +335,7 @@ function resolveVersionFromPackageTree(startDir, expectedName) {
   return null;
 }
 function getPackageVersion() {
-  const cliDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
+  const cliDir = resolve2(fileURLToPath(new URL(".", import.meta.url)));
   return resolveVersionFromPackageTree(cliDir, "nextclaw") ?? resolveVersionFromPackageTree(cliDir) ?? getCorePackageVersion();
 }
 function printAgentResponse(response) {
@@ -266,14 +344,12 @@ function printAgentResponse(response) {
 async function prompt(rl, question) {
   rl.setPrompt(question);
   rl.prompt();
-  return new Promise((resolve5) => {
-    rl.once("line", (line) => resolve5(line));
+  return new Promise((resolve8) => {
+    rl.once("line", (line) => resolve8(line));
   });
 }
 
 // src/cli/update/runner.ts
-import { spawnSync } from "child_process";
-import { resolve as resolve2 } from "path";
 var DEFAULT_TIMEOUT_MS = 20 * 6e4;
 function runSelfUpdate(options = {}) {
   const steps = [];
@@ -281,7 +357,7 @@ function runSelfUpdate(options = {}) {
   const updateCommand = options.updateCommand ?? process.env.NEXTCLAW_UPDATE_COMMAND?.trim();
   const packageName = options.packageName ?? "nextclaw";
   const runStep = (cmd, args, cwd) => {
-    const result = spawnSync(cmd, args, {
+    const result = spawnSync2(cmd, args, {
       cwd,
       encoding: "utf-8",
       timeout: timeoutMs,
@@ -298,7 +374,7 @@ function runSelfUpdate(options = {}) {
     return { ok: result.status === 0, code: result.status };
   };
   if (updateCommand) {
-    const cwd = options.cwd ? resolve2(options.cwd) : process.cwd();
+    const cwd = options.cwd ? resolve3(options.cwd) : process.cwd();
     const ok = runStep("sh", ["-c", updateCommand], cwd);
     if (!ok.ok) {
       return { ok: false, error: "update command failed", strategy: "command", steps };
@@ -315,1158 +391,210 @@ function runSelfUpdate(options = {}) {
   return { ok: false, error: "no update strategy available", strategy: "none", steps };
 }
 
-// src/cli/gateway/controller.ts
-var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-var readConfigSnapshot = (getConfigPath2, plugins2) => {
-  const path = getConfigPath2();
-  let raw = "";
-  let parsed = {};
-  if (existsSync2(path)) {
-    raw = readFileSync2(path, "utf-8");
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      parsed = {};
-    }
-  }
-  let config2;
-  let valid = true;
-  try {
-    config2 = ConfigSchema.parse(parsed);
-  } catch {
-    config2 = ConfigSchema.parse({});
-    valid = false;
-  }
-  if (!raw) {
-    raw = JSON.stringify(config2, null, 2);
+// src/cli/commands/config.ts
+import { buildReloadPlan, diffConfigPaths, loadConfig, saveConfig } from "@nextclaw/core";
+
+// src/cli/config-path.ts
+function isIndexSegment(raw) {
+  return /^[0-9]+$/.test(raw);
+}
+function parseConfigPath(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return [];
   }
-  const hash = hashRaw(raw);
-  const schema = buildConfigSchema({ version: getPackageVersion(), plugins: plugins2 });
-  const redacted = redactConfigObject(config2, schema.uiHints);
-  return { raw: valid ? JSON.stringify(redacted, null, 2) : null, hash: valid ? hash : null, config: config2, redacted, valid };
-};
-var redactValue = (value, plugins2) => {
-  const schema = buildConfigSchema({ version: getPackageVersion(), plugins: plugins2 });
-  return redactConfigObject(value, schema.uiHints);
-};
-var mergeDeep = (base, patch) => {
-  const next = { ...base };
-  for (const [key, value] of Object.entries(patch)) {
-    if (value && typeof value === "object" && !Array.isArray(value)) {
-      const baseVal = base[key];
-      if (baseVal && typeof baseVal === "object" && !Array.isArray(baseVal)) {
-        next[key] = mergeDeep(baseVal, value);
-      } else {
-        next[key] = mergeDeep({}, value);
+  const parts = [];
+  let current = "";
+  let i = 0;
+  while (i < trimmed.length) {
+    const ch = trimmed[i];
+    if (ch === "\\") {
+      const next = trimmed[i + 1];
+      if (next) {
+        current += next;
       }
-    } else {
-      next[key] = value;
+      i += 2;
+      continue;
     }
-  }
-  return next;
-};
-var GatewayControllerImpl = class {
-  constructor(deps) {
-    this.deps = deps;
-  }
-  async requestRestart(options) {
-    if (this.deps.requestRestart) {
-      await this.deps.requestRestart(options);
-      return;
+    if (ch === ".") {
+      if (current) {
+        parts.push(current);
+      }
+      current = "";
+      i += 1;
+      continue;
     }
-    const delay = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
-    console.log(`Gateway restart requested via tool${options?.reason ? ` (${options.reason})` : ""}.`);
-    setTimeout(() => {
-      process.exit(0);
-    }, delay);
+    if (ch === "[") {
+      if (current) {
+        parts.push(current);
+      }
+      current = "";
+      const close = trimmed.indexOf("]", i);
+      if (close === -1) {
+        throw new Error(`Invalid path (missing "]"): ${raw}`);
+      }
+      const inside = trimmed.slice(i + 1, close).trim();
+      if (!inside) {
+        throw new Error(`Invalid path (empty "[]"): ${raw}`);
+      }
+      parts.push(inside);
+      i = close + 1;
+      continue;
+    }
+    current += ch;
+    i += 1;
   }
-  status() {
-    return {
-      channels: this.deps.reloader.getChannels().enabledChannels,
-      cron: this.deps.cron.status(),
-      configPath: this.deps.getConfigPath()
-    };
+  if (current) {
+    parts.push(current);
   }
-  async reloadConfig(reason) {
-    return this.deps.reloader.reloadConfig(reason);
-  }
-  async restart(options) {
-    await this.requestRestart(options);
-    return "Restart scheduled";
+  return parts.map((part) => part.trim()).filter(Boolean);
+}
+function parseRequiredConfigPath(raw) {
+  const parsedPath = parseConfigPath(raw);
+  if (parsedPath.length === 0) {
+    throw new Error("Path is empty.");
   }
-  async getConfig() {
-    const plugins2 = this.deps.getPluginUiMetadata?.() ?? [];
-    const snapshot = readConfigSnapshot(this.deps.getConfigPath, plugins2);
-    return {
-      raw: snapshot.raw,
-      hash: snapshot.hash,
-      path: this.deps.getConfigPath(),
-      config: snapshot.redacted,
-      parsed: snapshot.redacted,
-      resolved: snapshot.redacted,
-      valid: snapshot.valid
-    };
+  return parsedPath;
+}
+function parseConfigSetValue(raw, opts) {
+  const trimmed = raw.trim();
+  if (opts.json) {
+    return JSON.parse(trimmed);
   }
-  async getConfigSchema() {
-    return buildConfigSchema({ version: getPackageVersion(), plugins: this.deps.getPluginUiMetadata?.() ?? [] });
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return raw;
   }
-  async applyConfig(params) {
-    const plugins2 = this.deps.getPluginUiMetadata?.() ?? [];
-    const snapshot = readConfigSnapshot(this.deps.getConfigPath, plugins2);
-    if (!params.baseHash) {
-      return { ok: false, error: "config base hash required; re-run config.get and retry" };
+}
+function getAtConfigPath(root, pathSegments) {
+  let current = root;
+  for (const segment of pathSegments) {
+    if (!current || typeof current !== "object") {
+      return { found: false };
     }
-    if (!snapshot.valid || !snapshot.hash) {
-      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
+    if (Array.isArray(current)) {
+      if (!isIndexSegment(segment)) {
+        return { found: false };
+      }
+      const index = Number.parseInt(segment, 10);
+      if (!Number.isFinite(index) || index < 0 || index >= current.length) {
+        return { found: false };
+      }
+      current = current[index];
+      continue;
     }
-    if (params.baseHash !== snapshot.hash) {
-      return { ok: false, error: "config changed since last load; re-run config.get and retry" };
+    const record = current;
+    if (!Object.prototype.hasOwnProperty.call(record, segment)) {
+      return { found: false };
     }
-    let parsedRaw;
-    try {
-      parsedRaw = JSON.parse(params.raw);
-    } catch {
-      return { ok: false, error: "invalid JSON in raw config" };
+    current = record[segment];
+  }
+  return { found: true, value: current };
+}
+function setAtConfigPath(root, pathSegments, value) {
+  let current = root;
+  for (let i = 0; i < pathSegments.length - 1; i += 1) {
+    const segment = pathSegments[i];
+    const next = pathSegments[i + 1];
+    const nextIsIndex = Boolean(next && isIndexSegment(next));
+    if (Array.isArray(current)) {
+      if (!isIndexSegment(segment)) {
+        throw new Error(`Expected numeric index for array segment "${segment}"`);
+      }
+      const index = Number.parseInt(segment, 10);
+      const existing2 = current[index];
+      if (!existing2 || typeof existing2 !== "object") {
+        current[index] = nextIsIndex ? [] : {};
+      }
+      current = current[index];
+      continue;
     }
-    let validated;
-    try {
-      validated = ConfigSchema.parse(parsedRaw);
-    } catch (err) {
-      return { ok: false, error: `invalid config: ${String(err)}` };
+    if (!current || typeof current !== "object") {
+      throw new Error(`Cannot traverse into "${segment}" (not an object)`);
     }
-    this.deps.saveConfig(validated);
-    const delayMs = params.restartDelayMs ?? 0;
-    await this.requestRestart({ delayMs, reason: "config.apply" });
-    return {
-      ok: true,
-      note: params.note ?? null,
-      path: this.deps.getConfigPath(),
-      config: redactValue(validated, plugins2),
-      restart: { scheduled: true, delayMs }
-    };
-  }
-  async patchConfig(params) {
-    const plugins2 = this.deps.getPluginUiMetadata?.() ?? [];
-    const snapshot = readConfigSnapshot(this.deps.getConfigPath, plugins2);
-    if (!params.baseHash) {
-      return { ok: false, error: "config base hash required; re-run config.get and retry" };
+    const record = current;
+    const existing = record[segment];
+    if (!existing || typeof existing !== "object") {
+      record[segment] = nextIsIndex ? [] : {};
     }
-    if (!snapshot.valid || !snapshot.hash) {
-      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
+    current = record[segment];
+  }
+  const last = pathSegments[pathSegments.length - 1];
+  if (Array.isArray(current)) {
+    if (!isIndexSegment(last)) {
+      throw new Error(`Expected numeric index for array segment "${last}"`);
     }
-    if (params.baseHash !== snapshot.hash) {
-      return { ok: false, error: "config changed since last load; re-run config.get and retry" };
+    const index = Number.parseInt(last, 10);
+    current[index] = value;
+    return;
+  }
+  if (!current || typeof current !== "object") {
+    throw new Error(`Cannot set "${last}" (parent is not an object)`);
+  }
+  current[last] = value;
+}
+function unsetAtConfigPath(root, pathSegments) {
+  let current = root;
+  for (let i = 0; i < pathSegments.length - 1; i += 1) {
+    const segment = pathSegments[i];
+    if (!current || typeof current !== "object") {
+      return false;
     }
-    let patch;
-    try {
-      patch = JSON.parse(params.raw);
-    } catch {
-      return { ok: false, error: "invalid JSON in raw config" };
+    if (Array.isArray(current)) {
+      if (!isIndexSegment(segment)) {
+        return false;
+      }
+      const index = Number.parseInt(segment, 10);
+      if (!Number.isFinite(index) || index < 0 || index >= current.length) {
+        return false;
+      }
+      current = current[index];
+      continue;
     }
-    const merged = mergeDeep(snapshot.config, patch);
-    let validated;
-    try {
-      validated = ConfigSchema.parse(merged);
-    } catch (err) {
-      return { ok: false, error: `invalid config: ${String(err)}` };
+    const record2 = current;
+    if (!Object.prototype.hasOwnProperty.call(record2, segment)) {
+      return false;
     }
-    this.deps.saveConfig(validated);
-    const delayMs = params.restartDelayMs ?? 0;
-    await this.requestRestart({ delayMs, reason: "config.patch" });
-    return {
-      ok: true,
-      note: params.note ?? null,
-      path: this.deps.getConfigPath(),
-      config: redactValue(validated, plugins2),
-      restart: { scheduled: true, delayMs }
-    };
+    current = record2[segment];
   }
-  async updateRun(params) {
-    const result = runSelfUpdate({ timeoutMs: params.timeoutMs });
-    if (!result.ok) {
-      return { ok: false, error: result.error ?? "update failed", steps: result.steps };
+  const last = pathSegments[pathSegments.length - 1];
+  if (Array.isArray(current)) {
+    if (!isIndexSegment(last)) {
+      return false;
     }
-    const delayMs = params.restartDelayMs ?? 0;
-    await this.requestRestart({ delayMs, reason: "update.run" });
-    return {
-      ok: true,
-      note: params.note ?? null,
-      restart: { scheduled: true, delayMs },
-      strategy: result.strategy,
-      steps: result.steps
-    };
+    const index = Number.parseInt(last, 10);
+    if (!Number.isFinite(index) || index < 0 || index >= current.length) {
+      return false;
+    }
+    current.splice(index, 1);
+    return true;
   }
-};
+  if (!current || typeof current !== "object") {
+    return false;
+  }
+  const record = current;
+  if (!Object.prototype.hasOwnProperty.call(record, last)) {
+    return false;
+  }
+  delete record[last];
+  return true;
+}
 
-// src/cli/restart-coordinator.ts
-var RestartCoordinator = class {
+// src/cli/commands/config.ts
+var ConfigCommands = class {
   constructor(deps) {
     this.deps = deps;
   }
-  restartingService = false;
-  exitScheduled = false;
-  async requestRestart(request) {
-    const reason = request.reason.trim() || "config changed";
-    const strategy = request.strategy ?? "background-service-or-manual";
-    if (strategy !== "exit-process") {
-      const state = this.deps.readServiceState();
-      const serviceRunning = Boolean(state && this.deps.isProcessRunning(state.pid));
-      const managedByCurrentProcess = Boolean(state && state.pid === this.deps.currentPid());
-      if (serviceRunning && !managedByCurrentProcess) {
-        if (this.restartingService) {
-          return {
-            status: "restart-in-progress",
-            message: "Restart already in progress; skipping duplicate request."
-          };
-        }
-        this.restartingService = true;
-        try {
-          const restarted = await this.deps.restartBackgroundService(reason);
-          if (restarted) {
-            return {
-              status: "service-restarted",
-              message: `Restarted background service to apply changes (${reason}).`
-            };
-          }
-        } finally {
-          this.restartingService = false;
-        }
-      }
-    }
-    if (strategy === "background-service-or-exit" || strategy === "exit-process") {
-      if (this.exitScheduled) {
-        return {
-          status: "exit-scheduled",
-          message: "Restart already scheduled; skipping duplicate request."
-        };
-      }
-      const delay = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
-      this.exitScheduled = true;
-      this.deps.scheduleProcessExit(delay, reason);
-      return {
-        status: "exit-scheduled",
-        message: `Restart scheduled (${reason}).`
-      };
-    }
-    return {
-      status: "manual-required",
-      message: request.manualMessage ?? "Restart the gateway to apply changes."
-    };
-  }
-};
-
-// src/cli/skills/clawhub.ts
-import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync3 } from "fs";
-import { isAbsolute, join as join2, resolve as resolve3 } from "path";
-async function installClawHubSkill(options) {
-  const slug = options.slug.trim();
-  if (!slug) {
-    throw new Error("Skill slug is required.");
-  }
-  const workdir = resolve3(options.workdir);
-  if (!existsSync3(workdir)) {
-    throw new Error(`Workdir does not exist: ${workdir}`);
-  }
-  const dirName = options.dir?.trim() || "skills";
-  const destinationDir = isAbsolute(dirName) ? resolve3(dirName, slug) : resolve3(workdir, dirName, slug);
-  const skillFile = join2(destinationDir, "SKILL.md");
-  if (!options.force && existsSync3(destinationDir)) {
-    if (existsSync3(skillFile)) {
-      return {
-        slug,
-        version: options.version,
-        registry: options.registry,
-        destinationDir,
-        alreadyInstalled: true
-      };
-    }
-    throw new Error(`Skill directory already exists: ${destinationDir} (use --force)`);
-  }
-  const args = buildClawHubArgs(slug, options);
-  const result = spawnSync2("npx", args, {
-    cwd: workdir,
-    stdio: "pipe",
-    env: process.env
-  });
-  if (result.error) {
-    throw new Error(`Failed to run npx clawhub: ${String(result.error)}`);
-  }
-  if (result.status !== 0) {
-    const stdout = result.stdout ? String(result.stdout).trim() : "";
-    const stderr = result.stderr ? String(result.stderr).trim() : "";
-    const details = [stderr, stdout].filter(Boolean).join("\n");
-    throw new Error(details || `clawhub install failed with code ${result.status ?? 1}`);
-  }
-  return {
-    slug,
-    version: options.version,
-    registry: options.registry,
-    destinationDir
-  };
-}
-function buildClawHubArgs(slug, options) {
-  const args = ["--yes", "clawhub", "install", slug];
-  if (options.version) {
-    args.push("--version", options.version);
-  }
-  if (options.registry) {
-    args.push("--registry", options.registry);
-  }
-  if (options.workdir) {
-    args.push("--workdir", options.workdir);
-  }
-  if (options.dir) {
-    args.push("--dir", options.dir);
-  }
-  if (options.force) {
-    args.push("--force");
-  }
-  return args;
-}
-
-// src/cli/runtime.ts
-var LOGO = "\u{1F916}";
-var EXIT_COMMANDS = /* @__PURE__ */ new Set(["exit", "quit", "/exit", "/quit", ":q"]);
-var FORCED_PUBLIC_UI_HOST = "0.0.0.0";
-function isIndexSegment(raw) {
-  return /^[0-9]+$/.test(raw);
-}
-function parseConfigPath(raw) {
-  const trimmed = raw.trim();
-  if (!trimmed) {
-    return [];
-  }
-  const parts = [];
-  let current = "";
-  let i = 0;
-  while (i < trimmed.length) {
-    const ch = trimmed[i];
-    if (ch === "\\") {
-      const next = trimmed[i + 1];
-      if (next) {
-        current += next;
-      }
-      i += 2;
-      continue;
-    }
-    if (ch === ".") {
-      if (current) {
-        parts.push(current);
-      }
-      current = "";
-      i += 1;
-      continue;
-    }
-    if (ch === "[") {
-      if (current) {
-        parts.push(current);
-      }
-      current = "";
-      const close = trimmed.indexOf("]", i);
-      if (close === -1) {
-        throw new Error(`Invalid path (missing "]"): ${raw}`);
-      }
-      const inside = trimmed.slice(i + 1, close).trim();
-      if (!inside) {
-        throw new Error(`Invalid path (empty "[]"): ${raw}`);
-      }
-      parts.push(inside);
-      i = close + 1;
-      continue;
-    }
-    current += ch;
-    i += 1;
-  }
-  if (current) {
-    parts.push(current);
-  }
-  return parts.map((part) => part.trim()).filter(Boolean);
-}
-function parseRequiredConfigPath(raw) {
-  const parsedPath = parseConfigPath(raw);
-  if (parsedPath.length === 0) {
-    throw new Error("Path is empty.");
-  }
-  return parsedPath;
-}
-function parseConfigSetValue(raw, opts) {
-  const trimmed = raw.trim();
-  if (opts.json) {
-    return JSON.parse(trimmed);
-  }
-  try {
-    return JSON.parse(trimmed);
-  } catch {
-    return raw;
-  }
-}
-function getAtConfigPath(root, pathSegments) {
-  let current = root;
-  for (const segment of pathSegments) {
-    if (!current || typeof current !== "object") {
-      return { found: false };
-    }
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) {
-        return { found: false };
-      }
-      const index = Number.parseInt(segment, 10);
-      if (!Number.isFinite(index) || index < 0 || index >= current.length) {
-        return { found: false };
-      }
-      current = current[index];
-      continue;
-    }
-    const record = current;
-    if (!Object.prototype.hasOwnProperty.call(record, segment)) {
-      return { found: false };
-    }
-    current = record[segment];
-  }
-  return { found: true, value: current };
-}
-function setAtConfigPath(root, pathSegments, value) {
-  let current = root;
-  for (let i = 0; i < pathSegments.length - 1; i += 1) {
-    const segment = pathSegments[i];
-    const next = pathSegments[i + 1];
-    const nextIsIndex = Boolean(next && isIndexSegment(next));
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) {
-        throw new Error(`Expected numeric index for array segment "${segment}"`);
-      }
-      const index = Number.parseInt(segment, 10);
-      const existing2 = current[index];
-      if (!existing2 || typeof existing2 !== "object") {
-        current[index] = nextIsIndex ? [] : {};
-      }
-      current = current[index];
-      continue;
-    }
-    if (!current || typeof current !== "object") {
-      throw new Error(`Cannot traverse into "${segment}" (not an object)`);
-    }
-    const record = current;
-    const existing = record[segment];
-    if (!existing || typeof existing !== "object") {
-      record[segment] = nextIsIndex ? [] : {};
-    }
-    current = record[segment];
-  }
-  const last = pathSegments[pathSegments.length - 1];
-  if (Array.isArray(current)) {
-    if (!isIndexSegment(last)) {
-      throw new Error(`Expected numeric index for array segment "${last}"`);
-    }
-    const index = Number.parseInt(last, 10);
-    current[index] = value;
-    return;
-  }
-  if (!current || typeof current !== "object") {
-    throw new Error(`Cannot set "${last}" (parent is not an object)`);
-  }
-  current[last] = value;
-}
-function unsetAtConfigPath(root, pathSegments) {
-  let current = root;
-  for (let i = 0; i < pathSegments.length - 1; i += 1) {
-    const segment = pathSegments[i];
-    if (!current || typeof current !== "object") {
-      return false;
-    }
-    if (Array.isArray(current)) {
-      if (!isIndexSegment(segment)) {
-        return false;
-      }
-      const index = Number.parseInt(segment, 10);
-      if (!Number.isFinite(index) || index < 0 || index >= current.length) {
-        return false;
-      }
-      current = current[index];
-      continue;
-    }
-    const record2 = current;
-    if (!Object.prototype.hasOwnProperty.call(record2, segment)) {
-      return false;
-    }
-    current = record2[segment];
-  }
-  const last = pathSegments[pathSegments.length - 1];
-  if (Array.isArray(current)) {
-    if (!isIndexSegment(last)) {
-      return false;
-    }
-    const index = Number.parseInt(last, 10);
-    if (!Number.isFinite(index) || index < 0 || index >= current.length) {
-      return false;
-    }
-    current.splice(index, 1);
-    return true;
-  }
-  if (!current || typeof current !== "object") {
-    return false;
-  }
-  const record = current;
-  if (!Object.prototype.hasOwnProperty.call(record, last)) {
-    return false;
-  }
-  delete record[last];
-  return true;
-}
-var MissingProvider = class extends LLMProvider {
-  constructor(defaultModel) {
-    super(null, null);
-    this.defaultModel = defaultModel;
-  }
-  setDefaultModel(model) {
-    this.defaultModel = model;
-  }
-  async chat() {
-    throw new Error("No API key configured yet. Configure provider credentials in UI and retry.");
-  }
-  getDefaultModel() {
-    return this.defaultModel;
-  }
-};
-var ConfigReloader = class {
-  constructor(options) {
-    this.options = options;
-    this.currentConfig = options.initialConfig;
-    this.channels = options.channels;
-  }
-  currentConfig;
-  channels;
-  reloadTask = null;
-  providerReloadTask = null;
-  reloadTimer = null;
-  reloadRunning = false;
-  reloadPending = false;
-  getChannels() {
-    return this.channels;
-  }
-  setApplyAgentRuntimeConfig(callback) {
-    this.options.applyAgentRuntimeConfig = callback;
-  }
-  async applyReloadPlan(nextConfig) {
-    const changedPaths = diffConfigPaths(this.currentConfig, nextConfig);
-    if (!changedPaths.length) {
-      return;
-    }
-    this.currentConfig = nextConfig;
-    const plan = buildReloadPlan(changedPaths);
-    if (plan.restartChannels) {
-      await this.reloadChannels(nextConfig);
-      console.log("Config reload: channels restarted.");
-    }
-    if (plan.reloadProviders) {
-      await this.reloadProvider(nextConfig);
-      console.log("Config reload: provider settings applied.");
-    }
-    if (plan.reloadAgent) {
-      this.options.applyAgentRuntimeConfig?.(nextConfig);
-      console.log("Config reload: agent defaults applied.");
-    }
-    if (plan.restartRequired.length > 0) {
-      this.options.onRestartRequired(plan.restartRequired);
-    }
-  }
-  scheduleReload(reason) {
-    if (this.reloadTimer) {
-      clearTimeout(this.reloadTimer);
-    }
-    this.reloadTimer = setTimeout(() => {
-      void this.runReload(reason);
-    }, 300);
-  }
-  async runReload(reason) {
-    if (this.reloadRunning) {
-      this.reloadPending = true;
-      return;
-    }
-    this.reloadRunning = true;
-    if (this.reloadTimer) {
-      clearTimeout(this.reloadTimer);
-      this.reloadTimer = null;
-    }
-    try {
-      const nextConfig = this.options.loadConfig();
-      await this.applyReloadPlan(nextConfig);
-    } catch (error) {
-      console.error(`Config reload failed (${reason}): ${String(error)}`);
-    } finally {
-      this.reloadRunning = false;
-      if (this.reloadPending) {
-        this.reloadPending = false;
-        this.scheduleReload("pending");
-      }
-    }
-  }
-  async reloadConfig(reason) {
-    await this.runReload(reason ?? "gateway tool");
-    return "Config reload triggered";
-  }
-  async reloadChannels(nextConfig) {
-    if (this.reloadTask) {
-      await this.reloadTask;
-      return;
-    }
-    this.reloadTask = (async () => {
-      await this.channels.stopAll();
-      this.channels = new ChannelManager(
-        nextConfig,
-        this.options.bus,
-        this.options.sessionManager,
-        this.options.getExtensionChannels?.() ?? []
-      );
-      await this.channels.startAll();
-    })();
-    try {
-      await this.reloadTask;
-    } finally {
-      this.reloadTask = null;
-    }
-  }
-  async reloadProvider(nextConfig) {
-    if (!this.options.providerManager) {
-      return;
-    }
-    if (this.providerReloadTask) {
-      await this.providerReloadTask;
-      return;
-    }
-    this.providerReloadTask = (async () => {
-      const nextProvider = this.options.makeProvider(nextConfig);
-      if (!nextProvider) {
-        console.warn("Provider reload skipped: missing API key.");
-        return;
-      }
-      this.options.providerManager?.set(nextProvider);
-    })();
-    try {
-      await this.providerReloadTask;
-    } finally {
-      this.providerReloadTask = null;
-    }
-  }
-};
-var CliRuntime = class {
-  logo;
-  restartCoordinator;
-  serviceRestartTask = null;
-  selfRelaunchArmed = false;
-  constructor(options = {}) {
-    this.logo = options.logo ?? LOGO;
-    this.restartCoordinator = new RestartCoordinator({
-      readServiceState,
-      isProcessRunning,
-      currentPid: () => process.pid,
-      restartBackgroundService: async (reason) => this.restartBackgroundService(reason),
-      scheduleProcessExit: (delayMs, reason) => this.scheduleProcessExit(delayMs, reason)
-    });
-  }
-  get version() {
-    return getPackageVersion();
-  }
-  scheduleProcessExit(delayMs, reason) {
-    console.warn(`Gateway restart requested (${reason}).`);
-    setTimeout(() => {
-      process.exit(0);
-    }, delayMs);
-  }
-  async restartBackgroundService(reason) {
-    if (this.serviceRestartTask) {
-      return this.serviceRestartTask;
-    }
-    this.serviceRestartTask = (async () => {
-      const state = readServiceState();
-      if (!state || !isProcessRunning(state.pid) || state.pid === process.pid) {
-        return false;
-      }
-      const uiHost = FORCED_PUBLIC_UI_HOST;
-      const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
-      console.log(`Applying changes (${reason}): restarting ${APP_NAME} background service...`);
-      await this.stopService();
-      await this.startService({
-        uiOverrides: {
-          enabled: true,
-          host: uiHost,
-          port: uiPort
-        },
-        open: false
-      });
-      return true;
-    })();
-    try {
-      return await this.serviceRestartTask;
-    } finally {
-      this.serviceRestartTask = null;
-    }
-  }
-  armManagedServiceRelaunch(params) {
-    const strategy = params.strategy ?? "background-service-or-manual";
-    if (strategy !== "background-service-or-exit" && strategy !== "exit-process") {
-      return;
-    }
-    if (this.selfRelaunchArmed) {
-      return;
-    }
-    const state = readServiceState();
-    if (!state || state.pid !== process.pid) {
-      return;
-    }
-    const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
-    const delayMs = typeof params.delayMs === "number" && Number.isFinite(params.delayMs) ? Math.max(0, Math.floor(params.delayMs)) : 100;
-    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath2(new URL("./index.js", import.meta.url));
-    const startArgs = [cliPath, "start", "--ui-port", String(uiPort)];
-    const serviceStatePath = resolve4(getDataDir2(), "run", "service.json");
-    const helperScript = [
-      'const { spawnSync } = require("node:child_process");',
-      'const { readFileSync } = require("node:fs");',
-      `const parentPid = ${process.pid};`,
-      `const delayMs = ${delayMs};`,
-      "const maxWaitMs = 120000;",
-      "const retryIntervalMs = 1000;",
-      "const startTimeoutMs = 60000;",
-      `const nodePath = ${JSON.stringify(process.execPath)};`,
-      `const startArgs = ${JSON.stringify(startArgs)};`,
-      `const serviceStatePath = ${JSON.stringify(serviceStatePath)};`,
-      "function isRunning(pid) {",
-      "  try {",
-      "    process.kill(pid, 0);",
-      "    return true;",
-      "  } catch {",
-      "    return false;",
-      "  }",
-      "}",
-      "function hasReplacementService() {",
-      "  try {",
-      '    const raw = readFileSync(serviceStatePath, "utf-8");',
-      "    const state = JSON.parse(raw);",
-      "    const pid = Number(state?.pid);",
-      "    return Number.isFinite(pid) && pid > 0 && pid !== parentPid && isRunning(pid);",
-      "  } catch {",
-      "    return false;",
-      "  }",
-      "}",
-      "function tryStart() {",
-      "  spawnSync(nodePath, startArgs, {",
-      '    stdio: "ignore",',
-      "    env: process.env,",
-      "    timeout: startTimeoutMs",
-      "  });",
-      "}",
-      "setTimeout(() => {",
-      "  const startedAt = Date.now();",
-      "  const tick = () => {",
-      "    if (hasReplacementService()) {",
-      "      process.exit(0);",
-      "      return;",
-      "    }",
-      "    if (Date.now() - startedAt >= maxWaitMs) {",
-      "      process.exit(0);",
-      "      return;",
-      "    }",
-      "    tryStart();",
-      "    if (hasReplacementService()) {",
-      "      process.exit(0);",
-      "      return;",
-      "    }",
-      "    setTimeout(tick, retryIntervalMs);",
-      "  };",
-      "  tick();",
-      "}, delayMs);"
-    ].join("\n");
-    try {
-      const helper = spawn2(process.execPath, ["-e", helperScript], {
-        detached: true,
-        stdio: "ignore",
-        env: process.env
-      });
-      helper.unref();
-      this.selfRelaunchArmed = true;
-      console.warn(`Gateway self-restart armed (${params.reason}).`);
-    } catch (error) {
-      console.error(`Failed to arm gateway self-restart: ${String(error)}`);
-    }
-  }
-  async requestRestart(params) {
-    this.armManagedServiceRelaunch({
-      reason: params.reason,
-      strategy: params.strategy,
-      delayMs: params.delayMs
-    });
-    const result = await this.restartCoordinator.requestRestart({
-      reason: params.reason,
-      strategy: params.strategy,
-      delayMs: params.delayMs,
-      manualMessage: params.manualMessage
-    });
-    if (result.status === "manual-required" || result.status === "restart-in-progress") {
-      console.log(result.message);
-      return;
-    }
-    if (result.status === "service-restarted") {
-      if (!params.silentOnServiceRestart) {
-        console.log(result.message);
-      }
-      return;
-    }
-    console.warn(result.message);
-  }
-  async onboard() {
-    console.warn(`Warning: ${APP_NAME} onboard is deprecated. Use "${APP_NAME} init" instead.`);
-    await this.init({ source: "onboard" });
-  }
-  async init(options = {}) {
-    const source = options.source ?? "init";
-    const prefix = options.auto ? "Auto init" : "Init";
-    const force = Boolean(options.force);
-    const configPath = getConfigPath();
-    let createdConfig = false;
-    if (!existsSync4(configPath)) {
-      const config3 = ConfigSchema2.parse({});
-      saveConfig(config3);
-      createdConfig = true;
-    }
-    const config2 = loadConfig();
-    const workspaceSetting = config2.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join3(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
-    const workspaceExisted = existsSync4(workspacePath);
-    mkdirSync2(workspacePath, { recursive: true });
-    const templateResult = this.createWorkspaceTemplates(workspacePath, { force });
-    if (createdConfig) {
-      console.log(`\u2713 ${prefix}: created config at ${configPath}`);
-    }
-    if (!workspaceExisted) {
-      console.log(`\u2713 ${prefix}: created workspace at ${workspacePath}`);
-    }
-    for (const file of templateResult.created) {
-      console.log(`\u2713 ${prefix}: created ${file}`);
-    }
-    if (!createdConfig && workspaceExisted && templateResult.created.length === 0) {
-      console.log(`${prefix}: already initialized.`);
-    }
-    if (!options.auto) {
-      console.log(`
-${this.logo} ${APP_NAME} is ready! (${source})`);
-      console.log("\nNext steps:");
-      console.log(`  1. Add your API key to ${configPath}`);
-      console.log(`  2. Chat: ${APP_NAME} agent -m "Hello!"`);
-    } else {
-      console.log(`Tip: Run "${APP_NAME} init${force ? " --force" : ""}" to re-run initialization if needed.`);
-    }
-  }
-  async gateway(opts) {
-    const uiOverrides = {
-      host: FORCED_PUBLIC_UI_HOST
-    };
-    if (opts.ui) {
-      uiOverrides.enabled = true;
-    }
-    if (opts.uiPort) {
-      uiOverrides.port = Number(opts.uiPort);
-    }
-    if (opts.uiOpen) {
-      uiOverrides.open = true;
-    }
-    await this.startGateway({ uiOverrides });
-  }
-  async ui(opts) {
-    const uiOverrides = {
-      enabled: true,
-      host: FORCED_PUBLIC_UI_HOST,
-      open: Boolean(opts.open)
-    };
-    if (opts.port) {
-      uiOverrides.port = Number(opts.port);
-    }
-    await this.startGateway({ uiOverrides, allowMissingProvider: true });
-  }
-  async start(opts) {
-    await this.init({ source: "start", auto: true });
-    const uiOverrides = {
-      enabled: true,
-      host: FORCED_PUBLIC_UI_HOST,
-      open: false
-    };
-    if (opts.uiPort) {
-      uiOverrides.port = Number(opts.uiPort);
-    }
-    await this.startService({
-      uiOverrides,
-      open: Boolean(opts.open)
-    });
-  }
-  async restart(opts) {
-    const state = readServiceState();
-    if (state && isProcessRunning(state.pid)) {
-      console.log(`Restarting ${APP_NAME}...`);
-      await this.stopService();
-    } else if (state) {
-      clearServiceState();
-      console.log("Service state was stale and has been cleaned up.");
-    } else {
-      console.log("No running service found. Starting a new service.");
-    }
-    await this.start(opts);
-  }
-  async serve(opts) {
-    const uiOverrides = {
-      enabled: true,
-      host: FORCED_PUBLIC_UI_HOST,
-      open: false
-    };
-    if (opts.uiPort) {
-      uiOverrides.port = Number(opts.uiPort);
-    }
-    await this.runForeground({
-      uiOverrides,
-      open: Boolean(opts.open)
-    });
-  }
-  async stop() {
-    await this.stopService();
-  }
-  async agent(opts) {
-    const config2 = loadConfig();
-    const workspace = getWorkspacePath(config2.agents.defaults.workspace);
-    const pluginRegistry = this.loadPluginRegistry(config2, workspace);
-    const extensionRegistry = this.toExtensionRegistry(pluginRegistry);
-    this.logPluginDiagnostics(pluginRegistry);
-    const bus = new MessageBus();
-    const provider = this.makeProvider(config2);
-    const providerManager = new ProviderManager(provider);
-    const agentLoop = new AgentLoop({
-      bus,
-      providerManager,
-      workspace,
-      model: config2.agents.defaults.model,
-      maxIterations: config2.agents.defaults.maxToolIterations,
-      maxTokens: config2.agents.defaults.maxTokens,
-      temperature: config2.agents.defaults.temperature,
-      braveApiKey: config2.tools.web.search.apiKey || void 0,
-      execConfig: config2.tools.exec,
-      restrictToWorkspace: config2.tools.restrictToWorkspace,
-      contextConfig: config2.agents.context,
-      config: config2,
-      extensionRegistry,
-      resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
-        registry: pluginRegistry,
-        channel,
-        cfg: loadConfig(),
-        accountId
-      })
-    });
-    if (opts.message) {
-      const response = await agentLoop.processDirect({
-        content: opts.message,
-        sessionKey: opts.session ?? "cli:default",
-        channel: "cli",
-        chatId: "direct"
-      });
-      printAgentResponse(response);
-      return;
-    }
-    console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
-`);
-    const historyFile = join3(getDataDir2(), "history", "cli_history");
-    const historyDir = resolve4(historyFile, "..");
-    mkdirSync2(historyDir, { recursive: true });
-    const history = existsSync4(historyFile) ? readFileSync3(historyFile, "utf-8").split("\n").filter(Boolean) : [];
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    rl.on("close", () => {
-      const merged = history.concat(rl.history ?? []);
-      writeFileSync2(historyFile, merged.join("\n"));
-      process.exit(0);
-    });
-    let running = true;
-    while (running) {
-      const line = await prompt(rl, "You: ");
-      const trimmed = line.trim();
-      if (!trimmed) {
-        continue;
-      }
-      if (EXIT_COMMANDS.has(trimmed.toLowerCase())) {
-        rl.close();
-        running = false;
-        break;
-      }
-      const response = await agentLoop.processDirect({
-        content: trimmed,
-        sessionKey: opts.session ?? "cli:default"
-      });
-      printAgentResponse(response);
-    }
-  }
-  async update(opts) {
-    let timeoutMs;
-    if (opts.timeout !== void 0) {
-      const parsed = Number(opts.timeout);
-      if (!Number.isFinite(parsed) || parsed <= 0) {
-        console.error("Invalid --timeout value. Provide milliseconds (e.g. 1200000).");
-        process.exit(1);
-      }
-      timeoutMs = parsed;
-    }
-    const result = runSelfUpdate({ timeoutMs, cwd: process.cwd() });
-    const printSteps = () => {
-      for (const step of result.steps) {
-        console.log(`- ${step.cmd} ${step.args.join(" ")} (code ${step.code ?? "?"})`);
-        if (step.stderr) {
-          console.log(`  stderr: ${step.stderr}`);
-        }
-        if (step.stdout) {
-          console.log(`  stdout: ${step.stdout}`);
-        }
-      }
-    };
-    if (!result.ok) {
-      console.error(`Update failed: ${result.error ?? "unknown error"}`);
-      if (result.steps.length > 0) {
-        printSteps();
-      }
-      process.exit(1);
-    }
-    console.log(`\u2713 Update complete (${result.strategy})`);
-    const state = readServiceState();
-    if (state && isProcessRunning(state.pid)) {
-      console.log(`Tip: restart ${APP_NAME} to apply the update.`);
-    }
-  }
-  pluginsList(opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
-      config: config2,
-      workspaceDir,
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
-    });
-    const list = opts.enabled ? report.plugins.filter((plugin) => plugin.status === "loaded") : report.plugins;
-    if (opts.json) {
-      console.log(
-        JSON.stringify(
-          {
-            workspaceDir,
-            plugins: list,
-            diagnostics: report.diagnostics
-          },
-          null,
-          2
-        )
-      );
-      return;
-    }
-    if (list.length === 0) {
-      console.log("No plugins discovered.");
-      return;
-    }
-    for (const plugin of list) {
-      const status = plugin.status === "loaded" ? "loaded" : plugin.status === "disabled" ? "disabled" : "error";
-      const title = plugin.name && plugin.name !== plugin.id ? `${plugin.name} (${plugin.id})` : plugin.id;
-      if (!opts.verbose) {
-        const desc = plugin.description ? plugin.description.length > 80 ? `${plugin.description.slice(0, 77)}...` : plugin.description : "(no description)";
-        console.log(`${title} ${status} - ${desc}`);
-        continue;
-      }
-      console.log(`${title} ${status}`);
-      console.log(`  source: ${plugin.source}`);
-      console.log(`  origin: ${plugin.origin}`);
-      if (plugin.version) {
-        console.log(`  version: ${plugin.version}`);
-      }
-      if (plugin.toolNames.length > 0) {
-        console.log(`  tools: ${plugin.toolNames.join(", ")}`);
-      }
-      if (plugin.channelIds.length > 0) {
-        console.log(`  channels: ${plugin.channelIds.join(", ")}`);
-      }
-      if (plugin.providerIds.length > 0) {
-        console.log(`  providers: ${plugin.providerIds.join(", ")}`);
-      }
-      if (plugin.error) {
-        console.log(`  error: ${plugin.error}`);
-      }
-      console.log("");
-    }
-  }
-  pluginsInfo(id, opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
-      config: config2,
-      workspaceDir,
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
-    });
-    const plugin = report.plugins.find((entry) => entry.id === id || entry.name === id);
-    if (!plugin) {
-      console.error(`Plugin not found: ${id}`);
-      process.exit(1);
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(plugin, null, 2));
-      return;
-    }
-    const install = config2.plugins.installs?.[plugin.id];
-    const lines = [];
-    lines.push(plugin.name || plugin.id);
-    if (plugin.name && plugin.name !== plugin.id) {
-      lines.push(`id: ${plugin.id}`);
-    }
-    if (plugin.description) {
-      lines.push(plugin.description);
-    }
-    lines.push("");
-    lines.push(`Status: ${plugin.status}`);
-    lines.push(`Source: ${plugin.source}`);
-    lines.push(`Origin: ${plugin.origin}`);
-    if (plugin.version) {
-      lines.push(`Version: ${plugin.version}`);
-    }
-    if (plugin.toolNames.length > 0) {
-      lines.push(`Tools: ${plugin.toolNames.join(", ")}`);
-    }
-    if (plugin.channelIds.length > 0) {
-      lines.push(`Channels: ${plugin.channelIds.join(", ")}`);
-    }
-    if (plugin.providerIds.length > 0) {
-      lines.push(`Providers: ${plugin.providerIds.join(", ")}`);
-    }
-    if (plugin.error) {
-      lines.push(`Error: ${plugin.error}`);
-    }
-    if (install) {
-      lines.push("");
-      lines.push(`Install: ${install.source}`);
-      if (install.spec) {
-        lines.push(`Spec: ${install.spec}`);
-      }
-      if (install.sourcePath) {
-        lines.push(`Source path: ${install.sourcePath}`);
-      }
-      if (install.installPath) {
-        lines.push(`Install path: ${install.installPath}`);
-      }
-      if (install.version) {
-        lines.push(`Recorded version: ${install.version}`);
-      }
-      if (install.installedAt) {
-        lines.push(`Installed at: ${install.installedAt}`);
-      }
-    }
-    console.log(lines.join("\n"));
-  }
-  configGet(pathExpr, opts = {}) {
-    const config2 = loadConfig();
-    let parsedPath;
-    try {
-      parsedPath = parseRequiredConfigPath(pathExpr);
-    } catch (error) {
-      console.error(String(error));
-      process.exit(1);
-      return;
+  configGet(pathExpr, opts = {}) {
+    const config2 = loadConfig();
+    let parsedPath;
+    try {
+      parsedPath = parseRequiredConfigPath(pathExpr);
+    } catch (error) {
+      console.error(String(error));
+      process.exit(1);
+      return;
     }
     const result = getAtConfigPath(config2, parsedPath);
     if (!result.found) {
@@ -1552,874 +680,831 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     if (plan.restartRequired.length === 0) {
       return;
     }
-    await this.requestRestart({
+    await this.deps.requestRestart({
       reason: `${params.reason} (${plan.restartRequired.join(", ")})`,
       manualMessage: params.manualMessage
     });
   }
-  async pluginsEnable(id) {
-    const config2 = loadConfig();
-    const next = enablePluginInConfig(config2, id);
-    saveConfig(next);
-    await this.requestRestart({
-      reason: `plugin enabled: ${id}`,
-      manualMessage: `Enabled plugin "${id}". Restart the gateway to apply.`
-    });
+};
+
+// src/cli/commands/channels.ts
+import { spawnSync as spawnSync3 } from "child_process";
+import { loadConfig as loadConfig2 } from "@nextclaw/core";
+var ChannelCommands = class {
+  constructor(deps) {
+    this.deps = deps;
   }
-  async pluginsDisable(id) {
-    const config2 = loadConfig();
-    const next = disablePluginInConfig(config2, id);
-    saveConfig(next);
-    await this.requestRestart({
-      reason: `plugin disabled: ${id}`,
-      manualMessage: `Disabled plugin "${id}". Restart the gateway to apply.`
-    });
+  channelsStatus() {
+    const config2 = loadConfig2();
+    console.log("Channel Status");
+    console.log(`WhatsApp: ${config2.channels.whatsapp.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`Discord: ${config2.channels.discord.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`Feishu: ${config2.channels.feishu.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`Mochat: ${config2.channels.mochat.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`Telegram: ${config2.channels.telegram.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`Slack: ${config2.channels.slack.enabled ? "\u2713" : "\u2717"}`);
+    console.log(`QQ: ${config2.channels.qq.enabled ? "\u2713" : "\u2717"}`);
   }
-  async pluginsUninstall(id, opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
-      config: config2,
-      workspaceDir,
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
-    });
-    const keepFiles = Boolean(opts.keepFiles || opts.keepConfig);
-    if (opts.keepConfig) {
-      console.log("`--keep-config` is deprecated, use `--keep-files`.");
-    }
-    const plugin = report.plugins.find((entry) => entry.id === id || entry.name === id);
-    const pluginId = plugin?.id ?? id;
-    const hasEntry = pluginId in (config2.plugins.entries ?? {});
-    const hasInstall = pluginId in (config2.plugins.installs ?? {});
-    if (!hasEntry && !hasInstall) {
-      if (plugin) {
-        console.error(
-          `Plugin "${pluginId}" is not managed by plugins config/install records and cannot be uninstalled.`
-        );
-      } else {
-        console.error(`Plugin not found: ${id}`);
-      }
-      process.exit(1);
+  channelsLogin() {
+    const bridgeDir = this.deps.getBridgeDir();
+    console.log(`${this.deps.logo} Starting bridge...`);
+    console.log("Scan the QR code to connect.\n");
+    const result = spawnSync3("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
+    if (result.status !== 0) {
+      console.error(`Bridge failed: ${result.status ?? 1}`);
     }
-    const install = config2.plugins.installs?.[pluginId];
-    const isLinked = install?.source === "path" && (!install.installPath || !install.sourcePath || resolve4(install.installPath) === resolve4(install.sourcePath));
-    const preview = [];
-    if (hasEntry) {
-      preview.push("config entry");
-    }
-    if (hasInstall) {
-      preview.push("install record");
-    }
-    if (config2.plugins.allow?.includes(pluginId)) {
-      preview.push("allowlist entry");
-    }
-    if (isLinked && install?.sourcePath && config2.plugins.load?.paths?.includes(install.sourcePath)) {
-      preview.push("load path");
-    }
-    const deleteTarget = !keepFiles ? resolveUninstallDirectoryTarget({
-      pluginId,
-      hasInstall,
-      installRecord: install
-    }) : null;
-    if (deleteTarget) {
-      preview.push(`directory: ${deleteTarget}`);
-    }
-    const pluginName = plugin?.name || pluginId;
-    const pluginTitle = pluginName !== pluginId ? `${pluginName} (${pluginId})` : pluginName;
-    console.log(`Plugin: ${pluginTitle}`);
-    console.log(`Will remove: ${preview.length > 0 ? preview.join(", ") : "(nothing)"}`);
-    if (opts.dryRun) {
-      console.log("Dry run, no changes made.");
+  }
+};
+
+// src/cli/commands/cron.ts
+import { CronService, getDataDir as getDataDir2 } from "@nextclaw/core";
+import { join as join3 } from "path";
+var CronCommands = class {
+  cronList(opts) {
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const service = new CronService(storePath);
+    const jobs = service.listJobs(Boolean(opts.all));
+    if (!jobs.length) {
+      console.log("No scheduled jobs.");
       return;
     }
-    if (!opts.force) {
-      const confirmed = await this.confirmYesNo(`Uninstall plugin "${pluginId}"?`);
-      if (!confirmed) {
-        console.log("Cancelled.");
-        return;
+    for (const job of jobs) {
+      let schedule = "";
+      if (job.schedule.kind === "every") {
+        schedule = `every ${Math.round((job.schedule.everyMs ?? 0) / 1e3)}s`;
+      } else if (job.schedule.kind === "cron") {
+        schedule = job.schedule.expr ?? "";
+      } else {
+        schedule = job.schedule.atMs ? new Date(job.schedule.atMs).toISOString() : "";
       }
+      console.log(`${job.id} ${job.name} ${schedule}`);
+    }
+  }
+  cronAdd(opts) {
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const service = new CronService(storePath);
+    let schedule = null;
+    if (opts.every) {
+      schedule = { kind: "every", everyMs: Number(opts.every) * 1e3 };
+    } else if (opts.cron) {
+      schedule = { kind: "cron", expr: String(opts.cron) };
+    } else if (opts.at) {
+      schedule = { kind: "at", atMs: Date.parse(String(opts.at)) };
+    }
+    if (!schedule) {
+      console.error("Error: Must specify --every, --cron, or --at");
+      return;
     }
-    const result = await uninstallPlugin({
-      config: config2,
-      pluginId,
-      deleteFiles: !keepFiles
+    const job = service.addJob({
+      name: opts.name,
+      schedule,
+      message: opts.message,
+      deliver: Boolean(opts.deliver),
+      channel: opts.channel,
+      to: opts.to
     });
-    if (!result.ok) {
-      console.error(result.error);
-      process.exit(1);
+    console.log(`\u2713 Added job '${job.name}' (${job.id})`);
+  }
+  cronRemove(jobId) {
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const service = new CronService(storePath);
+    if (service.removeJob(jobId)) {
+      console.log(`\u2713 Removed job ${jobId}`);
+    } else {
+      console.log(`Job ${jobId} not found`);
+    }
+  }
+  cronEnable(jobId, opts) {
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const service = new CronService(storePath);
+    const job = service.enableJob(jobId, !opts.disable);
+    if (job) {
+      console.log(`\u2713 Job '${job.name}' ${opts.disable ? "disabled" : "enabled"}`);
+    } else {
+      console.log(`Job ${jobId} not found`);
     }
-    for (const warning of result.warnings) {
-      console.warn(warning);
+  }
+  async cronRun(jobId, opts) {
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const service = new CronService(storePath);
+    const ok = await service.runJob(jobId, Boolean(opts.force));
+    console.log(ok ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
+  }
+};
+
+// src/cli/commands/diagnostics.ts
+import { createServer as createNetServer } from "net";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve4 } from "path";
+import {
+  APP_NAME,
+  getConfigPath,
+  getDataDir as getDataDir3,
+  getWorkspacePath,
+  loadConfig as loadConfig3,
+  PROVIDERS
+} from "@nextclaw/core";
+var DiagnosticsCommands = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  async status(opts = {}) {
+    const report = await this.collectRuntimeStatus({
+      verbose: Boolean(opts.verbose),
+      fix: Boolean(opts.fix)
+    });
+    if (opts.json) {
+      console.log(JSON.stringify(report, null, 2));
+      process.exitCode = report.exitCode;
+      return;
     }
-    saveConfig(result.config);
-    const removed = [];
-    if (result.actions.entry) {
-      removed.push("config entry");
+    console.log(`${this.deps.logo} ${APP_NAME} Status`);
+    console.log(`Level: ${report.level}`);
+    console.log(`Generated: ${report.generatedAt}`);
+    console.log("");
+    const processLabel = report.process.running ? `running (PID ${report.process.pid})` : report.process.staleState ? "stale-state" : "stopped";
+    console.log(`Process: ${processLabel}`);
+    console.log(`State file: ${report.serviceStatePath} ${report.serviceStateExists ? "\u2713" : "\u2717"}`);
+    if (report.process.startedAt) {
+      console.log(`Started: ${report.process.startedAt}`);
     }
-    if (result.actions.install) {
-      removed.push("install record");
+    console.log(`Managed health: ${report.health.managed.state} (${report.health.managed.detail})`);
+    if (!report.process.running) {
+      console.log(`Configured health: ${report.health.configured.state} (${report.health.configured.detail})`);
     }
-    if (result.actions.allowlist) {
-      removed.push("allowlist");
+    console.log(`UI: ${report.endpoints.uiUrl ?? report.endpoints.configuredUiUrl}`);
+    console.log(`API: ${report.endpoints.apiUrl ?? report.endpoints.configuredApiUrl}`);
+    console.log(`Config: ${report.configPath} ${report.configExists ? "\u2713" : "\u2717"}`);
+    console.log(`Workspace: ${report.workspacePath} ${report.workspaceExists ? "\u2713" : "\u2717"}`);
+    console.log(`Model: ${report.model}`);
+    for (const provider of report.providers) {
+      console.log(`${provider.name}: ${provider.configured ? "\u2713" : "not set"}${provider.detail ? ` (${provider.detail})` : ""}`);
     }
-    if (result.actions.loadPath) {
-      removed.push("load path");
+    if (report.fixActions.length > 0) {
+      console.log("");
+      console.log("Fix actions:");
+      for (const action of report.fixActions) {
+        console.log(`- ${action}`);
+      }
     }
-    if (result.actions.directory) {
-      removed.push("directory");
+    if (report.issues.length > 0) {
+      console.log("");
+      console.log("Issues:");
+      for (const issue of report.issues) {
+        console.log(`- ${issue}`);
+      }
     }
-    console.log(`Uninstalled plugin "${pluginId}". Removed: ${removed.length > 0 ? removed.join(", ") : "nothing"}.`);
-    await this.requestRestart({
-      reason: `plugin uninstalled: ${pluginId}`,
-      manualMessage: "Restart the gateway to apply changes."
-    });
-  }
-  async pluginsInstall(pathOrSpec, opts = {}) {
-    const fileSpec = this.resolveFileNpmSpecToLocalPath(pathOrSpec);
-    if (fileSpec && !fileSpec.ok) {
-      console.error(fileSpec.error);
-      process.exit(1);
+    if (report.recommendations.length > 0) {
+      console.log("");
+      console.log("Recommendations:");
+      for (const recommendation of report.recommendations) {
+        console.log(`- ${recommendation}`);
+      }
     }
-    const normalized = fileSpec && fileSpec.ok ? fileSpec.path : pathOrSpec;
-    const resolved = resolve4(expandHome(normalized));
-    const config2 = loadConfig();
-    if (existsSync4(resolved)) {
-      if (opts.link) {
-        const probe = await installPluginFromPath({ path: resolved, dryRun: true });
-        if (!probe.ok) {
-          console.error(probe.error);
-          process.exit(1);
-        }
-        let next3 = addPluginLoadPath(config2, resolved);
-        next3 = enablePluginInConfig(next3, probe.pluginId);
-        next3 = recordPluginInstall(next3, {
-          pluginId: probe.pluginId,
-          source: "path",
-          sourcePath: resolved,
-          installPath: resolved,
-          version: probe.version
-        });
-        saveConfig(next3);
-        console.log(`Linked plugin path: ${resolved}`);
-        await this.requestRestart({
-          reason: `plugin linked: ${probe.pluginId}`,
-          manualMessage: "Restart the gateway to load plugins."
-        });
-        return;
+    if (opts.verbose && report.logTail.length > 0) {
+      console.log("");
+      console.log("Recent logs:");
+      for (const line of report.logTail) {
+        console.log(line);
       }
-      const result2 = await installPluginFromPath({
-        path: resolved,
-        logger: {
-          info: (message) => console.log(message),
-          warn: (message) => console.warn(message)
+    }
+    process.exitCode = report.exitCode;
+  }
+  async doctor(opts = {}) {
+    const report = await this.collectRuntimeStatus({
+      verbose: Boolean(opts.verbose),
+      fix: Boolean(opts.fix)
+    });
+    const checkPort = await this.checkPortAvailability({
+      host: report.process.running ? report.endpoints.uiUrl ? new URL(report.endpoints.uiUrl).hostname : "127.0.0.1" : "127.0.0.1",
+      port: (() => {
+        try {
+          const base = report.process.running && report.endpoints.uiUrl ? report.endpoints.uiUrl : report.endpoints.configuredUiUrl;
+          return Number(new URL(base).port || 80);
+        } catch {
+          return 18791;
         }
-      });
-      if (!result2.ok) {
-        console.error(result2.error);
-        process.exit(1);
+      })()
+    });
+    const providerConfigured = report.providers.some((provider) => provider.configured);
+    const checks = [
+      {
+        name: "config-file",
+        status: report.configExists ? "pass" : "fail",
+        detail: report.configPath
+      },
+      {
+        name: "workspace-dir",
+        status: report.workspaceExists ? "pass" : "warn",
+        detail: report.workspacePath
+      },
+      {
+        name: "service-state",
+        status: report.process.staleState ? "fail" : report.process.running ? "pass" : "warn",
+        detail: report.process.running ? `PID ${report.process.pid}` : report.process.staleState ? "state exists but process is not running" : "service not running"
+      },
+      {
+        name: "service-health",
+        status: report.process.running ? report.health.managed.state === "ok" ? "pass" : "fail" : report.health.configured.state === "ok" ? "warn" : "warn",
+        detail: report.process.running ? `${report.health.managed.state}: ${report.health.managed.detail}` : `${report.health.configured.state}: ${report.health.configured.detail}`
+      },
+      {
+        name: "ui-port-availability",
+        status: report.process.running ? "pass" : checkPort.available ? "pass" : "fail",
+        detail: report.process.running ? "managed by running service" : checkPort.available ? "available" : checkPort.detail
+      },
+      {
+        name: "provider-config",
+        status: providerConfigured ? "pass" : "warn",
+        detail: providerConfigured ? "at least one provider configured" : "no provider api key configured"
       }
-      let next2 = enablePluginInConfig(config2, result2.pluginId);
-      next2 = recordPluginInstall(next2, {
-        pluginId: result2.pluginId,
-        source: this.isArchivePath(resolved) ? "archive" : "path",
-        sourcePath: resolved,
-        installPath: result2.targetDir,
-        version: result2.version
-      });
-      saveConfig(next2);
-      console.log(`Installed plugin: ${result2.pluginId}`);
-      await this.requestRestart({
-        reason: `plugin installed: ${result2.pluginId}`,
-        manualMessage: "Restart the gateway to load plugins."
-      });
+    ];
+    const failed = checks.filter((check) => check.status === "fail");
+    const warned = checks.filter((check) => check.status === "warn");
+    const exitCode = failed.length > 0 ? 1 : warned.length > 0 ? 1 : 0;
+    if (opts.json) {
+      console.log(
+        JSON.stringify(
+          {
+            generatedAt: report.generatedAt,
+            checks,
+            status: report,
+            exitCode
+          },
+          null,
+          2
+        )
+      );
+      process.exitCode = exitCode;
       return;
     }
-    if (opts.link) {
-      console.error("`--link` requires a local path.");
-      process.exit(1);
+    console.log(`${this.deps.logo} ${APP_NAME} Doctor`);
+    console.log(`Generated: ${report.generatedAt}`);
+    console.log("");
+    for (const check of checks) {
+      const icon = check.status === "pass" ? "\u2713" : check.status === "warn" ? "!" : "\u2717";
+      console.log(`${icon} ${check.name}: ${check.detail}`);
     }
-    if (this.looksLikePath(pathOrSpec)) {
-      console.error(`Path not found: ${resolved}`);
-      process.exit(1);
+    if (report.recommendations.length > 0) {
+      console.log("");
+      console.log("Recommendations:");
+      for (const recommendation of report.recommendations) {
+        console.log(`- ${recommendation}`);
+      }
     }
-    const result = await installPluginFromNpmSpec({
-      spec: pathOrSpec,
-      logger: {
-        info: (message) => console.log(message),
-        warn: (message) => console.warn(message)
+    if (opts.verbose && report.logTail.length > 0) {
+      console.log("");
+      console.log("Recent logs:");
+      for (const line of report.logTail) {
+        console.log(line);
       }
-    });
-    if (!result.ok) {
-      console.error(result.error);
-      process.exit(1);
     }
-    let next = enablePluginInConfig(config2, result.pluginId);
-    next = recordPluginInstall(next, {
-      pluginId: result.pluginId,
-      source: "npm",
-      spec: pathOrSpec,
-      installPath: result.targetDir,
-      version: result.version
-    });
-    saveConfig(next);
-    console.log(`Installed plugin: ${result.pluginId}`);
-    await this.requestRestart({
-      reason: `plugin installed: ${result.pluginId}`,
-      manualMessage: "Restart the gateway to load plugins."
-    });
+    process.exitCode = exitCode;
   }
-  pluginsDoctor() {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
-      config: config2,
-      workspaceDir,
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
-    });
-    const pluginErrors = report.plugins.filter((plugin) => plugin.status === "error");
-    const diagnostics = report.diagnostics.filter((diag) => diag.level === "error");
-    if (pluginErrors.length === 0 && diagnostics.length === 0) {
-      console.log("No plugin issues detected.");
-      return;
-    }
-    if (pluginErrors.length > 0) {
-      console.log("Plugin errors:");
-      for (const entry of pluginErrors) {
-        console.log(`- ${entry.id}: ${entry.error ?? "failed to load"} (${entry.source})`);
-      }
+  async collectRuntimeStatus(params) {
+    const configPath = getConfigPath();
+    const config2 = loadConfig3();
+    const workspacePath = getWorkspacePath(config2.agents.defaults.workspace);
+    const serviceStatePath = resolve4(getDataDir3(), "run", "service.json");
+    const fixActions = [];
+    let serviceState = readServiceState();
+    if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
+      clearServiceState();
+      fixActions.push("Cleared stale service state file.");
+      serviceState = readServiceState();
     }
-    if (diagnostics.length > 0) {
-      if (pluginErrors.length > 0) {
-        console.log("");
+    const managedByState = Boolean(serviceState);
+    const running = Boolean(serviceState && isProcessRunning(serviceState.pid));
+    const staleState = Boolean(serviceState && !running);
+    const configuredUi = resolveUiConfig(config2, { enabled: true, host: config2.ui.host, port: config2.ui.port });
+    const configuredUiUrl = resolveUiApiBase(configuredUi.host, configuredUi.port);
+    const configuredApiUrl = `${configuredUiUrl}/api`;
+    const managedUiUrl = serviceState?.uiUrl ?? null;
+    const managedApiUrl = serviceState?.apiUrl ?? null;
+    const managedHealth = running && managedApiUrl ? await this.probeApiHealth(`${managedApiUrl}/health`) : { state: "unreachable", detail: "service not running" };
+    const configuredHealth = await this.probeApiHealth(`${configuredApiUrl}/health`, 900);
+    const orphanSuspected = !running && configuredHealth.state === "ok";
+    const providers = PROVIDERS.map((spec) => {
+      const provider = config2.providers[spec.name];
+      if (!provider) {
+        return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
       }
-      console.log("Diagnostics:");
-      for (const diag of diagnostics) {
-        const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
-        console.log(`- ${prefix}${diag.message}`);
+      if (spec.isLocal) {
+        return {
+          name: spec.displayName ?? spec.name,
+          configured: Boolean(provider.apiBase),
+          detail: provider.apiBase ? provider.apiBase : "apiBase not set"
+        };
       }
-    }
-  }
-  async skillsInstall(options) {
-    const workdir = options.workdir ? expandHome(options.workdir) : getWorkspacePath();
-    const result = await installClawHubSkill({
-      slug: options.slug,
-      version: options.version,
-      registry: options.registry,
-      workdir,
-      dir: options.dir,
-      force: options.force
+      return {
+        name: spec.displayName ?? spec.name,
+        configured: Boolean(provider.apiKey),
+        detail: provider.apiKey ? "apiKey set" : "apiKey not set"
+      };
     });
-    const versionLabel = result.version ?? "latest";
-    if (result.alreadyInstalled) {
-      console.log(`\u2713 ${result.slug} is already installed`);
-    } else {
-      console.log(`\u2713 Installed ${result.slug}@${versionLabel}`);
+    const issues = [];
+    const recommendations = [];
+    if (!existsSync3(configPath)) {
+      issues.push("Config file is missing.");
+      recommendations.push(`Run ${APP_NAME} init to create config files.`);
     }
-    if (result.registry) {
-      console.log(`  Registry: ${result.registry}`);
+    if (!existsSync3(workspacePath)) {
+      issues.push("Workspace directory does not exist.");
+      recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
     }
-    console.log(`  Path: ${result.destinationDir}`);
-  }
-  channelsStatus() {
-    const config2 = loadConfig();
-    console.log("Channel Status");
-    console.log(`WhatsApp: ${config2.channels.whatsapp.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`Discord: ${config2.channels.discord.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`Feishu: ${config2.channels.feishu.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`Mochat: ${config2.channels.mochat.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`Telegram: ${config2.channels.telegram.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`Slack: ${config2.channels.slack.enabled ? "\u2713" : "\u2717"}`);
-    console.log(`QQ: ${config2.channels.qq.enabled ? "\u2713" : "\u2717"}`);
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
-      config: config2,
-      workspaceDir,
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
-    });
-    const pluginChannels = report.plugins.filter((plugin) => plugin.status === "loaded" && plugin.channelIds.length > 0);
-    if (pluginChannels.length > 0) {
-      console.log("Plugin Channels:");
-      for (const plugin of pluginChannels) {
-        const channels2 = plugin.channelIds.join(", ");
-        console.log(`- ${channels2} (plugin: ${plugin.id})`);
-      }
+    if (staleState) {
+      issues.push("Service state is stale (state exists but process is not running).");
+      recommendations.push(`Run ${APP_NAME} status --fix to clean stale state.`);
     }
-  }
-  channelsLogin() {
-    const bridgeDir = this.getBridgeDir();
-    console.log(`${this.logo} Starting bridge...`);
-    console.log("Scan the QR code to connect.\n");
-    const result = spawnSync3("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
-    if (result.status !== 0) {
-      console.error(`Bridge failed: ${result.status ?? 1}`);
+    if (running && managedHealth.state !== "ok") {
+      issues.push(`Managed service health check failed: ${managedHealth.detail}`);
+      recommendations.push(`Check logs at ${serviceState?.logPath ?? resolveServiceLogPath()}.`);
     }
-  }
-  async channelsAdd(opts) {
-    const channelId = opts.channel?.trim();
-    if (!channelId) {
-      console.error("--channel is required");
-      process.exit(1);
+    if (!running) {
+      recommendations.push(`Run ${APP_NAME} start to launch the service.`);
     }
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const pluginRegistry = this.loadPluginRegistry(config2, workspaceDir);
-    const bindings = getPluginChannelBindings(pluginRegistry);
-    const binding = bindings.find((entry) => entry.channelId === channelId || entry.pluginId === channelId);
-    if (!binding) {
-      console.error(`No plugin channel found for: ${channelId}`);
-      process.exit(1);
+    if (orphanSuspected) {
+      issues.push("A service appears healthy on configured API endpoint, but state is missing/stale.");
+      recommendations.push("Another process may be occupying the UI port; stop it or use --ui-port with a free port.");
     }
-    const setup = binding.channel.setup;
-    if (!setup?.applyAccountConfig) {
-      console.error(`Channel "${binding.channelId}" does not support setup.`);
-      process.exit(1);
+    if (!providers.some((provider) => provider.configured)) {
+      recommendations.push("Configure at least one provider API key in UI or config before expecting agent replies.");
     }
-    const input = {
-      name: opts.name,
-      token: opts.token,
-      code: opts.code,
-      url: opts.url,
-      httpUrl: opts.httpUrl
+    const logTail = params.verbose ? this.readLogTail(serviceState?.logPath ?? resolveServiceLogPath(), 25) : [];
+    const level = running ? managedHealth.state === "ok" ? issues.length > 0 ? "degraded" : "healthy" : "degraded" : "stopped";
+    const exitCode = level === "healthy" ? 0 : level === "degraded" ? 1 : 2;
+    return {
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      configPath,
+      configExists: existsSync3(configPath),
+      workspacePath,
+      workspaceExists: existsSync3(workspacePath),
+      model: config2.agents.defaults.model,
+      providers,
+      serviceStatePath,
+      serviceStateExists: existsSync3(serviceStatePath),
+      fixActions,
+      process: {
+        managedByState,
+        pid: serviceState?.pid ?? null,
+        running,
+        staleState,
+        orphanSuspected,
+        startedAt: serviceState?.startedAt ?? null
+      },
+      endpoints: {
+        uiUrl: managedUiUrl,
+        apiUrl: managedApiUrl,
+        configuredUiUrl,
+        configuredApiUrl
+      },
+      health: {
+        managed: managedHealth,
+        configured: configuredHealth
+      },
+      issues,
+      recommendations,
+      logTail,
+      level,
+      exitCode
     };
-    const currentView = this.toPluginConfigView(config2, bindings);
-    const accountId = binding.channel.config?.defaultAccountId?.(currentView) ?? "default";
-    const validateError = setup.validateInput?.({
-      cfg: currentView,
-      input,
-      accountId
-    });
-    if (validateError) {
-      console.error(`Channel setup validation failed: ${validateError}`);
-      process.exit(1);
-    }
-    const nextView = setup.applyAccountConfig({
-      cfg: currentView,
-      input,
-      accountId
-    });
-    if (!nextView || typeof nextView !== "object" || Array.isArray(nextView)) {
-      console.error("Channel setup returned invalid config payload.");
-      process.exit(1);
-    }
-    let next = this.mergePluginConfigView(config2, nextView, bindings);
-    next = enablePluginInConfig(next, binding.pluginId);
-    saveConfig(next);
-    console.log(`Configured channel "${binding.channelId}" via plugin "${binding.pluginId}".`);
-    await this.requestRestart({
-      reason: `channel configured via plugin: ${binding.pluginId}`,
-      manualMessage: "Restart the gateway to apply changes."
-    });
   }
-  toPluginConfigView(config2, bindings) {
-    const view = JSON.parse(JSON.stringify(config2));
-    const channels2 = view.channels && typeof view.channels === "object" && !Array.isArray(view.channels) ? { ...view.channels } : {};
-    for (const binding of bindings) {
-      const pluginConfig = config2.plugins.entries?.[binding.pluginId]?.config;
-      if (!pluginConfig || typeof pluginConfig !== "object" || Array.isArray(pluginConfig)) {
-        continue;
+  async probeApiHealth(url, timeoutMs = 1500) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+      const response = await fetch(url, {
+        method: "GET",
+        signal: controller.signal
+      });
+      if (!response.ok) {
+        return { state: "invalid-response", detail: `HTTP ${response.status}` };
+      }
+      const payload = await response.json();
+      if (payload?.ok === true && payload?.data?.status === "ok") {
+        return { state: "ok", detail: "health endpoint returned ok", payload };
       }
-      channels2[binding.channelId] = JSON.parse(JSON.stringify(pluginConfig));
+      return { state: "invalid-response", detail: "unexpected health payload", payload };
+    } catch (error) {
+      return { state: "unreachable", detail: String(error) };
+    } finally {
+      clearTimeout(timer);
     }
-    view.channels = channels2;
-    return view;
   }
-  mergePluginConfigView(baseConfig, pluginViewConfig, bindings) {
-    const next = JSON.parse(JSON.stringify(baseConfig));
-    const pluginChannels = pluginViewConfig.channels && typeof pluginViewConfig.channels === "object" && !Array.isArray(pluginViewConfig.channels) ? pluginViewConfig.channels : {};
-    const entries = { ...next.plugins.entries ?? {} };
-    for (const binding of bindings) {
-      if (!Object.prototype.hasOwnProperty.call(pluginChannels, binding.channelId)) {
-        continue;
-      }
-      const channelConfig = pluginChannels[binding.channelId];
-      if (!channelConfig || typeof channelConfig !== "object" || Array.isArray(channelConfig)) {
-        continue;
+  readLogTail(path, maxLines = 25) {
+    if (!existsSync3(path)) {
+      return [];
+    }
+    try {
+      const lines = readFileSync2(path, "utf-8").split(/\r?\n/).filter(Boolean);
+      if (lines.length <= maxLines) {
+        return lines;
       }
-      entries[binding.pluginId] = {
-        ...entries[binding.pluginId] ?? {},
-        config: channelConfig
-      };
+      return lines.slice(lines.length - maxLines);
+    } catch {
+      return [];
     }
-    next.plugins = {
-      ...next.plugins,
-      entries
-    };
-    return next;
   }
-  cronList(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const jobs = service.listJobs(Boolean(opts.all));
-    if (!jobs.length) {
-      console.log("No scheduled jobs.");
-      return;
+  async checkPortAvailability(params) {
+    return await new Promise((resolve8) => {
+      const server = createNetServer();
+      server.once("error", (error) => {
+        resolve8({
+          available: false,
+          detail: `bind failed on ${params.host}:${params.port} (${String(error)})`
+        });
+      });
+      server.listen(params.port, params.host, () => {
+        server.close(() => {
+          resolve8({
+            available: true,
+            detail: `bind ok on ${params.host}:${params.port}`
+          });
+        });
+      });
+    });
+  }
+};
+
+// src/cli/commands/service.ts
+import {
+  APP_NAME as APP_NAME2,
+  AgentLoop,
+  ChannelManager as ChannelManager2,
+  CronService as CronService2,
+  getApiBase,
+  getConfigPath as getConfigPath2,
+  getDataDir as getDataDir4,
+  getProvider,
+  getProviderName,
+  getWorkspacePath as getWorkspacePath2,
+  HeartbeatService,
+  LiteLLMProvider,
+  loadConfig as loadConfig4,
+  MessageBus,
+  ProviderManager,
+  saveConfig as saveConfig2,
+  SessionManager
+} from "@nextclaw/core";
+import { startUiServer } from "@nextclaw/server";
+import { closeSync, mkdirSync as mkdirSync2, openSync } from "fs";
+import { join as join4, resolve as resolve5 } from "path";
+import { spawn as spawn2 } from "child_process";
+import chokidar from "chokidar";
+
+// src/cli/gateway/controller.ts
+import { createHash } from "crypto";
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+import {
+  buildConfigSchema,
+  ConfigSchema,
+  redactConfigObject
+} from "@nextclaw/core";
+var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
+var readConfigSnapshot = (getConfigPath4) => {
+  const path = getConfigPath4();
+  let raw = "";
+  let parsed = {};
+  if (existsSync4(path)) {
+    raw = readFileSync3(path, "utf-8");
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      parsed = {};
     }
-    for (const job of jobs) {
-      let schedule = "";
-      if (job.schedule.kind === "every") {
-        schedule = `every ${Math.round((job.schedule.everyMs ?? 0) / 1e3)}s`;
-      } else if (job.schedule.kind === "cron") {
-        schedule = job.schedule.expr ?? "";
+  }
+  let config2;
+  let valid = true;
+  try {
+    config2 = ConfigSchema.parse(parsed);
+  } catch {
+    config2 = ConfigSchema.parse({});
+    valid = false;
+  }
+  if (!raw) {
+    raw = JSON.stringify(config2, null, 2);
+  }
+  const hash = hashRaw(raw);
+  const schema = buildConfigSchema({ version: getPackageVersion() });
+  const redacted = redactConfigObject(config2, schema.uiHints);
+  return { raw: valid ? JSON.stringify(redacted, null, 2) : null, hash: valid ? hash : null, config: config2, redacted, valid };
+};
+var redactValue = (value) => {
+  const schema = buildConfigSchema({ version: getPackageVersion() });
+  return redactConfigObject(value, schema.uiHints);
+};
+var mergeDeep = (base, patch) => {
+  const next = { ...base };
+  for (const [key, value] of Object.entries(patch)) {
+    if (value && typeof value === "object" && !Array.isArray(value)) {
+      const baseVal = base[key];
+      if (baseVal && typeof baseVal === "object" && !Array.isArray(baseVal)) {
+        next[key] = mergeDeep(baseVal, value);
       } else {
-        schedule = job.schedule.atMs ? new Date(job.schedule.atMs).toISOString() : "";
+        next[key] = mergeDeep({}, value);
       }
-      console.log(`${job.id} ${job.name} ${schedule}`);
+    } else {
+      next[key] = value;
     }
   }
-  cronAdd(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    let schedule = null;
-    if (opts.every) {
-      schedule = { kind: "every", everyMs: Number(opts.every) * 1e3 };
-    } else if (opts.cron) {
-      schedule = { kind: "cron", expr: String(opts.cron) };
-    } else if (opts.at) {
-      schedule = { kind: "at", atMs: Date.parse(String(opts.at)) };
-    }
-    if (!schedule) {
-      console.error("Error: Must specify --every, --cron, or --at");
+  return next;
+};
+var GatewayControllerImpl = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  async requestRestart(options) {
+    if (this.deps.requestRestart) {
+      await this.deps.requestRestart(options);
       return;
     }
-    const job = service.addJob({
-      name: opts.name,
-      schedule,
-      message: opts.message,
-      deliver: Boolean(opts.deliver),
-      channel: opts.channel,
-      to: opts.to
-    });
-    console.log(`\u2713 Added job '${job.name}' (${job.id})`);
+    const delay = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
+    console.log(`Gateway restart requested via tool${options?.reason ? ` (${options.reason})` : ""}.`);
+    setTimeout(() => {
+      process.exit(0);
+    }, delay);
   }
-  cronRemove(jobId) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    if (service.removeJob(jobId)) {
-      console.log(`\u2713 Removed job ${jobId}`);
-    } else {
-      console.log(`Job ${jobId} not found`);
-    }
+  status() {
+    return {
+      channels: this.deps.reloader.getChannels().enabledChannels,
+      cron: this.deps.cron.status(),
+      configPath: this.deps.getConfigPath()
+    };
   }
-  cronEnable(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const job = service.enableJob(jobId, !opts.disable);
-    if (job) {
-      console.log(`\u2713 Job '${job.name}' ${opts.disable ? "disabled" : "enabled"}`);
-    } else {
-      console.log(`Job ${jobId} not found`);
-    }
+  async reloadConfig(reason) {
+    return this.deps.reloader.reloadConfig(reason);
   }
-  async cronRun(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const ok = await service.runJob(jobId, Boolean(opts.force));
-    console.log(ok ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
+  async restart(options) {
+    await this.requestRestart(options);
+    return "Restart scheduled";
   }
-  async status(opts = {}) {
-    const report = await this.collectRuntimeStatus({
-      verbose: Boolean(opts.verbose),
-      fix: Boolean(opts.fix)
-    });
-    if (opts.json) {
-      console.log(JSON.stringify(report, null, 2));
-      process.exitCode = report.exitCode;
-      return;
-    }
-    console.log(`${this.logo} ${APP_NAME} Status`);
-    console.log(`Level: ${report.level}`);
-    console.log(`Generated: ${report.generatedAt}`);
-    console.log("");
-    const processLabel = report.process.running ? `running (PID ${report.process.pid})` : report.process.staleState ? "stale-state" : "stopped";
-    console.log(`Process: ${processLabel}`);
-    console.log(`State file: ${report.serviceStatePath} ${report.serviceStateExists ? "\u2713" : "\u2717"}`);
-    if (report.process.startedAt) {
-      console.log(`Started: ${report.process.startedAt}`);
-    }
-    console.log(`Managed health: ${report.health.managed.state} (${report.health.managed.detail})`);
-    if (!report.process.running) {
-      console.log(`Configured health: ${report.health.configured.state} (${report.health.configured.detail})`);
-    }
-    console.log(`UI: ${report.endpoints.uiUrl ?? report.endpoints.configuredUiUrl}`);
-    console.log(`API: ${report.endpoints.apiUrl ?? report.endpoints.configuredApiUrl}`);
-    console.log(`Config: ${report.configPath} ${report.configExists ? "\u2713" : "\u2717"}`);
-    console.log(`Workspace: ${report.workspacePath} ${report.workspaceExists ? "\u2713" : "\u2717"}`);
-    console.log(`Model: ${report.model}`);
-    for (const provider of report.providers) {
-      console.log(`${provider.name}: ${provider.configured ? "\u2713" : "not set"}${provider.detail ? ` (${provider.detail})` : ""}`);
-    }
-    if (report.fixActions.length > 0) {
-      console.log("");
-      console.log("Fix actions:");
-      for (const action of report.fixActions) {
-        console.log(`- ${action}`);
-      }
-    }
-    if (report.issues.length > 0) {
-      console.log("");
-      console.log("Issues:");
-      for (const issue of report.issues) {
-        console.log(`- ${issue}`);
-      }
+  async getConfig() {
+    const snapshot = readConfigSnapshot(this.deps.getConfigPath);
+    return {
+      raw: snapshot.raw,
+      hash: snapshot.hash,
+      path: this.deps.getConfigPath(),
+      config: snapshot.redacted,
+      parsed: snapshot.redacted,
+      resolved: snapshot.redacted,
+      valid: snapshot.valid
+    };
+  }
+  async getConfigSchema() {
+    return buildConfigSchema({ version: getPackageVersion() });
+  }
+  async applyConfig(params) {
+    const snapshot = readConfigSnapshot(this.deps.getConfigPath);
+    if (!params.baseHash) {
+      return { ok: false, error: "config base hash required; re-run config.get and retry" };
     }
-    if (report.recommendations.length > 0) {
-      console.log("");
-      console.log("Recommendations:");
-      for (const recommendation of report.recommendations) {
-        console.log(`- ${recommendation}`);
-      }
+    if (!snapshot.valid || !snapshot.hash) {
+      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
     }
-    if (opts.verbose && report.logTail.length > 0) {
-      console.log("");
-      console.log("Recent logs:");
-      for (const line of report.logTail) {
-        console.log(line);
-      }
+    if (params.baseHash !== snapshot.hash) {
+      return { ok: false, error: "config changed since last load; re-run config.get and retry" };
     }
-    process.exitCode = report.exitCode;
-  }
-  async doctor(opts = {}) {
-    const report = await this.collectRuntimeStatus({
-      verbose: Boolean(opts.verbose),
-      fix: Boolean(opts.fix)
-    });
-    const checkPort = await this.checkPortAvailability({
-      host: report.process.running ? report.endpoints.uiUrl ? new URL(report.endpoints.uiUrl).hostname : "127.0.0.1" : "127.0.0.1",
-      port: (() => {
-        try {
-          const base = report.process.running && report.endpoints.uiUrl ? report.endpoints.uiUrl : report.endpoints.configuredUiUrl;
-          return Number(new URL(base).port || 80);
-        } catch {
-          return 18791;
-        }
-      })()
-    });
-    const providerConfigured = report.providers.some((provider) => provider.configured);
-    const checks = [
-      {
-        name: "config-file",
-        status: report.configExists ? "pass" : "fail",
-        detail: report.configPath
-      },
-      {
-        name: "workspace-dir",
-        status: report.workspaceExists ? "pass" : "warn",
-        detail: report.workspacePath
-      },
-      {
-        name: "service-state",
-        status: report.process.staleState ? "fail" : report.process.running ? "pass" : "warn",
-        detail: report.process.running ? `PID ${report.process.pid}` : report.process.staleState ? "state exists but process is not running" : "service not running"
-      },
-      {
-        name: "service-health",
-        status: report.process.running ? report.health.managed.state === "ok" ? "pass" : "fail" : report.health.configured.state === "ok" ? "warn" : "warn",
-        detail: report.process.running ? `${report.health.managed.state}: ${report.health.managed.detail}` : `${report.health.configured.state}: ${report.health.configured.detail}`
-      },
-      {
-        name: "ui-port-availability",
-        status: report.process.running ? "pass" : checkPort.available ? "pass" : "fail",
-        detail: report.process.running ? "managed by running service" : checkPort.available ? "available" : checkPort.detail
-      },
-      {
-        name: "provider-config",
-        status: providerConfigured ? "pass" : "warn",
-        detail: providerConfigured ? "at least one provider configured" : "no provider api key configured"
-      }
-    ];
-    const failed = checks.filter((check) => check.status === "fail");
-    const warned = checks.filter((check) => check.status === "warn");
-    const exitCode = failed.length > 0 ? 1 : warned.length > 0 ? 1 : 0;
-    if (opts.json) {
-      console.log(
-        JSON.stringify(
-          {
-            generatedAt: report.generatedAt,
-            checks,
-            status: report,
-            exitCode
-          },
-          null,
-          2
-        )
-      );
-      process.exitCode = exitCode;
-      return;
+    let parsedRaw;
+    try {
+      parsedRaw = JSON.parse(params.raw);
+    } catch {
+      return { ok: false, error: "invalid JSON in raw config" };
     }
-    console.log(`${this.logo} ${APP_NAME} Doctor`);
-    console.log(`Generated: ${report.generatedAt}`);
-    console.log("");
-    for (const check of checks) {
-      const icon = check.status === "pass" ? "\u2713" : check.status === "warn" ? "!" : "\u2717";
-      console.log(`${icon} ${check.name}: ${check.detail}`);
+    let validated;
+    try {
+      validated = ConfigSchema.parse(parsedRaw);
+    } catch (err) {
+      return { ok: false, error: `invalid config: ${String(err)}` };
     }
-    if (report.recommendations.length > 0) {
-      console.log("");
-      console.log("Recommendations:");
-      for (const recommendation of report.recommendations) {
-        console.log(`- ${recommendation}`);
-      }
+    this.deps.saveConfig(validated);
+    const delayMs = params.restartDelayMs ?? 0;
+    await this.requestRestart({ delayMs, reason: "config.apply" });
+    return {
+      ok: true,
+      note: params.note ?? null,
+      path: this.deps.getConfigPath(),
+      config: redactValue(validated),
+      restart: { scheduled: true, delayMs }
+    };
+  }
+  async patchConfig(params) {
+    const snapshot = readConfigSnapshot(this.deps.getConfigPath);
+    if (!params.baseHash) {
+      return { ok: false, error: "config base hash required; re-run config.get and retry" };
     }
-    if (opts.verbose && report.logTail.length > 0) {
-      console.log("");
-      console.log("Recent logs:");
-      for (const line of report.logTail) {
-        console.log(line);
-      }
+    if (!snapshot.valid || !snapshot.hash) {
+      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
     }
-    process.exitCode = exitCode;
+    if (params.baseHash !== snapshot.hash) {
+      return { ok: false, error: "config changed since last load; re-run config.get and retry" };
+    }
+    let patch;
+    try {
+      patch = JSON.parse(params.raw);
+    } catch {
+      return { ok: false, error: "invalid JSON in raw config" };
+    }
+    const merged = mergeDeep(snapshot.config, patch);
+    let validated;
+    try {
+      validated = ConfigSchema.parse(merged);
+    } catch (err) {
+      return { ok: false, error: `invalid config: ${String(err)}` };
+    }
+    this.deps.saveConfig(validated);
+    const delayMs = params.restartDelayMs ?? 0;
+    await this.requestRestart({ delayMs, reason: "config.patch" });
+    return {
+      ok: true,
+      note: params.note ?? null,
+      path: this.deps.getConfigPath(),
+      config: redactValue(validated),
+      restart: { scheduled: true, delayMs }
+    };
   }
-  async collectRuntimeStatus(params) {
-    const configPath = getConfigPath();
-    const config2 = loadConfig();
-    const workspacePath = getWorkspacePath(config2.agents.defaults.workspace);
-    const serviceStatePath = resolve4(getDataDir2(), "run", "service.json");
-    const fixActions = [];
-    let serviceState = readServiceState();
-    if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
-      clearServiceState();
-      fixActions.push("Cleared stale service state file.");
-      serviceState = readServiceState();
+  async updateRun(params) {
+    const result = runSelfUpdate({ timeoutMs: params.timeoutMs });
+    if (!result.ok) {
+      return { ok: false, error: result.error ?? "update failed", steps: result.steps };
     }
-    const managedByState = Boolean(serviceState);
-    const running = Boolean(serviceState && isProcessRunning(serviceState.pid));
-    const staleState = Boolean(serviceState && !running);
-    const configuredUi = resolveUiConfig(config2, { enabled: true, host: config2.ui.host, port: config2.ui.port });
-    const configuredUiUrl = resolveUiApiBase(configuredUi.host, configuredUi.port);
-    const configuredApiUrl = `${configuredUiUrl}/api`;
-    const managedUiUrl = serviceState?.uiUrl ?? null;
-    const managedApiUrl = serviceState?.apiUrl ?? null;
-    const managedHealth = running && managedApiUrl ? await this.probeApiHealth(`${managedApiUrl}/health`) : { state: "unreachable", detail: "service not running" };
-    const configuredHealth = await this.probeApiHealth(`${configuredApiUrl}/health`, 900);
-    const orphanSuspected = !running && configuredHealth.state === "ok";
-    const providers = PROVIDERS.map((spec) => {
-      const provider = config2.providers[spec.name];
-      if (!provider) {
-        return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
-      }
-      if (spec.isLocal) {
-        return {
-          name: spec.displayName ?? spec.name,
-          configured: Boolean(provider.apiBase),
-          detail: provider.apiBase ? provider.apiBase : "apiBase not set"
-        };
-      }
-      return {
-        name: spec.displayName ?? spec.name,
-        configured: Boolean(provider.apiKey),
-        detail: provider.apiKey ? "apiKey set" : "apiKey not set"
-      };
-    });
-    const issues = [];
-    const recommendations = [];
-    if (!existsSync4(configPath)) {
-      issues.push("Config file is missing.");
-      recommendations.push(`Run ${APP_NAME} init to create config files.`);
+    const delayMs = params.restartDelayMs ?? 0;
+    await this.requestRestart({ delayMs, reason: "update.run" });
+    return {
+      ok: true,
+      note: params.note ?? null,
+      restart: { scheduled: true, delayMs },
+      strategy: result.strategy,
+      steps: result.steps
+    };
+  }
+};
+
+// src/cli/config-reloader.ts
+import {
+  buildReloadPlan as buildReloadPlan2,
+  diffConfigPaths as diffConfigPaths2,
+  ChannelManager
+} from "@nextclaw/core";
+var ConfigReloader = class {
+  constructor(options) {
+    this.options = options;
+    this.currentConfig = options.initialConfig;
+    this.channels = options.channels;
+  }
+  currentConfig;
+  channels;
+  reloadTask = null;
+  providerReloadTask = null;
+  reloadTimer = null;
+  reloadRunning = false;
+  reloadPending = false;
+  getChannels() {
+    return this.channels;
+  }
+  setApplyAgentRuntimeConfig(callback) {
+    this.options.applyAgentRuntimeConfig = callback;
+  }
+  async applyReloadPlan(nextConfig) {
+    const changedPaths = diffConfigPaths2(this.currentConfig, nextConfig);
+    if (!changedPaths.length) {
+      return;
     }
-    if (!existsSync4(workspacePath)) {
-      issues.push("Workspace directory does not exist.");
-      recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
+    this.currentConfig = nextConfig;
+    const plan = buildReloadPlan2(changedPaths);
+    if (plan.restartChannels) {
+      await this.reloadChannels(nextConfig);
+      console.log("Config reload: channels restarted.");
     }
-    if (staleState) {
-      issues.push("Service state is stale (state exists but process is not running).");
-      recommendations.push(`Run ${APP_NAME} status --fix to clean stale state.`);
+    if (plan.reloadProviders) {
+      await this.reloadProvider(nextConfig);
+      console.log("Config reload: provider settings applied.");
     }
-    if (running && managedHealth.state !== "ok") {
-      issues.push(`Managed service health check failed: ${managedHealth.detail}`);
-      recommendations.push(`Check logs at ${serviceState?.logPath ?? resolveServiceLogPath()}.`);
+    if (plan.reloadAgent) {
+      this.options.applyAgentRuntimeConfig?.(nextConfig);
+      console.log("Config reload: agent defaults applied.");
     }
-    if (!running) {
-      recommendations.push(`Run ${APP_NAME} start to launch the service.`);
+    if (plan.restartRequired.length > 0) {
+      this.options.onRestartRequired(plan.restartRequired);
     }
-    if (orphanSuspected) {
-      issues.push("A service appears healthy on configured API endpoint, but state is missing/stale.");
-      recommendations.push("Another process may be occupying the UI port; stop it or use --ui-port with a free port.");
+  }
+  scheduleReload(reason) {
+    if (this.reloadTimer) {
+      clearTimeout(this.reloadTimer);
     }
-    if (!providers.some((provider) => provider.configured)) {
-      recommendations.push("Configure at least one provider API key in UI or config before expecting agent replies.");
+    this.reloadTimer = setTimeout(() => {
+      void this.runReload(reason);
+    }, 300);
+  }
+  async runReload(reason) {
+    if (this.reloadRunning) {
+      this.reloadPending = true;
+      return;
+    }
+    this.reloadRunning = true;
+    if (this.reloadTimer) {
+      clearTimeout(this.reloadTimer);
+      this.reloadTimer = null;
+    }
+    try {
+      const nextConfig = this.options.loadConfig();
+      await this.applyReloadPlan(nextConfig);
+    } catch (error) {
+      console.error(`Config reload failed (${reason}): ${String(error)}`);
+    } finally {
+      this.reloadRunning = false;
+      if (this.reloadPending) {
+        this.reloadPending = false;
+        this.scheduleReload("pending");
+      }
     }
-    const logTail = params.verbose ? this.readLogTail(serviceState?.logPath ?? resolveServiceLogPath(), 25) : [];
-    const level = running ? managedHealth.state === "ok" ? issues.length > 0 ? "degraded" : "healthy" : "degraded" : "stopped";
-    const exitCode = level === "healthy" ? 0 : level === "degraded" ? 1 : 2;
-    return {
-      generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      configPath,
-      configExists: existsSync4(configPath),
-      workspacePath,
-      workspaceExists: existsSync4(workspacePath),
-      model: config2.agents.defaults.model,
-      providers,
-      serviceStatePath,
-      serviceStateExists: existsSync4(serviceStatePath),
-      fixActions,
-      process: {
-        managedByState,
-        pid: serviceState?.pid ?? null,
-        running,
-        staleState,
-        orphanSuspected,
-        startedAt: serviceState?.startedAt ?? null
-      },
-      endpoints: {
-        uiUrl: managedUiUrl,
-        apiUrl: managedApiUrl,
-        configuredUiUrl,
-        configuredApiUrl
-      },
-      health: {
-        managed: managedHealth,
-        configured: configuredHealth
-      },
-      issues,
-      recommendations,
-      logTail,
-      level,
-      exitCode
-    };
   }
-  async probeApiHealth(url, timeoutMs = 1500) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
+  async reloadConfig(reason) {
+    await this.runReload(reason ?? "gateway tool");
+    return "Config reload triggered";
+  }
+  async reloadChannels(nextConfig) {
+    if (this.reloadTask) {
+      await this.reloadTask;
+      return;
+    }
+    this.reloadTask = (async () => {
+      await this.channels.stopAll();
+      this.channels = new ChannelManager(
+        nextConfig,
+        this.options.bus,
+        this.options.sessionManager,
+        this.options.getExtensionChannels?.() ?? []
+      );
+      await this.channels.startAll();
+    })();
     try {
-      const response = await fetch(url, {
-        method: "GET",
-        signal: controller.signal
-      });
-      if (!response.ok) {
-        return { state: "invalid-response", detail: `HTTP ${response.status}` };
-      }
-      const payload = await response.json();
-      if (payload?.ok === true && payload?.data?.status === "ok") {
-        return { state: "ok", detail: "health endpoint returned ok", payload };
-      }
-      return { state: "invalid-response", detail: "unexpected health payload", payload };
-    } catch (error) {
-      return { state: "unreachable", detail: String(error) };
+      await this.reloadTask;
     } finally {
-      clearTimeout(timer);
+      this.reloadTask = null;
     }
   }
-  readLogTail(path, maxLines = 25) {
-    if (!existsSync4(path)) {
-      return [];
+  async reloadProvider(nextConfig) {
+    if (!this.options.providerManager) {
+      return;
     }
-    try {
-      const lines = readFileSync3(path, "utf-8").split(/\r?\n/).filter(Boolean);
-      if (lines.length <= maxLines) {
-        return lines;
+    if (this.providerReloadTask) {
+      await this.providerReloadTask;
+      return;
+    }
+    this.providerReloadTask = (async () => {
+      const nextProvider = this.options.makeProvider(nextConfig);
+      if (!nextProvider) {
+        console.warn("Provider reload skipped: missing API key.");
+        return;
       }
-      return lines.slice(lines.length - maxLines);
-    } catch {
-      return [];
+      this.options.providerManager?.set(nextProvider);
+    })();
+    try {
+      await this.providerReloadTask;
+    } finally {
+      this.providerReloadTask = null;
     }
   }
-  async checkPortAvailability(params) {
-    return await new Promise((resolve5) => {
-      const server = createNetServer();
-      server.once("error", (error) => {
-        resolve5({
-          available: false,
-          detail: `bind failed on ${params.host}:${params.port} (${String(error)})`
-        });
-      });
-      server.listen(params.port, params.host, () => {
-        server.close(() => {
-          resolve5({
-            available: true,
-            detail: `bind ok on ${params.host}:${params.port}`
-          });
-        });
-      });
-    });
+};
+
+// src/cli/missing-provider.ts
+import { LLMProvider } from "@nextclaw/core";
+var MissingProvider = class extends LLMProvider {
+  constructor(defaultModel) {
+    super(null, null);
+    this.defaultModel = defaultModel;
   }
-  loadPluginRegistry(config2, workspaceDir) {
-    return loadOpenClawPlugins({
-      config: config2,
-      workspaceDir,
-      reservedToolNames: [
-        "read_file",
-        "write_file",
-        "edit_file",
-        "list_dir",
-        "exec",
-        "web_search",
-        "web_fetch",
-        "message",
-        "spawn",
-        "sessions_list",
-        "sessions_history",
-        "sessions_send",
-        "memory_search",
-        "memory_get",
-        "subagents",
-        "gateway",
-        "cron"
-      ],
-      reservedChannelIds: Object.keys(config2.channels),
-      reservedProviderIds: PROVIDERS.map((provider) => provider.name),
-      logger: {
-        info: (message) => console.log(message),
-        warn: (message) => console.warn(message),
-        error: (message) => console.error(message),
-        debug: (message) => console.debug(message)
-      }
-    });
+  setDefaultModel(model) {
+    this.defaultModel = model;
   }
-  toExtensionRegistry(pluginRegistry) {
-    return {
-      tools: pluginRegistry.tools.map((tool) => ({
-        extensionId: tool.pluginId,
-        factory: tool.factory,
-        names: tool.names,
-        optional: tool.optional,
-        source: tool.source
-      })),
-      channels: pluginRegistry.channels.map((channel) => ({
-        extensionId: channel.pluginId,
-        channel: channel.channel,
-        source: channel.source
-      })),
-      diagnostics: pluginRegistry.diagnostics.map((diag) => ({
-        level: diag.level,
-        message: diag.message,
-        extensionId: diag.pluginId,
-        source: diag.source
-      }))
-    };
+  async chat() {
+    throw new Error("No API key configured yet. Configure provider credentials in UI and retry.");
   }
-  logPluginDiagnostics(registry) {
-    for (const diag of registry.diagnostics) {
-      const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
-      const text = `${prefix}${diag.message}`;
-      if (diag.level === "error") {
-        console.error(`[plugins] ${text}`);
-      } else {
-        console.warn(`[plugins] ${text}`);
-      }
-    }
+  getDefaultModel() {
+    return this.defaultModel;
+  }
+};
+
+// src/cli/commands/service.ts
+var ServiceCommands = class {
+  constructor(deps) {
+    this.deps = deps;
   }
   async startGateway(options = {}) {
-    const config2 = loadConfig();
-    const workspace = getWorkspacePath(config2.agents.defaults.workspace);
-    const pluginRegistry = this.loadPluginRegistry(config2, workspace);
-    const extensionRegistry = this.toExtensionRegistry(pluginRegistry);
-    this.logPluginDiagnostics(pluginRegistry);
+    const config2 = loadConfig4();
+    const workspace = getWorkspacePath2(config2.agents.defaults.workspace);
     const bus = new MessageBus();
     const provider = options.allowMissingProvider === true ? this.makeProvider(config2, { allowMissing: true }) : this.makeProvider(config2);
     const providerManager = new ProviderManager(provider ?? this.makeMissingProvider(config2));
     const sessionManager = new SessionManager(workspace);
-    const cronStorePath = join3(getDataDir2(), "cron", "jobs.json");
-    const cron2 = new CronService(cronStorePath);
-    const pluginUiMetadata = getPluginUiMetadataFromRegistry(pluginRegistry);
+    const cronStorePath = join4(getDataDir4(), "cron", "jobs.json");
+    const cron2 = new CronService2(cronStorePath);
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
     if (!provider) {
       console.warn("Warning: No API key configured. The gateway is running, but agent replies are disabled until provider config is set.");
     }
-    const channels2 = new ChannelManager(config2, bus, sessionManager, extensionRegistry.channels);
+    const channels2 = new ChannelManager2(config2, bus, sessionManager, []);
     const reloader = new ConfigReloader({
       initialConfig: config2,
       channels: channels2,
@@ -2427,10 +1512,9 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig,
-      getExtensionChannels: () => extensionRegistry.channels,
+      loadConfig: loadConfig4,
       onRestartRequired: (paths) => {
-        void this.requestRestart({
+        void this.deps.requestRestart({
           reason: `config reload requires restart: ${paths.join(", ")}`,
           manualMessage: `Config changes require restart: ${paths.join(", ")}`,
           strategy: "background-service-or-manual"
@@ -2440,11 +1524,10 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
-      getConfigPath,
-      saveConfig,
-      getPluginUiMetadata: () => pluginUiMetadata,
+      getConfigPath: getConfigPath2,
+      saveConfig: saveConfig2,
       requestRestart: async (options2) => {
-        await this.requestRestart({
+        await this.deps.requestRestart({
           reason: options2?.reason ?? "gateway tool restart",
           manualMessage: "Restart the gateway to apply changes.",
           strategy: "background-service-or-exit",
@@ -2468,55 +1551,9 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       sessionManager,
       contextConfig: config2.agents.context,
       gatewayController,
-      config: config2,
-      extensionRegistry,
-      resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
-        registry: pluginRegistry,
-        channel,
-        cfg: loadConfig(),
-        accountId
-      })
+      config: config2
     });
     reloader.setApplyAgentRuntimeConfig((nextConfig) => agent.applyRuntimeConfig(nextConfig));
-    const pluginChannelBindings = getPluginChannelBindings(pluginRegistry);
-    setPluginRuntimeBridge({
-      loadConfig: () => this.toPluginConfigView(loadConfig(), pluginChannelBindings),
-      writeConfigFile: async (nextConfigView) => {
-        if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
-          throw new Error("plugin runtime writeConfigFile expects an object config");
-        }
-        const current = loadConfig();
-        const next = this.mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig(next);
-      },
-      dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
-        const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
-        const body = typeof ctx.Body === "string" ? ctx.Body : "";
-        const content = (bodyForAgent || body).trim();
-        if (!content) {
-          return;
-        }
-        const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : `plugin:${typeof ctx.OriginatingChannel === "string" ? ctx.OriginatingChannel : "channel"}:${typeof ctx.SenderId === "string" ? ctx.SenderId : "unknown"}`;
-        const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
-        const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
-        try {
-          const response = await agent.processDirect({
-            content,
-            sessionKey,
-            channel,
-            chatId,
-            metadata: typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? { account_id: ctx.AccountId } : {}
-          });
-          const replyText = typeof response === "string" ? response : String(response ?? "");
-          if (replyText.trim()) {
-            await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
-          }
-        } catch (error) {
-          dispatcherOptions.onError?.(error);
-          throw error;
-        }
-      }
-    });
     cron2.onJob = async (job) => {
       const response = await agent.processDirect({
         content: job.payload.message,
@@ -2552,7 +1589,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       console.log(`\u2713 Cron: ${cronStatus.jobs} scheduled jobs`);
     }
     console.log("\u2713 Heartbeat: every 30m");
-    const configPath = getConfigPath();
+    const configPath = getConfigPath2();
     const watcher = chokidar.watch(configPath, {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
@@ -2562,32 +1599,216 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     watcher.on("unlink", () => reloader.scheduleReload("config unlink"));
     await cron2.start();
     await heartbeat.start();
-    let pluginGatewayHandles = [];
+    await Promise.allSettled([agent.run(), reloader.getChannels().startAll()]);
+  }
+  async runForeground(options) {
+    const config2 = loadConfig4();
+    const uiConfig = resolveUiConfig(config2, options.uiOverrides);
+    const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
+    if (options.open) {
+      openBrowser(uiUrl);
+    }
+    await this.startGateway({
+      uiOverrides: options.uiOverrides,
+      allowMissingProvider: true,
+      uiStaticDir: resolveUiStaticDir()
+    });
+  }
+  async startService(options) {
+    const config2 = loadConfig4();
+    const uiConfig = resolveUiConfig(config2, options.uiOverrides);
+    const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
+    const apiUrl = `${uiUrl}/api`;
+    const staticDir = resolveUiStaticDir();
+    const existing = readServiceState();
+    if (existing && isProcessRunning(existing.pid)) {
+      console.log(`\u2713 ${APP_NAME2} is already running (PID ${existing.pid})`);
+      console.log(`UI: ${existing.uiUrl}`);
+      console.log(`API: ${existing.apiUrl}`);
+      const parsedUi = (() => {
+        try {
+          const parsed = new URL(existing.uiUrl);
+          const port = Number(parsed.port || 80);
+          return {
+            host: existing.uiHost ?? parsed.hostname,
+            port: Number.isFinite(port) ? port : existing.uiPort ?? 18791
+          };
+        } catch {
+          return {
+            host: existing.uiHost ?? "127.0.0.1",
+            port: existing.uiPort ?? 18791
+          };
+        }
+      })();
+      if (parsedUi.host !== uiConfig.host || parsedUi.port !== uiConfig.port) {
+        console.log(
+          `Detected running service UI bind (${parsedUi.host}:${parsedUi.port}); enforcing (${uiConfig.host}:${uiConfig.port})...`
+        );
+        await this.stopService();
+        const stateAfterStop = readServiceState();
+        if (stateAfterStop && isProcessRunning(stateAfterStop.pid)) {
+          console.error("Error: Failed to stop running service while enforcing public UI exposure.");
+          return;
+        }
+        return this.startService(options);
+      }
+      await this.printPublicUiUrls(parsedUi.host, parsedUi.port);
+      console.log(`Logs: ${existing.logPath}`);
+      console.log(`Stop: ${APP_NAME2} stop`);
+      return;
+    }
+    if (existing) {
+      clearServiceState();
+    }
+    if (!staticDir) {
+      console.log("Warning: UI frontend not found in package assets.");
+    }
+    const logPath = resolveServiceLogPath();
+    const logDir = resolve5(logPath, "..");
+    mkdirSync2(logDir, { recursive: true });
+    const logFd = openSync(logPath, "a");
+    const serveArgs = buildServeArgs({
+      uiPort: uiConfig.port
+    });
+    const child = spawn2(process.execPath, [...process.execArgv, ...serveArgs], {
+      env: process.env,
+      stdio: ["ignore", logFd, logFd],
+      detached: true
+    });
+    closeSync(logFd);
+    if (!child.pid) {
+      console.error("Error: Failed to start background service.");
+      return;
+    }
+    const healthUrl = `${apiUrl}/health`;
+    const started = await this.waitForBackgroundServiceReady({
+      pid: child.pid,
+      healthUrl,
+      timeoutMs: 8e3
+    });
+    if (!started) {
+      if (isProcessRunning(child.pid)) {
+        try {
+          process.kill(child.pid, "SIGTERM");
+          await waitForExit(child.pid, 2e3);
+        } catch {
+        }
+      }
+      clearServiceState();
+      console.error(`Error: Failed to start background service. Check logs: ${logPath}`);
+      return;
+    }
+    child.unref();
+    const state = {
+      pid: child.pid,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      uiUrl,
+      apiUrl,
+      uiHost: uiConfig.host,
+      uiPort: uiConfig.port,
+      logPath
+    };
+    writeServiceState(state);
+    console.log(`\u2713 ${APP_NAME2} started in background (PID ${state.pid})`);
+    console.log(`UI: ${uiUrl}`);
+    console.log(`API: ${apiUrl}`);
+    await this.printPublicUiUrls(uiConfig.host, uiConfig.port);
+    console.log(`Logs: ${logPath}`);
+    console.log(`Stop: ${APP_NAME2} stop`);
+    if (options.open) {
+      openBrowser(uiUrl);
+    }
+  }
+  async stopService() {
+    const state = readServiceState();
+    if (!state) {
+      console.log("No running service found.");
+      return;
+    }
+    if (!isProcessRunning(state.pid)) {
+      console.log("Service is not running. Cleaning up state.");
+      clearServiceState();
+      return;
+    }
+    console.log(`Stopping ${APP_NAME2} (PID ${state.pid})...`);
     try {
-      const startedPluginGateways = await startPluginChannelGateways({
-        registry: pluginRegistry,
-        logger: {
-          info: (message) => console.log(`[plugins] ${message}`),
-          warn: (message) => console.warn(`[plugins] ${message}`),
-          error: (message) => console.error(`[plugins] ${message}`),
-          debug: (message) => console.debug(`[plugins] ${message}`)
+      process.kill(state.pid, "SIGTERM");
+    } catch (error) {
+      console.error(`Failed to stop service: ${String(error)}`);
+      return;
+    }
+    const stopped = await waitForExit(state.pid, 3e3);
+    if (!stopped) {
+      try {
+        process.kill(state.pid, "SIGKILL");
+      } catch (error) {
+        console.error(`Failed to force stop service: ${String(error)}`);
+        return;
+      }
+      await waitForExit(state.pid, 2e3);
+    }
+    clearServiceState();
+    console.log(`\u2713 ${APP_NAME2} stopped`);
+  }
+  async waitForBackgroundServiceReady(params) {
+    const startedAt = Date.now();
+    while (Date.now() - startedAt < params.timeoutMs) {
+      if (!isProcessRunning(params.pid)) {
+        return false;
+      }
+      try {
+        const response = await fetch(params.healthUrl, { method: "GET" });
+        if (!response.ok) {
+          await new Promise((resolve8) => setTimeout(resolve8, 200));
+          continue;
         }
-      });
-      pluginGatewayHandles = startedPluginGateways.handles;
-      for (const diag of startedPluginGateways.diagnostics) {
-        const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
-        const text = `${prefix}${diag.message}`;
-        if (diag.level === "error") {
-          console.error(`[plugins] ${text}`);
-        } else {
-          console.warn(`[plugins] ${text}`);
+        const payload = await response.json();
+        const healthy = payload?.ok === true && payload?.data?.status === "ok";
+        if (!healthy) {
+          await new Promise((resolve8) => setTimeout(resolve8, 200));
+          continue;
+        }
+        await new Promise((resolve8) => setTimeout(resolve8, 300));
+        if (isProcessRunning(params.pid)) {
+          return true;
         }
+      } catch {
       }
-      await Promise.allSettled([agent.run(), reloader.getChannels().startAll()]);
-    } finally {
-      await stopPluginChannelGateways(pluginGatewayHandles);
-      setPluginRuntimeBridge(null);
+      await new Promise((resolve8) => setTimeout(resolve8, 200));
+    }
+    return false;
+  }
+  createMissingProvider(config2) {
+    return this.makeMissingProvider(config2);
+  }
+  createProvider(config2, options) {
+    if (options?.allowMissing) {
+      return this.makeProvider(config2, { allowMissing: true });
+    }
+    return this.makeProvider(config2);
+  }
+  makeMissingProvider(config2) {
+    return new MissingProvider(config2.agents.defaults.model);
+  }
+  makeProvider(config2, options) {
+    const provider = getProvider(config2);
+    const model = config2.agents.defaults.model;
+    if (!provider?.apiKey && !model.startsWith("bedrock/")) {
+      if (options?.allowMissing) {
+        return null;
+      }
+      console.error("Error: No API key configured.");
+      console.error(`Set one in ${getConfigPath2()} under providers section`);
+      process.exit(1);
     }
+    return new LiteLLMProvider({
+      apiKey: provider?.apiKey ?? null,
+      apiBase: getApiBase(config2),
+      defaultModel: model,
+      extraHeaders: provider?.extraHeaders ?? null,
+      providerName: getProviderName(config2),
+      wireApi: provider?.wireApi ?? null
+    });
   }
   async printPublicUiUrls(host, port) {
     if (isLoopbackHost(host)) {
@@ -2610,7 +1831,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
-      configPath: getConfigPath(),
+      configPath: getConfigPath2(),
       staticDir: uiStaticDir ?? void 0
     });
     const uiUrl = `http://${uiServer.host}:${uiServer.port}`;
@@ -2623,425 +1844,652 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       openBrowser(uiUrl);
     }
   }
-  async runForeground(options) {
-    const config2 = loadConfig();
-    const uiConfig = resolveUiConfig(config2, options.uiOverrides);
-    const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
-    if (options.open) {
-      openBrowser(uiUrl);
+};
+
+// src/cli/workspace.ts
+import { cpSync, existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync4, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { createRequire } from "module";
+import { dirname, join as join5, resolve as resolve6 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { APP_NAME as APP_NAME3, getDataDir as getDataDir5 } from "@nextclaw/core";
+import { spawnSync as spawnSync4 } from "child_process";
+var WorkspaceManager = class {
+  constructor(logo) {
+    this.logo = logo;
+  }
+  createWorkspaceTemplates(workspace, options = {}) {
+    const created = [];
+    const force = Boolean(options.force);
+    const templateDir = this.resolveTemplateDir();
+    if (!templateDir) {
+      console.warn("Warning: Template directory not found. Skipping workspace templates.");
+      return { created };
     }
-    await this.startGateway({
-      uiOverrides: options.uiOverrides,
-      allowMissingProvider: true,
-      uiStaticDir: resolveUiStaticDir()
+    const templateFiles = [
+      { source: "AGENTS.md", target: "AGENTS.md" },
+      { source: "SOUL.md", target: "SOUL.md" },
+      { source: "USER.md", target: "USER.md" },
+      { source: "IDENTITY.md", target: "IDENTITY.md" },
+      { source: "TOOLS.md", target: "TOOLS.md" },
+      { source: "USAGE.md", target: "USAGE.md" },
+      { source: "BOOT.md", target: "BOOT.md" },
+      { source: "BOOTSTRAP.md", target: "BOOTSTRAP.md" },
+      { source: "HEARTBEAT.md", target: "HEARTBEAT.md" },
+      { source: "MEMORY.md", target: "MEMORY.md" },
+      { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
+    ];
+    for (const entry of templateFiles) {
+      const filePath = join5(workspace, entry.target);
+      if (!force && existsSync5(filePath)) {
+        continue;
+      }
+      const templatePath = join5(templateDir, entry.source);
+      if (!existsSync5(templatePath)) {
+        console.warn(`Warning: Template file missing: ${templatePath}`);
+        continue;
+      }
+      const raw = readFileSync4(templatePath, "utf-8");
+      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME3);
+      mkdirSync3(dirname(filePath), { recursive: true });
+      writeFileSync2(filePath, content);
+      created.push(entry.target);
+    }
+    const memoryDir = join5(workspace, "memory");
+    if (!existsSync5(memoryDir)) {
+      mkdirSync3(memoryDir, { recursive: true });
+      created.push(join5("memory", ""));
+    }
+    const skillsDir = join5(workspace, "skills");
+    if (!existsSync5(skillsDir)) {
+      mkdirSync3(skillsDir, { recursive: true });
+      created.push(join5("skills", ""));
+    }
+    const seeded = this.seedBuiltinSkills(skillsDir, { force });
+    if (seeded > 0) {
+      created.push(`skills (seeded ${seeded} built-ins)`);
+    }
+    return { created };
+  }
+  seedBuiltinSkills(targetDir, options = {}) {
+    const sourceDir = this.resolveBuiltinSkillsDir();
+    if (!sourceDir) {
+      return 0;
+    }
+    const force = Boolean(options.force);
+    let seeded = 0;
+    for (const entry of readdirSync(sourceDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) {
+        continue;
+      }
+      const src = join5(sourceDir, entry.name);
+      if (!existsSync5(join5(src, "SKILL.md"))) {
+        continue;
+      }
+      const dest = join5(targetDir, entry.name);
+      if (!force && existsSync5(dest)) {
+        continue;
+      }
+      cpSync(src, dest, { recursive: true, force: true });
+      seeded += 1;
+    }
+    return seeded;
+  }
+  resolveBuiltinSkillsDir() {
+    try {
+      const require2 = createRequire(import.meta.url);
+      const entry = require2.resolve("@nextclaw/core");
+      const pkgRoot = resolve6(dirname(entry), "..");
+      const distSkills = join5(pkgRoot, "dist", "skills");
+      if (existsSync5(distSkills)) {
+        return distSkills;
+      }
+      const srcSkills = join5(pkgRoot, "src", "agent", "skills");
+      if (existsSync5(srcSkills)) {
+        return srcSkills;
+      }
+      return null;
+    } catch {
+      return null;
+    }
+  }
+  resolveTemplateDir() {
+    const override = process.env.NEXTCLAW_TEMPLATE_DIR?.trim();
+    if (override) {
+      return override;
+    }
+    const cliDir = resolve6(fileURLToPath2(new URL(".", import.meta.url)));
+    const pkgRoot = resolve6(cliDir, "..", "..");
+    const candidates = [join5(pkgRoot, "templates")];
+    for (const candidate of candidates) {
+      if (existsSync5(candidate)) {
+        return candidate;
+      }
+    }
+    return null;
+  }
+  getBridgeDir() {
+    const userBridge = join5(getDataDir5(), "bridge");
+    if (existsSync5(join5(userBridge, "dist", "index.js"))) {
+      return userBridge;
+    }
+    if (!which("npm")) {
+      console.error("npm not found. Please install Node.js >= 18.");
+      process.exit(1);
+    }
+    const cliDir = resolve6(fileURLToPath2(new URL(".", import.meta.url)));
+    const pkgRoot = resolve6(cliDir, "..", "..");
+    const pkgBridge = join5(pkgRoot, "bridge");
+    const srcBridge = join5(pkgRoot, "..", "..", "bridge");
+    let source = null;
+    if (existsSync5(join5(pkgBridge, "package.json"))) {
+      source = pkgBridge;
+    } else if (existsSync5(join5(srcBridge, "package.json"))) {
+      source = srcBridge;
+    }
+    if (!source) {
+      console.error(`Bridge source not found. Try reinstalling ${APP_NAME3}.`);
+      process.exit(1);
+    }
+    console.log(`${this.logo} Setting up bridge...`);
+    mkdirSync3(resolve6(userBridge, ".."), { recursive: true });
+    if (existsSync5(userBridge)) {
+      rmSync2(userBridge, { recursive: true, force: true });
+    }
+    cpSync(source, userBridge, {
+      recursive: true,
+      filter: (src) => !src.includes("node_modules") && !src.includes("dist")
     });
+    const install = spawnSync4("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
+    if (install.status !== 0) {
+      console.error(`Bridge install failed: ${install.status ?? 1}`);
+      if (install.stderr) {
+        console.error(String(install.stderr).slice(0, 500));
+      }
+      process.exit(1);
+    }
+    const build = spawnSync4("npm", ["run", "build"], { cwd: userBridge, stdio: "pipe" });
+    if (build.status !== 0) {
+      console.error(`Bridge build failed: ${build.status ?? 1}`);
+      if (build.stderr) {
+        console.error(String(build.stderr).slice(0, 500));
+      }
+      process.exit(1);
+    }
+    console.log("\u2713 Bridge ready\n");
+    return userBridge;
   }
-  async startService(options) {
-    const config2 = loadConfig();
-    const uiConfig = resolveUiConfig(config2, options.uiOverrides);
-    const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
-    const apiUrl = `${uiUrl}/api`;
-    const staticDir = resolveUiStaticDir();
-    const existing = readServiceState();
-    if (existing && isProcessRunning(existing.pid)) {
-      console.log(`\u2713 ${APP_NAME} is already running (PID ${existing.pid})`);
-      console.log(`UI: ${existing.uiUrl}`);
-      console.log(`API: ${existing.apiUrl}`);
-      const parsedUi = (() => {
-        try {
-          const parsed = new URL(existing.uiUrl);
-          const port = Number(parsed.port || 80);
-          return {
-            host: existing.uiHost ?? parsed.hostname,
-            port: Number.isFinite(port) ? port : existing.uiPort ?? 18791
-          };
-        } catch {
-          return {
-            host: existing.uiHost ?? "127.0.0.1",
-            port: existing.uiPort ?? 18791
-          };
-        }
-      })();
-      if (parsedUi.host !== uiConfig.host || parsedUi.port !== uiConfig.port) {
-        console.log(
-          `Detected running service UI bind (${parsedUi.host}:${parsedUi.port}); enforcing (${uiConfig.host}:${uiConfig.port})...`
-        );
-        await this.stopService();
-        const stateAfterStop = readServiceState();
-        if (stateAfterStop && isProcessRunning(stateAfterStop.pid)) {
-          console.error("Error: Failed to stop running service while enforcing public UI exposure.");
-          return;
-        }
-        return this.startService(options);
+};
+
+// src/cli/runtime.ts
+var LOGO = "\u{1F916}";
+var EXIT_COMMANDS = /* @__PURE__ */ new Set(["exit", "quit", "/exit", "/quit", ":q"]);
+var FORCED_PUBLIC_UI_HOST = "0.0.0.0";
+var CliRuntime = class {
+  logo;
+  restartCoordinator;
+  serviceRestartTask = null;
+  selfRelaunchArmed = false;
+  workspaceManager;
+  serviceCommands;
+  configCommands;
+  channelCommands;
+  cronCommands;
+  diagnosticsCommands;
+  constructor(options = {}) {
+    this.logo = options.logo ?? LOGO;
+    this.workspaceManager = new WorkspaceManager(this.logo);
+    this.serviceCommands = new ServiceCommands({
+      requestRestart: (params) => this.requestRestart(params)
+    });
+    this.configCommands = new ConfigCommands({
+      requestRestart: (params) => this.requestRestart(params)
+    });
+    this.channelCommands = new ChannelCommands({
+      logo: this.logo,
+      getBridgeDir: () => this.workspaceManager.getBridgeDir()
+    });
+    this.cronCommands = new CronCommands();
+    this.diagnosticsCommands = new DiagnosticsCommands({ logo: this.logo });
+    this.restartCoordinator = new RestartCoordinator({
+      readServiceState,
+      isProcessRunning,
+      currentPid: () => process.pid,
+      restartBackgroundService: async (reason) => this.restartBackgroundService(reason),
+      scheduleProcessExit: (delayMs, reason) => this.scheduleProcessExit(delayMs, reason)
+    });
+  }
+  get version() {
+    return getPackageVersion();
+  }
+  scheduleProcessExit(delayMs, reason) {
+    console.warn(`Gateway restart requested (${reason}).`);
+    setTimeout(() => {
+      process.exit(0);
+    }, delayMs);
+  }
+  async restartBackgroundService(reason) {
+    if (this.serviceRestartTask) {
+      return this.serviceRestartTask;
+    }
+    this.serviceRestartTask = (async () => {
+      const state = readServiceState();
+      if (!state || !isProcessRunning(state.pid) || state.pid === process.pid) {
+        return false;
       }
-      await this.printPublicUiUrls(parsedUi.host, parsedUi.port);
-      console.log(`Logs: ${existing.logPath}`);
-      console.log(`Stop: ${APP_NAME} stop`);
+      const uiHost = FORCED_PUBLIC_UI_HOST;
+      const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
+      console.log(`Applying changes (${reason}): restarting ${APP_NAME4} background service...`);
+      await this.serviceCommands.stopService();
+      await this.serviceCommands.startService({
+        uiOverrides: {
+          enabled: true,
+          host: uiHost,
+          port: uiPort
+        },
+        open: false
+      });
+      return true;
+    })();
+    try {
+      return await this.serviceRestartTask;
+    } finally {
+      this.serviceRestartTask = null;
+    }
+  }
+  armManagedServiceRelaunch(params) {
+    const strategy = params.strategy ?? "background-service-or-manual";
+    if (strategy !== "background-service-or-exit" && strategy !== "exit-process") {
       return;
     }
-    if (existing) {
-      clearServiceState();
+    if (this.selfRelaunchArmed) {
+      return;
     }
-    if (!staticDir) {
-      console.log("Warning: UI frontend not found in package assets.");
+    const state = readServiceState();
+    if (!state || state.pid !== process.pid) {
+      return;
     }
-    const logPath = resolveServiceLogPath();
-    const logDir = resolve4(logPath, "..");
-    mkdirSync2(logDir, { recursive: true });
-    const logFd = openSync(logPath, "a");
-    const serveArgs = buildServeArgs({
-      uiPort: uiConfig.port
+    const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
+    const delayMs = typeof params.delayMs === "number" && Number.isFinite(params.delayMs) ? Math.max(0, Math.floor(params.delayMs)) : 100;
+    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath3(new URL("./index.js", import.meta.url));
+    const startArgs = [cliPath, "start", "--ui-port", String(uiPort)];
+    const serviceStatePath = resolve7(getDataDir6(), "run", "service.json");
+    const helperScript = [
+      'const { spawnSync } = require("node:child_process");',
+      'const { readFileSync } = require("node:fs");',
+      `const parentPid = ${process.pid};`,
+      `const delayMs = ${delayMs};`,
+      "const maxWaitMs = 120000;",
+      "const retryIntervalMs = 1000;",
+      "const startTimeoutMs = 60000;",
+      `const nodePath = ${JSON.stringify(process.execPath)};`,
+      `const startArgs = ${JSON.stringify(startArgs)};`,
+      `const serviceStatePath = ${JSON.stringify(serviceStatePath)};`,
+      "function isRunning(pid) {",
+      "  try {",
+      "    process.kill(pid, 0);",
+      "    return true;",
+      "  } catch {",
+      "    return false;",
+      "  }",
+      "}",
+      "function hasReplacementService() {",
+      "  try {",
+      '    const raw = readFileSync(serviceStatePath, "utf-8");',
+      "    const state = JSON.parse(raw);",
+      "    const pid = Number(state?.pid);",
+      "    return Number.isFinite(pid) && pid > 0 && pid !== parentPid && isRunning(pid);",
+      "  } catch {",
+      "    return false;",
+      "  }",
+      "}",
+      "function tryStart() {",
+      "  spawnSync(nodePath, startArgs, {",
+      '    stdio: "ignore",',
+      "    env: process.env,",
+      "    timeout: startTimeoutMs",
+      "  });",
+      "}",
+      "setTimeout(() => {",
+      "  const startedAt = Date.now();",
+      "  const tick = () => {",
+      "    if (hasReplacementService()) {",
+      "      process.exit(0);",
+      "      return;",
+      "    }",
+      "    if (Date.now() - startedAt >= maxWaitMs) {",
+      "      process.exit(0);",
+      "      return;",
+      "    }",
+      "    tryStart();",
+      "    if (hasReplacementService()) {",
+      "      process.exit(0);",
+      "      return;",
+      "    }",
+      "    setTimeout(tick, retryIntervalMs);",
+      "  };",
+      "  tick();",
+      "}, delayMs);"
+    ].join("\n");
+    try {
+      const helper = spawn3(process.execPath, ["-e", helperScript], {
+        detached: true,
+        stdio: "ignore",
+        env: process.env
+      });
+      helper.unref();
+      this.selfRelaunchArmed = true;
+      console.warn(`Gateway self-restart armed (${params.reason}).`);
+    } catch (error) {
+      console.error(`Failed to arm gateway self-restart: ${String(error)}`);
+    }
+  }
+  async requestRestart(params) {
+    this.armManagedServiceRelaunch({
+      reason: params.reason,
+      strategy: params.strategy,
+      delayMs: params.delayMs
     });
-    const child = spawn2(process.execPath, [...process.execArgv, ...serveArgs], {
-      env: process.env,
-      stdio: ["ignore", logFd, logFd],
-      detached: true
+    const result = await this.restartCoordinator.requestRestart({
+      reason: params.reason,
+      strategy: params.strategy,
+      delayMs: params.delayMs,
+      manualMessage: params.manualMessage
     });
-    closeSync(logFd);
-    if (!child.pid) {
-      console.error("Error: Failed to start background service.");
+    if (result.status === "manual-required" || result.status === "restart-in-progress") {
+      console.log(result.message);
       return;
     }
-    const healthUrl = `${apiUrl}/health`;
-    const started = await this.waitForBackgroundServiceReady({
-      pid: child.pid,
-      healthUrl,
-      timeoutMs: 8e3
-    });
-    if (!started) {
-      if (isProcessRunning(child.pid)) {
-        try {
-          process.kill(child.pid, "SIGTERM");
-          await waitForExit(child.pid, 2e3);
-        } catch {
-        }
+    if (result.status === "service-restarted") {
+      if (!params.silentOnServiceRestart) {
+        console.log(result.message);
       }
-      clearServiceState();
-      console.error(`Error: Failed to start background service. Check logs: ${logPath}`);
       return;
     }
-    child.unref();
-    const state = {
-      pid: child.pid,
-      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      uiUrl,
-      apiUrl,
-      uiHost: uiConfig.host,
-      uiPort: uiConfig.port,
-      logPath
-    };
-    writeServiceState(state);
-    console.log(`\u2713 ${APP_NAME} started in background (PID ${state.pid})`);
-    console.log(`UI: ${uiUrl}`);
-    console.log(`API: ${apiUrl}`);
-    await this.printPublicUiUrls(uiConfig.host, uiConfig.port);
-    console.log(`Logs: ${logPath}`);
-    console.log(`Stop: ${APP_NAME} stop`);
-    if (options.open) {
-      openBrowser(uiUrl);
-    }
+    console.warn(result.message);
   }
-  async waitForBackgroundServiceReady(params) {
-    const startedAt = Date.now();
-    while (Date.now() - startedAt < params.timeoutMs) {
-      if (!isProcessRunning(params.pid)) {
-        return false;
-      }
-      try {
-        const response = await fetch(params.healthUrl, { method: "GET" });
-        if (!response.ok) {
-          await new Promise((resolve5) => setTimeout(resolve5, 200));
-          continue;
-        }
-        const payload = await response.json();
-        const healthy = payload?.ok === true && payload?.data?.status === "ok";
-        if (!healthy) {
-          await new Promise((resolve5) => setTimeout(resolve5, 200));
-          continue;
-        }
-        await new Promise((resolve5) => setTimeout(resolve5, 300));
-        if (isProcessRunning(params.pid)) {
-          return true;
-        }
-      } catch {
-      }
-      await new Promise((resolve5) => setTimeout(resolve5, 200));
-    }
-    return false;
+  async onboard() {
+    console.warn(`Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`);
+    await this.init({ source: "onboard" });
   }
-  async stopService() {
-    const state = readServiceState();
-    if (!state) {
-      console.log("No running service found.");
-      return;
+  async init(options = {}) {
+    const source = options.source ?? "init";
+    const prefix = options.auto ? "Auto init" : "Init";
+    const force = Boolean(options.force);
+    const configPath = getConfigPath3();
+    let createdConfig = false;
+    if (!existsSync6(configPath)) {
+      const config3 = ConfigSchema2.parse({});
+      saveConfig3(config3);
+      createdConfig = true;
     }
-    if (!isProcessRunning(state.pid)) {
-      console.log("Service is not running. Cleaning up state.");
-      clearServiceState();
-      return;
+    const config2 = loadConfig5();
+    const workspaceSetting = config2.agents.defaults.workspace;
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join6(getDataDir6(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
+    const workspaceExisted = existsSync6(workspacePath);
+    mkdirSync4(workspacePath, { recursive: true });
+    const templateResult = this.workspaceManager.createWorkspaceTemplates(workspacePath, { force });
+    if (createdConfig) {
+      console.log(`\u2713 ${prefix}: created config at ${configPath}`);
     }
-    console.log(`Stopping ${APP_NAME} (PID ${state.pid})...`);
-    try {
-      process.kill(state.pid, "SIGTERM");
-    } catch (error) {
-      console.error(`Failed to stop service: ${String(error)}`);
-      return;
+    if (!workspaceExisted) {
+      console.log(`\u2713 ${prefix}: created workspace at ${workspacePath}`);
     }
-    const stopped = await waitForExit(state.pid, 3e3);
-    if (!stopped) {
-      try {
-        process.kill(state.pid, "SIGKILL");
-      } catch (error) {
-        console.error(`Failed to force stop service: ${String(error)}`);
-        return;
-      }
-      await waitForExit(state.pid, 2e3);
+    for (const file of templateResult.created) {
+      console.log(`\u2713 ${prefix}: created ${file}`);
+    }
+    if (!createdConfig && workspaceExisted && templateResult.created.length === 0) {
+      console.log(`${prefix}: already initialized.`);
+    }
+    if (!options.auto) {
+      console.log(`
+${this.logo} ${APP_NAME4} is ready! (${source})`);
+      console.log("\nNext steps:");
+      console.log(`  1. Add your API key to ${configPath}`);
+      console.log(`  2. Chat: ${APP_NAME4} agent -m "Hello!"`);
+    } else {
+      console.log(`Tip: Run "${APP_NAME4} init${force ? " --force" : ""}" to re-run initialization if needed.`);
     }
-    clearServiceState();
-    console.log(`\u2713 ${APP_NAME} stopped`);
   }
-  async confirmYesNo(question) {
-    const rl = createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-    const answer = await new Promise((resolve5) => {
-      rl.question(`${question} [y/N] `, (line) => resolve5(line));
-    });
-    rl.close();
-    const normalized = answer.trim().toLowerCase();
-    return normalized === "y" || normalized === "yes";
+  async gateway(opts) {
+    const uiOverrides = {
+      host: FORCED_PUBLIC_UI_HOST
+    };
+    if (opts.ui) {
+      uiOverrides.enabled = true;
+    }
+    if (opts.uiPort) {
+      uiOverrides.port = Number(opts.uiPort);
+    }
+    if (opts.uiOpen) {
+      uiOverrides.open = true;
+    }
+    await this.serviceCommands.startGateway({ uiOverrides });
   }
-  makeMissingProvider(config2) {
-    return new MissingProvider(config2.agents.defaults.model);
+  async ui(opts) {
+    const uiOverrides = {
+      enabled: true,
+      host: FORCED_PUBLIC_UI_HOST,
+      open: Boolean(opts.open)
+    };
+    if (opts.port) {
+      uiOverrides.port = Number(opts.port);
+    }
+    await this.serviceCommands.startGateway({ uiOverrides, allowMissingProvider: true });
   }
-  makeProvider(config2, options) {
-    const provider = getProvider(config2);
-    const model = config2.agents.defaults.model;
-    if (!provider?.apiKey && !model.startsWith("bedrock/")) {
-      if (options?.allowMissing) {
-        return null;
-      }
-      console.error("Error: No API key configured.");
-      console.error(`Set one in ${getConfigPath()} under providers section`);
-      process.exit(1);
+  async start(opts) {
+    await this.init({ source: "start", auto: true });
+    const uiOverrides = {
+      enabled: true,
+      host: FORCED_PUBLIC_UI_HOST,
+      open: false
+    };
+    if (opts.uiPort) {
+      uiOverrides.port = Number(opts.uiPort);
     }
-    return new LiteLLMProvider({
-      apiKey: provider?.apiKey ?? null,
-      apiBase: getApiBase(config2),
-      defaultModel: model,
-      extraHeaders: provider?.extraHeaders ?? null,
-      providerName: getProviderName(config2),
-      wireApi: provider?.wireApi ?? null
+    await this.serviceCommands.startService({
+      uiOverrides,
+      open: Boolean(opts.open)
     });
   }
-  resolveFileNpmSpecToLocalPath(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed.toLowerCase().startsWith("file:")) {
-      return null;
-    }
-    const rest = trimmed.slice("file:".length);
-    if (!rest) {
-      return { ok: false, error: "unsupported file: spec: missing path" };
-    }
-    if (rest.startsWith("///")) {
-      return { ok: true, path: rest.slice(2) };
-    }
-    if (rest.startsWith("//localhost/")) {
-      return { ok: true, path: rest.slice("//localhost".length) };
-    }
-    if (rest.startsWith("//")) {
-      return {
-        ok: false,
-        error: 'unsupported file: URL host (expected "file:<path>" or "file:///abs/path")'
-      };
+  async restart(opts) {
+    const state = readServiceState();
+    if (state && isProcessRunning(state.pid)) {
+      console.log(`Restarting ${APP_NAME4}...`);
+      await this.serviceCommands.stopService();
+    } else if (state) {
+      clearServiceState();
+      console.log("Service state was stale and has been cleaned up.");
+    } else {
+      console.log("No running service found. Starting a new service.");
     }
-    return { ok: true, path: rest };
+    await this.start(opts);
   }
-  looksLikePath(raw) {
-    return raw.startsWith(".") || raw.startsWith("~") || raw.startsWith("/") || raw.endsWith(".ts") || raw.endsWith(".js") || raw.endsWith(".mjs") || raw.endsWith(".cjs") || raw.endsWith(".tgz") || raw.endsWith(".tar.gz") || raw.endsWith(".tar") || raw.endsWith(".zip");
+  async serve(opts) {
+    const uiOverrides = {
+      enabled: true,
+      host: FORCED_PUBLIC_UI_HOST,
+      open: false
+    };
+    if (opts.uiPort) {
+      uiOverrides.port = Number(opts.uiPort);
+    }
+    await this.serviceCommands.runForeground({
+      uiOverrides,
+      open: Boolean(opts.open)
+    });
   }
-  isArchivePath(filePath) {
-    const lower = filePath.toLowerCase();
-    return lower.endsWith(".zip") || lower.endsWith(".tgz") || lower.endsWith(".tar.gz") || lower.endsWith(".tar");
+  async stop() {
+    await this.serviceCommands.stopService();
   }
-  createWorkspaceTemplates(workspace, options = {}) {
-    const created = [];
-    const force = Boolean(options.force);
-    const templateDir = this.resolveTemplateDir();
-    if (!templateDir) {
-      console.warn("Warning: Template directory not found. Skipping workspace templates.");
-      return { created };
+  async agent(opts) {
+    const config2 = loadConfig5();
+    const workspace = getWorkspacePath3(config2.agents.defaults.workspace);
+    const bus = new MessageBus2();
+    const provider = this.serviceCommands.createProvider(config2) ?? this.serviceCommands.createMissingProvider(config2);
+    const providerManager = new ProviderManager2(provider);
+    const agentLoop = new AgentLoop2({
+      bus,
+      providerManager,
+      workspace,
+      model: config2.agents.defaults.model,
+      maxIterations: config2.agents.defaults.maxToolIterations,
+      maxTokens: config2.agents.defaults.maxTokens,
+      temperature: config2.agents.defaults.temperature,
+      braveApiKey: config2.tools.web.search.apiKey || void 0,
+      execConfig: config2.tools.exec,
+      restrictToWorkspace: config2.tools.restrictToWorkspace,
+      contextConfig: config2.agents.context,
+      config: config2
+    });
+    if (opts.message) {
+      const response = await agentLoop.processDirect({
+        content: opts.message,
+        sessionKey: opts.session ?? "cli:default",
+        channel: "cli",
+        chatId: "direct"
+      });
+      printAgentResponse(response);
+      return;
     }
-    const templateFiles = [
-      { source: "AGENTS.md", target: "AGENTS.md" },
-      { source: "SOUL.md", target: "SOUL.md" },
-      { source: "USER.md", target: "USER.md" },
-      { source: "IDENTITY.md", target: "IDENTITY.md" },
-      { source: "TOOLS.md", target: "TOOLS.md" },
-      { source: "USAGE.md", target: "USAGE.md" },
-      { source: "BOOT.md", target: "BOOT.md" },
-      { source: "BOOTSTRAP.md", target: "BOOTSTRAP.md" },
-      { source: "HEARTBEAT.md", target: "HEARTBEAT.md" },
-      { source: "MEMORY.md", target: "MEMORY.md" },
-      { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
-    ];
-    for (const entry of templateFiles) {
-      const filePath = join3(workspace, entry.target);
-      if (!force && existsSync4(filePath)) {
+    console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
+`);
+    const historyFile = join6(getDataDir6(), "history", "cli_history");
+    const historyDir = resolve7(historyFile, "..");
+    mkdirSync4(historyDir, { recursive: true });
+    const history = existsSync6(historyFile) ? readFileSync5(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.on("close", () => {
+      const merged = history.concat(rl.history ?? []);
+      writeFileSync3(historyFile, merged.join("\n"));
+      process.exit(0);
+    });
+    let running = true;
+    while (running) {
+      const line = await prompt(rl, "You: ");
+      const trimmed = line.trim();
+      if (!trimmed) {
         continue;
       }
-      const templatePath = join3(templateDir, entry.source);
-      if (!existsSync4(templatePath)) {
-        console.warn(`Warning: Template file missing: ${templatePath}`);
-        continue;
+      if (EXIT_COMMANDS.has(trimmed.toLowerCase())) {
+        rl.close();
+        running = false;
+        break;
       }
-      const raw = readFileSync3(templatePath, "utf-8");
-      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME);
-      mkdirSync2(dirname(filePath), { recursive: true });
-      writeFileSync2(filePath, content);
-      created.push(entry.target);
-    }
-    const memoryDir = join3(workspace, "memory");
-    if (!existsSync4(memoryDir)) {
-      mkdirSync2(memoryDir, { recursive: true });
-      created.push(join3("memory", ""));
-    }
-    const skillsDir = join3(workspace, "skills");
-    if (!existsSync4(skillsDir)) {
-      mkdirSync2(skillsDir, { recursive: true });
-      created.push(join3("skills", ""));
-    }
-    const seeded = this.seedBuiltinSkills(skillsDir, { force });
-    if (seeded > 0) {
-      created.push(`skills (seeded ${seeded} built-ins)`);
+      const response = await agentLoop.processDirect({
+        content: trimmed,
+        sessionKey: opts.session ?? "cli:default"
+      });
+      printAgentResponse(response);
     }
-    return { created };
   }
-  seedBuiltinSkills(targetDir, options = {}) {
-    const sourceDir = this.resolveBuiltinSkillsDir();
-    if (!sourceDir) {
-      return 0;
-    }
-    const force = Boolean(options.force);
-    let seeded = 0;
-    for (const entry of readdirSync(sourceDir, { withFileTypes: true })) {
-      if (!entry.isDirectory()) {
-        continue;
-      }
-      const src = join3(sourceDir, entry.name);
-      if (!existsSync4(join3(src, "SKILL.md"))) {
-        continue;
-      }
-      const dest = join3(targetDir, entry.name);
-      if (!force && existsSync4(dest)) {
-        continue;
+  async update(opts) {
+    let timeoutMs;
+    if (opts.timeout !== void 0) {
+      const parsed = Number(opts.timeout);
+      if (!Number.isFinite(parsed) || parsed <= 0) {
+        console.error("Invalid --timeout value. Provide milliseconds (e.g. 1200000).");
+        process.exit(1);
       }
-      cpSync(src, dest, { recursive: true, force: true });
-      seeded += 1;
+      timeoutMs = parsed;
     }
-    return seeded;
-  }
-  resolveBuiltinSkillsDir() {
-    try {
-      const require2 = createRequire(import.meta.url);
-      const entry = require2.resolve("@nextclaw/core");
-      const pkgRoot = resolve4(dirname(entry), "..");
-      const distSkills = join3(pkgRoot, "dist", "skills");
-      if (existsSync4(distSkills)) {
-        return distSkills;
-      }
-      const srcSkills = join3(pkgRoot, "src", "agent", "skills");
-      if (existsSync4(srcSkills)) {
-        return srcSkills;
+    const result = runSelfUpdate({ timeoutMs, cwd: process.cwd() });
+    const printSteps = () => {
+      for (const step of result.steps) {
+        console.log(`- ${step.cmd} ${step.args.join(" ")} (code ${step.code ?? "?"})`);
+        if (step.stderr) {
+          console.log(`  stderr: ${step.stderr}`);
+        }
+        if (step.stdout) {
+          console.log(`  stdout: ${step.stdout}`);
+        }
       }
-      return null;
-    } catch {
-      return null;
-    }
-  }
-  resolveTemplateDir() {
-    const override = process.env.NEXTCLAW_TEMPLATE_DIR?.trim();
-    if (override) {
-      return override;
-    }
-    const cliDir = resolve4(fileURLToPath2(new URL(".", import.meta.url)));
-    const pkgRoot = resolve4(cliDir, "..", "..");
-    const candidates = [join3(pkgRoot, "templates")];
-    for (const candidate of candidates) {
-      if (existsSync4(candidate)) {
-        return candidate;
+    };
+    if (!result.ok) {
+      console.error(`Update failed: ${result.error ?? "unknown error"}`);
+      if (result.steps.length > 0) {
+        printSteps();
       }
-    }
-    return null;
-  }
-  getBridgeDir() {
-    const userBridge = join3(getDataDir2(), "bridge");
-    if (existsSync4(join3(userBridge, "dist", "index.js"))) {
-      return userBridge;
-    }
-    if (!which("npm")) {
-      console.error("npm not found. Please install Node.js >= 18.");
-      process.exit(1);
-    }
-    const cliDir = resolve4(fileURLToPath2(new URL(".", import.meta.url)));
-    const pkgRoot = resolve4(cliDir, "..", "..");
-    const pkgBridge = join3(pkgRoot, "bridge");
-    const srcBridge = join3(pkgRoot, "..", "..", "bridge");
-    let source = null;
-    if (existsSync4(join3(pkgBridge, "package.json"))) {
-      source = pkgBridge;
-    } else if (existsSync4(join3(srcBridge, "package.json"))) {
-      source = srcBridge;
-    }
-    if (!source) {
-      console.error(`Bridge source not found. Try reinstalling ${APP_NAME}.`);
       process.exit(1);
     }
-    console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync2(resolve4(userBridge, ".."), { recursive: true });
-    if (existsSync4(userBridge)) {
-      rmSync2(userBridge, { recursive: true, force: true });
+    console.log(`\u2713 Update complete (${result.strategy})`);
+    const state = readServiceState();
+    if (state && isProcessRunning(state.pid)) {
+      console.log(`Tip: restart ${APP_NAME4} to apply the update.`);
     }
-    cpSync(source, userBridge, {
-      recursive: true,
-      filter: (src) => !src.includes("node_modules") && !src.includes("dist")
+  }
+  configGet(pathExpr, opts = {}) {
+    this.configCommands.configGet(pathExpr, opts);
+  }
+  async configSet(pathExpr, value, opts = {}) {
+    await this.configCommands.configSet(pathExpr, value, opts);
+  }
+  async configUnset(pathExpr) {
+    await this.configCommands.configUnset(pathExpr);
+  }
+  channelsStatus() {
+    this.channelCommands.channelsStatus();
+  }
+  channelsLogin() {
+    this.channelCommands.channelsLogin();
+  }
+  cronList(opts) {
+    this.cronCommands.cronList(opts);
+  }
+  cronAdd(opts) {
+    this.cronCommands.cronAdd(opts);
+  }
+  cronRemove(jobId) {
+    this.cronCommands.cronRemove(jobId);
+  }
+  cronEnable(jobId, opts) {
+    this.cronCommands.cronEnable(jobId, opts);
+  }
+  async cronRun(jobId, opts) {
+    await this.cronCommands.cronRun(jobId, opts);
+  }
+  async status(opts = {}) {
+    await this.diagnosticsCommands.status(opts);
+  }
+  async doctor(opts = {}) {
+    await this.diagnosticsCommands.doctor(opts);
+  }
+  async skillsInstall(options) {
+    const workdir = options.workdir ? expandHome(options.workdir) : getWorkspacePath3();
+    const result = await installClawHubSkill({
+      slug: options.slug,
+      version: options.version,
+      registry: options.registry,
+      workdir,
+      dir: options.dir,
+      force: options.force
     });
-    const install = spawnSync3("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
-    if (install.status !== 0) {
-      console.error(`Bridge install failed: ${install.status ?? 1}`);
-      if (install.stderr) {
-        console.error(String(install.stderr).slice(0, 500));
-      }
-      process.exit(1);
+    const versionLabel = result.version ?? "latest";
+    if (result.alreadyInstalled) {
+      console.log(`\u2713 ${result.slug} is already installed`);
+    } else {
+      console.log(`\u2713 Installed ${result.slug}@${versionLabel}`);
     }
-    const build = spawnSync3("npm", ["run", "build"], { cwd: userBridge, stdio: "pipe" });
-    if (build.status !== 0) {
-      console.error(`Bridge build failed: ${build.status ?? 1}`);
-      if (build.stderr) {
-        console.error(String(build.stderr).slice(0, 500));
-      }
-      process.exit(1);
+    if (result.registry) {
+      console.log(`  Registry: ${result.registry}`);
     }
-    console.log("\u2713 Bridge ready\n");
-    return userBridge;
+    console.log(`  Path: ${result.destinationDir}`);
   }
 };
 
 // src/cli/index.ts
 var program = new Command();
 var runtime = new CliRuntime({ logo: LOGO });
-program.name(APP_NAME2).description(`${LOGO} ${APP_NAME2} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
-program.command("onboard").description(`Initialize ${APP_NAME2} configuration and workspace`).action(async () => runtime.onboard());
-program.command("init").description(`Initialize ${APP_NAME2} configuration and workspace`).option("-f, --force", "Overwrite existing template files").action(async (opts) => runtime.init({ force: Boolean(opts.force) }));
-program.command("gateway").description(`Start the ${APP_NAME2} gateway`).option("-p, --port <port>", "Gateway port", "18790").option("-v, --verbose", "Verbose output", false).option("--ui", "Enable UI server", false).option("--ui-port <port>", "UI port").option("--ui-open", "Open browser when UI starts", false).action(async (opts) => runtime.gateway(opts));
-program.command("ui").description(`Start the ${APP_NAME2} UI with gateway`).option("--port <port>", "UI port").option("--no-open", "Disable opening browser").action(async (opts) => runtime.ui(opts));
-program.command("start").description(`Start the ${APP_NAME2} gateway + UI in the background`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.start(opts));
-program.command("restart").description(`Restart the ${APP_NAME2} background service`).option("--ui-port <port>", "UI port").option("--open", "Open browser after restart", false).action(async (opts) => runtime.restart(opts));
-program.command("serve").description(`Run the ${APP_NAME2} gateway + UI in the foreground`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.serve(opts));
-program.command("stop").description(`Stop the ${APP_NAME2} background service`).action(async () => runtime.stop());
+program.name(APP_NAME5).description(`${LOGO} ${APP_NAME5} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
+program.command("onboard").description(`Initialize ${APP_NAME5} configuration and workspace`).action(async () => runtime.onboard());
+program.command("init").description(`Initialize ${APP_NAME5} configuration and workspace`).option("-f, --force", "Overwrite existing template files").action(async (opts) => runtime.init({ force: Boolean(opts.force) }));
+program.command("gateway").description(`Start the ${APP_NAME5} gateway`).option("-p, --port <port>", "Gateway port", "18790").option("-v, --verbose", "Verbose output", false).option("--ui", "Enable UI server", false).option("--ui-port <port>", "UI port").option("--ui-open", "Open browser when UI starts", false).action(async (opts) => runtime.gateway(opts));
+program.command("ui").description(`Start the ${APP_NAME5} UI with gateway`).option("--port <port>", "UI port").option("--no-open", "Disable opening browser").action(async (opts) => runtime.ui(opts));
+program.command("start").description(`Start the ${APP_NAME5} gateway + UI in the background`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.start(opts));
+program.command("restart").description(`Restart the ${APP_NAME5} background service`).option("--ui-port <port>", "UI port").option("--open", "Open browser after restart", false).action(async (opts) => runtime.restart(opts));
+program.command("serve").description(`Run the ${APP_NAME5} gateway + UI in the foreground`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.serve(opts));
+program.command("stop").description(`Stop the ${APP_NAME5} background service`).action(async () => runtime.stop());
 program.command("agent").description("Interact with the agent directly").option("-m, --message <message>", "Message to send to the agent").option("-s, --session <session>", "Session ID", "cli:default").option("--no-markdown", "Disable Markdown rendering").action(async (opts) => runtime.agent(opts));
-program.command("update").description(`Update ${APP_NAME2}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
+program.command("update").description(`Update ${APP_NAME5}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
 var registerClawHubInstall = (cmd) => {
   cmd.command("install <slug>").description("Install a skill from ClawHub").option("--version <version>", "Skill version (default: latest)").option("--registry <url>", "ClawHub registry base URL").option("--workdir <dir>", "Workspace directory to install into").option("--dir <dir>", "Skills directory name (default: skills)").option("-f, --force", "Overwrite existing skill files", false).action(async (slug, opts) => runtime.skillsInstall({ slug, ...opts }));
 };
@@ -3049,20 +2497,11 @@ var skills = program.command("skills").description("Manage skills");
 registerClawHubInstall(skills);
 var clawhub = program.command("clawhub").description("Install skills from ClawHub");
 registerClawHubInstall(clawhub);
-var plugins = program.command("plugins").description("Manage OpenClaw-compatible plugins");
-plugins.command("list").description("List discovered plugins").option("--json", "Print JSON").option("--enabled", "Only show enabled plugins", false).option("--verbose", "Show detailed entries", false).action((opts) => runtime.pluginsList(opts));
-plugins.command("info <id>").description("Show plugin details").option("--json", "Print JSON").action((id, opts) => runtime.pluginsInfo(id, opts));
-plugins.command("enable <id>").description("Enable a plugin in config").action((id) => runtime.pluginsEnable(id));
-plugins.command("disable <id>").description("Disable a plugin in config").action((id) => runtime.pluginsDisable(id));
-plugins.command("uninstall <id>").description("Uninstall a plugin").option("--keep-files", "Keep installed files on disk", false).option("--keep-config", "Deprecated alias for --keep-files", false).option("--force", "Skip confirmation prompt", false).option("--dry-run", "Show what would be removed without making changes", false).action(async (id, opts) => runtime.pluginsUninstall(id, opts));
-plugins.command("install <path-or-spec>").description("Install a plugin (path, archive, or npm spec)").option("-l, --link", "Link a local path instead of copying", false).action(async (pathOrSpec, opts) => runtime.pluginsInstall(pathOrSpec, opts));
-plugins.command("doctor").description("Report plugin load issues").action(() => runtime.pluginsDoctor());
 var config = program.command("config").description("Manage config values");
 config.command("get <path>").description("Get a config value by dot path").option("--json", "Output JSON", false).action((path, opts) => runtime.configGet(path, opts));
 config.command("set <path> <value>").description("Set a config value by dot path").option("--json", "Parse value as JSON", false).action((path, value, opts) => runtime.configSet(path, value, opts));
 config.command("unset <path>").description("Remove a config value by dot path").action((path) => runtime.configUnset(path));
 var channels = program.command("channels").description("Manage channels");
-channels.command("add").description("Configure a plugin channel (OpenClaw-compatible setup)").requiredOption("--channel <id>", "Plugin channel id").option("--code <code>", "Pairing code").option("--token <token>", "Connector token").option("--name <name>", "Display name").option("--url <url>", "API base URL").option("--http-url <url>", "Alias for --url").action((opts) => runtime.channelsAdd(opts));
 channels.command("status").description("Show channel status").action(() => runtime.channelsStatus());
 channels.command("login").description("Link device via QR code").action(() => runtime.channelsLogin());
 var cron = program.command("cron").description("Manage scheduled tasks");
@@ -3071,6 +2510,6 @@ cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOpti
 cron.command("remove <jobId>").action((jobId) => runtime.cronRemove(jobId));
 cron.command("enable <jobId>").option("--disable", "Disable instead of enable").action((jobId, opts) => runtime.cronEnable(jobId, opts));
 cron.command("run <jobId>").option("-f, --force", "Run even if disabled").action(async (jobId, opts) => runtime.cronRun(jobId, opts));
-program.command("status").description(`Show ${APP_NAME2} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
-program.command("doctor").description(`Run ${APP_NAME2} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));
+program.command("status").description(`Show ${APP_NAME5} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
+program.command("doctor").description(`Run ${APP_NAME5} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));
 program.parseAsync(process.argv);