nextclaw 0.4.5 → 0.4.6

package/dist/cli/index.js

@@ -43,19 +43,16 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync2
 } from "fs";
-import { dirname, join as join4, resolve as resolve4 } from "path";
+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";
@@ -297,6 +294,50 @@ async function prompt(rl, question) {
   });
 }
 
+// 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,7 +554,8 @@ var GatewayControllerImpl = class {
       ok: true,
       note: params.note ?? null,
       restart: { scheduled: true, delayMs },
-      steps
+      strategy: result.strategy,
+      steps: result.steps
     };
   }
 };
@@ -574,7 +563,7 @@ 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";
+import { isAbsolute, join as join2, resolve as resolve3 } from "path";
 async function installClawHubSkill(options) {
   const slug = options.slug.trim();
   if (!slug) {
@@ -586,7 +575,7 @@ async function installClawHubSkill(options) {
   }
   const dirName = options.dir?.trim() || "skills";
   const destinationDir = isAbsolute(dirName) ? resolve3(dirName, slug) : resolve3(workdir, dirName, slug);
-  const skillFile = join3(destinationDir, "SKILL.md");
+  const skillFile = join2(destinationDir, "SKILL.md");
   if (!options.force && existsSync3(destinationDir)) {
     if (existsSync3(skillFile)) {
       return {
@@ -776,7 +765,7 @@ var CliRuntime = class {
     }
     const config = loadConfig();
     const workspaceSetting = config.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join4(getDataDir2(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
+    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 });
@@ -941,7 +930,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
     console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `);
-    const historyFile = join4(getDataDir2(), "history", "cli_history");
+    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) : [];
@@ -970,6 +959,41 @@ ${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({
@@ -1012,7 +1036,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronList(opts) {
-    const storePath = join4(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) {
@@ -1032,7 +1056,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronAdd(opts) {
-    const storePath = join4(getDataDir2(), "cron", "jobs.json");
+    const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
     let schedule = null;
     if (opts.every) {
@@ -1057,7 +1081,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     console.log(`\u2713 Added job '${job.name}' (${job.id})`);
   }
   cronRemove(jobId) {
-    const storePath = join4(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}`);
@@ -1066,7 +1090,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   cronEnable(jobId, opts) {
-    const storePath = join4(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) {
@@ -1076,7 +1100,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     }
   }
   async cronRun(jobId, opts) {
-    const storePath = join4(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}`);
@@ -1108,7 +1132,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 = join4(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;
@@ -1382,11 +1406,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join4(workspace, entry.target);
+      const filePath = join3(workspace, entry.target);
       if (!force && existsSync4(filePath)) {
         continue;
       }
-      const templatePath = join4(templateDir, entry.source);
+      const templatePath = join3(templateDir, entry.source);
       if (!existsSync4(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
@@ -1397,15 +1421,15 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       writeFileSync2(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join4(workspace, "memory");
+    const memoryDir = join3(workspace, "memory");
     if (!existsSync4(memoryDir)) {
       mkdirSync2(memoryDir, { recursive: true });
-      created.push(join4("memory", ""));
+      created.push(join3("memory", ""));
     }
-    const skillsDir = join4(workspace, "skills");
+    const skillsDir = join3(workspace, "skills");
     if (!existsSync4(skillsDir)) {
       mkdirSync2(skillsDir, { recursive: true });
-      created.push(join4("skills", ""));
+      created.push(join3("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -1428,11 +1452,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join4(sourceDir, entry.name);
-      if (!existsSync4(join4(src, "SKILL.md"))) {
+      const src = join3(sourceDir, entry.name);
+      if (!existsSync4(join3(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join4(targetDir, entry.name);
+      const dest = join3(targetDir, entry.name);
       if (!force && existsSync4(dest)) {
         continue;
       }
@@ -1446,11 +1470,11 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       const require2 = createRequire(import.meta.url);
       const entry = require2.resolve("nextclaw-core");
       const pkgRoot = resolve4(dirname(entry), "..");
-      const distSkills = join4(pkgRoot, "dist", "skills");
+      const distSkills = join3(pkgRoot, "dist", "skills");
       if (existsSync4(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join4(pkgRoot, "src", "agent", "skills");
+      const srcSkills = join3(pkgRoot, "src", "agent", "skills");
       if (existsSync4(srcSkills)) {
         return srcSkills;
       }
@@ -1464,9 +1488,9 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     if (override) {
       return override;
     }
-    const cliDir = resolve4(fileURLToPath3(new URL(".", import.meta.url)));
+    const cliDir = resolve4(fileURLToPath2(new URL(".", import.meta.url)));
     const pkgRoot = resolve4(cliDir, "..", "..");
-    const candidates = [join4(pkgRoot, "templates")];
+    const candidates = [join3(pkgRoot, "templates")];
     for (const candidate of candidates) {
       if (existsSync4(candidate)) {
         return candidate;
@@ -1475,22 +1499,22 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     return null;
   }
   getBridgeDir() {
-    const userBridge = join4(getDataDir2(), "bridge");
-    if (existsSync4(join4(userBridge, "dist", "index.js"))) {
+    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(fileURLToPath3(new URL(".", import.meta.url)));
+    const cliDir = resolve4(fileURLToPath2(new URL(".", import.meta.url)));
     const pkgRoot = resolve4(cliDir, "..", "..");
-    const pkgBridge = join4(pkgRoot, "bridge");
-    const srcBridge = join4(pkgRoot, "..", "..", "bridge");
+    const pkgBridge = join3(pkgRoot, "bridge");
+    const srcBridge = join3(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync4(join4(pkgBridge, "package.json"))) {
+    if (existsSync4(join3(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync4(join4(srcBridge, "package.json"))) {
+    } else if (existsSync4(join3(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -1539,6 +1563,7 @@ 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 }));
 };

package/package.json

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