@theokit/sdk 2.13.1 → 2.14.0

package/dist/define-tool.d.ts

@@ -1,4 +1,5 @@
 import type { z as ZodNamespace, ZodType } from "zod";
+import type { SanitizeOptions } from "./sanitize/types.js";
 import type { CustomTool } from "./types/agent.js";
 /**
  * Spec accepted by {@link defineTool}. `inputSchema` is a Zod schema; the
@@ -15,6 +16,13 @@ export interface DefineToolSpec<T extends ZodType> {
     inputSchema: T;
     /** Handler invoked with the parsed input. Type is inferred via `z.infer<T>`. */
     handler: (input: ZodNamespace.infer<T>) => string | Promise<string>;
+    /**
+     * Sanitize the raw model-emitted args BEFORE schema validation (`@theokit/sdk/sanitize`).
+     * `true` trims whitespace; an object opts into coercion / JSON-repair. Coercion is schema-aware
+     * against this tool's `inputSchema`. Absent ⇒ args reach validation untouched. Sanitize is
+     * hygiene, not a validity bypass — a genuinely invalid arg still raises `ZodError`.
+     */
+    sanitize?: boolean | SanitizeOptions;
 }
 /**
  * Type-safe builder for {@link CustomTool}. Converts a Zod schema to JSON

package/dist/eval.cjs

@@ -10950,6 +10950,115 @@ function toOllamaTools(tools) {
     }
   }));
 }
+var cachedJsonrepair;
+function loadJsonrepair() {
+  if (cachedJsonrepair === void 0) {
+    const req = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('eval.cjs', document.baseURI).href)));
+    cachedJsonrepair = req("jsonrepair").jsonrepair;
+  }
+  return cachedJsonrepair;
+}
+function isPlainObject(v) {
+  return v !== null && typeof v === "object" && !Array.isArray(v);
+}
+function toFiniteNumber(raw) {
+  if (raw === "") return void 0;
+  const n = Number(raw);
+  return Number.isFinite(n) && String(n) === raw ? n : void 0;
+}
+function tryJson(raw, repair) {
+  const t = raw.trimStart();
+  if (!(t.startsWith("{") || t.startsWith("["))) return void 0;
+  try {
+    return JSON.parse(repair ? loadJsonrepair()(t) : t);
+  } catch {
+    return void 0;
+  }
+}
+function heuristicCoerce(raw, repairJson) {
+  if (raw === "true") return true;
+  if (raw === "false") return false;
+  if (raw === "null") return null;
+  const n = toFiniteNumber(raw);
+  if (n !== void 0) return n;
+  const json = tryJson(raw, false) ?? (repairJson ? tryJson(raw, true) : void 0);
+  return json === void 0 ? raw : json;
+}
+function coerceCandidates(raw, repairJson) {
+  const out = [];
+  if (raw === "true") out.push(true);
+  else if (raw === "false") out.push(false);
+  else if (raw === "null") out.push(null);
+  const n = toFiniteNumber(raw);
+  if (n !== void 0) out.push(n);
+  const json = tryJson(raw, false) ?? (repairJson ? tryJson(raw, true) : void 0);
+  if (json !== void 0) out.push(json);
+  out.push(raw);
+  return out;
+}
+function objectShape(schema) {
+  const shape = schema?.shape;
+  return shape !== null && typeof shape === "object" ? shape : void 0;
+}
+
+// src/sanitize/sanitize-tool-input.ts
+function applyTrim(key, value, ctx) {
+  const trimmed = value.trim();
+  if (trimmed !== value) ctx.notes.push(`trimmed "${key}"`);
+  return trimmed;
+}
+function applyCoerce(key, raw, ctx) {
+  const field = ctx.shape?.[key];
+  let coerced = raw;
+  if (field) {
+    for (const candidate of coerceCandidates(raw, ctx.repairJson)) {
+      if (field.safeParse(candidate).success) {
+        coerced = candidate;
+        break;
+      }
+    }
+  } else {
+    coerced = heuristicCoerce(raw, ctx.repairJson);
+  }
+  if (coerced !== raw) ctx.notes.push(`coerced "${key}"`);
+  return coerced;
+}
+function applyRepair(key, value, ctx) {
+  const repaired = tryJson(value, true);
+  if (repaired === void 0) return value;
+  ctx.notes.push(`repaired json "${key}"`);
+  return repaired;
+}
+function sanitizeString(key, value, ctx) {
+  let out = ctx.trim ? applyTrim(key, value, ctx) : value;
+  if (ctx.coerce && typeof out === "string") out = applyCoerce(key, out, ctx);
+  if (ctx.repairJson && !ctx.coerce && typeof out === "string") out = applyRepair(key, out, ctx);
+  return out;
+}
+function walk(input, ctx, depth) {
+  const out = {};
+  for (const [key, value] of Object.entries(input)) {
+    if (typeof value === "string") out[key] = sanitizeString(key, value, ctx);
+    else if (ctx.deep && depth < ctx.maxDepth && isPlainObject(value))
+      out[key] = walk(value, ctx, depth + 1);
+    else out[key] = value;
+  }
+  return out;
+}
+function sanitizeToolInput(input, options) {
+  if (!isPlainObject(input)) return { value: input, changed: false, notes: [] };
+  const ctx = {
+    trim: options?.trim,
+    coerce: options?.coerce ?? false,
+    repairJson: options?.repairJson ?? false,
+    deep: options?.deep ?? false,
+    maxDepth: options?.maxDepth ?? 8,
+    shape: objectShape(options?.schema),
+    notes: []
+  };
+  const value = walk(input, ctx, 0);
+  return { value, changed: ctx.notes.length > 0, notes: ctx.notes };
+}
 
 // src/internal/llm/hermes-tool-extract.ts
 var HERMES_BLOCK = /<function=\s*([^>\s]+)\s*>([\s\S]*?)<\/tool_call>/g;
@@ -10975,9 +11084,9 @@ function parseHermesParams(inner) {
     const key = param[1];
     const value = param[2];
     if (key === void 0 || value === void 0) continue;
-    input[key.trim()] = value.trim();
+    input[key.trim()] = value;
   }
-  return input;
+  return sanitizeToolInput(input, { trim: true }).value;
 }
 
 // src/internal/llm/openai.ts
@@ -15787,7 +15896,7 @@ var JsonlParseError = class extends Error {
   }
   line;
 };
-function isPlainObject(value) {
+function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function tryParseObjectLine(line) {
@@ -15798,7 +15907,7 @@ function tryParseObjectLine(line) {
   } catch {
     return void 0;
   }
-  return isPlainObject(parsed) ? parsed : void 0;
+  return isPlainObject2(parsed) ? parsed : void 0;
 }
 function loadJsonl(path, opts = {}) {
   const text = fs.readFileSync(path, "utf8");
@@ -15814,7 +15923,7 @@ function loadJsonl(path, opts = {}) {
     } catch {
       throw new JsonlParseError(`line ${lineNumber}: invalid JSON`, lineNumber);
     }
-    if (!isPlainObject(parsed)) {
+    if (!isPlainObject2(parsed)) {
       throw new JsonlParseError(`line ${lineNumber}: not a JSON object`, lineNumber);
     }
     out.push(opts.map ? opts.map(parsed, lineNumber) : parsed);