nextclaw 0.5.1 → 0.5.3

package/dist/cli/index.js

@@ -63,6 +63,7 @@ import {
   writeFileSync as writeFileSync2
 } from "fs";
 import { dirname, join as join3, resolve as resolve4 } from "path";
+import { createServer as createNetServer } from "net";
 import { spawn as spawn2, spawnSync as spawnSync3 } from "child_process";
 import { createInterface } from "readline";
 import { createRequire } from "module";
@@ -1925,26 +1926,321 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const ok = await service.runJob(jobId, Boolean(opts.force));
     console.log(ok ? "\u2713 Job executed" : `Failed to run job ${jobId}`);
   }
-  status() {
+  async status(opts = {}) {
+    const report = await this.collectRuntimeStatus({
+      verbose: Boolean(opts.verbose),
+      fix: Boolean(opts.fix)
+    });
+    if (opts.json) {
+      console.log(JSON.stringify(report, null, 2));
+      process.exitCode = report.exitCode;
+      return;
+    }
+    console.log(`${this.logo} ${APP_NAME} Status`);
+    console.log(`Level: ${report.level}`);
+    console.log(`Generated: ${report.generatedAt}`);
+    console.log("");
+    const processLabel = report.process.running ? `running (PID ${report.process.pid})` : report.process.staleState ? "stale-state" : "stopped";
+    console.log(`Process: ${processLabel}`);
+    console.log(`State file: ${report.serviceStatePath} ${report.serviceStateExists ? "\u2713" : "\u2717"}`);
+    if (report.process.startedAt) {
+      console.log(`Started: ${report.process.startedAt}`);
+    }
+    console.log(`Managed health: ${report.health.managed.state} (${report.health.managed.detail})`);
+    if (!report.process.running) {
+      console.log(`Configured health: ${report.health.configured.state} (${report.health.configured.detail})`);
+    }
+    console.log(`UI: ${report.endpoints.uiUrl ?? report.endpoints.configuredUiUrl}`);
+    console.log(`API: ${report.endpoints.apiUrl ?? report.endpoints.configuredApiUrl}`);
+    console.log(`Config: ${report.configPath} ${report.configExists ? "\u2713" : "\u2717"}`);
+    console.log(`Workspace: ${report.workspacePath} ${report.workspaceExists ? "\u2713" : "\u2717"}`);
+    console.log(`Model: ${report.model}`);
+    for (const provider of report.providers) {
+      console.log(`${provider.name}: ${provider.configured ? "\u2713" : "not set"}${provider.detail ? ` (${provider.detail})` : ""}`);
+    }
+    if (report.fixActions.length > 0) {
+      console.log("");
+      console.log("Fix actions:");
+      for (const action of report.fixActions) {
+        console.log(`- ${action}`);
+      }
+    }
+    if (report.issues.length > 0) {
+      console.log("");
+      console.log("Issues:");
+      for (const issue of report.issues) {
+        console.log(`- ${issue}`);
+      }
+    }
+    if (report.recommendations.length > 0) {
+      console.log("");
+      console.log("Recommendations:");
+      for (const recommendation of report.recommendations) {
+        console.log(`- ${recommendation}`);
+      }
+    }
+    if (opts.verbose && report.logTail.length > 0) {
+      console.log("");
+      console.log("Recent logs:");
+      for (const line of report.logTail) {
+        console.log(line);
+      }
+    }
+    process.exitCode = report.exitCode;
+  }
+  async doctor(opts = {}) {
+    const report = await this.collectRuntimeStatus({
+      verbose: Boolean(opts.verbose),
+      fix: Boolean(opts.fix)
+    });
+    const checkPort = await this.checkPortAvailability({
+      host: report.process.running ? report.endpoints.uiUrl ? new URL(report.endpoints.uiUrl).hostname : "127.0.0.1" : "127.0.0.1",
+      port: (() => {
+        try {
+          const base = report.process.running && report.endpoints.uiUrl ? report.endpoints.uiUrl : report.endpoints.configuredUiUrl;
+          return Number(new URL(base).port || 80);
+        } catch {
+          return 18791;
+        }
+      })()
+    });
+    const providerConfigured = report.providers.some((provider) => provider.configured);
+    const checks = [
+      {
+        name: "config-file",
+        status: report.configExists ? "pass" : "fail",
+        detail: report.configPath
+      },
+      {
+        name: "workspace-dir",
+        status: report.workspaceExists ? "pass" : "warn",
+        detail: report.workspacePath
+      },
+      {
+        name: "service-state",
+        status: report.process.staleState ? "fail" : report.process.running ? "pass" : "warn",
+        detail: report.process.running ? `PID ${report.process.pid}` : report.process.staleState ? "state exists but process is not running" : "service not running"
+      },
+      {
+        name: "service-health",
+        status: report.process.running ? report.health.managed.state === "ok" ? "pass" : "fail" : report.health.configured.state === "ok" ? "warn" : "warn",
+        detail: report.process.running ? `${report.health.managed.state}: ${report.health.managed.detail}` : `${report.health.configured.state}: ${report.health.configured.detail}`
+      },
+      {
+        name: "ui-port-availability",
+        status: report.process.running ? "pass" : checkPort.available ? "pass" : "fail",
+        detail: report.process.running ? "managed by running service" : checkPort.available ? "available" : checkPort.detail
+      },
+      {
+        name: "provider-config",
+        status: providerConfigured ? "pass" : "warn",
+        detail: providerConfigured ? "at least one provider configured" : "no provider api key configured"
+      }
+    ];
+    const failed = checks.filter((check) => check.status === "fail");
+    const warned = checks.filter((check) => check.status === "warn");
+    const exitCode = failed.length > 0 ? 1 : warned.length > 0 ? 1 : 0;
+    if (opts.json) {
+      console.log(
+        JSON.stringify(
+          {
+            generatedAt: report.generatedAt,
+            checks,
+            status: report,
+            exitCode
+          },
+          null,
+          2
+        )
+      );
+      process.exitCode = exitCode;
+      return;
+    }
+    console.log(`${this.logo} ${APP_NAME} Doctor`);
+    console.log(`Generated: ${report.generatedAt}`);
+    console.log("");
+    for (const check of checks) {
+      const icon = check.status === "pass" ? "\u2713" : check.status === "warn" ? "!" : "\u2717";
+      console.log(`${icon} ${check.name}: ${check.detail}`);
+    }
+    if (report.recommendations.length > 0) {
+      console.log("");
+      console.log("Recommendations:");
+      for (const recommendation of report.recommendations) {
+        console.log(`- ${recommendation}`);
+      }
+    }
+    if (opts.verbose && report.logTail.length > 0) {
+      console.log("");
+      console.log("Recent logs:");
+      for (const line of report.logTail) {
+        console.log(line);
+      }
+    }
+    process.exitCode = exitCode;
+  }
+  async collectRuntimeStatus(params) {
     const configPath = getConfigPath();
     const config2 = loadConfig();
-    const workspace = getWorkspacePath(config2.agents.defaults.workspace);
-    console.log(`${this.logo} ${APP_NAME} Status
-`);
-    console.log(`Config: ${configPath} ${existsSync4(configPath) ? "\u2713" : "\u2717"}`);
-    console.log(`Workspace: ${workspace} ${existsSync4(workspace) ? "\u2713" : "\u2717"}`);
-    console.log(`Model: ${config2.agents.defaults.model}`);
-    for (const spec of PROVIDERS) {
+    const workspacePath = getWorkspacePath(config2.agents.defaults.workspace);
+    const serviceStatePath = resolve4(getDataDir2(), "run", "service.json");
+    const fixActions = [];
+    let serviceState = readServiceState();
+    if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
+      clearServiceState();
+      fixActions.push("Cleared stale service state file.");
+      serviceState = readServiceState();
+    }
+    const managedByState = Boolean(serviceState);
+    const running = Boolean(serviceState && isProcessRunning(serviceState.pid));
+    const staleState = Boolean(serviceState && !running);
+    const configuredUi = resolveUiConfig(config2, { enabled: true, host: config2.ui.host, port: config2.ui.port });
+    const configuredUiUrl = resolveUiApiBase(configuredUi.host, configuredUi.port);
+    const configuredApiUrl = `${configuredUiUrl}/api`;
+    const managedUiUrl = serviceState?.uiUrl ?? null;
+    const managedApiUrl = serviceState?.apiUrl ?? null;
+    const managedHealth = running && managedApiUrl ? await this.probeApiHealth(`${managedApiUrl}/health`) : { state: "unreachable", detail: "service not running" };
+    const configuredHealth = await this.probeApiHealth(`${configuredApiUrl}/health`, 900);
+    const orphanSuspected = !running && configuredHealth.state === "ok";
+    const providers = PROVIDERS.map((spec) => {
       const provider = config2.providers[spec.name];
       if (!provider) {
-        continue;
+        return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
       }
       if (spec.isLocal) {
-        console.log(`${spec.displayName ?? spec.name}: ${provider.apiBase ? `\u2713 ${provider.apiBase}` : "not set"}`);
-      } else {
-        console.log(`${spec.displayName ?? spec.name}: ${provider.apiKey ? "\u2713" : "not set"}`);
+        return {
+          name: spec.displayName ?? spec.name,
+          configured: Boolean(provider.apiBase),
+          detail: provider.apiBase ? provider.apiBase : "apiBase not set"
+        };
       }
+      return {
+        name: spec.displayName ?? spec.name,
+        configured: Boolean(provider.apiKey),
+        detail: provider.apiKey ? "apiKey set" : "apiKey not set"
+      };
+    });
+    const issues = [];
+    const recommendations = [];
+    if (!existsSync4(configPath)) {
+      issues.push("Config file is missing.");
+      recommendations.push(`Run ${APP_NAME} init to create config files.`);
     }
+    if (!existsSync4(workspacePath)) {
+      issues.push("Workspace directory does not exist.");
+      recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
+    }
+    if (staleState) {
+      issues.push("Service state is stale (state exists but process is not running).");
+      recommendations.push(`Run ${APP_NAME} status --fix to clean stale state.`);
+    }
+    if (running && managedHealth.state !== "ok") {
+      issues.push(`Managed service health check failed: ${managedHealth.detail}`);
+      recommendations.push(`Check logs at ${serviceState?.logPath ?? resolveServiceLogPath()}.`);
+    }
+    if (!running) {
+      recommendations.push(`Run ${APP_NAME} start to launch the service.`);
+    }
+    if (orphanSuspected) {
+      issues.push("A service appears healthy on configured API endpoint, but state is missing/stale.");
+      recommendations.push("Another process may be occupying the UI port; stop it or use --ui-port with a free port.");
+    }
+    if (!providers.some((provider) => provider.configured)) {
+      recommendations.push("Configure at least one provider API key in UI or config before expecting agent replies.");
+    }
+    const logTail = params.verbose ? this.readLogTail(serviceState?.logPath ?? resolveServiceLogPath(), 25) : [];
+    const level = running ? managedHealth.state === "ok" ? issues.length > 0 ? "degraded" : "healthy" : "degraded" : "stopped";
+    const exitCode = level === "healthy" ? 0 : level === "degraded" ? 1 : 2;
+    return {
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      configPath,
+      configExists: existsSync4(configPath),
+      workspacePath,
+      workspaceExists: existsSync4(workspacePath),
+      model: config2.agents.defaults.model,
+      providers,
+      serviceStatePath,
+      serviceStateExists: existsSync4(serviceStatePath),
+      fixActions,
+      process: {
+        managedByState,
+        pid: serviceState?.pid ?? null,
+        running,
+        staleState,
+        orphanSuspected,
+        startedAt: serviceState?.startedAt ?? null
+      },
+      endpoints: {
+        uiUrl: managedUiUrl,
+        apiUrl: managedApiUrl,
+        configuredUiUrl,
+        configuredApiUrl
+      },
+      health: {
+        managed: managedHealth,
+        configured: configuredHealth
+      },
+      issues,
+      recommendations,
+      logTail,
+      level,
+      exitCode
+    };
+  }
+  async probeApiHealth(url, timeoutMs = 1500) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+      const response = await fetch(url, {
+        method: "GET",
+        signal: controller.signal
+      });
+      if (!response.ok) {
+        return { state: "invalid-response", detail: `HTTP ${response.status}` };
+      }
+      const payload = await response.json();
+      if (payload?.ok === true && payload?.data?.status === "ok") {
+        return { state: "ok", detail: "health endpoint returned ok", payload };
+      }
+      return { state: "invalid-response", detail: "unexpected health payload", payload };
+    } catch (error) {
+      return { state: "unreachable", detail: String(error) };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  readLogTail(path, maxLines = 25) {
+    if (!existsSync4(path)) {
+      return [];
+    }
+    try {
+      const lines = readFileSync3(path, "utf-8").split(/\r?\n/).filter(Boolean);
+      if (lines.length <= maxLines) {
+        return lines;
+      }
+      return lines.slice(lines.length - maxLines);
+    } catch {
+      return [];
+    }
+  }
+  async checkPortAvailability(params) {
+    return await new Promise((resolve5) => {
+      const server = createNetServer();
+      server.once("error", (error) => {
+        resolve5({
+          available: false,
+          detail: `bind failed on ${params.host}:${params.port} (${String(error)})`
+        });
+      });
+      server.listen(params.port, params.host, () => {
+        server.close(() => {
+          resolve5({
+            available: true,
+            detail: `bind ok on ${params.host}:${params.port}`
+          });
+        });
+      });
+    });
   }
   loadPluginRegistry(config2, workspaceDir) {
     return loadOpenClawPlugins({
@@ -2360,7 +2656,18 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       }
       try {
         const response = await fetch(params.healthUrl, { method: "GET" });
-        if (response.ok) {
+        if (!response.ok) {
+          await new Promise((resolve5) => setTimeout(resolve5, 200));
+          continue;
+        }
+        const payload = await response.json();
+        const healthy = payload?.ok === true && payload?.data?.status === "ok";
+        if (!healthy) {
+          await new Promise((resolve5) => setTimeout(resolve5, 200));
+          continue;
+        }
+        await new Promise((resolve5) => setTimeout(resolve5, 300));
+        if (isProcessRunning(params.pid)) {
           return true;
         }
       } catch {
@@ -2674,5 +2981,6 @@ cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOpti
 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("run <jobId>").option("-f, --force", "Run even if disabled").action(async (jobId, opts) => runtime.cronRun(jobId, opts));
-program.command("status").description(`Show ${APP_NAME2} status`).action(() => runtime.status());
+program.command("status").description(`Show ${APP_NAME2} 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_NAME2} 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));
 program.parseAsync(process.argv);

package/package.json

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