nextclaw 0.4.0 → 0.4.2

package/dist/cli/index.js

@@ -10,7 +10,7 @@ import {
   saveConfig,
   getConfigPath,
   getDataDir as getDataDir2,
-  ConfigSchema,
+  ConfigSchema as ConfigSchema2,
   getApiBase,
   getProvider,
   getProviderName,
@@ -35,20 +35,31 @@ import { startUiServer } from "nextclaw-server";
 import {
   closeSync,
   cpSync,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   mkdirSync as mkdirSync2,
   openSync,
-  readFileSync as readFileSync2,
+  readdirSync,
+  readFileSync as readFileSync3,
   rmSync as rmSync2,
   writeFileSync as writeFileSync2
 } from "fs";
-import { createHash } from "crypto";
-import { dirname, join as join2, resolve as resolve2 } from "path";
-import { spawn as spawn2, spawnSync } from "child_process";
+import { dirname, join as join3, resolve as resolve3 } from "path";
+import { spawn as spawn2, spawnSync as spawnSync2 } from "child_process";
 import { createInterface } from "readline";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { createRequire } from "module";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import chokidar from "chokidar";
 
+// src/cli/gateway/controller.ts
+import { createHash } from "crypto";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { spawnSync } from "child_process";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { join as join2, resolve as resolve2 } from "path";
+import {
+  ConfigSchema
+} from "nextclaw-core";
+
 // src/cli/utils.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from "fs";
 import { join, resolve } from "path";
@@ -87,12 +98,12 @@ async function isPortAvailable(port, host) {
   return await canBindPort(port, checkHost);
 }
 async function canBindPort(port, host) {
-  return await new Promise((resolve3) => {
+  return await new Promise((resolve4) => {
     const server = createServer();
     server.unref();
-    server.once("error", () => resolve3(false));
+    server.once("error", () => resolve4(false));
     server.listen({ port, host }, () => {
-      server.close(() => resolve3(true));
+      server.close(() => resolve4(true));
     });
   });
 }
@@ -150,7 +161,7 @@ async function waitForExit(pid, timeoutMs) {
     if (!isProcessRunning(pid)) {
       return true;
     }
-    await new Promise((resolve3) => setTimeout(resolve3, 200));
+    await new Promise((resolve4) => setTimeout(resolve4, 200));
   }
   return !isProcessRunning(pid);
 }
@@ -281,14 +292,395 @@ function printAgentResponse(response) {
 async function prompt(rl, question) {
   rl.setPrompt(question);
   rl.prompt();
-  return new Promise((resolve3) => {
-    rl.once("line", (line) => resolve3(line));
+  return new Promise((resolve4) => {
+    rl.once("line", (line) => resolve4(line));
   });
 }
 
+// src/cli/gateway/controller.ts
+var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
+var redactConfig = (value) => {
+  if (Array.isArray(value)) {
+    return value.map((entry) => redactConfig(entry));
+  }
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  const entries = value;
+  const output = {};
+  for (const [key, val] of Object.entries(entries)) {
+    if (/apiKey|token|secret|password|appId|clientSecret|accessKey/i.test(key)) {
+      output[key] = val ? "***" : val;
+      continue;
+    }
+    output[key] = redactConfig(val);
+  }
+  return output;
+};
+var readConfigSnapshot = (getConfigPath2) => {
+  const path = getConfigPath2();
+  let raw = "";
+  let parsed = {};
+  if (existsSync2(path)) {
+    raw = readFileSync2(path, "utf-8");
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      parsed = {};
+    }
+  }
+  let config;
+  let valid = true;
+  try {
+    config = ConfigSchema.parse(parsed);
+  } catch {
+    config = ConfigSchema.parse({});
+    valid = false;
+  }
+  if (!raw) {
+    raw = JSON.stringify(config, null, 2);
+  }
+  const hash = hashRaw(raw);
+  const redacted = redactConfig(config);
+  return { raw: valid ? JSON.stringify(redacted, null, 2) : null, hash: valid ? hash : null, config, redacted, valid };
+};
+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);
+      }
+    } else {
+      next[key] = value;
+    }
+  }
+  return next;
+};
+var buildSchemaFromValue = (value) => {
+  if (Array.isArray(value)) {
+    const item = value.length ? buildSchemaFromValue(value[0]) : { type: "string" };
+    return { type: "array", items: item };
+  }
+  if (value && typeof value === "object") {
+    const props = {};
+    for (const [key, val] of Object.entries(value)) {
+      props[key] = buildSchemaFromValue(val);
+    }
+    return { type: "object", properties: props };
+  }
+  if (typeof value === "number") {
+    return { type: "number" };
+  }
+  if (typeof value === "boolean") {
+    return { type: "boolean" };
+  }
+  if (value === null) {
+    return { type: ["null", "string"] };
+  }
+  return { type: "string" };
+};
+var scheduleRestart = (delayMs, reason) => {
+  const delay = typeof delayMs === "number" && Number.isFinite(delayMs) ? Math.max(0, delayMs) : 100;
+  console.log(`Gateway restart requested via tool${reason ? ` (${reason})` : ""}.`);
+  setTimeout(() => {
+    process.exit(0);
+  }, delay);
+};
+var GatewayControllerImpl = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  status() {
+    return {
+      channels: this.deps.reloader.getChannels().enabledChannels,
+      cron: this.deps.cron.status(),
+      configPath: this.deps.getConfigPath()
+    };
+  }
+  async reloadConfig(reason) {
+    return this.deps.reloader.reloadConfig(reason);
+  }
+  async restart(options) {
+    scheduleRestart(options?.delayMs, options?.reason);
+    return "Restart scheduled";
+  }
+  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() {
+    const base = ConfigSchema.parse({});
+    return {
+      schema: {
+        ...buildSchemaFromValue(base),
+        title: "NextClawConfig",
+        description: "NextClaw config schema (simplified)"
+      },
+      uiHints: {},
+      version: getPackageVersion(),
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
+  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 (!snapshot.valid || !snapshot.hash) {
+      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
+    }
+    if (params.baseHash !== snapshot.hash) {
+      return { ok: false, error: "config changed since last load; re-run config.get and retry" };
+    }
+    let parsedRaw;
+    try {
+      parsedRaw = JSON.parse(params.raw);
+    } catch {
+      return { ok: false, error: "invalid JSON in raw config" };
+    }
+    let validated;
+    try {
+      validated = ConfigSchema.parse(parsedRaw);
+    } catch (err) {
+      return { ok: false, error: `invalid config: ${String(err)}` };
+    }
+    this.deps.saveConfig(validated);
+    const delayMs = params.restartDelayMs ?? 0;
+    scheduleRestart(delayMs, "config.apply");
+    return {
+      ok: true,
+      note: params.note ?? null,
+      path: this.deps.getConfigPath(),
+      config: redactConfig(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 (!snapshot.valid || !snapshot.hash) {
+      return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
+    }
+    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;
+    scheduleRestart(delayMs, "config.patch");
+    return {
+      ok: true,
+      note: params.note ?? null,
+      path: this.deps.getConfigPath(),
+      config: redactConfig(validated),
+      restart: { scheduled: true, delayMs }
+    };
+  }
+  async updateRun(params) {
+    const timeoutMs = params.timeoutMs ?? 20 * 6e4;
+    const gatewayDir = resolve2(fileURLToPath2(new URL(".", import.meta.url)));
+    const cliDir = resolve2(gatewayDir, "..");
+    const pkgRoot = resolve2(cliDir, "..", "..");
+    const repoRoot = existsSync2(join2(pkgRoot, ".git")) ? pkgRoot : resolve2(pkgRoot, "..", "..");
+    const steps = [];
+    const runStep = (cmd, args, cwd) => {
+      const result = spawnSync(cmd, args, {
+        cwd,
+        encoding: "utf-8",
+        timeout: timeoutMs,
+        stdio: "pipe"
+      });
+      const step = {
+        cmd,
+        args,
+        cwd,
+        code: result.status,
+        stdout: (result.stdout ?? "").toString().slice(0, 4e3),
+        stderr: (result.stderr ?? "").toString().slice(0, 4e3)
+      };
+      steps.push(step);
+      return { ok: result.status === 0, code: result.status };
+    };
+    const updateCommand = process.env.NEXTCLAW_UPDATE_COMMAND?.trim();
+    if (updateCommand) {
+      const ok = runStep("sh", ["-c", updateCommand], process.cwd());
+      if (!ok.ok) {
+        return { ok: false, error: "update command failed", steps };
+      }
+    } else if (existsSync2(join2(repoRoot, ".git"))) {
+      if (!which("git")) {
+        return { ok: false, error: "git not found for repo update", steps };
+      }
+      const ok = runStep("git", ["-C", repoRoot, "pull", "--rebase"], repoRoot);
+      if (!ok.ok) {
+        return { ok: false, error: "git pull failed", steps };
+      }
+      if (existsSync2(join2(repoRoot, "pnpm-lock.yaml")) && which("pnpm")) {
+        const installOk = runStep("pnpm", ["install"], repoRoot);
+        if (!installOk.ok) {
+          return { ok: false, error: "pnpm install failed", steps };
+        }
+      } else if (existsSync2(join2(repoRoot, "package.json")) && which("npm")) {
+        const installOk = runStep("npm", ["install"], repoRoot);
+        if (!installOk.ok) {
+          return { ok: false, error: "npm install failed", steps };
+        }
+      }
+    } else if (which("npm")) {
+      const ok = runStep("npm", ["i", "-g", "nextclaw"], process.cwd());
+      if (!ok.ok) {
+        return { ok: false, error: "npm install -g nextclaw failed", steps };
+      }
+    } else {
+      return { ok: false, error: "no update strategy available", steps };
+    }
+    const delayMs = params.restartDelayMs ?? 0;
+    scheduleRestart(delayMs, "update.run");
+    return {
+      ok: true,
+      note: params.note ?? null,
+      restart: { scheduled: true, delayMs },
+      steps
+    };
+  }
+};
+
 // src/cli/runtime.ts
 var LOGO = "\u{1F916}";
 var EXIT_COMMANDS = /* @__PURE__ */ new Set(["exit", "quit", "/exit", "/quit", ":q"]);
+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;
+  }
+  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);
+    }
+    if (plan.reloadProviders) {
+      await this.reloadProvider(nextConfig);
+    }
+    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);
+      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;
   constructor(options = {}) {
@@ -307,15 +699,15 @@ var CliRuntime = class {
     const force = Boolean(options.force);
     const configPath = getConfigPath();
     let createdConfig = false;
-    if (!existsSync2(configPath)) {
-      const config2 = ConfigSchema.parse({});
+    if (!existsSync3(configPath)) {
+      const config2 = ConfigSchema2.parse({});
       saveConfig(config2);
       createdConfig = true;
     }
     const config = loadConfig();
     const workspaceSetting = config.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join2(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
-    const workspaceExisted = existsSync2(workspacePath);
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join3(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
+    const workspaceExisted = existsSync3(workspacePath);
     mkdirSync2(workspacePath, { recursive: true });
     const templateResult = this.createWorkspaceTemplates(workspacePath, { force });
     if (createdConfig) {
@@ -479,10 +871,10 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
     console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `);
-    const historyFile = join2(getDataDir2(), "history", "cli_history");
-    const historyDir = resolve2(historyFile, "..");
+    const historyFile = join3(getDataDir2(), "history", "cli_history");
+    const historyDir = resolve3(historyFile, "..");
     mkdirSync2(historyDir, { recursive: true });
-    const history = existsSync2(historyFile) ? readFileSync2(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+    const history = existsSync3(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 ?? []);
@@ -523,13 +915,13 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const bridgeDir = this.getBridgeDir();
     console.log(`${this.logo} Starting bridge...`);
     console.log("Scan the QR code to connect.\n");
-    const result = spawnSync("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
+    const result = spawnSync2("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
     if (result.status !== 0) {
       console.error(`Bridge failed: ${result.status ?? 1}`);
     }
   }
   cronList(opts) {
-    const storePath = join2(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const jobs = service.listJobs(Boolean(opts.all));
     if (!jobs.length) {
@@ -549,7 +941,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronAdd(opts) {
-    const storePath = join2(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     let schedule = null;
     if (opts.every) {
@@ -574,7 +966,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     console.log(`\u2713 Added job '${job.name}' (${job.id})`);
   }
   cronRemove(jobId) {
-    const storePath = join2(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     if (service.removeJob(jobId)) {
       console.log(`\u2713 Removed job ${jobId}`);
@@ -583,7 +975,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronEnable(jobId, opts) {
-    const storePath = join2(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const job = service.enableJob(jobId, !opts.disable);
     if (job) {
@@ -593,7 +985,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   async cronRun(jobId, opts) {
-    const storePath = join2(getDataDir2(), "cron", "jobs.json");
+    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}`);
@@ -604,8 +996,8 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const workspace = getWorkspacePath(config.agents.defaults.workspace);
     console.log(`${this.logo} ${APP_NAME} Status
 `);
-    console.log(`Config: ${configPath} ${existsSync2(configPath) ? "\u2713" : "\u2717"}`);
-    console.log(`Workspace: ${workspace} ${existsSync2(workspace) ? "\u2713" : "\u2717"}`);
+    console.log(`Config: ${configPath} ${existsSync3(configPath) ? "\u2713" : "\u2717"}`);
+    console.log(`Workspace: ${workspace} ${existsSync3(workspace) ? "\u2713" : "\u2717"}`);
     console.log(`Model: ${config.agents.defaults.model}`);
     for (const spec of PROVIDERS) {
       const provider = config.providers[spec.name];
@@ -625,33 +1017,36 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const provider = options.allowMissingProvider === true ? this.makeProvider(config, { allowMissing: true }) : this.makeProvider(config);
     const providerManager = provider ? new ProviderManager(provider) : null;
     const sessionManager = new SessionManager(getWorkspacePath(config.agents.defaults.workspace));
-    const cronStorePath = join2(getDataDir2(), "cron", "jobs.json");
+    const cronStorePath = join3(getDataDir2(), "cron", "jobs.json");
     const cron2 = new CronService(cronStorePath);
     const uiConfig = resolveUiConfig(config, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
     if (!provider) {
-      if (uiConfig.enabled) {
-        const uiServer = startUiServer({
-          host: uiConfig.host,
-          port: uiConfig.port,
-          configPath: getConfigPath(),
-          staticDir: uiStaticDir ?? void 0
-        });
-        const uiUrl = `http://${uiServer.host}:${uiServer.port}`;
-        console.log(`\u2713 UI API: ${uiUrl}/api`);
-        if (uiStaticDir) {
-          console.log(`\u2713 UI frontend: ${uiUrl}`);
-        }
-        if (uiConfig.open) {
-          openBrowser(uiUrl);
-        }
-      }
+      this.startUiIfEnabled(uiConfig, uiStaticDir);
       console.log("Warning: No API key configured. UI server only.");
       await new Promise(() => {
       });
       return;
     }
-    const gatewayController = {};
+    const channels2 = new ChannelManager(config, bus, sessionManager);
+    const reloader = new ConfigReloader({
+      initialConfig: config,
+      channels: channels2,
+      bus,
+      sessionManager,
+      providerManager,
+      makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }),
+      loadConfig,
+      onRestartRequired: (paths) => {
+        console.warn(`Config changes require restart: ${paths.join(", ")}`);
+      }
+    });
+    const gatewayController = new GatewayControllerImpl({
+      reloader,
+      cron: cron2,
+      getConfigPath,
+      saveConfig
+    });
     const agent = new AgentLoop({
       bus,
       providerManager: providerManager ?? new ProviderManager(provider),
@@ -690,385 +1085,12 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       30 * 60,
       true
     );
-    let currentConfig = config;
-    let channels2 = new ChannelManager(currentConfig, bus, sessionManager);
-    let reloadTask = null;
-    const reloadChannels = async (nextConfig) => {
-      if (reloadTask) {
-        await reloadTask;
-        return;
-      }
-      reloadTask = (async () => {
-        await channels2.stopAll();
-        channels2 = new ChannelManager(nextConfig, bus, sessionManager);
-        await channels2.startAll();
-      })();
-      try {
-        await reloadTask;
-      } finally {
-        reloadTask = null;
-      }
-    };
-    let providerReloadTask = null;
-    const reloadProvider = async (nextConfig) => {
-      if (!providerManager) {
-        return;
-      }
-      if (providerReloadTask) {
-        await providerReloadTask;
-        return;
-      }
-      providerReloadTask = (async () => {
-        const nextProvider = this.makeProvider(nextConfig, { allowMissing: true });
-        if (!nextProvider) {
-          console.warn("Provider reload skipped: missing API key.");
-          return;
-        }
-        providerManager.set(nextProvider);
-      })();
-      try {
-        await providerReloadTask;
-      } finally {
-        providerReloadTask = null;
-      }
-    };
-    const applyReloadPlan = async (nextConfig) => {
-      const changedPaths = diffConfigPaths(currentConfig, nextConfig);
-      if (!changedPaths.length) {
-        return;
-      }
-      currentConfig = nextConfig;
-      const plan = buildReloadPlan(changedPaths);
-      if (plan.restartChannels) {
-        await reloadChannels(nextConfig);
-      }
-      if (plan.reloadProviders) {
-        await reloadProvider(nextConfig);
-      }
-      if (plan.restartRequired.length > 0) {
-        console.warn(`Config changes require restart: ${plan.restartRequired.join(", ")}`);
-      }
-    };
-    let reloadTimer = null;
-    let reloadRunning = false;
-    let reloadPending = false;
-    const scheduleConfigReload = (reason) => {
-      if (reloadTimer) {
-        clearTimeout(reloadTimer);
-      }
-      reloadTimer = setTimeout(() => {
-        void runConfigReload(reason);
-      }, 300);
-    };
-    const runConfigReload = async (reason) => {
-      if (reloadRunning) {
-        reloadPending = true;
-        return;
-      }
-      reloadRunning = true;
-      if (reloadTimer) {
-        clearTimeout(reloadTimer);
-        reloadTimer = null;
-      }
-      try {
-        const nextConfig = loadConfig();
-        await applyReloadPlan(nextConfig);
-      } catch (error) {
-        console.error(`Config reload failed (${reason}): ${String(error)}`);
-      } finally {
-        reloadRunning = false;
-        if (reloadPending) {
-          reloadPending = false;
-          scheduleConfigReload("pending");
-        }
-      }
-    };
-    const hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-    const redactConfig = (value) => {
-      if (Array.isArray(value)) {
-        return value.map((entry) => redactConfig(entry));
-      }
-      if (!value || typeof value !== "object") {
-        return value;
-      }
-      const entries = value;
-      const output = {};
-      for (const [key, val] of Object.entries(entries)) {
-        if (/apiKey|token|secret|password|appId|clientSecret|accessKey/i.test(key)) {
-          output[key] = val ? "***" : val;
-          continue;
-        }
-        output[key] = redactConfig(val);
-      }
-      return output;
-    };
-    const readConfigSnapshot = () => {
-      const path = getConfigPath();
-      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);
-      }
-      const hash = hashRaw(raw);
-      const redacted = redactConfig(config2);
-      return { raw: valid ? JSON.stringify(redacted, null, 2) : null, hash: valid ? hash : null, config: config2, redacted, valid };
-    };
-    const 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);
-          }
-        } else {
-          next[key] = value;
-        }
-      }
-      return next;
-    };
-    const buildSchemaFromValue = (value) => {
-      if (Array.isArray(value)) {
-        const item = value.length ? buildSchemaFromValue(value[0]) : { type: "string" };
-        return { type: "array", items: item };
-      }
-      if (value && typeof value === "object") {
-        const props = {};
-        for (const [key, val] of Object.entries(value)) {
-          props[key] = buildSchemaFromValue(val);
-        }
-        return { type: "object", properties: props };
-      }
-      if (typeof value === "number") {
-        return { type: "number" };
-      }
-      if (typeof value === "boolean") {
-        return { type: "boolean" };
-      }
-      if (value === null) {
-        return { type: ["null", "string"] };
-      }
-      return { type: "string" };
-    };
-    const scheduleRestart = (delayMs, reason) => {
-      const delay = typeof delayMs === "number" && Number.isFinite(delayMs) ? Math.max(0, delayMs) : 100;
-      console.log(`Gateway restart requested via tool${reason ? ` (${reason})` : ""}.`);
-      setTimeout(() => {
-        process.exit(0);
-      }, delay);
-    };
-    gatewayController.status = () => ({
-      channels: channels2.enabledChannels,
-      cron: cron2.status(),
-      configPath: getConfigPath()
-    });
-    gatewayController.reloadConfig = async (reason) => {
-      await runConfigReload(reason ?? "gateway tool");
-      return "Config reload triggered";
-    };
-    gatewayController.restart = async (options2) => {
-      scheduleRestart(options2?.delayMs, options2?.reason);
-      return "Restart scheduled";
-    };
-    gatewayController.getConfig = async () => {
-      const snapshot = readConfigSnapshot();
-      return {
-        raw: snapshot.raw,
-        hash: snapshot.hash,
-        path: getConfigPath(),
-        config: snapshot.redacted,
-        parsed: snapshot.redacted,
-        resolved: snapshot.redacted,
-        valid: snapshot.valid
-      };
-    };
-    gatewayController.getConfigSchema = async () => {
-      const base = ConfigSchema.parse({});
-      return {
-        schema: {
-          ...buildSchemaFromValue(base),
-          title: "NextClawConfig",
-          description: "NextClaw config schema (simplified)"
-        },
-        uiHints: {},
-        version: getPackageVersion(),
-        generatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      };
-    };
-    gatewayController.applyConfig = async (params) => {
-      const snapshot = readConfigSnapshot();
-      if (!params.baseHash) {
-        return { ok: false, error: "config base hash required; re-run config.get and retry" };
-      }
-      if (!snapshot.valid || !snapshot.hash) {
-        return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
-      }
-      if (params.baseHash !== snapshot.hash) {
-        return { ok: false, error: "config changed since last load; re-run config.get and retry" };
-      }
-      let parsedRaw;
-      try {
-        parsedRaw = JSON.parse(params.raw);
-      } catch {
-        return { ok: false, error: "invalid JSON in raw config" };
-      }
-      let validated;
-      try {
-        validated = ConfigSchema.parse(parsedRaw);
-      } catch (err) {
-        return { ok: false, error: `invalid config: ${String(err)}` };
-      }
-      saveConfig(validated);
-      const delayMs = params.restartDelayMs ?? 0;
-      scheduleRestart(delayMs, "config.apply");
-      return {
-        ok: true,
-        note: params.note ?? null,
-        path: getConfigPath(),
-        config: redactConfig(validated),
-        restart: { scheduled: true, delayMs }
-      };
-    };
-    gatewayController.patchConfig = async (params) => {
-      const snapshot = readConfigSnapshot();
-      if (!params.baseHash) {
-        return { ok: false, error: "config base hash required; re-run config.get and retry" };
-      }
-      if (!snapshot.valid || !snapshot.hash) {
-        return { ok: false, error: "config base hash unavailable; re-run config.get and retry" };
-      }
-      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)}` };
-      }
-      saveConfig(validated);
-      const delayMs = params.restartDelayMs ?? 0;
-      scheduleRestart(delayMs, "config.patch");
-      return {
-        ok: true,
-        note: params.note ?? null,
-        path: getConfigPath(),
-        config: redactConfig(validated),
-        restart: { scheduled: true, delayMs }
-      };
-    };
-    gatewayController.updateRun = async (params) => {
-      const timeoutMs = params.timeoutMs ?? 20 * 6e4;
-      const cliDir = resolve2(fileURLToPath2(new URL(".", import.meta.url)));
-      const pkgRoot = resolve2(cliDir, "..", "..");
-      const repoRoot = existsSync2(join2(pkgRoot, ".git")) ? pkgRoot : resolve2(pkgRoot, "..", "..");
-      const steps = [];
-      const runStep = (cmd, args, cwd) => {
-        const result = spawnSync(cmd, args, {
-          cwd,
-          encoding: "utf-8",
-          timeout: timeoutMs,
-          stdio: "pipe"
-        });
-        const step = {
-          cmd,
-          args,
-          cwd,
-          code: result.status,
-          stdout: (result.stdout ?? "").toString().slice(0, 4e3),
-          stderr: (result.stderr ?? "").toString().slice(0, 4e3)
-        };
-        steps.push(step);
-        return { ok: result.status === 0, code: result.status };
-      };
-      const updateCommand = process.env.NEXTCLAW_UPDATE_COMMAND?.trim();
-      if (updateCommand) {
-        const ok = runStep("sh", ["-c", updateCommand], process.cwd());
-        if (!ok.ok) {
-          return { ok: false, error: "update command failed", steps };
-        }
-      } else if (existsSync2(join2(repoRoot, ".git"))) {
-        if (!which("git")) {
-          return { ok: false, error: "git not found for repo update", steps };
-        }
-        const ok = runStep("git", ["-C", repoRoot, "pull", "--rebase"], repoRoot);
-        if (!ok.ok) {
-          return { ok: false, error: "git pull failed", steps };
-        }
-        if (existsSync2(join2(repoRoot, "pnpm-lock.yaml")) && which("pnpm")) {
-          const installOk = runStep("pnpm", ["install"], repoRoot);
-          if (!installOk.ok) {
-            return { ok: false, error: "pnpm install failed", steps };
-          }
-        } else if (existsSync2(join2(repoRoot, "package.json")) && which("npm")) {
-          const installOk = runStep("npm", ["install"], repoRoot);
-          if (!installOk.ok) {
-            return { ok: false, error: "npm install failed", steps };
-          }
-        }
-      } else if (which("npm")) {
-        const ok = runStep("npm", ["i", "-g", "nextclaw"], process.cwd());
-        if (!ok.ok) {
-          return { ok: false, error: "npm install -g nextclaw failed", steps };
-        }
-      } else {
-        return { ok: false, error: "no update strategy available", steps };
-      }
-      const delayMs = params.restartDelayMs ?? 0;
-      scheduleRestart(delayMs, "update.run");
-      return {
-        ok: true,
-        note: params.note ?? null,
-        restart: { scheduled: true, delayMs },
-        steps
-      };
-    };
-    if (channels2.enabledChannels.length) {
-      console.log(`\u2713 Channels enabled: ${channels2.enabledChannels.join(", ")}`);
+    if (reloader.getChannels().enabledChannels.length) {
+      console.log(`\u2713 Channels enabled: ${reloader.getChannels().enabledChannels.join(", ")}`);
     } else {
       console.log("Warning: No channels enabled");
     }
-    if (uiConfig.enabled) {
-      const uiServer = startUiServer({
-        host: uiConfig.host,
-        port: uiConfig.port,
-        configPath: getConfigPath(),
-        staticDir: uiStaticDir ?? void 0
-      });
-      const uiUrl = `http://${uiServer.host}:${uiServer.port}`;
-      console.log(`\u2713 UI API: ${uiUrl}/api`);
-      if (uiStaticDir) {
-        console.log(`\u2713 UI frontend: ${uiUrl}`);
-      }
-      if (uiConfig.open) {
-        openBrowser(uiUrl);
-      }
-    }
+    this.startUiIfEnabled(uiConfig, uiStaticDir);
     const cronStatus = cron2.status();
     if (cronStatus.jobs > 0) {
       console.log(`\u2713 Cron: ${cronStatus.jobs} scheduled jobs`);
@@ -1079,12 +1101,31 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
     });
-    watcher.on("add", () => scheduleConfigReload("config add"));
-    watcher.on("change", () => scheduleConfigReload("config change"));
-    watcher.on("unlink", () => scheduleConfigReload("config unlink"));
+    watcher.on("add", () => reloader.scheduleReload("config add"));
+    watcher.on("change", () => reloader.scheduleReload("config change"));
+    watcher.on("unlink", () => reloader.scheduleReload("config unlink"));
     await cron2.start();
     await heartbeat.start();
-    await Promise.allSettled([agent.run(), channels2.startAll()]);
+    await Promise.allSettled([agent.run(), reloader.getChannels().startAll()]);
+  }
+  startUiIfEnabled(uiConfig, uiStaticDir) {
+    if (!uiConfig.enabled) {
+      return;
+    }
+    const uiServer = startUiServer({
+      host: uiConfig.host,
+      port: uiConfig.port,
+      configPath: getConfigPath(),
+      staticDir: uiStaticDir ?? void 0
+    });
+    const uiUrl = `http://${uiServer.host}:${uiServer.port}`;
+    console.log(`\u2713 UI API: ${uiUrl}/api`);
+    if (uiStaticDir) {
+      console.log(`\u2713 UI frontend: ${uiUrl}`);
+    }
+    if (uiConfig.open) {
+      openBrowser(uiUrl);
+    }
   }
   async runForeground(options) {
     const config = loadConfig();
@@ -1141,7 +1182,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       console.log("Warning: UI frontend not found. Use --frontend to start the dev server.");
     }
     const logPath = resolveServiceLogPath();
-    const logDir = resolve2(logPath, "..");
+    const logDir = resolve3(logPath, "..");
     mkdirSync2(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const serveArgs = buildServeArgs({
@@ -1250,65 +1291,115 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join2(workspace, entry.target);
-      if (!force && existsSync2(filePath)) {
+      const filePath = join3(workspace, entry.target);
+      if (!force && existsSync3(filePath)) {
         continue;
       }
-      const templatePath = join2(templateDir, entry.source);
-      if (!existsSync2(templatePath)) {
+      const templatePath = join3(templateDir, entry.source);
+      if (!existsSync3(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
-      const raw = readFileSync2(templatePath, "utf-8");
+      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 = join2(workspace, "memory");
-    if (!existsSync2(memoryDir)) {
+    const memoryDir = join3(workspace, "memory");
+    if (!existsSync3(memoryDir)) {
       mkdirSync2(memoryDir, { recursive: true });
-      created.push(join2("memory", ""));
+      created.push(join3("memory", ""));
     }
-    const skillsDir = join2(workspace, "skills");
-    if (!existsSync2(skillsDir)) {
+    const skillsDir = join3(workspace, "skills");
+    if (!existsSync3(skillsDir)) {
       mkdirSync2(skillsDir, { recursive: true });
-      created.push(join2("skills", ""));
+      created.push(join3("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);
+    const existing = readdirSync(targetDir, { withFileTypes: true }).filter((entry) => !entry.name.startsWith("."));
+    if (!force && existing.length > 0) {
+      return 0;
+    }
+    let seeded = 0;
+    for (const entry of readdirSync(sourceDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) {
+        continue;
+      }
+      const src = join3(sourceDir, entry.name);
+      if (!existsSync3(join3(src, "SKILL.md"))) {
+        continue;
+      }
+      const dest = join3(targetDir, entry.name);
+      if (!force && existsSync3(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 = resolve3(dirname(entry), "..");
+      const distSkills = join3(pkgRoot, "dist", "skills");
+      if (existsSync3(distSkills)) {
+        return distSkills;
+      }
+      const srcSkills = join3(pkgRoot, "src", "agent", "skills");
+      if (existsSync3(srcSkills)) {
+        return srcSkills;
+      }
+      return null;
+    } catch {
+      return null;
+    }
+  }
   resolveTemplateDir() {
     const override = process.env.NEXTCLAW_TEMPLATE_DIR?.trim();
     if (override) {
       return override;
     }
-    const cliDir = resolve2(fileURLToPath2(new URL(".", import.meta.url)));
-    const pkgRoot = resolve2(cliDir, "..", "..");
-    const candidates = [join2(pkgRoot, "templates")];
+    const cliDir = resolve3(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve3(cliDir, "..", "..");
+    const candidates = [join3(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync2(candidate)) {
+      if (existsSync3(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join2(getDataDir2(), "bridge");
-    if (existsSync2(join2(userBridge, "dist", "index.js"))) {
+    const userBridge = join3(getDataDir2(), "bridge");
+    if (existsSync3(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 = resolve2(fileURLToPath2(new URL(".", import.meta.url)));
-    const pkgRoot = resolve2(cliDir, "..", "..");
-    const pkgBridge = join2(pkgRoot, "bridge");
-    const srcBridge = join2(pkgRoot, "..", "..", "bridge");
+    const cliDir = resolve3(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve3(cliDir, "..", "..");
+    const pkgBridge = join3(pkgRoot, "bridge");
+    const srcBridge = join3(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync2(join2(pkgBridge, "package.json"))) {
+    if (existsSync3(join3(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync2(join2(srcBridge, "package.json"))) {
+    } else if (existsSync3(join3(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -1316,15 +1407,15 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync2(resolve2(userBridge, ".."), { recursive: true });
-    if (existsSync2(userBridge)) {
+    mkdirSync2(resolve3(userBridge, ".."), { recursive: true });
+    if (existsSync3(userBridge)) {
       rmSync2(userBridge, { recursive: true, force: true });
     }
     cpSync(source, userBridge, {
       recursive: true,
       filter: (src) => !src.includes("node_modules") && !src.includes("dist")
     });
-    const install = spawnSync("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
+    const install = spawnSync2("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
     if (install.status !== 0) {
       console.error(`Bridge install failed: ${install.status ?? 1}`);
       if (install.stderr) {
@@ -1332,7 +1423,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       }
       process.exit(1);
     }
-    const build = spawnSync("npm", ["run", "build"], { cwd: userBridge, stdio: "pipe" });
+    const build = spawnSync2("npm", ["run", "build"], { cwd: userBridge, stdio: "pipe" });
     if (build.status !== 0) {
       console.error(`Bridge build failed: ${build.status ?? 1}`);
       if (build.stderr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,8 +38,8 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "nextclaw-core": "^0.4.0",
-    "nextclaw-server": "^0.3.1"
+    "nextclaw-core": "^0.4.2",
+    "nextclaw-server": "^0.3.2"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",