nextclaw 0.16.17 → 0.16.18

package/dist/cli/index.js

@@ -2995,45 +2995,36 @@ var ChannelCommands = class {
   }
 };
 
-// src/cli/commands/cron.ts
+// src/cli/commands/cron/cron-local.service.ts
 import { CronService, getDataDir as getDataDir3 } from "@nextclaw/core";
 import { join as join3 } from "path";
-var CronCommands = class {
-  cronList(opts) {
-    const storePath = join3(getDataDir3(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const jobs = service.listJobs(Boolean(opts.all));
-    if (!jobs.length) {
-      console.log("No scheduled jobs.");
-      return;
-    }
-    for (const job of jobs) {
-      let schedule = "";
-      if (job.schedule.kind === "every") {
-        schedule = `every ${Math.round((job.schedule.everyMs ?? 0) / 1e3)}s`;
-      } else if (job.schedule.kind === "cron") {
-        schedule = job.schedule.expr ?? "";
-      } else {
-        schedule = job.schedule.atMs ? new Date(job.schedule.atMs).toISOString() : "";
-      }
-      console.log(`${job.id} ${job.name} ${schedule}`);
-    }
+function createCronService() {
+  const storePath = join3(getDataDir3(), "cron", "jobs.json");
+  return new CronService(storePath);
+}
+function toSchedule(opts) {
+  if (opts.every) {
+    return { kind: "every", everyMs: Number(opts.every) * 1e3 };
   }
-  cronAdd(opts) {
-    const storePath = join3(getDataDir3(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    let schedule = null;
-    if (opts.every) {
-      schedule = { kind: "every", everyMs: Number(opts.every) * 1e3 };
-    } else if (opts.cron) {
-      schedule = { kind: "cron", expr: String(opts.cron) };
-    } else if (opts.at) {
-      schedule = { kind: "at", atMs: Date.parse(String(opts.at)) };
-    }
+  if (opts.cron) {
+    return { kind: "cron", expr: String(opts.cron) };
+  }
+  if (opts.at) {
+    return { kind: "at", atMs: Date.parse(String(opts.at)) };
+  }
+  return null;
+}
+var CronLocalService = class {
+  list = (all) => {
+    const service = createCronService();
+    return service.listJobs(all);
+  };
+  add = (opts) => {
+    const schedule = toSchedule(opts);
     if (!schedule) {
-      console.error("Error: Must specify --every, --cron, or --at");
-      return;
+      return { job: null, error: "Error: Must specify --every, --cron, or --at" };
     }
+    const service = createCronService();
     const job = service.addJob({
       name: opts.name,
       schedule,
@@ -3043,33 +3034,198 @@ var CronCommands = class {
       to: opts.to,
       accountId: opts.account
     });
-    console.log(`\u2713 Added job '${job.name}' (${job.id})`);
+    return { job };
+  };
+  remove = (jobId) => {
+    const service = createCronService();
+    return service.removeJob(jobId);
+  };
+  enable = (jobId, enabled) => {
+    const service = createCronService();
+    return service.enableJob(jobId, enabled) ?? null;
+  };
+  run = async (jobId, force) => {
+    const service = createCronService();
+    return service.runJob(jobId, force);
+  };
+};
+
+// src/cli/commands/cron/cron-job.utils.ts
+function formatCronSchedule(schedule) {
+  if (schedule.kind === "every") {
+    return `every ${Math.round((schedule.everyMs ?? 0) / 1e3)}s`;
   }
-  cronRemove(jobId) {
-    const storePath = join3(getDataDir3(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    if (service.removeJob(jobId)) {
+  if (schedule.kind === "cron") {
+    return schedule.expr ?? "";
+  }
+  return schedule.atMs ? new Date(schedule.atMs).toISOString() : "";
+}
+function printCronJobs(jobs) {
+  if (!jobs.length) {
+    console.log("No scheduled jobs.");
+    return;
+  }
+  for (const job of jobs) {
+    console.log(`${job.id} ${job.name} ${formatCronSchedule(job.schedule)}`);
+  }
+}
+
+// src/cli/commands/shared/ui-bridge-api.service.ts
+import { ensureUiBridgeSecret } from "@nextclaw/server";
+function resolveManagedApiBase() {
+  const state = readServiceState();
+  if (!state?.apiUrl || !state.pid) {
+    return null;
+  }
+  if (!isProcessRunning(state.pid)) {
+    return null;
+  }
+  return state.apiUrl.replace(/\/+$/, "");
+}
+var UiBridgeApiClient = class {
+  constructor(apiBase) {
+    this.apiBase = apiBase;
+  }
+  cookie;
+  getCookie = async () => {
+    if (this.cookie !== void 0) {
+      return this.cookie;
+    }
+    const bridgeSecret = ensureUiBridgeSecret();
+    const response = await fetch(`${this.apiBase}/api/auth/bridge`, {
+      method: "POST",
+      headers: {
+        "x-nextclaw-ui-bridge-secret": bridgeSecret
+      }
+    });
+    if (!response.ok) {
+      throw new Error(`bridge auth failed with status ${response.status}`);
+    }
+    const payload = await response.json();
+    if (!payload.ok) {
+      throw new Error(payload.error?.message ?? "bridge auth failed");
+    }
+    this.cookie = typeof payload.data.cookie === "string" && payload.data.cookie.trim() ? payload.data.cookie.trim() : null;
+    return this.cookie;
+  };
+  request = async (params) => {
+    const cookie = await this.getCookie();
+    const response = await fetch(`${this.apiBase}${params.path}`, {
+      method: params.method ?? "GET",
+      headers: {
+        ...params.body ? { "Content-Type": "application/json" } : {},
+        ...cookie ? { Cookie: cookie } : {}
+      },
+      ...params.body ? { body: JSON.stringify(params.body) } : {}
+    });
+    if (!response.ok) {
+      throw new Error(`api request failed with status ${response.status}`);
+    }
+    const payload = await response.json();
+    if (!payload.ok) {
+      throw new Error(payload.error?.message ?? "api request failed");
+    }
+    return payload.data;
+  };
+};
+
+// src/cli/commands/cron.ts
+var CronCommands = class {
+  constructor(local = new CronLocalService()) {
+    this.local = local;
+  }
+  createApiClient = () => {
+    const apiBase = resolveManagedApiBase();
+    if (!apiBase) {
+      return null;
+    }
+    return new UiBridgeApiClient(apiBase);
+  };
+  cronList = async (opts) => {
+    const apiClient = this.createApiClient();
+    if (apiClient) {
+      try {
+        const query = opts.all ? "?all=1" : "";
+        const data = await apiClient.request({
+          path: `/api/cron${query}`
+        });
+        printCronJobs(data.jobs);
+        return;
+      } catch {
+      }
+    }
+    printCronJobs(this.local.list(Boolean(opts.all)));
+  };
+  cronAdd = async (opts) => {
+    const result = this.local.add(opts);
+    if (!result.job) {
+      console.error(result.error ?? "Error: Failed to add job");
+      return;
+    }
+    console.log(`\u2713 Added job '${result.job.name}' (${result.job.id})`);
+  };
+  cronRemove = async (jobId) => {
+    const apiClient = this.createApiClient();
+    if (apiClient) {
+      try {
+        const data = await apiClient.request({
+          path: `/api/cron/${encodeURIComponent(jobId)}`,
+          method: "DELETE"
+        });
+        if (data.deleted) {
+          console.log(`\u2713 Removed job ${jobId}`);
+          return;
+        }
+      } catch {
+      }
+    }
+    if (this.local.remove(jobId)) {
       console.log(`\u2713 Removed job ${jobId}`);
     } else {
       console.log(`Job ${jobId} not found`);
     }
-  }
-  cronEnable(jobId, opts) {
-    const storePath = join3(getDataDir3(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const job = service.enableJob(jobId, !opts.disable);
+  };
+  cronEnable = async (jobId, opts) => {
+    const apiClient = this.createApiClient();
+    const enabled = !opts.disable;
+    if (apiClient) {
+      try {
+        const data = await apiClient.request({
+          path: `/api/cron/${encodeURIComponent(jobId)}/enable`,
+          method: "PUT",
+          body: { enabled }
+        });
+        if (data.job) {
+          console.log(`\u2713 Job '${data.job.name}' ${opts.disable ? "disabled" : "enabled"}`);
+          return;
+        }
+      } catch {
+      }
+    }
+    const job = this.local.enable(jobId, enabled);
     if (job) {
       console.log(`\u2713 Job '${job.name}' ${opts.disable ? "disabled" : "enabled"}`);
     } else {
       console.log(`Job ${jobId} not found`);
     }
-  }
-  async cronRun(jobId, opts) {
-    const storePath = join3(getDataDir3(), "cron", "jobs.json");
-    const service = new CronService(storePath);
-    const ok = await service.runJob(jobId, Boolean(opts.force));
+  };
+  cronRun = async (jobId, opts) => {
+    const apiClient = this.createApiClient();
+    if (apiClient) {
+      try {
+        const data = await apiClient.request({
+          path: `/api/cron/${encodeURIComponent(jobId)}/run`,
+          method: "POST",
+          body: { force: Boolean(opts.force) }
+        });
+        console.log(data.executed ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
+        return;
+      } catch {
+      }
+    }
+    const ok = await this.local.run(jobId, Boolean(opts.force));
     console.log(ok ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
-  }
+  };
 };
 
 // src/cli/commands/platform-auth.ts
@@ -10390,21 +10546,21 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
   async channelsAdd(opts) {
     await this.channelCommands.channelsAdd(opts);
   }
-  cronList(opts) {
-    this.cronCommands.cronList(opts);
-  }
-  cronAdd(opts) {
-    this.cronCommands.cronAdd(opts);
-  }
-  cronRemove(jobId) {
-    this.cronCommands.cronRemove(jobId);
-  }
-  cronEnable(jobId, opts) {
-    this.cronCommands.cronEnable(jobId, opts);
-  }
-  async cronRun(jobId, opts) {
+  cronList = async (opts) => {
+    await this.cronCommands.cronList(opts);
+  };
+  cronAdd = async (opts) => {
+    await this.cronCommands.cronAdd(opts);
+  };
+  cronRemove = async (jobId) => {
+    await this.cronCommands.cronRemove(jobId);
+  };
+  cronEnable = async (jobId, opts) => {
+    await this.cronCommands.cronEnable(jobId, opts);
+  };
+  cronRun = async (jobId, opts) => {
     await this.cronCommands.cronRun(jobId, opts);
-  }
+  };
   async status(opts = {}) {
     await this.diagnosticsCommands.status(opts);
   }
@@ -10529,10 +10685,10 @@ channels.command("add").description("Configure a plugin channel (OpenClaw-compat
 channels.command("status").description("Show channel status").action(() => runtime.channelsStatus());
 channels.command("login").description("Link device via QR code").option("--channel <id>", "Plugin channel id").option("--account <id>", "Channel account id").option("--url <url>", "Channel API base URL").option("--http-url <url>", "Alias for --url").option("-v, --verbose", "Verbose output", false).action(async (opts) => runtime.channelsLogin(opts));
 var cron = program.command("cron").description("Manage scheduled tasks");
-cron.command("list").option("-a, --all", "Include disabled jobs").action((opts) => runtime.cronList(opts));
-cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOption("-m, --message <message>", "Message for agent").option("-e, --every <seconds>", "Run every N seconds").option("-c, --cron <expr>", "Cron expression").option("--at <iso>", "Run once at time (ISO format)").option("-d, --deliver", "Deliver response to channel").option("--to <recipient>", "Recipient for delivery").option("--channel <channel>", "Channel for delivery").option("--account <id>", "Account id for channel delivery").action((opts) => runtime.cronAdd(opts));
-cron.command("remove <jobId>").action((jobId) => runtime.cronRemove(jobId));
-cron.command("enable <jobId>").option("--disable", "Disable instead of enable").action((jobId, opts) => runtime.cronEnable(jobId, opts));
+cron.command("list").option("-a, --all", "Include disabled jobs").action(async (opts) => runtime.cronList(opts));
+cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOption("-m, --message <message>", "Message for agent").option("-e, --every <seconds>", "Run every N seconds").option("-c, --cron <expr>", "Cron expression").option("--at <iso>", "Run once at time (ISO format)").option("-d, --deliver", "Deliver response to channel").option("--to <recipient>", "Recipient for delivery").option("--channel <channel>", "Channel for delivery").option("--account <id>", "Account id for channel delivery").action(async (opts) => runtime.cronAdd(opts));
+cron.command("remove <jobId>").action(async (jobId) => runtime.cronRemove(jobId));
+cron.command("enable <jobId>").option("--disable", "Disable instead of enable").action(async (jobId, opts) => runtime.cronEnable(jobId, opts));
 cron.command("run <jobId>").option("-f, --force", "Run even if disabled").action(async (jobId, opts) => runtime.cronRun(jobId, opts));
 program.command("status").description(`Show ${APP_NAME6} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
 program.command("doctor").description(`Run ${APP_NAME6} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.16.17",
+  "version": "0.16.18",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -39,16 +39,16 @@
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "yaml": "^2.8.1",
+    "@nextclaw/mcp": "0.1.54",
     "@nextclaw/core": "0.11.7",
-    "@nextclaw/ncp": "0.4.0",
     "@nextclaw/ncp-agent-runtime": "0.3.0",
-    "@nextclaw/mcp": "0.1.54",
     "@nextclaw/ncp-mcp": "0.1.54",
+    "@nextclaw/ncp": "0.4.0",
     "@nextclaw/ncp-toolkit": "0.4.6",
-    "@nextclaw/remote": "0.1.63",
-    "@nextclaw/runtime": "0.2.21",
     "@nextclaw/server": "0.11.11",
-    "@nextclaw/openclaw-compat": "0.3.45"
+    "@nextclaw/remote": "0.1.63",
+    "@nextclaw/openclaw-compat": "0.3.45",
+    "@nextclaw/runtime": "0.2.21"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",