nextclaw 0.4.4 → 0.4.6

package/dist/cli/index.js

@@ -35,7 +35,7 @@ import { startUiServer } from "nextclaw-server";
 import {
   closeSync,
   cpSync,
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   mkdirSync as mkdirSync2,
   openSync,
   readdirSync,
@@ -43,19 +43,16 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync2
 } from "fs";
-import { dirname, join as join3, resolve as resolve3 } from "path";
-import { spawn as spawn2, spawnSync as spawnSync2 } from "child_process";
+import { dirname, join as join3, resolve as resolve4 } from "path";
+import { spawn as spawn2, spawnSync as spawnSync3 } from "child_process";
 import { createInterface } from "readline";
 import { createRequire } from "module";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { fileURLToPath as fileURLToPath2 } 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";
@@ -98,12 +95,12 @@ async function isPortAvailable(port, host) {
   return await canBindPort(port, checkHost);
 }
 async function canBindPort(port, host) {
-  return await new Promise((resolve4) => {
+  return await new Promise((resolve5) => {
     const server = createServer();
     server.unref();
-    server.once("error", () => resolve4(false));
+    server.once("error", () => resolve5(false));
     server.listen({ port, host }, () => {
-      server.close(() => resolve4(true));
+      server.close(() => resolve5(true));
     });
   });
 }
@@ -161,7 +158,7 @@ async function waitForExit(pid, timeoutMs) {
     if (!isProcessRunning(pid)) {
       return true;
     }
-    await new Promise((resolve4) => setTimeout(resolve4, 200));
+    await new Promise((resolve5) => setTimeout(resolve5, 200));
   }
   return !isProcessRunning(pid);
 }
@@ -292,11 +289,55 @@ function printAgentResponse(response) {
 async function prompt(rl, question) {
   rl.setPrompt(question);
   rl.prompt();
-  return new Promise((resolve4) => {
-    rl.once("line", (line) => resolve4(line));
+  return new Promise((resolve5) => {
+    rl.once("line", (line) => resolve5(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 = [];
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  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, {
+      cwd,
+      encoding: "utf-8",
+      timeout: timeoutMs,
+      stdio: "pipe"
+    });
+    steps.push({
+      cmd,
+      args,
+      cwd,
+      code: result.status,
+      stdout: (result.stdout ?? "").toString().slice(0, 4e3),
+      stderr: (result.stderr ?? "").toString().slice(0, 4e3)
+    });
+    return { ok: result.status === 0, code: result.status };
+  };
+  if (updateCommand) {
+    const cwd = options.cwd ? resolve2(options.cwd) : process.cwd();
+    const ok = runStep("sh", ["-c", updateCommand], cwd);
+    if (!ok.ok) {
+      return { ok: false, error: "update command failed", strategy: "command", steps };
+    }
+    return { ok: true, strategy: "command", steps };
+  }
+  if (which("npm")) {
+    const ok = runStep("npm", ["i", "-g", packageName], process.cwd());
+    if (!ok.ok) {
+      return { ok: false, error: `npm install -g ${packageName} failed`, strategy: "npm", steps };
+    }
+    return { ok: true, strategy: "npm", steps };
+  }
+  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 redactConfig = (value) => {
@@ -503,62 +544,9 @@ var GatewayControllerImpl = class {
     };
   }
   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 result = runSelfUpdate({ timeoutMs: params.timeoutMs });
+    if (!result.ok) {
+      return { ok: false, error: result.error ?? "update failed", steps: result.steps };
     }
     const delayMs = params.restartDelayMs ?? 0;
     scheduleRestart(delayMs, "update.run");
@@ -566,11 +554,82 @@ var GatewayControllerImpl = class {
       ok: true,
       note: params.note ?? null,
       restart: { scheduled: true, delayMs },
-      steps
+      strategy: result.strategy,
+      steps: result.steps
     };
   }
 };
 
+// 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"]);
@@ -699,7 +758,7 @@ var CliRuntime = class {
     const force = Boolean(options.force);
     const configPath = getConfigPath();
     let createdConfig = false;
-    if (!existsSync3(configPath)) {
+    if (!existsSync4(configPath)) {
       const config2 = ConfigSchema2.parse({});
       saveConfig(config2);
       createdConfig = true;
@@ -707,7 +766,7 @@ var CliRuntime = class {
     const config = loadConfig();
     const workspaceSetting = config.agents.defaults.workspace;
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join3(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
-    const workspaceExisted = existsSync3(workspacePath);
+    const workspaceExisted = existsSync4(workspacePath);
     mkdirSync2(workspacePath, { recursive: true });
     const templateResult = this.createWorkspaceTemplates(workspacePath, { force });
     if (createdConfig) {
@@ -872,9 +931,9 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `);
     const historyFile = join3(getDataDir2(), "history", "cli_history");
-    const historyDir = resolve3(historyFile, "..");
+    const historyDir = resolve4(historyFile, "..");
     mkdirSync2(historyDir, { recursive: true });
-    const history = existsSync3(historyFile) ? readFileSync3(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+    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 ?? []);
@@ -900,6 +959,62 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       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.`);
+    }
+  }
+  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
+    });
+    const versionLabel = result.version ?? "latest";
+    if (result.alreadyInstalled) {
+      console.log(`\u2713 ${result.slug} is already installed`);
+    } else {
+      console.log(`\u2713 Installed ${result.slug}@${versionLabel}`);
+    }
+    if (result.registry) {
+      console.log(`  Registry: ${result.registry}`);
+    }
+    console.log(`  Path: ${result.destinationDir}`);
+  }
   channelsStatus() {
     const config = loadConfig();
     console.log("Channel Status");
@@ -915,7 +1030,7 @@ ${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 = spawnSync2("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
+    const result = spawnSync3("npm", ["start"], { cwd: bridgeDir, stdio: "inherit" });
     if (result.status !== 0) {
       console.error(`Bridge failed: ${result.status ?? 1}`);
     }
@@ -996,8 +1111,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} ${existsSync3(configPath) ? "\u2713" : "\u2717"}`);
-    console.log(`Workspace: ${workspace} ${existsSync3(workspace) ? "\u2713" : "\u2717"}`);
+    console.log(`Config: ${configPath} ${existsSync4(configPath) ? "\u2713" : "\u2717"}`);
+    console.log(`Workspace: ${workspace} ${existsSync4(workspace) ? "\u2713" : "\u2717"}`);
     console.log(`Model: ${config.agents.defaults.model}`);
     for (const spec of PROVIDERS) {
       const provider = config.providers[spec.name];
@@ -1182,7 +1297,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 = resolve3(logPath, "..");
+    const logDir = resolve4(logPath, "..");
     mkdirSync2(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const serveArgs = buildServeArgs({
@@ -1292,11 +1407,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     ];
     for (const entry of templateFiles) {
       const filePath = join3(workspace, entry.target);
-      if (!force && existsSync3(filePath)) {
+      if (!force && existsSync4(filePath)) {
         continue;
       }
       const templatePath = join3(templateDir, entry.source);
-      if (!existsSync3(templatePath)) {
+      if (!existsSync4(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
@@ -1307,12 +1422,12 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       created.push(entry.target);
     }
     const memoryDir = join3(workspace, "memory");
-    if (!existsSync3(memoryDir)) {
+    if (!existsSync4(memoryDir)) {
       mkdirSync2(memoryDir, { recursive: true });
       created.push(join3("memory", ""));
     }
     const skillsDir = join3(workspace, "skills");
-    if (!existsSync3(skillsDir)) {
+    if (!existsSync4(skillsDir)) {
       mkdirSync2(skillsDir, { recursive: true });
       created.push(join3("skills", ""));
     }
@@ -1338,11 +1453,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
         continue;
       }
       const src = join3(sourceDir, entry.name);
-      if (!existsSync3(join3(src, "SKILL.md"))) {
+      if (!existsSync4(join3(src, "SKILL.md"))) {
         continue;
       }
       const dest = join3(targetDir, entry.name);
-      if (!force && existsSync3(dest)) {
+      if (!force && existsSync4(dest)) {
         continue;
       }
       cpSync(src, dest, { recursive: true, force: true });
@@ -1354,13 +1469,13 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     try {
       const require2 = createRequire(import.meta.url);
       const entry = require2.resolve("nextclaw-core");
-      const pkgRoot = resolve3(dirname(entry), "..");
+      const pkgRoot = resolve4(dirname(entry), "..");
       const distSkills = join3(pkgRoot, "dist", "skills");
-      if (existsSync3(distSkills)) {
+      if (existsSync4(distSkills)) {
         return distSkills;
       }
       const srcSkills = join3(pkgRoot, "src", "agent", "skills");
-      if (existsSync3(srcSkills)) {
+      if (existsSync4(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -1373,11 +1488,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     if (override) {
       return override;
     }
-    const cliDir = resolve3(fileURLToPath3(new URL(".", import.meta.url)));
-    const pkgRoot = resolve3(cliDir, "..", "..");
+    const cliDir = resolve4(fileURLToPath2(new URL(".", import.meta.url)));
+    const pkgRoot = resolve4(cliDir, "..", "..");
     const candidates = [join3(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync3(candidate)) {
+      if (existsSync4(candidate)) {
         return candidate;
       }
     }
@@ -1385,21 +1500,21 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
   }
   getBridgeDir() {
     const userBridge = join3(getDataDir2(), "bridge");
-    if (existsSync3(join3(userBridge, "dist", "index.js"))) {
+    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 = resolve3(fileURLToPath3(new URL(".", import.meta.url)));
-    const pkgRoot = resolve3(cliDir, "..", "..");
+    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 (existsSync3(join3(pkgBridge, "package.json"))) {
+    if (existsSync4(join3(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync3(join3(srcBridge, "package.json"))) {
+    } else if (existsSync4(join3(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -1407,15 +1522,15 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync2(resolve3(userBridge, ".."), { recursive: true });
-    if (existsSync3(userBridge)) {
+    mkdirSync2(resolve4(userBridge, ".."), { recursive: true });
+    if (existsSync4(userBridge)) {
       rmSync2(userBridge, { recursive: true, force: true });
     }
     cpSync(source, userBridge, {
       recursive: true,
       filter: (src) => !src.includes("node_modules") && !src.includes("dist")
     });
-    const install = spawnSync2("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
+    const install = spawnSync3("npm", ["install"], { cwd: userBridge, stdio: "pipe" });
     if (install.status !== 0) {
       console.error(`Bridge install failed: ${install.status ?? 1}`);
       if (install.stderr) {
@@ -1423,7 +1538,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       }
       process.exit(1);
     }
-    const build = spawnSync2("npm", ["run", "build"], { cwd: userBridge, stdio: "pipe" });
+    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) {
@@ -1448,6 +1563,14 @@ program.command("start").description(`Start the ${APP_NAME2} gateway + UI in the
 program.command("serve").description(`Run the ${APP_NAME2} gateway + UI in the foreground`).option("--ui-host <host>", "UI host").option("--ui-port <port>", "UI port").option("--frontend", "Start UI frontend dev server").option("--frontend-port <port>", "UI frontend dev server 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.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));
+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 }));
+};
+var skills = program.command("skills").description("Manage skills");
+registerClawHubInstall(skills);
+var clawhub = program.command("clawhub").description("Install skills from ClawHub");
+registerClawHubInstall(clawhub);
 var channels = program.command("channels").description("Manage channels");
 channels.command("status").description("Show channel status").action(() => runtime.channelsStatus());
 channels.command("login").description("Link device via QR code").action(() => runtime.channelsLogin());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",