@deepstrike/sdk 0.2.24 → 0.2.25

package/dist/tools/index.js

@@ -37,6 +37,22 @@ export function validateToolArguments(schemaJson, args) {
 function validateValue(schema, parent, key, path, state) {
     let value = parent[key];
     const expectedType = schema.type;
+    // 0. 多态联合 (oneOf / anyOf) —— 先于单一 type 分支匹配
+    const union = (schema.oneOf ?? schema.anyOf);
+    if (Array.isArray(union)) {
+        for (const sub of union) {
+            // 先克隆再试：避免某分支的 auto-cast/裁剪部分改写后又失败，污染后续分支
+            const probe = { v: structuredClone(parent[key]) };
+            const probeState = { repaired: false };
+            if (!validateValue(sub, probe, "v", path, probeState)) {
+                parent[key] = probe.v; // 接受首个匹配分支(连同它内部的 repair)
+                if (probeState.repaired)
+                    state.repaired = true;
+                return undefined;
+            }
+        }
+        return `${path} does not match any allowed shape`;
+    }
     // 1. 类型自动规整 (Auto-cast)
     if (typeof expectedType === "string") {
         if (expectedType === "boolean") {
@@ -92,14 +108,25 @@ function validateValue(schema, parent, key, path, state) {
             if (!value || typeof value !== "object" || Array.isArray(value))
                 return `${path} must be object`;
             const obj = value;
-            // 3a. 裁剪多余字段
+            // 3a. 裁剪多余字段 —— 尊重 additionalProperties。
+            // 缺省/false 维持旧的"裁剪"行为（所有现存工具都依赖它）；只有显式 true 或子 schema 才放行。
             const properties = schema.properties ?? {};
             const allowedKeys = new Set(Object.keys(properties));
+            const additional = schema.additionalProperties;
             for (const objKey of Object.keys(obj)) {
-                if (!allowedKeys.has(objKey)) {
-                    delete obj[objKey];
-                    state.repaired = true;
+                if (allowedKeys.has(objKey))
+                    continue;
+                if (additional === true)
+                    continue; // 任意键放行：不校验、不裁剪
+                if (additional && typeof additional === "object") {
+                    // 用子 schema 递归校验每个额外键的值（也会 auto-cast / 补默认）
+                    const err = validateValue(additional, obj, objKey, `${path}.${objKey}`, state);
+                    if (err)
+                        return err;
+                    continue;
                 }
+                delete obj[objKey]; // additionalProperties 缺省/false → 维持旧行为
+                state.repaired = true;
             }
             for (const required of schema.required ?? []) {
                 if (!(required in obj))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepstrike/sdk",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "DeepStrike Node.js SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.99.0",
-    "@deepstrike/core": "0.2.24",
+    "@deepstrike/core": "0.2.25",
     "@google/generative-ai": "^0.24.1",
     "openai": "^5.23.2"
   },