nextclaw 0.4.3 → 0.4.5

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,8 +43,8 @@ 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 join4, 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";
@@ -98,12 +98,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 +161,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,8 +292,8 @@ 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));
   });
 }
 
@@ -571,6 +571,76 @@ var GatewayControllerImpl = class {
   }
 };
 
+// src/cli/skills/clawhub.ts
+import { spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync3 } from "fs";
+import { isAbsolute, join as join3, 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 = join3(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,15 +769,15 @@ 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;
     }
     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 workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join4(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
+    const workspaceExisted = existsSync4(workspacePath);
     mkdirSync2(workspacePath, { recursive: true });
     const templateResult = this.createWorkspaceTemplates(workspacePath, { force });
     if (createdConfig) {
@@ -871,10 +941,10 @@ ${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 historyFile = join4(getDataDir2(), "history", "cli_history");
+    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 +970,27 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       printAgentResponse(response);
     }
   }
+  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,13 +1006,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 = 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}`);
     }
   }
   cronList(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join4(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const jobs = service.listJobs(Boolean(opts.all));
     if (!jobs.length) {
@@ -941,7 +1032,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronAdd(opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join4(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     let schedule = null;
     if (opts.every) {
@@ -966,7 +1057,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     console.log(`\u2713 Added job '${job.name}' (${job.id})`);
   }
   cronRemove(jobId) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join4(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     if (service.removeJob(jobId)) {
       console.log(`\u2713 Removed job ${jobId}`);
@@ -975,7 +1066,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronEnable(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join4(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     const job = service.enableJob(jobId, !opts.disable);
     if (job) {
@@ -985,7 +1076,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   async cronRun(jobId, opts) {
-    const storePath = join3(getDataDir2(), "cron", "jobs.json");
+    const storePath = join4(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}`);
@@ -996,8 +1087,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];
@@ -1017,7 +1108,7 @@ ${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 = join3(getDataDir2(), "cron", "jobs.json");
+    const cronStorePath = join4(getDataDir2(), "cron", "jobs.json");
     const cron2 = new CronService(cronStorePath);
     const uiConfig = resolveUiConfig(config, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
@@ -1182,7 +1273,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({
@@ -1291,12 +1382,12 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join3(workspace, entry.target);
-      if (!force && existsSync3(filePath)) {
+      const filePath = join4(workspace, entry.target);
+      if (!force && existsSync4(filePath)) {
         continue;
       }
-      const templatePath = join3(templateDir, entry.source);
-      if (!existsSync3(templatePath)) {
+      const templatePath = join4(templateDir, entry.source);
+      if (!existsSync4(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
@@ -1306,15 +1397,15 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       writeFileSync2(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join3(workspace, "memory");
-    if (!existsSync3(memoryDir)) {
+    const memoryDir = join4(workspace, "memory");
+    if (!existsSync4(memoryDir)) {
       mkdirSync2(memoryDir, { recursive: true });
-      created.push(join3("memory", ""));
+      created.push(join4("memory", ""));
     }
-    const skillsDir = join3(workspace, "skills");
-    if (!existsSync3(skillsDir)) {
+    const skillsDir = join4(workspace, "skills");
+    if (!existsSync4(skillsDir)) {
       mkdirSync2(skillsDir, { recursive: true });
-      created.push(join3("skills", ""));
+      created.push(join4("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -1337,12 +1428,12 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join3(sourceDir, entry.name);
-      if (!existsSync3(join3(src, "SKILL.md"))) {
+      const src = join4(sourceDir, entry.name);
+      if (!existsSync4(join4(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join3(targetDir, entry.name);
-      if (!force && existsSync3(dest)) {
+      const dest = join4(targetDir, entry.name);
+      if (!force && existsSync4(dest)) {
         continue;
       }
       cpSync(src, dest, { recursive: true, force: true });
@@ -1354,13 +1445,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 distSkills = join3(pkgRoot, "dist", "skills");
-      if (existsSync3(distSkills)) {
+      const pkgRoot = resolve4(dirname(entry), "..");
+      const distSkills = join4(pkgRoot, "dist", "skills");
+      if (existsSync4(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join3(pkgRoot, "src", "agent", "skills");
-      if (existsSync3(srcSkills)) {
+      const srcSkills = join4(pkgRoot, "src", "agent", "skills");
+      if (existsSync4(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -1373,33 +1464,33 @@ ${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 candidates = [join3(pkgRoot, "templates")];
+    const cliDir = resolve4(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve4(cliDir, "..", "..");
+    const candidates = [join4(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync3(candidate)) {
+      if (existsSync4(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join3(getDataDir2(), "bridge");
-    if (existsSync3(join3(userBridge, "dist", "index.js"))) {
+    const userBridge = join4(getDataDir2(), "bridge");
+    if (existsSync4(join4(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 pkgBridge = join3(pkgRoot, "bridge");
-    const srcBridge = join3(pkgRoot, "..", "..", "bridge");
+    const cliDir = resolve4(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve4(cliDir, "..", "..");
+    const pkgBridge = join4(pkgRoot, "bridge");
+    const srcBridge = join4(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync3(join3(pkgBridge, "package.json"))) {
+    if (existsSync4(join4(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync3(join3(srcBridge, "package.json"))) {
+    } else if (existsSync4(join4(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -1407,15 +1498,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 +1514,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 +1539,13 @@ 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));
+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.3",
+  "version": "0.4.5",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,7 +38,7 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "nextclaw-core": "^0.4.3",
+    "nextclaw-core": "^0.4.4",
     "nextclaw-server": "^0.3.2"
   },
   "devDependencies": {