nextclaw 0.17.8 → 0.17.10

package/dist/cli/index.js

@@ -19,7 +19,7 @@ import { request } from "node:http";
 import { request as request$1 } from "node:https";
 import { setImmediate as setImmediate$1, setTimeout as setTimeout$1 } from "node:timers/promises";
 import chokidar from "chokidar";
-import { DefaultNcpAgentRuntime, LocalAssetStore, buildAssetContentPath, buildNcpUserContent } from "@nextclaw/ncp-agent-runtime";
+import { DefaultNcpAgentRuntime, LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool } from "@nextclaw/ncp-agent-runtime";
 import { McpNcpToolRegistryAdapter } from "@nextclaw/ncp-mcp";
 import { NCP_INTERNAL_VISIBILITY_METADATA_KEY, NcpEventType, readAssistantReasoningNormalizationMode, readAssistantReasoningNormalizationModeFromMetadata, sanitizeAssistantReplyTags, writeAssistantReasoningNormalizationModeToMetadata } from "@nextclaw/ncp";
 import { DefaultNcpAgentBackend, createAgentClientFromServer } from "@nextclaw/ncp-toolkit";
@@ -6204,6 +6204,41 @@ function decodeMarketplaceFileContent(path, contentBase64) {
 	return Buffer.from(normalized, "base64");
 }
 //#endregion
+//#region src/cli/update/self-update-report.utils.ts
+function reportSelfUpdateResult(params) {
+	const { appName, currentVersion, result, readInstalledVersion } = params;
+	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();
+		return {
+			ok: false,
+			shouldSuggestRestart: false
+		};
+	}
+	if (result.strategy === "noop") {
+		console.log(`✓ ${appName} is already up to date (${result.latestVersion ?? currentVersion})`);
+		return {
+			ok: true,
+			shouldSuggestRestart: false
+		};
+	}
+	const versionAfter = result.latestVersion ?? readInstalledVersion();
+	console.log(`✓ Update complete (${result.strategy})`);
+	if (versionAfter === currentVersion) console.log(`Version unchanged: ${currentVersion}`);
+	else console.log(`Version updated: ${currentVersion} -> ${versionAfter}`);
+	return {
+		ok: true,
+		shouldSuggestRestart: true
+	};
+}
+//#endregion
 //#region src/cli/update/runner.ts
 const DEFAULT_TIMEOUT_MS = 20 * 6e4;
 function runSelfUpdate(options = {}) {
@@ -6211,6 +6246,7 @@ function runSelfUpdate(options = {}) {
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const updateCommand = options.updateCommand ?? process.env.NEXTCLAW_UPDATE_COMMAND?.trim();
 	const packageName = options.packageName ?? "nextclaw";
+	const currentVersion = options.currentVersion?.trim() || null;
 	const resolveShellCommand = (command) => {
 		if (process.platform === "win32") return {
 			cmd: process.env.ComSpec || "cmd.exe",
@@ -6234,19 +6270,33 @@ function runSelfUpdate(options = {}) {
 			timeout: timeoutMs,
 			stdio: "pipe"
 		});
+		const stdout = (result.stdout ?? "").toString().slice(0, 4e3);
+		const stderr = (result.stderr ?? "").toString().slice(0, 4e3);
 		steps.push({
 			cmd,
 			args,
 			cwd,
 			code: result.status,
-			stdout: (result.stdout ?? "").toString().slice(0, 4e3),
-			stderr: (result.stderr ?? "").toString().slice(0, 4e3)
+			stdout,
+			stderr
 		});
 		return {
 			ok: result.status === 0,
-			code: result.status
+			code: result.status,
+			stdout,
+			stderr
 		};
 	};
+	const parseLatestVersion = (raw) => {
+		const trimmed = raw.trim();
+		if (!trimmed) return null;
+		try {
+			const parsed = JSON.parse(trimmed);
+			return typeof parsed === "string" && parsed.trim() ? parsed.trim() : null;
+		} catch {
+			return trimmed;
+		}
+	};
 	if (updateCommand) {
 		const cwd = options.cwd ? resolve(options.cwd) : process.cwd();
 		const shellCommand = resolveShellCommand(updateCommand);
@@ -6264,19 +6314,35 @@ function runSelfUpdate(options = {}) {
 	}
 	const npmExecutable = findExecutableOnPath("npm");
 	if (npmExecutable) {
+		const cwd = options.cwd ? resolve(options.cwd) : process.cwd();
+		const latestVersionStep = runStep(npmExecutable, [
+			"view",
+			packageName,
+			"version",
+			"--json"
+		], cwd);
+		const latestVersion = latestVersionStep.ok ? parseLatestVersion(latestVersionStep.stdout) : null;
+		if (latestVersion && currentVersion && latestVersion === currentVersion) return {
+			ok: true,
+			strategy: "noop",
+			latestVersion,
+			steps
+		};
 		if (!runStep(npmExecutable, [
 			"i",
 			"-g",
 			packageName
-		], process.cwd()).ok) return {
+		], cwd).ok) return {
 			ok: false,
 			error: `npm install -g ${packageName} failed`,
 			strategy: "npm",
+			latestVersion: latestVersion ?? void 0,
 			steps
 		};
 		return {
 			ok: true,
 			strategy: "npm",
+			latestVersion: latestVersion ?? void 0,
 			steps
 		};
 	}
@@ -10343,48 +10409,39 @@ var AssetPutTool = class {
 	description = "Put a normal file path or base64 bytes into the managed asset store.";
 	parameters = {
 		type: "object",
-		oneOf: [{
-			type: "object",
-			properties: {
-				path: {
-					type: "string",
-					description: "Existing local file path to put into the asset store."
-				},
-				fileName: {
-					type: "string",
-					description: "Optional asset file name override."
-				},
-				mimeType: {
-					type: "string",
-					description: "Optional mime type override."
-				}
+		properties: {
+			path: {
+				type: "string",
+				description: "Existing local file path to put into the asset store."
 			},
-			required: ["path"],
-			additionalProperties: false
-		}, {
-			type: "object",
-			properties: {
-				bytesBase64: {
-					type: "string",
-					description: "Base64 file bytes. Use together with fileName when no source path exists."
-				},
-				fileName: {
-					type: "string",
-					description: "Asset file name. Required when using bytesBase64."
-				},
-				mimeType: {
-					type: "string",
-					description: "Optional mime type override."
-				}
+			bytesBase64: {
+				type: "string",
+				description: "Base64 file bytes. Use together with fileName when no source path exists."
 			},
-			required: ["bytesBase64", "fileName"],
-			additionalProperties: false
-		}]
+			fileName: {
+				type: "string",
+				description: "Optional asset file name override. Required when using bytesBase64."
+			},
+			mimeType: {
+				type: "string",
+				description: "Optional mime type override."
+			}
+		},
+		additionalProperties: false
 	};
 	constructor(assetStore, contentBasePath) {
 		this.assetStore = assetStore;
 		this.contentBasePath = contentBasePath;
 	}
+	validateArgs = (args) => {
+		const path = readOptionalString$5(args.path);
+		const bytesBase64 = readOptionalString$5(args.bytesBase64);
+		const fileName = readOptionalString$5(args.fileName);
+		if (path && bytesBase64) return ["Provide either path, or bytesBase64 + fileName, not both."];
+		if (path) return [];
+		if (bytesBase64) return fileName ? [] : ["fileName is required when using bytesBase64."];
+		return ["Provide either path, or bytesBase64 + fileName."];
+	};
 	execute = async (args) => {
 		const path = readOptionalString$5(args?.path);
 		const fileName = readOptionalString$5(args?.fileName);
@@ -10475,11 +10532,12 @@ var AssetStatTool = class {
 	};
 };
 function createAssetTools(params) {
+	const { assetStore } = params;
 	const contentBasePath = params.contentBasePath ?? "/api/ncp/assets/content";
 	return [
-		new AssetPutTool(params.assetStore, contentBasePath),
-		new AssetExportTool(params.assetStore),
-		new AssetStatTool(params.assetStore, contentBasePath)
+		new AssetPutTool(assetStore, contentBasePath),
+		new AssetExportTool(assetStore),
+		new AssetStatTool(assetStore, contentBasePath)
 	];
 }
 //#endregion
@@ -11181,19 +11239,20 @@ function readRequestedAgentId(metadata) {
 	return normalizeString(metadata.agent_id)?.toLowerCase() ?? normalizeString(metadata.agentId)?.toLowerCase() ?? null;
 }
 function resolveAgentProfile(params) {
-	const defaultAgentId = resolveDefaultAgentProfileId(params.config);
-	const candidateAgentId = normalizeString(params.storedAgentId)?.toLowerCase() ?? readRequestedAgentId(params.requestMetadata) ?? defaultAgentId;
-	const profile = findEffectiveAgentProfile(params.config, candidateAgentId) ?? findEffectiveAgentProfile(params.config, defaultAgentId);
+	const { config, requestMetadata, storedAgentId } = params;
+	const { agents: { defaults }, search: searchConfig, tools: { restrictToWorkspace, exec: { timeout: execTimeoutSeconds } } } = config;
+	const defaultAgentId = resolveDefaultAgentProfileId(config);
+	const profile = findEffectiveAgentProfile(config, normalizeString(storedAgentId)?.toLowerCase() ?? readRequestedAgentId(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
 	if (!profile) throw new Error(`default agent profile not found: ${defaultAgentId}`);
 	return {
 		agentId: profile.id,
-		workspace: getWorkspacePath(profile.workspace ?? params.config.agents.defaults.workspace),
-		model: profile.model ?? params.config.agents.defaults.model,
-		maxIterations: profile.maxToolIterations ?? params.config.agents.defaults.maxToolIterations,
-		contextTokens: profile.contextTokens ?? params.config.agents.defaults.contextTokens,
-		restrictToWorkspace: params.config.tools.restrictToWorkspace,
-		searchConfig: params.config.search,
-		execTimeoutSeconds: params.config.tools.exec.timeout
+		workspace: getWorkspacePath(profile.workspace ?? defaults.workspace),
+		model: profile.model ?? defaults.model,
+		maxIterations: profile.maxToolIterations ?? defaults.maxToolIterations,
+		contextTokens: profile.contextTokens ?? defaults.contextTokens,
+		restrictToWorkspace,
+		searchConfig,
+		execTimeoutSeconds
 	};
 }
 function shouldAppendTimeHint(content) {
@@ -11241,14 +11300,7 @@ function filterTools(toolDefinitions, requestedToolNames) {
 	return filtered.length > 0 ? filtered : void 0;
 }
 function buildRequestedOpenAiTools(toolDefinitions, requestedToolNames) {
-	return filterTools(toolDefinitions.map((tool) => ({
-		type: "function",
-		function: {
-			name: tool.name,
-			description: tool.description,
-			parameters: tool.parameters
-		}
-	})), requestedToolNames);
+	return filterTools(toolDefinitions.map(buildOpenAiFunctionTool), requestedToolNames);
 }
 var NextclawNcpContextBuilder = class {
 	inputBudgetPruner = new InputBudgetPruner();
@@ -15842,28 +15894,19 @@ var CliRuntime = class {
 		}
 		const versionBefore = getPackageVersion$1();
 		console.log(`Current version: ${versionBefore}`);
-		const result = runSelfUpdate({
-			timeoutMs,
-			cwd: process.cwd()
+		const report = reportSelfUpdateResult({
+			appName: APP_NAME,
+			currentVersion: versionBefore,
+			result: runSelfUpdate({
+				timeoutMs,
+				cwd: process.cwd(),
+				currentVersion: versionBefore
+			}),
+			readInstalledVersion: getPackageVersion$1
 		});
-		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);
-		}
-		const versionAfter = getPackageVersion$1();
-		console.log(`✓ Update complete (${result.strategy})`);
-		if (versionAfter === versionBefore) console.log(`Version unchanged: ${versionBefore}`);
-		else console.log(`Version updated: ${versionBefore} -> ${versionAfter}`);
+		if (!report.ok) process.exit(1);
 		const state = managedServiceStateStore.read();
-		if (state && isProcessRunning(state.pid)) console.log(`Tip: restart ${APP_NAME} to apply the update.`);
+		if (report.shouldSuggestRestart && state && isProcessRunning(state.pid)) console.log(`Tip: restart ${APP_NAME} to apply the update.`);
 	};
 	agentsList = (opts = {}) => {
 		this.agentCommands.agentsList(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.17.8",
+  "version": "0.17.10",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -40,16 +40,16 @@
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "yaml": "^2.8.1",
-    "@nextclaw/ncp-mcp": "0.1.71",
+    "@nextclaw/core": "0.12.5",
+    "@nextclaw/ncp-agent-runtime": "0.3.10",
     "@nextclaw/ncp": "0.5.0",
-    "@nextclaw/ncp-toolkit": "0.5.4",
-    "@nextclaw/openclaw-compat": "1.0.4",
-    "@nextclaw/ncp-agent-runtime": "0.3.9",
-    "@nextclaw/remote": "0.1.81",
-    "@nextclaw/server": "0.12.4",
-    "@nextclaw/mcp": "0.1.69",
-    "@nextclaw/core": "0.12.4",
-    "@nextclaw/runtime": "0.2.36"
+    "@nextclaw/openclaw-compat": "1.0.5",
+    "@nextclaw/mcp": "0.1.70",
+    "@nextclaw/ncp-toolkit": "0.5.5",
+    "@nextclaw/ncp-mcp": "0.1.72",
+    "@nextclaw/server": "0.12.5",
+    "@nextclaw/remote": "0.1.82",
+    "@nextclaw/runtime": "0.2.37"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
@@ -57,7 +57,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ui": "0.12.6"
+    "@nextclaw/ui": "0.12.7"
   },
   "scripts": {
     "dev": "tsx watch --tsconfig tsconfig.json src/cli/index.ts",