la-machina-engine 0.7.2 → 0.7.4

package/dist/index.cjs

@@ -1817,7 +1817,11 @@ var AnthropicClient = class {
       messages: request.messages,
       stream: true,
       ...request.system !== void 0 ? { system: request.system } : {},
-      ...request.tools !== void 0 ? { tools: request.tools } : {}
+      ...request.tools !== void 0 ? { tools: request.tools } : {},
+      // Plan 025 — `'required'` maps to Anthropic's `tool_choice: { type: 'any' }`,
+      // which forces the model to call SOME tool but doesn't pin which.
+      // `'auto'` is the SDK default — omit to let it through unchanged.
+      ...request.toolChoice === "required" ? { tool_choice: { type: "any" } } : {}
     };
     const requestOptions = {};
     if (betas.length > 0) {
@@ -1999,6 +2003,9 @@ var AISdkAdapter = class {
       tools,
       ...request.maxTokens !== void 0 ? { maxOutputTokens: request.maxTokens } : {},
       ...request.temperature !== void 0 ? { temperature: request.temperature } : {},
+      // Plan 025 — pass through `'required'` so the AI SDK forwards it
+      // to the provider as that provider's "force tool call" flag.
+      ...request.toolChoice === "required" ? { toolChoice: "required" } : {},
       maxRetries: this.options.maxRetries ?? 2
     });
     for await (const event of result.fullStream) {
@@ -2618,6 +2625,17 @@ function ensureToolResultPairing(messages) {
   return messages;
 }
 
+// src/engine/lastTurnGuard.ts
+init_cjs_shims();
+var LAST_TURN_INSTRUCTION_JSON = "SYSTEM NOTE: This is your final allowed turn. Emit ONLY the JSON object that satisfies the output schema in the system prompt. Do not call any more tools. Do not write any explanation, narration, or markdown \u2014 only the raw JSON.";
+var LAST_TURN_INSTRUCTION_TEXT = "SYSTEM NOTE: This is your final allowed turn. Stop calling tools and deliver your final answer now. The next turn will not happen.";
+function lastTurnInstruction(outputFormat) {
+  return outputFormat === "json" ? LAST_TURN_INSTRUCTION_JSON : LAST_TURN_INSTRUCTION_TEXT;
+}
+function shouldInjectLastTurnInstruction(opts) {
+  return opts.turnCount + 1 === opts.maxTurns;
+}
+
 // src/compact/compactor.ts
 init_cjs_shims();
 
@@ -3109,15 +3127,29 @@ async function agentLoop(options) {
     const toolCalls = [];
     let stopReason = null;
     let turnUsage = { input: 0, output: 0 };
+    let messagesForApi = messages;
+    if (shouldInjectLastTurnInstruction({
+      turnCount: ctx.getTurnCount(),
+      maxTurns: ctx.getMaxTurns()
+    })) {
+      messagesForApi = [
+        ...messages,
+        {
+          role: "user",
+          content: [{ type: "text", text: lastTurnInstruction(options.outputFormat) }]
+        }
+      ];
+    }
     const normalizedMessages = normalizeMessages(
-      messages
+      messagesForApi
     );
     try {
       for await (const event of client.streamMessage({
         messages: normalizedMessages,
         system,
         tools: anthropicTools,
-        ...escalatedMaxTokens !== void 0 ? { maxTokens: escalatedMaxTokens } : {}
+        ...escalatedMaxTokens !== void 0 ? { maxTokens: escalatedMaxTokens } : {},
+        ...options.toolChoice !== void 0 ? { toolChoice: options.toolChoice } : {}
       })) {
         const handled = consumeEvent(event);
         if (handled.text !== void 0) textBlocks.push(handled.text);
@@ -3668,6 +3700,9 @@ var RunContext = class {
   getTurnCount() {
     return this.turnCount;
   }
+  getMaxTurns() {
+    return this.maxTurns;
+  }
   getTokensUsed() {
     return this.tokensUsed;
   }
@@ -7866,6 +7901,9 @@ async function collectSkills(storage, skillsDir) {
 // src/engine/jsonOutput.ts
 init_cjs_shims();
 var import_zod_to_json_schema2 = require("zod-to-json-schema");
+function isZodSchema(s) {
+  return s !== null && typeof s === "object" && "_def" in s && typeof s.safeParse === "function";
+}
 function buildSchemaPrompt(schema) {
   const lines = [
     "# Output Format",
@@ -7875,11 +7913,18 @@ function buildSchemaPrompt(schema) {
     "Do NOT wrap in ```json ... ```. Just raw JSON."
   ];
   if (schema) {
-    const jsonSchema2 = (0, import_zod_to_json_schema2.zodToJsonSchema)(schema, {
-      target: "jsonSchema7",
-      $refStrategy: "none"
-    });
-    const { $schema: _, ...clean } = jsonSchema2;
+    let clean;
+    if (isZodSchema(schema)) {
+      const jsonSchema2 = (0, import_zod_to_json_schema2.zodToJsonSchema)(schema, {
+        target: "jsonSchema7",
+        $refStrategy: "none"
+      });
+      const { $schema: _z, ...rest } = jsonSchema2;
+      clean = rest;
+    } else {
+      const { $schema: _j, ...rest } = schema;
+      clean = rest;
+    }
     lines.push("", "The JSON MUST conform to this schema:", JSON.stringify(clean, null, 2));
   } else {
     lines.push("", "Return a JSON object with the relevant data.");
@@ -7915,6 +7960,9 @@ function tryParseJSON2(text2) {
   return { ok: false, error: "No valid JSON found in response" };
 }
 function validateOutput(value, schema) {
+  if (!isZodSchema(schema)) {
+    return { ok: true, data: value };
+  }
   const result = schema.safeParse(value);
   if (result.success) {
     return { ok: true, data: result.data };
@@ -9644,6 +9692,35 @@ var TranscriptReader = class {
   }
 };
 
+// src/engine/runToolFilter.ts
+init_cjs_shims();
+function applyRunToolFilter(registry, options) {
+  const stripAll = options.toolChoice === "none" || options.tools !== void 0 && options.tools.length === 0;
+  if (stripAll) {
+    if (options.toolChoice === "required") {
+      throw new EngineError(
+        "ERR_TOOL_CHOICE_CONFLICT",
+        "toolChoice: 'required' is incompatible with an empty tool set (received tools: [] or toolChoice: 'none')."
+      );
+    }
+    for (const tool of registry.list()) {
+      registry.unregister(tool.name);
+    }
+    return;
+  }
+  if (options.tools === void 0) return;
+  const allow = new Set(options.tools);
+  for (const tool of registry.list()) {
+    if (!allow.has(tool.name)) registry.unregister(tool.name);
+  }
+  if (options.toolChoice === "required" && registry.count() === 0) {
+    throw new EngineError(
+      "ERR_TOOL_CHOICE_CONFLICT",
+      "toolChoice: 'required' was requested but no tools matched the per-run allowlist after applying config filters."
+    );
+  }
+}
+
 // src/engine/rehydrate.ts
 init_cjs_shims();
 function rebuildMessagesFromEntries(entries) {
@@ -10120,6 +10197,7 @@ var Engine = class {
       ...knowledgeRuntime !== void 0 ? { knowledge: knowledgeRuntime } : {},
       ...this.internals.fetch !== void 0 ? { fetch: this.internals.fetch } : {}
     });
+    applyRunToolFilter(registry, options);
     const writer = new TranscriptWriter({
       storage: storage.workspace,
       logPath,
@@ -10174,7 +10252,14 @@ var Engine = class {
         ...runTimeout.signal !== void 0 ? { runSignal: runTimeout.signal, runTimeoutMs: this.config.execution.runTimeoutMs } : {},
         ...gate !== void 0 ? { gateBeforeTool: gate } : {},
         ..._internal?.handoffToRunner === true ? { handoffToRunner: true } : {},
-        ...offloadConfig !== void 0 ? { toolResultOffload: offloadConfig } : {}
+        ...offloadConfig !== void 0 ? { toolResultOffload: offloadConfig } : {},
+        // Plan 025 — output mode + tool-choice plumbed down so the
+        // last-turn guard picks the right instruction text and the
+        // model adapter can pass `'required'` to the provider. `'none'`
+        // is already handled above by stripping the tool list, so the
+        // loop only ever sees `'auto'` or `'required'`.
+        ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},
+        ...options.toolChoice === "required" ? { toolChoice: "required" } : {}
       });
       const result = await this.finalizeResult(loopResult, writer, logPath, {
         ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},