nextclaw 0.17.9 → 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";
@@ -10409,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."
+			},
+			fileName: {
+				type: "string",
+				description: "Optional asset file name override. Required when using bytesBase64."
 			},
-			required: ["bytesBase64", "fileName"],
-			additionalProperties: false
-		}]
+			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);
@@ -10541,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
@@ -11247,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) {
@@ -11307,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.17.9",
+  "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/core": "0.12.5",
+    "@nextclaw/ncp-agent-runtime": "0.3.10",
     "@nextclaw/ncp": "0.5.0",
-    "@nextclaw/ncp-agent-runtime": "0.3.9",
-    "@nextclaw/core": "0.12.4",
-    "@nextclaw/ncp-mcp": "0.1.71",
-    "@nextclaw/ncp-toolkit": "0.5.4",
-    "@nextclaw/mcp": "0.1.69",
-    "@nextclaw/openclaw-compat": "1.0.4",
-    "@nextclaw/server": "0.12.4",
-    "@nextclaw/remote": "0.1.81",
-    "@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",