clef-mcp 0.1.1 → 0.1.2

package/dist/index.d.ts

@@ -426,6 +426,6 @@ declare function clefDecideOutputSchema(): z.ZodObject<{
 /** `state` cannot be size-checked inside zod (it is `unknown`), so it is validated separately. */
 declare function validateStateSize(state: unknown, limits: Limits): void;
 
-declare const VERSION = "0.1.1";
+declare const VERSION = "0.1.2";
 
 export { CLEF_FLASH, type ClefConfig, type ClefDecideInput, type ClefDecideOutput, type ClefDecisionAnswer, ClefError, ClefErrorCode, type ClefQuestion, type ClefRuntime, type ClefServerDeps, DEFAULT_LIMITS, type DownloadProgress, type InstallModelResult, type Limits, LlamaCppRuntime, type LlamaCppRuntimeOptions, type LogLevel, type Logger, MODELS, type ModelManifest, type ModelSpec, type PlatformInfo, type ProbeResult, type QuantSpec, type QuestionType, type ResolvedBinary, type RunningClefServer, type RuntimeHealth, SERVER_INSTRUCTIONS, StderrLogger, type SystemOneRequest, type SystemOneResponse, TOOL_NAME, VERSION, assertSupportedPlatform, clefDecideInputSchema, clefDecideOutputSchema, createClefServer, createLogger, deepVerifyChecksum, defaultClefHome, detectPlatform, downloadFile, downloadManagedLlama, ensureLlamaRuntime, errorJson, exitCodeFor, fetchFileInfo, findInstalledManifest, formatBytes, fromSystemOneResponse, getModelSpec, getQuantSpec, installModel, limitsFromEnv, loadConfig, manifestPathFor, modelQuantDir, pathsFor, pickQuant, probeInference, readModelManifest, removeManagedRuntime, resolveLlamaServerBinary, toSystemOneRequest, validateStateSize, verifyModelFiles, writeModelManifest };

package/dist/index.js

@@ -210,7 +210,9 @@ function toSystemOneRequest(input, defaultModel) {
   const questions = {};
   for (const [qid, q] of Object.entries(input.questions)) {
     const question = { type: q.type, instructions: q.instructions };
-    if (q.criteria !== void 0) question.criteria = q.criteria;
+    if (q.criteria !== void 0) {
+      question.criteria = q.type === "choice" && Array.isArray(q.criteria) ? Object.fromEntries(q.criteria.map((c) => [c, c])) : q.criteria;
+    }
     questions[qid] = question;
   }
   return {
@@ -1211,14 +1213,23 @@ import { z } from "zod";
 function criteriaDescription(limits) {
   return z.string().min(1).max(limits.maxCriteriaDescChars);
 }
+function countIssues(count, limits) {
+  if (count === 0) return "criteria must not be empty";
+  if (count > limits.maxCriteriaPerQuestion) return `too many criteria (max ${limits.maxCriteriaPerQuestion})`;
+  return void 0;
+}
 function choiceCriteria(limits) {
-  return z.record(z.string().min(1).max(limits.maxCriteriaDescChars), criteriaDescription(limits)).check((ctx) => {
-    const count = Object.keys(ctx.value).length;
-    if (count === 0) ctx.issues.push({ code: "custom", message: "criteria must not be empty", input: ctx.value });
-    if (count > limits.maxCriteriaPerQuestion) {
-      ctx.issues.push({ code: "custom", message: `too many criteria (max ${limits.maxCriteriaPerQuestion})`, input: ctx.value });
-    }
-  });
+  return z.union([
+    // Plain list: option ids equal to the strings themselves.
+    z.array(criteriaDescription(limits)).check((ctx) => {
+      const problem = countIssues(ctx.value.length, limits);
+      if (problem) ctx.issues.push({ code: "custom", message: problem, input: ctx.value });
+    }),
+    z.record(z.string().min(1).max(limits.maxCriteriaDescChars), criteriaDescription(limits)).check((ctx) => {
+      const problem = countIssues(Object.keys(ctx.value).length, limits);
+      if (problem) ctx.issues.push({ code: "custom", message: problem, input: ctx.value });
+    })
+  ]);
 }
 function scoreCriteria(limits) {
   return z.array(criteriaDescription(limits)).check((ctx) => {
@@ -1239,7 +1250,7 @@ function questionSchema(limits) {
       if (!parsed.success) {
         ctx.addIssue({
           code: "custom",
-          message: `"choice" questions require non-empty criteria as a map of option id -> description (${parsed.error.issues[0]?.message ?? "invalid criteria"})`
+          message: `"choice" questions require non-empty criteria as a map of option id -> description, or a plain list of options (${parsed.error.issues[0]?.message ?? "invalid criteria"})`
         });
       }
     } else if (q.type === "score") {
@@ -1414,7 +1425,7 @@ function createClefServer(deps = {}) {
 }
 
 // src/version.ts
-var VERSION = "0.1.1";
+var VERSION = "0.1.2";
 export {
   CLEF_FLASH,
   ClefError,