@prompty/core 2.0.0-alpha.6 → 2.0.0-alpha.7

package/dist/index.js

@@ -2220,7 +2220,12 @@ var init_property = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'properties' format: key '${key}' has an array value. 'properties' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Property.load(value, context));
             } else {
@@ -3128,7 +3133,12 @@ var init_tool = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'bindings' format: key '${key}' has an array value. 'bindings' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Binding.load(value, context));
             } else {
@@ -3343,7 +3353,12 @@ var init_tool = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'parameters' format: key '${key}' has an array value. 'parameters' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Property.load(value, context));
             } else {
@@ -4100,7 +4115,12 @@ var init_prompty = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'inputs' format: key '${key}' has an array value. 'inputs' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Property.load(value, context));
             } else {
@@ -4130,7 +4150,12 @@ var init_prompty = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'outputs' format: key '${key}' has an array value. 'outputs' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Property.load(value, context));
             } else {
@@ -4160,7 +4185,12 @@ var init_prompty = __esm({
           for (const [key, value] of Object.entries(
             data
           )) {
-            if (value && typeof value === "object" && !Array.isArray(value)) {
+            if (Array.isArray(value)) {
+              throw new Error(
+                `Invalid 'tools' format: key '${key}' has an array value. 'tools' must be a flat list of objects or a name-keyed dict \u2014 not a nested { ${key}: [...] } structure.`
+              );
+            }
+            if (value && typeof value === "object") {
               value["name"] = key;
               result.push(Tool.load(value, context));
             } else {
@@ -4570,14 +4600,14 @@ var init_tool_dispatch = __esm({
       async executeTool(tool2, _args, _agent, _parentInputs) {
         const name = tool2.name ?? "unknown";
         throw new Error(
-          `Function tool '${name}' declared but no callable provided. Pass it via tools: { '${name}': fn } in invokeAgent().`
+          `Function tool '${name}' declared but no callable provided. Pass it via tools: { '${name}': fn } in turn().`
         );
       }
     };
     PromptyToolHandler = class {
       async executeTool(tool2, args, agent, _parentInputs) {
         const { load: load2 } = await Promise.resolve().then(() => (init_loader(), loader_exports));
-        const { prepare: prepare2, run: run2, invokeAgent: invokeAgent2 } = await Promise.resolve().then(() => (init_pipeline(), pipeline_exports));
+        const { prepare: prepare2, run: run2, turn: turn2 } = await Promise.resolve().then(() => (init_pipeline(), pipeline_exports));
         const parentPath = (agent.metadata ?? {}).__source_path;
         if (!parentPath) {
           return `Error: cannot resolve PromptyTool '${tool2.name}': parent has no __source_path`;
@@ -4596,7 +4626,7 @@ var init_tool_dispatch = __esm({
           child.metadata.__prompty_tool_stack = [...stack, parentPath];
           const mode = tool2.mode ?? "single";
           if (mode === "agentic") {
-            const result = await invokeAgent2(child, args);
+            const result = await turn2(child, args);
             return typeof result === "string" ? result : JSON.stringify(result);
           } else {
             const messages = await prepare2(child, args);
@@ -4841,6 +4871,7 @@ __export(pipeline_exports, {
   render: () => render,
   resolveBindings: () => resolveBindings,
   run: () => run,
+  turn: () => turn,
   validateInputs: () => validateInputs
 });
 function sanitizeNonces(value) {
@@ -5031,7 +5062,17 @@ async function invoke(prompt, inputs, options) {
     emit("description", "Invoke a prompty");
     emit("inputs", { prompt: serializeAgent(agent), inputs: inputs ?? {} });
     const messages = await prepare(agent, inputs);
-    const result = await run(agent, messages, options);
+    const provider = resolveProvider(agent);
+    const executor = getExecutor(provider);
+    const response = await executor.execute(agent, messages);
+    if (options?.raw) {
+      emit("result", response);
+      if (options?.validator) {
+        return cast(response, options.validator);
+      }
+      return response;
+    }
+    const result = await process2(agent, response);
     emit("result", result);
     if (options?.validator) {
       return cast(result, options.validator);
@@ -5039,45 +5080,9 @@ async function invoke(prompt, inputs, options) {
     return result;
   });
 }
-function resolveBindings(agent, toolName, args, parentInputs) {
-  if (!parentInputs || !agent.tools || agent.tools.length === 0) return args;
-  const toolDef = agent.tools.find((t) => t.name === toolName);
-  if (!toolDef || !toolDef.bindings || toolDef.bindings.length === 0) return args;
-  const merged = { ...args };
-  for (const binding of toolDef.bindings) {
-    if (binding.input in parentInputs) {
-      merged[binding.name] = parentInputs[binding.input];
-    }
-  }
-  return merged;
-}
-function isAsyncIterable(value) {
-  return value != null && typeof value === "object" && Symbol.asyncIterator in value;
-}
-function isToolCallLike(item) {
-  return typeof item === "object" && item !== null && "id" in item && "name" in item && "arguments" in item;
-}
-async function consumeStream(agent, response, onEvent) {
-  const processed = await process2(agent, response);
-  const toolCalls = [];
-  const textParts = [];
-  if (isAsyncIterable(processed)) {
-    for await (const item of processed) {
-      if (isToolCallLike(item)) {
-        toolCalls.push(item);
-      } else if (typeof item === "string") {
-        textParts.push(item);
-        emitEvent(onEvent, "token", { token: item });
-      }
-    }
-  } else if (typeof processed === "string") {
-    textParts.push(processed);
-    emitEvent(onEvent, "token", { token: processed });
-  }
-  return { toolCalls, content: textParts.join("") };
-}
-async function invokeAgent(prompt, inputs, options) {
-  const rawResult = await traceSpan("invokeAgent", async (emit) => {
+async function turn(prompt, inputs, options) {
+  const label = options?.turn != null ? `turn ${options.turn}` : "turn";
+  const rawResult = await traceSpan(label, async (emit) => {
     const agent = typeof prompt === "string" ? await traceSpan("load", async (loadEmit) => {
       loadEmit("signature", "prompty.load");
       loadEmit("description", "Load a prompty file.");
@@ -5086,7 +5091,62 @@ async function invokeAgent(prompt, inputs, options) {
       loadEmit("result", serializeAgent(loaded));
       return loaded;
     }) : prompt;
+    emit("signature", "prompty.turn");
+    emit("description", label);
+    emit("inputs", sanitizeValue("inputs", inputs));
     const tools = options?.tools ?? {};
+    const hasTools = Object.keys(tools).length > 0;
+    if (!hasTools) {
+      let messages2 = await prepare(agent, inputs);
+      const onEvent2 = options?.onEvent;
+      if (options?.steering) {
+        const pending = options.steering.drain();
+        if (pending.length > 0) {
+          messages2.push(...pending);
+          emitEvent(onEvent2, "messages_updated", { messages: messages2 });
+        }
+      }
+      if (options?.contextBudget !== void 0) {
+        const [droppedCount] = trimToContextWindow(messages2, options.contextBudget);
+        if (droppedCount > 0) {
+          emitEvent(onEvent2, "messages_updated", { messages: messages2 });
+        }
+      }
+      if (options?.guardrails) {
+        const result = options.guardrails.checkInput(messages2);
+        if (!result.allowed) {
+          emitEvent(onEvent2, "error", { message: `Input guardrail denied: ${result.reason}` });
+          throw new GuardrailError(result.reason ?? "Input guardrail denied");
+        }
+        if (result.rewrite) messages2 = result.rewrite;
+      }
+      checkCancellation(options?.signal);
+      const provider2 = resolveProvider(agent);
+      const executor2 = getExecutor(provider2);
+      const response2 = await executor2.execute(agent, messages2);
+      if (options?.raw) {
+        emit("result", response2);
+        return response2;
+      }
+      const processed = await process2(agent, response2);
+      if (options?.guardrails) {
+        const contentStr = typeof processed === "string" ? processed : JSON.stringify(processed);
+        const assistantMsg = new Message("assistant", [text(contentStr)]);
+        const gr = options.guardrails.checkOutput(assistantMsg);
+        if (!gr.allowed) {
+          emitEvent(onEvent2, "error", { message: `Output guardrail denied: ${gr.reason}` });
+          throw new GuardrailError(gr.reason ?? "Output guardrail denied");
+        }
+        if (gr.rewrite !== void 0) {
+          emit("result", gr.rewrite);
+          emitEvent(onEvent2, "done", { response: gr.rewrite, messages: messages2 });
+          return gr.rewrite;
+        }
+      }
+      emit("result", sanitizeValue("result", processed));
+      emitEvent(onEvent2, "done", { response: processed, messages: messages2 });
+      return processed;
+    }
     const maxIterations = options?.maxIterations ?? DEFAULT_MAX_ITERATIONS;
     const onEvent = options?.onEvent;
     const signal = options?.signal;
@@ -5094,9 +5154,6 @@ async function invokeAgent(prompt, inputs, options) {
     const guardrails = options?.guardrails;
     const steering = options?.steering;
     const parallelToolCalls = options?.parallelToolCalls ?? false;
-    emit("signature", "prompty.invokeAgent");
-    emit("description", "Invoke a prompty with tool calling");
-    emit("inputs", { prompt: serializeAgent(agent), tools: Object.keys(tools), inputs: inputs ?? {} });
     let messages = await prepare(agent, inputs);
     const parentInputs = inputs ?? {};
     const provider = resolveProvider(agent);
@@ -5126,12 +5183,12 @@ async function invokeAgent(prompt, inputs, options) {
         }
       }
       if (guardrails) {
-        const result2 = guardrails.checkInput(messages);
-        if (!result2.allowed) {
-          emitEvent(onEvent, "error", { message: `Input guardrail denied: ${result2.reason}` });
-          throw new GuardrailError(result2.reason ?? "Input guardrail denied");
+        const result = guardrails.checkInput(messages);
+        if (!result.allowed) {
+          emitEvent(onEvent, "error", { message: `Input guardrail denied: ${result.reason}` });
+          throw new GuardrailError(result.reason ?? "Input guardrail denied");
         }
-        if (result2.rewrite) messages = result2.rewrite;
+        if (result.rewrite) messages = result.rewrite;
       }
       try {
         checkCancellation(signal);
@@ -5163,9 +5220,9 @@ async function invokeAgent(prompt, inputs, options) {
           );
         }
         const toolMessages2 = await traceSpan("toolCalls", async (toolEmit) => {
-          toolEmit("signature", "prompty.invokeAgent.toolCalls");
+          toolEmit("signature", "prompty.turn.toolCalls");
           toolEmit("description", `Tool call round ${iteration}`);
-          const result2 = await buildToolMessagesFromCallsWithExtensions(
+          const result = await buildToolMessagesFromCallsWithExtensions(
             toolCalls,
             content,
             tools,
@@ -5174,8 +5231,8 @@ async function invokeAgent(prompt, inputs, options) {
             toolEmit,
             { onEvent, signal, guardrails, parallel: parallelToolCalls }
           );
-          toolEmit("result", result2.map((m) => ({ role: m.role, content: m.parts.map((p) => p.value ?? "").join(""), metadata: m.metadata })));
-          return result2;
+          toolEmit("result", result.map((m) => ({ role: m.role, content: m.parts.map((p) => p.value ?? "").join(""), metadata: m.metadata })));
+          return result;
         });
         messages.push(...toolMessages2);
         emitEvent(onEvent, "messages_updated", { messages });
@@ -5221,9 +5278,9 @@ async function invokeAgent(prompt, inputs, options) {
         );
       }
       const toolMessages = await traceSpan("toolCalls", async (toolEmit) => {
-        toolEmit("signature", "prompty.invokeAgent.toolCalls");
+        toolEmit("signature", "prompty.turn.toolCalls");
         toolEmit("description", `Tool call round ${iteration}`);
-        const result2 = await buildToolResultMessagesWithExtensions(
+        const result = await buildToolResultMessagesWithExtensions(
           response,
           tools,
           agent,
@@ -5231,28 +5288,55 @@ async function invokeAgent(prompt, inputs, options) {
           toolEmit,
           { onEvent, signal, guardrails, parallel: parallelToolCalls }
         );
-        toolEmit("result", result2.map((m) => ({ role: m.role, content: m.parts.map((p) => p.value ?? "").join(""), metadata: m.metadata })));
-        return result2;
+        toolEmit("result", result.map((m) => ({ role: m.role, content: m.parts.map((p) => p.value ?? "").join(""), metadata: m.metadata })));
+        return result;
       });
       messages.push(...toolMessages);
       emitEvent(onEvent, "messages_updated", { messages });
     }
-    emit("iterations", iteration);
-    if (options?.raw) {
-      emit("result", response);
-      emitEvent(onEvent, "done", { response, messages });
-      return response;
-    }
-    const result = await process2(agent, response);
-    emit("result", result);
-    emitEvent(onEvent, "done", { response: result, messages });
-    return result;
   });
   if (options?.validator) {
     return cast(rawResult, options.validator);
   }
   return rawResult;
 }
+function resolveBindings(agent, toolName, args, parentInputs) {
+  if (!parentInputs || !agent.tools || agent.tools.length === 0) return args;
+  const toolDef = agent.tools.find((t) => t.name === toolName);
+  if (!toolDef || !toolDef.bindings || toolDef.bindings.length === 0) return args;
+  const merged = { ...args };
+  for (const binding of toolDef.bindings) {
+    if (binding.input in parentInputs) {
+      merged[binding.name] = parentInputs[binding.input];
+    }
+  }
+  return merged;
+}
+function isAsyncIterable(value) {
+  return value != null && typeof value === "object" && Symbol.asyncIterator in value;
+}
+function isToolCallLike(item) {
+  return typeof item === "object" && item !== null && "id" in item && "name" in item && "arguments" in item;
+}
+async function consumeStream(agent, response, onEvent) {
+  const processed = await process2(agent, response);
+  const toolCalls = [];
+  const textParts = [];
+  if (isAsyncIterable(processed)) {
+    for await (const item of processed) {
+      if (isToolCallLike(item)) {
+        toolCalls.push(item);
+      } else if (typeof item === "string") {
+        textParts.push(item);
+        emitEvent(onEvent, "token", { token: item });
+      }
+    }
+  } else if (typeof processed === "string") {
+    textParts.push(processed);
+    emitEvent(onEvent, "token", { token: processed });
+  }
+  return { toolCalls, content: textParts.join("") };
+}
 function expandThreads(messages, nonces, inputs) {
   if (nonces.size === 0) return messages;
   const nonceToName = /* @__PURE__ */ new Map();
@@ -5451,7 +5535,7 @@ async function buildToolMessagesFromCallsWithExtensions(toolCalls, textContent,
   const executor = getExecutor(provider);
   return executor.formatToolMessages(null, normalizedCalls, toolResults, textContent);
 }
-var DEFAULT_FORMAT, DEFAULT_PARSER, DEFAULT_PROVIDER, DEFAULT_MAX_ITERATIONS;
+var DEFAULT_FORMAT, DEFAULT_PARSER, DEFAULT_PROVIDER, DEFAULT_MAX_ITERATIONS, invokeAgent;
 var init_pipeline = __esm({
   "src/core/pipeline.ts"() {
     "use strict";
@@ -5470,6 +5554,7 @@ var init_pipeline = __esm({
     DEFAULT_PARSER = "prompty";
     DEFAULT_PROVIDER = "openai";
     DEFAULT_MAX_ITERATIONS = 10;
+    invokeAgent = turn;
   }
 });
 
@@ -6067,6 +6152,7 @@ export {
   traceMethod,
   traceSpan,
   trimToContextWindow,
+  turn,
   validateInputs
 };
 //# sourceMappingURL=index.js.map