flavor-code 1.3.10 → 1.3.11

package/dist/desktop/main.js

@@ -6095,9 +6095,10 @@ function withStructuredOutput(options) {
       throw new Error("Structured output retry delays must be non-negative integers");
     }
   }
-  const tool = modelToolFromZod(options.name, options.description, options.schema);
+  const generatedTool = options.modelInputSchema === void 0 ? modelToolFromZod(options.name, options.description, options.schema) : { name: options.name, description: options.description, inputSchema: options.modelInputSchema };
+  const tool = options.modelStrict === void 0 ? generatedTool : { ...generatedTool, strict: options.modelStrict };
   const maxAttempts = retry.maxRetries + 1;
-  const jsonSchema = tool.inputSchema;
+  const validationSchema = jsonSchemaFromZod(options.schema);
   const model = {
     async *stream(request) {
       let candidate;
@@ -6170,7 +6171,7 @@ function withStructuredOutput(options) {
             }
           }
           if (candidateCount === 1 && candidate !== null && typeof candidate === "object") {
-            candidate = coerceByJsonSchema(candidate, jsonSchema);
+            candidate = coerceByJsonSchema(candidate, validationSchema);
           }
           if (candidateCount !== 1) {
             attemptError = {
@@ -6242,7 +6243,13 @@ function withStructuredOutput(options) {
   return model;
 }
 function strictJsonSchema(schema) {
-  return ensureStrictSchema(z12.toJSONSchema(schema));
+  return strictJsonSchemaObject(jsonSchemaFromZod(schema));
+}
+function jsonSchemaFromZod(schema) {
+  return z12.toJSONSchema(schema);
+}
+function strictJsonSchemaObject(schema) {
+  return ensureStrictSchema(schema);
 }
 function extractJsonObject(text) {
   const trimmed = text.trim();
@@ -6290,6 +6297,7 @@ function coerceByJsonSchema(value, schema) {
   const node = schema;
   const branches = [
     ...Array.isArray(node.anyOf) ? node.anyOf : [],
+    ...Array.isArray(node.oneOf) ? node.oneOf : [],
     ...Array.isArray(node.allOf) ? node.allOf : []
   ].filter((branch) => branch !== null && typeof branch === "object");
   const types = [];
@@ -6309,40 +6317,108 @@ function coerceByJsonSchema(value, schema) {
     if (lowered === "true") return true;
     if (lowered === "false") return false;
   }
+  if (types.includes("object") && !types.includes("string") && typeof value === "string") {
+    const trimmed = value.trim();
+    if (trimmed.startsWith("{")) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
+          return coerceByJsonSchema(parsed, node);
+        }
+      } catch {
+      }
+    }
+  }
+  if (types.includes("array") && !Array.isArray(value) && value !== null && value !== void 0 && !types.some((type) => matchesJsonSchemaType(value, type))) {
+    const arraySchema = [node, ...branches].find((candidate) => {
+      const type = candidate.type;
+      return type === "array" || Array.isArray(type) && type.includes("array");
+    });
+    if (typeof value === "string" && value.trim().startsWith("[")) {
+      try {
+        const parsed = JSON.parse(value.trim());
+        if (Array.isArray(parsed)) return coerceByJsonSchema(parsed, arraySchema ?? node);
+      } catch {
+      }
+    }
+    return [arraySchema?.items === void 0 ? value : coerceByJsonSchema(value, arraySchema.items)];
+  }
   if (value !== null && typeof value === "object" && !Array.isArray(value)) {
-    const properties = node.properties ?? branches.find((branch) => branch.properties)?.properties;
+    const objectSchema = [node, ...branches].find((candidate) => candidate.type === "object" || candidate.properties !== void 0);
+    const properties = objectSchema?.properties;
     if (properties !== void 0) {
       const output = {};
+      const required2 = new Set(Array.isArray(objectSchema?.required) ? objectSchema.required : []);
       for (const [key, child] of Object.entries(value)) {
-        output[key] = properties[key] !== void 0 ? coerceByJsonSchema(child, properties[key]) : child;
+        const childSchema = properties[key];
+        if (child === null && childSchema !== void 0 && !required2.has(key) && !jsonSchemaAllowsNull(childSchema)) {
+          continue;
+        }
+        output[key] = childSchema !== void 0 ? coerceByJsonSchema(child, childSchema) : child;
       }
       return output;
     }
   }
-  if (types.includes("array") && Array.isArray(value) && node.items !== void 0) {
-    return value.map((item) => coerceByJsonSchema(item, node.items));
+  if (types.includes("array") && Array.isArray(value)) {
+    const arraySchema = [node, ...branches].find((candidate) => {
+      const type = candidate.type;
+      return type === "array" || Array.isArray(type) && type.includes("array");
+    });
+    if (arraySchema?.items !== void 0) {
+      return value.map((item) => coerceByJsonSchema(item, arraySchema.items));
+    }
   }
   return value;
 }
+function matchesJsonSchemaType(value, type) {
+  if (type === "null") return value === null;
+  if (type === "array") return Array.isArray(value);
+  if (type === "object") return value !== null && typeof value === "object" && !Array.isArray(value);
+  if (type === "integer") return typeof value === "number" && Number.isInteger(value);
+  if (type === "number") return typeof value === "number";
+  return typeof value === type;
+}
+function jsonSchemaAllowsNull(schema) {
+  if (schema === null || typeof schema !== "object") return false;
+  const node = schema;
+  if (node.type === "null" || Array.isArray(node.type) && node.type.includes("null")) return true;
+  return [node.anyOf, node.oneOf].some((branches) => Array.isArray(branches) && branches.some((branch) => jsonSchemaAllowsNull(branch)));
+}
 function modelToolFromZod(name, description, schema) {
   return { name, description, inputSchema: strictJsonSchema(schema) };
 }
 function ensureStrictSchema(schema) {
+  const output = { ...schema };
+  for (const keyword of ["anyOf", "oneOf", "allOf", "prefixItems"]) {
+    const branches = schema[keyword];
+    if (Array.isArray(branches)) {
+      output[keyword] = branches.map((branch) => typeof branch === "object" && branch !== null ? ensureStrictSchema(branch) : branch);
+    }
+  }
+  if (typeof schema.items === "object" && schema.items !== null) {
+    output.items = ensureStrictSchema(schema.items);
+  }
+  for (const keyword of ["$defs", "definitions"]) {
+    const definitions = schema[keyword];
+    if (typeof definitions === "object" && definitions !== null && !Array.isArray(definitions)) {
+      output[keyword] = Object.fromEntries(Object.entries(definitions).map(([key, definition]) => [
+        key,
+        typeof definition === "object" && definition !== null ? ensureStrictSchema(definition) : definition
+      ]));
+    }
+  }
   if (schema.type !== "object" || typeof schema.properties !== "object" || schema.properties === null) {
-    return schema;
+    return output;
   }
-  const required2 = Array.isArray(schema.required) ? [...schema.required] : [];
-  const requiredSet = new Set(required2);
+  const requiredSet = new Set(Array.isArray(schema.required) ? schema.required : []);
   const properties = {};
   for (const [key, value] of Object.entries(schema.properties)) {
     const child = typeof value === "object" && value !== null ? ensureStrictSchema(value) : value;
-    if (requiredSet.has(key)) properties[key] = child;
-    else {
-      properties[key] = { anyOf: [child, { type: "null" }] };
-      requiredSet.add(key);
-    }
+    if (requiredSet.has(key) || jsonSchemaAllowsNull(child)) properties[key] = child;
+    else properties[key] = { anyOf: [child, { type: "null" }] };
+    requiredSet.add(key);
   }
-  return { ...schema, additionalProperties: false, required: [...requiredSet], properties };
+  return { ...output, additionalProperties: false, required: [...requiredSet], properties };
 }
 function repairMessages(messages, tool, original, candidate, error) {
   const details = [
@@ -6712,19 +6788,11 @@ var AgentLoop = class {
           });
           continue;
         }
-        const validation = collected.kind === "valid" ? this.#options.runtime.validate(collected) : { ok: false, error: collected.error };
+        const validation = collected.kind === "valid" ? this.#options.runtime.normalize(collected) : { ok: false, error: collected.error };
         if (validation.ok) {
           toolCalls.push({ id: collected.id, name: collected.name, input: validation.input });
           continue;
         }
-        if (collected.kind === "valid") {
-          const coerced = coerceByJsonSchema(collected.input, strictJsonSchema(definition.inputSchema));
-          const revalidation = this.#options.runtime.validate({ ...collected, input: coerced });
-          if (revalidation.ok) {
-            toolCalls.push({ id: collected.id, name: collected.name, input: revalidation.input });
-            continue;
-          }
-        }
         const repairModelId = this.#options.fallbackModelId ?? this.#options.modelId;
         const invalidOutput = collected.kind === "invalid" ? collected.rawInput : serializeToolInput(collected.input);
         const structured = withStructuredOutput({
@@ -6733,6 +6801,8 @@ var AgentLoop = class {
           name: definition.name,
           description: definition.description,
           schema: definition.inputSchema,
+          ...definition.modelInputSchema === void 0 ? {} : { modelInputSchema: definition.modelInputSchema },
+          ...definition.modelStrict === void 0 ? {} : { modelStrict: definition.modelStrict },
           beforeAttempt: async ({ attempt: repairAttempt, maxAttempts: repairMaxAttempts, messageCount }) => {
             const before = await this.#options.hooks.emit({
               version: 1,
@@ -7658,12 +7728,24 @@ var ToolRuntime = class {
       throw error;
     }
   }
+  /**
+   * Validates a call and applies the same conservative provider-argument
+   * normalization used by the agent loop before falling back to repair.
+   */
+  normalize(call) {
+    const validation = this.validate(call);
+    if (validation.ok || validation.error.code === "unknown_tool") return validation;
+    const tool = this.#tools.get(call.name);
+    if (tool === void 0) return validation;
+    const input = coerceByJsonSchema(call.input, jsonSchemaFromZod(tool.inputSchema));
+    return this.validate({ ...call, input });
+  }
   async #execute(call, context) {
     const tool = this.#tools.get(call.name);
     if (tool === void 0) return { ok: false, error: { code: "unknown_tool", message: `Unknown tool: ${call.name}` } };
     const signal = context.signal ?? new AbortController().signal;
     const toolCallId = call.id ?? randomUUID7();
-    const validation = this.validate(call);
+    const validation = this.normalize(call);
     if (!validation.ok) {
       return this.#fail(toolCallId, call.name, call.input, context.agent, validation.error.code, validation.error.message);
     }
@@ -9414,6 +9496,7 @@ var PluginHost = class {
             description: contribution.description,
             inputSchema: z18.unknown(),
             ...contribution.modelInputSchema === void 0 ? {} : { modelInputSchema: contribution.modelInputSchema },
+            ...contribution.modelInputSchema === void 0 ? {} : { modelStrict: false },
             ...contribution.readOnly === void 0 ? {} : { readOnly: contribution.readOnly },
             paths: () => [],
             execute: (input, _signal, toolContext) => session.invoke("tool", contribution.name, [
@@ -19923,7 +20006,7 @@ function compileDefinition(record3, scope2, workspace) {
     name: record3.name,
     description: record3.description,
     inputSchema,
-    modelInputSchema: record3.inputSchema,
+    modelInputSchema: strictJsonSchemaObject(record3.inputSchema),
     modelStrict: true,
     ...record3.agents === void 0 ? {} : { agents: record3.agents },
     paths: () => [],
@@ -20413,16 +20496,24 @@ var MVP_COMMANDS = [
   "fork",
   "pals",
   "chat",
-  "co-work"
+  "co-work",
+  "tool"
 ];
-function parseSlashCommand(input, dynamicCommands = [], skillCommands = []) {
+function parseSlashCommand(input, dynamicCommands = [], skillCommands = [], managedTools = []) {
   const trimmed = input.trim();
   if (!trimmed.startsWith("/")) return null;
-  const [rawName = "", ...args] = trimmed.slice(1).split(/\s+/);
+  const match = /^(\S+)(?:\s+([\s\S]*))?$/u.exec(trimmed.slice(1));
+  const rawName = match?.[1] ?? "";
+  const rawArguments = match?.[2] ?? "";
+  const args = rawArguments.length === 0 ? [] : rawArguments.split(/\s+/u);
   const name = rawName.toLowerCase();
   if (!MVP_COMMANDS.includes(name) && dynamicCommands.includes(name)) {
     return { name: "plugin", command: name, args };
   }
+  if (!MVP_COMMANDS.includes(name)) {
+    const managedTool = managedTools.find((tool) => tool.toLowerCase() === name);
+    if (managedTool !== void 0) return { name: "managed-tool", tool: managedTool, input: rawArguments };
+  }
   if (!MVP_COMMANDS.includes(name) && skillCommands.includes(name)) {
     return { name: "skill", skill: name, prompt: args.join(" ") };
   }
@@ -20444,6 +20535,15 @@ function parseSlashCommand(input, dynamicCommands = [], skillCommands = []) {
     }
     return { name, mode: normalized };
   }
+  if (name === "tool") {
+    const [requested] = args;
+    const managedTool = requested === void 0 ? void 0 : managedTools.find((candidate) => candidate.toLowerCase() === requested.toLowerCase());
+    if (managedTool === void 0) {
+      return { name: "invalid", command: name, message: "Use /tool <registered-tool> [JSON object]." };
+    }
+    const inputStart = rawArguments.search(/\s/u);
+    return { name: "managed-tool", tool: managedTool, input: inputStart < 0 ? "" : rawArguments.slice(inputStart).trimStart() };
+  }
   if (name === "audit") {
     const toolFilter = args.length > 0 ? args.join(" ") : void 0;
     return { name, toolFilter };
@@ -20671,6 +20771,7 @@ var HELP = [
   "/review [focus]                         review uncommitted changes before committing",
   "/evolve <signals|suggest|improve <id>|verify <name>|reload <name>|test|revert <name>|done <id>>  self-improvement loop",
   "/mcp [status|tools|reconnect|enable|disable]  manage MCP servers",
+  "/tool <registered-tool> [JSON object]      run a registered tool (or use /<tool-name>)",
   "/ide                                     show VS Code connection and cursor/selection",
   "/pals [--verbose|rename <alias>|info <alias-or-uuid>]",
   "/chat <alias-or-uuid> <goal>             send a task that starts on the receiving pal",
@@ -20942,7 +21043,12 @@ var FlavorSession = class {
         } catch {
         }
       }
-      const command = parseSlashCommand(prompt, this.#services.pluginCommands().map(({ name }) => name), skillNames);
+      const command = parseSlashCommand(
+        prompt,
+        this.#services.pluginCommands().map(({ name }) => name),
+        skillNames,
+        this.#services.managedToolCommands().map(({ name }) => name)
+      );
       if (command !== null) await this.#dispatch(command, controller2.signal);
       else for await (const event of this.#services.run(prompt, controller2.signal, {
         getSteeringMessages: () => this.#drainMessages("steer", true).map((item) => item.text),
@@ -21044,6 +21150,8 @@ var FlavorSession = class {
       this.#notice(`Main permissions set to ${command.mode}. Child approvals use bubble mode unless plan mode is active.`);
     } else if (command.name === "plugin") {
       this.#notice(format(await this.#services.runPluginCommand(command.command, command.args, signal)));
+    } else if (command.name === "managed-tool") {
+      this.#notice(format(await this.#services.runManagedTool(command.tool, command.input, signal)));
     } else if (command.name === "skill") {
       for await (const event of this.#services.runSkill(command.skill, command.prompt, signal)) this.#services.output(event);
     } else if (command.name === "loop") {
@@ -24644,6 +24752,7 @@ async function createProductionRuntime(options) {
       managedTools.push(tool);
     }
     if (harnessCreated) harness.replaceMainTools(tools);
+    options.onToolsChange?.();
   };
   tools.push(...createManagedToolManagementTools({
     store: managedToolStore,
@@ -25973,6 +26082,25 @@ ${renderMemoryDocument(entries)}`;
         signal.throwIfAborted();
         return awaitWithSignal3(Promise.resolve(handler(args, { workspace, signal })), signal);
       },
+      managedToolCommands: () => managedTools.map(({ name, description }) => ({ name, description })).sort((left, right) => left.name.localeCompare(right.name)),
+      runManagedTool: async (name, rawInput, signal) => {
+        const tool = managedTools.find((candidate) => sameToolName(candidate.name, name));
+        if (tool === void 0) throw new Error(`Registered tool "${name}" is no longer available.`);
+        signal.throwIfAborted();
+        const input = normalizeToolCallInput(rawInput);
+        const call = { name: tool.name, input };
+        const validation = harness.main.runtime.normalize(call);
+        if (!validation.ok) throw new Error(`Invalid input for registered tool "${tool.name}": ${validation.error.message}`);
+        harness.main.runtime.beginTurn();
+        const result = await harness.main.runtime.execute(
+          { name: tool.name, input: validation.input },
+          { agent: "main", ownerId: "main", signal }
+        );
+        if (!result.ok) {
+          throw new Error(`Registered tool "${tool.name}" failed (${result.error?.code ?? "unknown"}): ${result.error?.message ?? "Unknown error"}`);
+        }
+        return result.output !== void 0 ? result.output : result.content;
+      },
       output: emitOutput,
       questions,
       async login() {
@@ -29286,7 +29414,8 @@ var DesktopRuntimeController = class {
         ...runtime.approvals.pending === void 0 ? {} : { approval: runtime.approvals.pending },
         ...runtime.services.questions.pending === void 0 ? {} : { questions: runtime.services.questions.pending },
         ...runtime.memoryReviews.pending.length === 0 ? {} : { memoryReviews: runtime.memoryReviews.pending },
-        ...(runtime.memoryReviews.autoDismissSeconds ?? 0) > 0 ? { memoryAutoDismissSeconds: runtime.memoryReviews.autoDismissSeconds } : {}
+        ...(runtime.memoryReviews.autoDismissSeconds ?? 0) > 0 ? { memoryAutoDismissSeconds: runtime.memoryReviews.autoDismissSeconds } : {},
+        ...(runtime.services.managedToolCommands?.().length ?? 0) === 0 ? {} : { managedTools: runtime.services.managedToolCommands() }
       },
       diagnostics: runtime?.diagnostics ?? [],
       models: this.#models,
@@ -29340,6 +29469,9 @@ var DesktopRuntimeController = class {
       },
       onApprovalChange: () => {
         if (this.#runtime !== void 0) this.#publishSnapshot();
+      },
+      onToolsChange: () => {
+        if (this.#runtime !== void 0) this.#publishSnapshot();
       }
     });
     outputSessionId = runtime.sessionId;