nextclaw 0.9.11 → 0.9.13

package/dist/cli/index.js

@@ -26,7 +26,7 @@ import {
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
   setPluginRuntimeBridge as setPluginRuntimeBridge2
 } from "@nextclaw/openclaw-compat";
-import { existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync8, writeFileSync as writeFileSync6 } from "fs";
 import { join as join7, resolve as resolve9 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { fileURLToPath as fileURLToPath4 } from "url";
@@ -1925,7 +1925,7 @@ var DiagnosticsCommands = class {
     });
     if (opts.json) {
       console.log(JSON.stringify(report, null, 2));
-      process.exitCode = report.exitCode;
+      process.exitCode = 0;
       return;
     }
     console.log(`${this.deps.logo} ${APP_NAME} Status`);
@@ -1978,7 +1978,7 @@ var DiagnosticsCommands = class {
         console.log(line);
       }
     }
-    process.exitCode = report.exitCode;
+    process.exitCode = 0;
   }
   async doctor(opts = {}) {
     const report = await this.collectRuntimeStatus({
@@ -2148,7 +2148,7 @@ var DiagnosticsCommands = class {
     }
     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;
+    const exitCode = 0;
     return {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       configPath,
@@ -2252,7 +2252,7 @@ import {
   stopPluginChannelGateways
 } from "@nextclaw/openclaw-compat";
 import { startUiServer } from "@nextclaw/server";
-import { appendFileSync, closeSync, cpSync, existsSync as existsSync8, mkdirSync as mkdirSync4, mkdtempSync, openSync, rmSync as rmSync3 } from "fs";
+import { appendFileSync, closeSync, cpSync, existsSync as existsSync8, mkdirSync as mkdirSync4, mkdtempSync, openSync, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
 import { dirname, isAbsolute as isAbsolute2, join as join5, relative, resolve as resolve7 } from "path";
 import { tmpdir } from "os";
 import { spawn as spawn2 } from "child_process";
@@ -4391,33 +4391,51 @@ var ServiceCommands = class {
   }
   async materializeMarketplaceGitSkillSource(params) {
     const parsed = this.parseMarketplaceGitSkillSource(params.source);
-    const gitPath = findExecutableOnPath("git");
-    if (!gitPath) {
-      throw new Error("git is required to install marketplace git skills");
+    const gitPath = this.resolveGitExecutablePath();
+    const fallbackNotes = [];
+    if (gitPath) {
+      try {
+        return await this.materializeMarketplaceGitSkillViaGit({ gitPath, parsed });
+      } catch (error) {
+        fallbackNotes.push(`Git fast path failed: ${String(error)}`);
+      }
+    } else {
+      fallbackNotes.push("Git fast path unavailable: git executable not found");
     }
+    const httpResult = await this.materializeMarketplaceGitSkillViaGithubApi(parsed);
+    return {
+      ...httpResult,
+      commandOutput: [...fallbackNotes, httpResult.commandOutput].filter(Boolean).join("\n")
+    };
+  }
+  resolveGitExecutablePath() {
+    return findExecutableOnPath("git");
+  }
+  async materializeMarketplaceGitSkillViaGit(params) {
     const tempRoot = mkdtempSync(join5(tmpdir(), "nextclaw-marketplace-skill-"));
     const repoDir = join5(tempRoot, "repo");
     try {
       const cloneArgs = ["clone", "--depth", "1", "--filter=blob:none", "--sparse"];
-      if (parsed.ref) {
-        cloneArgs.push("--branch", parsed.ref);
+      if (params.parsed.ref) {
+        cloneArgs.push("--branch", params.parsed.ref);
       }
-      cloneArgs.push(parsed.repoUrl, repoDir);
-      const cloneResult = await this.runCommand(gitPath, cloneArgs, {
+      cloneArgs.push(params.parsed.repoUrl, repoDir);
+      const cloneResult = await this.runCommand(params.gitPath, cloneArgs, {
         cwd: tempRoot,
         timeoutMs: 18e4
       });
-      const sparseResult = await this.runCommand(gitPath, ["-C", repoDir, "sparse-checkout", "set", parsed.skillPath], {
+      const sparseResult = await this.runCommand(params.gitPath, ["-C", repoDir, "sparse-checkout", "set", params.parsed.skillPath], {
         cwd: tempRoot,
         timeoutMs: 6e4
       });
-      const skillDir = join5(repoDir, parsed.skillPath);
+      const skillDir = join5(repoDir, params.parsed.skillPath);
       return {
         tempRoot,
         skillDir,
         commandOutput: [
-          `Git repository: ${parsed.repoUrl}`,
-          `Git path: ${parsed.skillPath}`,
+          "Installer path: git-sparse",
+          `Git repository: ${params.parsed.repoUrl}`,
+          `Git path: ${params.parsed.skillPath}`,
           this.mergeCommandOutput(cloneResult.stdout, cloneResult.stderr),
           this.mergeCommandOutput(sparseResult.stdout, sparseResult.stderr)
         ].filter(Boolean).join("\n")
@@ -4427,6 +4445,98 @@ var ServiceCommands = class {
       throw error;
     }
   }
+  async materializeMarketplaceGitSkillViaGithubApi(parsed) {
+    const tempRoot = mkdtempSync(join5(tmpdir(), "nextclaw-marketplace-skill-"));
+    const skillDir = join5(tempRoot, "skill");
+    const downloadedFiles = [];
+    try {
+      mkdirSync4(skillDir, { recursive: true });
+      await this.downloadGithubDirectoryToPath({
+        parsed,
+        remotePath: parsed.skillPath,
+        localDir: skillDir,
+        relativePrefix: "",
+        downloadedFiles
+      });
+      return {
+        tempRoot,
+        skillDir,
+        commandOutput: [
+          "Installer path: github-http",
+          `Git repository: ${parsed.repoUrl}`,
+          `Git path: ${parsed.skillPath}`,
+          `Downloaded files: ${downloadedFiles.length}`
+        ].join("\n")
+      };
+    } catch (error) {
+      rmSync3(tempRoot, { recursive: true, force: true });
+      throw error;
+    }
+  }
+  async downloadGithubDirectoryToPath(params) {
+    const encodedPath = params.remotePath.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/");
+    const apiUrl = new URL(`https://api.github.com/repos/${params.parsed.owner}/${params.parsed.repo}/contents/${encodedPath}`);
+    if (params.parsed.ref) {
+      apiUrl.searchParams.set("ref", params.parsed.ref);
+    }
+    const payload = await this.fetchJsonWithHeaders(apiUrl.toString(), {
+      Accept: "application/vnd.github+json",
+      "User-Agent": `${APP_NAME2}/${getPackageVersion()}`
+    });
+    if (!Array.isArray(payload)) {
+      throw new Error(`GitHub path is not a directory: ${params.remotePath}`);
+    }
+    for (const entry of payload) {
+      if (!entry || typeof entry !== "object") {
+        continue;
+      }
+      const item = entry;
+      const itemName = typeof item.name === "string" ? item.name.trim() : "";
+      const itemPath = typeof item.path === "string" ? item.path.trim() : "";
+      if (!itemName || !itemPath) {
+        continue;
+      }
+      if (item.type === "dir") {
+        const childLocalDir = join5(params.localDir, itemName);
+        mkdirSync4(childLocalDir, { recursive: true });
+        await this.downloadGithubDirectoryToPath({
+          parsed: params.parsed,
+          remotePath: itemPath,
+          localDir: childLocalDir,
+          relativePrefix: params.relativePrefix ? `${params.relativePrefix}/${itemName}` : itemName,
+          downloadedFiles: params.downloadedFiles
+        });
+        continue;
+      }
+      if (item.type !== "file") {
+        throw new Error(`Unsupported GitHub skill entry type: ${item.type ?? "unknown"}`);
+      }
+      if (!item.download_url) {
+        throw new Error(`GitHub skill file missing download_url: ${itemPath}`);
+      }
+      const content = await this.fetchBinaryWithHeaders(item.download_url, {
+        "User-Agent": `${APP_NAME2}/${getPackageVersion()}`
+      });
+      const localFile = join5(params.localDir, itemName);
+      writeFileSync4(localFile, content);
+      params.downloadedFiles.push(params.relativePrefix ? `${params.relativePrefix}/${itemName}` : itemName);
+    }
+  }
+  async fetchJsonWithHeaders(url, headers) {
+    const response = await fetch(url, { headers });
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status} when fetching ${url}`);
+    }
+    return await response.json();
+  }
+  async fetchBinaryWithHeaders(url, headers) {
+    const response = await fetch(url, { headers });
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status} when downloading ${url}`);
+    }
+    const bytes = await response.arrayBuffer();
+    return Buffer.from(bytes);
+  }
   parseMarketplaceGitSkillSource(source) {
     const trimmed = source.trim();
     if (!trimmed) {
@@ -4447,6 +4557,8 @@ var ServiceCommands = class {
         throw new Error(`Unsupported GitHub skill source URL: ${source}`);
       }
       return {
+        owner: owner2,
+        repo: repo2,
         repoUrl: `https://github.com/${owner2}/${repo2}.git`,
         skillPath: pathParts2.join("/"),
         ref: ref2
@@ -4466,6 +4578,8 @@ var ServiceCommands = class {
       throw new Error(`Unsupported git skill source: ${source}`);
     }
     return {
+      owner,
+      repo,
       repoUrl: `https://github.com/${owner}/${repo}.git`,
       skillPath: pathParts.join("/"),
       ref: ref && ref.trim().length > 0 ? ref.trim() : void 0
@@ -4628,7 +4742,7 @@ ${stderr}`.trim();
 };
 
 // src/cli/workspace.ts
-import { cpSync as cpSync2, existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync7, readdirSync as readdirSync2, rmSync as rmSync4, writeFileSync as writeFileSync4 } from "fs";
+import { cpSync as cpSync2, existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync7, readdirSync as readdirSync2, rmSync as rmSync4, writeFileSync as writeFileSync5 } from "fs";
 import { createRequire } from "module";
 import { dirname as dirname2, join as join6, resolve as resolve8 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
@@ -4672,7 +4786,7 @@ var WorkspaceManager = class {
       const raw = readFileSync7(templatePath, "utf-8");
       const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME3);
       mkdirSync5(dirname2(filePath), { recursive: true });
-      writeFileSync4(filePath, content);
+      writeFileSync5(filePath, content);
       created.push(entry.target);
     }
     const memoryDir = join6(workspace, "memory");
@@ -5240,7 +5354,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         const merged = history.concat(
           rl.history ?? []
         );
-        writeFileSync5(historyFile, merged.join("\n"));
+        writeFileSync6(historyFile, merged.join("\n"));
         process.exit(0);
       });
       let running = true;

package/package.json

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

package/templates/USAGE.md

@@ -8,13 +8,14 @@ This guide covers installation, configuration, channels, tools, automation, and
 
 ## AI Self-Management Contract
 
-When NextClaw AI needs to operate the product itself (status/doctor/channels/config/cron), follow these rules:
+When NextClaw AI needs to operate the product itself (version/status/doctor/channels/config/cron), follow these rules:
 
 1. **Read this guide first** (`USAGE.md`) before executing management commands.
-2. **Prefer machine-readable output** (`--json`) whenever available.
-3. **Close the loop after changes** with `nextclaw status --json` (and `nextclaw doctor --json` when needed).
-4. **Be explicit about restart semantics** (hot-apply, auto-restart, or manual restart required).
-5. **Never invent commands**; use documented commands or `nextclaw --help` / `nextclaw <subcommand> --help`.
+2. **Use the exact command for the intent**: use `nextclaw --version` for version lookup; do not infer version from `status`.
+3. **Prefer machine-readable output** (`--json`) whenever available.
+4. **Close the loop after changes** with `nextclaw status --json` (and `nextclaw doctor --json` when needed).
+5. **Be explicit about restart semantics** (hot-apply, auto-restart, or manual restart required).
+6. **Never invent commands**; use documented commands or `nextclaw --help` / `nextclaw <subcommand> --help`.
 
 ---
 
@@ -421,6 +422,7 @@ Created under the workspace:
 | `nextclaw ui` | Start UI and gateway in the foreground |
 | `nextclaw gateway` | Start gateway only (for channels) |
 | `nextclaw serve` | Run gateway + UI in the foreground (no background) |
+| `nextclaw --version` | Show the installed NextClaw version |
 | `nextclaw agent -m "message"` | Send a one-off message to the agent |
 | `nextclaw agent` | Interactive chat in the terminal |
 | `nextclaw agent --session <id> --model <model>` | Use a session-specific model/provider route (sticky for that session) |
@@ -460,8 +462,9 @@ If service is already running, new UI port flags do not hot-apply; use `nextclaw
 
 Status/diagnostics tips:
 
+- `nextclaw --version` is the only supported way to query the installed CLI version.
 - `nextclaw status` shows runtime truth (process + health + config summary).
-- `nextclaw status --json` outputs machine-readable status and sets exit code (`0` healthy, `1` degraded, `2` stopped).
+- `nextclaw status --json` outputs machine-readable status and exits `0` when the command itself succeeds; use the JSON `level` field (`healthy` / `degraded` / `stopped`) to interpret runtime state.
 - `nextclaw status --fix` safely clears stale service state if PID is dead.
 - `nextclaw doctor` runs additional checks (state coherence, health, port availability, provider readiness).