nextclaw 0.4.6 → 0.4.8

package/dist/cli/index.js

@@ -54,7 +54,9 @@ import chokidar from "chokidar";
 import { createHash } from "crypto";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import {
-  ConfigSchema
+  buildConfigSchema,
+  ConfigSchema,
+  redactConfigObject
 } from "nextclaw-core";
 
 // src/cli/utils.ts
@@ -63,7 +65,7 @@ import { join, resolve } from "path";
 import { spawn } from "child_process";
 import { createServer } from "net";
 import { fileURLToPath } from "url";
-import { getDataDir } from "nextclaw-core";
+import { getDataDir, getPackageVersion } from "nextclaw-core";
 function resolveUiConfig(config, overrides) {
   const base = config.ui ?? { enabled: false, host: "127.0.0.1", port: 18791, open: false };
   return { ...base, ...overrides ?? {} };
@@ -204,17 +206,6 @@ function openBrowser(url) {
   const child = spawn(command, args, { stdio: "ignore", detached: true });
   child.unref();
 }
-function getPackageVersion() {
-  try {
-    const cliDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
-    const pkgPath = resolve(cliDir, "..", "..", "package.json");
-    const raw = readFileSync(pkgPath, "utf-8");
-    const parsed = JSON.parse(raw);
-    return typeof parsed.version === "string" ? parsed.version : "0.0.0";
-  } catch {
-    return "0.0.0";
-  }
-}
 function which(binary) {
   const paths = (process.env.PATH ?? "").split(":");
   for (const dir of paths) {
@@ -340,24 +331,6 @@ function runSelfUpdate(options = {}) {
 
 // src/cli/gateway/controller.ts
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-var redactConfig = (value) => {
-  if (Array.isArray(value)) {
-    return value.map((entry) => redactConfig(entry));
-  }
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  const entries = value;
-  const output = {};
-  for (const [key, val] of Object.entries(entries)) {
-    if (/apiKey|token|secret|password|appId|clientSecret|accessKey/i.test(key)) {
-      output[key] = val ? "***" : val;
-      continue;
-    }
-    output[key] = redactConfig(val);
-  }
-  return output;
-};
 var readConfigSnapshot = (getConfigPath2) => {
   const path = getConfigPath2();
   let raw = "";
@@ -382,9 +355,14 @@ var readConfigSnapshot = (getConfigPath2) => {
     raw = JSON.stringify(config, null, 2);
   }
   const hash = hashRaw(raw);
-  const redacted = redactConfig(config);
+  const schema = buildConfigSchema({ version: getPackageVersion() });
+  const redacted = redactConfigObject(config, schema.uiHints);
   return { raw: valid ? JSON.stringify(redacted, null, 2) : null, hash: valid ? hash : null, config, redacted, valid };
 };
+var redactValue = (value) => {
+  const schema = buildConfigSchema({ version: getPackageVersion() });
+  return redactConfigObject(value, schema.uiHints);
+};
 var mergeDeep = (base, patch) => {
   const next = { ...base };
   for (const [key, value] of Object.entries(patch)) {
@@ -401,29 +379,6 @@ var mergeDeep = (base, patch) => {
   }
   return next;
 };
-var buildSchemaFromValue = (value) => {
-  if (Array.isArray(value)) {
-    const item = value.length ? buildSchemaFromValue(value[0]) : { type: "string" };
-    return { type: "array", items: item };
-  }
-  if (value && typeof value === "object") {
-    const props = {};
-    for (const [key, val] of Object.entries(value)) {
-      props[key] = buildSchemaFromValue(val);
-    }
-    return { type: "object", properties: props };
-  }
-  if (typeof value === "number") {
-    return { type: "number" };
-  }
-  if (typeof value === "boolean") {
-    return { type: "boolean" };
-  }
-  if (value === null) {
-    return { type: ["null", "string"] };
-  }
-  return { type: "string" };
-};
 var scheduleRestart = (delayMs, reason) => {
   const delay = typeof delayMs === "number" && Number.isFinite(delayMs) ? Math.max(0, delayMs) : 100;
   console.log(`Gateway restart requested via tool${reason ? ` (${reason})` : ""}.`);
@@ -462,17 +417,7 @@ var GatewayControllerImpl = class {
     };
   }
   async getConfigSchema() {
-    const base = ConfigSchema.parse({});
-    return {
-      schema: {
-        ...buildSchemaFromValue(base),
-        title: "NextClawConfig",
-        description: "NextClaw config schema (simplified)"
-      },
-      uiHints: {},
-      version: getPackageVersion(),
-      generatedAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
+    return buildConfigSchema({ version: getPackageVersion() });
   }
   async applyConfig(params) {
     const snapshot = readConfigSnapshot(this.deps.getConfigPath);
@@ -504,7 +449,7 @@ var GatewayControllerImpl = class {
       ok: true,
       note: params.note ?? null,
       path: this.deps.getConfigPath(),
-      config: redactConfig(validated),
+      config: redactValue(validated),
       restart: { scheduled: true, delayMs }
     };
   }
@@ -539,7 +484,7 @@ var GatewayControllerImpl = class {
       ok: true,
       note: params.note ?? null,
       path: this.deps.getConfigPath(),
-      config: redactConfig(validated),
+      config: redactValue(validated),
       restart: { scheduled: true, delayMs }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,8 +38,8 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "nextclaw-core": "^0.4.4",
-    "nextclaw-server": "^0.3.2"
+    "nextclaw-core": "^0.4.6",
+    "nextclaw-server": "^0.3.3"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
@@ -54,7 +54,8 @@
     "vitest": "^2.1.2"
   },
   "scripts": {
-    "dev": "pnpm -C ../nextclaw-core build && pnpm -C ../nextclaw-server build && tsx src/cli/index.ts",
+    "dev": "tsx watch --tsconfig tsconfig.json src/cli/index.ts",
+    "dev:build": "pnpm -C ../nextclaw-core build && pnpm -C ../nextclaw-server build && tsx src/cli/index.ts",
     "build": "pnpm -C ../nextclaw-core build && pnpm -C ../nextclaw-server build && tsup src/index.ts src/cli/index.ts --format esm --dts --out-dir dist && node scripts/copy-ui-dist.mjs",
     "start": "node dist/cli.js",
     "lint": "eslint .",