@sixb/core 0.1.7 → 0.1.8

package/dist/{chunk-n2arzn6e.js → chunk-4qfkag59.js}

@@ -3,7 +3,7 @@ import {
   SIXB_API_ROUTES,
   matchesPathPattern,
   normalizeRoutePath
-} from "./chunk-z2sery1b.js";
+} from "./chunk-9nbmsvn5.js";
 import {
   ModelProviderError,
   ModelStreamError,
@@ -13,14 +13,12 @@ import {
 } from "./chunk-p2vqaxkc.js";
 import {
   AgentDefinitionError,
-  AgentMessageAdapterError,
-  AgentToolResultValidationError,
-  normalizeAgentContextEntries
-} from "./chunk-atmkaf60.js";
+  AgentToolResultValidationError
+} from "./chunk-5e3pq99w.js";
 import {
   normalizeSchemaValue,
   validateSchemaValue
-} from "./chunk-d63tybny.js";
+} from "./chunk-h0k55pc7.js";
 import {
   OntologyValidationError
 } from "./chunk-dktq02ne.js";
@@ -107,192 +105,6 @@ function getInvalidAgentToolResultReason(value) {
 }
 
 // src/agents/adapters.ts
-var TOOL_TYPE_PREFIX = "tool-";
-function assertAdapter(condition, message) {
-  if (!condition) {
-    throw new AgentMessageAdapterError(`[Sixb] ${message}`);
-  }
-}
-function requireJson(value, label) {
-  const reason = getInvalidJsonValueReason(value, label);
-  assertAdapter(reason === undefined, `agent message ${label} must be a JSON value; ${reason}`);
-  return value;
-}
-function optionalJson(value, label) {
-  if (value === undefined)
-    return;
-  return requireJson(omitUndefinedObjectProperties(value), label);
-}
-function optionalProviderData(value, label) {
-  const json = optionalJson(value, label);
-  if (json === undefined)
-    return;
-  assertAdapter(isPlainRecord(json), `agent message ${label} must be a provider-keyed JSON object`);
-  return json;
-}
-function omitUndefinedObjectProperties(value) {
-  return omitUndefinedObjectPropertiesInternal(value, new Set);
-}
-function omitUndefinedObjectPropertiesInternal(value, seen) {
-  if (typeof value !== "object" || value === null)
-    return value;
-  if (seen.has(value))
-    return value;
-  seen.add(value);
-  try {
-    if (Array.isArray(value)) {
-      return value.map((entry) => omitUndefinedObjectPropertiesInternal(entry, seen));
-    }
-    if (!isPlainRecord(value))
-      return value;
-    return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== undefined).map(([key, entry]) => [key, omitUndefinedObjectPropertiesInternal(entry, seen)]));
-  } finally {
-    seen.delete(value);
-  }
-}
-function isToolType(type) {
-  return type === "dynamic-tool" || type.startsWith(TOOL_TYPE_PREFIX);
-}
-function toolNameFromInbound(part) {
-  if (part.type === "dynamic-tool") {
-    assertAdapter(typeof part.toolName === "string" && part.toolName.length > 0, "dynamic-tool part is missing a tool name");
-    return part.toolName;
-  }
-  const name = part.type.slice(TOOL_TYPE_PREFIX.length);
-  assertAdapter(name.length > 0, `tool part type '${part.type}' is missing a tool name`);
-  return name;
-}
-function fromUiMessage(message) {
-  const { role } = message;
-  assertAdapter(role === "system" || role === "user" || role === "assistant", `unsupported message role '${role}'`);
-  const parts = message.parts.map((part) => fromUiMessagePart(part));
-  assertAdapter(role === "user" || !parts.some((part) => part.type === "context"), "context parts are only valid on user messages");
-  const metadata = optionalJson(message.metadata, "metadata");
-  return {
-    role,
-    parts,
-    ...metadata === undefined ? {} : { metadata }
-  };
-}
-function fromUiMessagePart(part) {
-  switch (part.type) {
-    case "text":
-    case "reasoning": {
-      assertAdapter(typeof part.text === "string", `${part.type} part is missing text`);
-      assertAdapter(part.state !== "streaming", `cannot persist a streaming ${part.type} part; messages are written only once finalized`);
-      const providerMetadata = optionalProviderData(part.providerMetadata, `${part.type}.providerMetadata`);
-      return {
-        type: part.type,
-        text: part.text,
-        ...providerMetadata === undefined ? {} : { providerMetadata }
-      };
-    }
-    case "step-start":
-      return { type: "step-start" };
-    case "file": {
-      assertAdapter(isFileRef(part.fileRef), "file part is missing a valid fileRef");
-      const providerMetadata = optionalProviderData(part.providerMetadata, "file.providerMetadata");
-      return {
-        type: "file",
-        fileRef: part.fileRef,
-        ...providerMetadata === undefined ? {} : { providerMetadata }
-      };
-    }
-    case "context":
-      return fromUiContextPart(part);
-    case "provider-state":
-      assertAdapter(typeof part.providerId === "string" && part.providerId.length > 0, "provider-state part is missing a provider id");
-      return {
-        type: "provider-state",
-        providerId: part.providerId,
-        data: requireJson(part.data, "provider-state data")
-      };
-    default: {
-      assertAdapter(isToolType(part.type), `unsupported message part type '${part.type}'; extend the Sixb message part union to support it`);
-      return fromUiToolPart(part);
-    }
-  }
-}
-function fromUiContextPart(part) {
-  try {
-    const [entry] = normalizeAgentContextEntries([
-      { context: part.context, origin: part.origin }
-    ]);
-    return { type: "context", ...entry };
-  } catch (error) {
-    throw new AgentMessageAdapterError(error instanceof Error ? error.message : "[Sixb] Invalid agent context part.");
-  }
-}
-function fromUiToolPart(part) {
-  const dynamic = part.type === "dynamic-tool";
-  const toolName = toolNameFromInbound(part);
-  assertAdapter(typeof part.toolCallId === "string" && part.toolCallId.length > 0, `tool part '${part.type}' is missing a toolCallId`);
-  assertAdapter(part.state === "output-available" || part.state === "output-error", `cannot persist tool part '${part.toolCallId}' in transient state '${part.state}'; only terminal states are stored`);
-  const input = part.input === undefined ? null : requireJson(part.input, "tool input");
-  const providerMetadata = optionalProviderData(part.callProviderMetadata, "tool callProviderMetadata");
-  const base = {
-    type: "tool-call",
-    toolCallId: part.toolCallId,
-    toolName,
-    input,
-    ...dynamic ? { dynamic: true } : {},
-    ...part.providerExecuted === undefined ? {} : { providerExecuted: part.providerExecuted },
-    ...providerMetadata === undefined ? {} : { providerMetadata }
-  };
-  if (part.state === "output-available") {
-    return { ...base, state: "output-available", output: requireJson(part.output, "tool output") };
-  }
-  assertAdapter(typeof part.errorText === "string", `tool part '${part.toolCallId}' is missing errorText`);
-  return { ...base, state: "output-error", errorText: part.errorText };
-}
-function toUiMessage(message) {
-  return {
-    role: message.role,
-    parts: message.parts.map((part) => toUiPart(part)),
-    ...message.metadata === undefined ? {} : { metadata: message.metadata }
-  };
-}
-function toUiPart(part) {
-  switch (part.type) {
-    case "text":
-    case "reasoning":
-      return {
-        type: part.type,
-        text: part.text,
-        ...part.providerMetadata === undefined ? {} : { providerMetadata: part.providerMetadata }
-      };
-    case "step-start":
-      return { type: "step-start" };
-    case "file":
-      return {
-        type: "file",
-        fileRef: part.fileRef,
-        ...part.providerMetadata === undefined ? {} : { providerMetadata: part.providerMetadata }
-      };
-    case "context":
-      return { type: "context", context: part.context, origin: part.origin };
-    case "provider-state":
-      return {
-        type: "provider-state",
-        providerId: part.providerId,
-        data: part.data
-      };
-    case "tool-call":
-      return toUiToolPart(part);
-  }
-}
-function toUiToolPart(part) {
-  const body = {
-    toolCallId: part.toolCallId,
-    ...part.providerExecuted === undefined ? {} : { providerExecuted: part.providerExecuted },
-    ...part.providerMetadata === undefined ? {} : { callProviderMetadata: part.providerMetadata }
-  };
-  const state = part.state === "output-available" ? { state: "output-available", input: part.input, output: part.output } : { state: "output-error", input: part.input, errorText: part.errorText };
-  if (part.dynamic) {
-    return { type: "dynamic-tool", toolName: part.toolName, ...body, ...state };
-  }
-  return { type: `tool-${part.toolName}`, ...body, ...state };
-}
 function toModelMessages(messages, options = {}) {
   const result = [];
   for (const message of messages) {
@@ -311,7 +123,7 @@ function toModelMessages(messages, options = {}) {
   return result;
 }
 function systemModelMessage(message) {
-  const textParts = message.parts.filter(isTextPart);
+  const textParts = message.parts.filter((part) => part.type === "text");
   const providerData = mergeProviderMetadata(textParts);
   return {
     role: "system",
@@ -375,16 +187,11 @@ function appendAssistantModelMessages(result, message, options) {
     const current = block;
     block = [];
     const content = [];
+    const toolResults = [];
     for (const { part, partIndex } of current) {
-      if (part.type === "text") {
-        content.push({
-          type: "text",
-          text: part.text,
-          ...part.providerMetadata === undefined ? {} : { providerData: part.providerMetadata }
-        });
-      } else if (part.type === "reasoning") {
+      if (part.type === "text" || part.type === "reasoning") {
         content.push({
-          type: "reasoning",
+          type: part.type,
           text: part.text,
           ...part.providerMetadata === undefined ? {} : { providerData: part.providerMetadata }
         });
@@ -397,6 +204,8 @@ function appendAssistantModelMessages(result, message, options) {
         content.push(toolCallModelPart(part));
         if (part.providerExecuted === true) {
           content.push(toolResultModelPart(message, part, partIndex, "json", options));
+        } else {
+          toolResults.push(toolResultModelPart(message, part, partIndex, "text", options));
         }
       } else if (part.type === "provider-state") {
         content.push({
@@ -407,7 +216,6 @@ function appendAssistantModelMessages(result, message, options) {
       }
     }
     result.push({ role: "assistant", content });
-    const toolResults = current.flatMap(({ part, partIndex }) => part.type === "tool-call" && part.providerExecuted !== true ? [toolResultModelPart(message, part, partIndex, "text", options)] : []);
     if (toolResults.length > 0) {
       result.push({ role: "tool", content: toolResults });
     }
@@ -472,9 +280,6 @@ function toolResultFileFallbackText(part) {
   ].filter((value) => value !== undefined);
   return `[Tool-created file: ${attributes.join(" ")}. Contents are not available inline.]`;
 }
-function isTextPart(part) {
-  return part.type === "text";
-}
 // src/agents/api-gateway.ts
 import { createHmac, timingSafeEqual } from "crypto";
 var AGENT_API_GATEWAY_PREFIX = "/__sixb/agent-api";
@@ -633,23 +438,17 @@ function invalidAgentToolSchema(toolName, path) {
   return new AgentDefinitionError(`[Sixb] Agent tool '${toolName}' ${path} must be a valid Sixb schema.`);
 }
 function assertValidProjectAgentToolDefinitions(tools) {
-  assertValidAgentToolDefinitionList(tools, {
-    invalidDefinitions: "[Sixb] Project tools must contain only agent tool definitions.",
-    duplicateName: (name) => `[Sixb] Project tools contain duplicate tool name '${name}'.`
-  });
-}
-function assertValidAgentToolDefinitionList(tools, messages) {
   const seen = new Set;
   for (let index = 0;index < tools.length; index += 1) {
     const tool = tools[index];
     if (!Object.hasOwn(tools, index) || !isAgentToolDefinition(tool)) {
-      throw new AgentDefinitionError(messages.invalidDefinitions);
+      throw new AgentDefinitionError("[Sixb] Project tools must contain only agent tool definitions.");
     }
     assertValidAgentToolName(tool.name);
     assertValidAgentToolDescription(tool.name, tool.description);
     assertValidAgentToolInput(tool.name, tool.input);
     if (seen.has(tool.name)) {
-      throw new AgentDefinitionError(messages.duplicateName(tool.name));
+      throw new AgentDefinitionError(`[Sixb] Project tools contain duplicate tool name '${tool.name}'.`);
     }
     seen.add(tool.name);
   }
@@ -1274,6 +1073,9 @@ function validateModelToolOutput(output, toolName) {
     }
     return;
   }
+  if (output.type !== "json" && output.type !== "error-json") {
+    throw new TypeError(`[SixbModels] Tool '${toolName}' returned an unsupported model output type.`);
+  }
   assertJsonValue(output.value, `tool '${toolName}' model output`);
 }
 function modelOutputMatchesOriginal(output, original) {
@@ -1287,6 +1089,9 @@ function modelToolOutput(value) {
   return typeof value === "string" ? { type: "text", value } : { type: "json", value };
 }
 function toolErrorResult(part, errorText) {
+  if (typeof errorText !== "string") {
+    throw new TypeError(`[SixbModels] Tool '${part.toolName}' error text must be a string.`);
+  }
   return {
     type: "tool-result",
     toolCallId: part.toolCallId,
@@ -1368,6 +1173,10 @@ class StreamAccumulator {
         this.addProviderToolResult(event);
         return;
       case "provider-state":
+        if (typeof event.providerId !== "string" || event.providerId.length === 0) {
+          this.captureProjectionError(new ModelStreamError("[SixbModels] Provider state requires a nonempty provider ID."));
+          return;
+        }
         if (this.captureProviderState(event.data)) {
           this.parts.push({
             type: "provider-state",
@@ -1525,7 +1334,7 @@ class StreamAccumulator {
   }
   async startTool(event) {
     this.requireStarted(event.type);
-    if (!event.id || !event.toolName) {
+    if (typeof event.id !== "string" || !event.id || typeof event.toolName !== "string" || !event.toolName) {
       throw new ModelStreamError("[SixbModels] Tool calls require nonempty IDs and names.");
     }
     if (this.toolCalls.has(event.id)) {
@@ -1604,8 +1413,7 @@ class StreamAccumulator {
     if (data === undefined)
       return;
     try {
-      validateProviderData(data);
-      return data;
+      return normalizeProviderData(data);
     } catch (error) {
       this.captureProjectionError(error);
       return;
@@ -1657,9 +1465,8 @@ function validateUsage(usage) {
     }
   }
 }
-function validateProviderData(data) {
-  if (data === undefined)
-    return;
+function normalizeProviderData(value) {
+  const data = omitUndefinedObjectProperties(value);
   assertJsonValue(data, "provider data");
   if (typeof data !== "object" || data === null || Array.isArray(data)) {
     throw new TypeError("[SixbModels] provider data must be a JSON object.");
@@ -1667,6 +1474,22 @@ function validateProviderData(data) {
   if (JSON.stringify(data).length > MAX_PROVIDER_DATA_BYTES) {
     throw new ModelStreamError(`[SixbModels] Provider data exceeds the ${MAX_PROVIDER_DATA_BYTES}-byte response limit.`);
   }
+  return data;
+}
+function omitUndefinedObjectProperties(value, seen = new Set) {
+  if (typeof value !== "object" || value === null || seen.has(value))
+    return value;
+  seen.add(value);
+  try {
+    if (Array.isArray(value)) {
+      return value.map((entry) => omitUndefinedObjectProperties(entry, seen));
+    }
+    if (!isPlainRecord(value))
+      return value;
+    return Object.fromEntries(Reflect.ownKeys(value).filter((key) => Object.prototype.propertyIsEnumerable.call(value, key)).map((key) => [key, Reflect.get(value, key)]).filter(([, entry]) => entry !== undefined).map(([key, entry]) => [key, omitUndefinedObjectProperties(entry, seen)]));
+  } finally {
+    seen.delete(value);
+  }
 }
 function mergeProviderData(first, second) {
   if (first === undefined)
@@ -1740,6 +1563,6 @@ function projectionError(checkpoint, detail) {
 function escapeXml3(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
 }
-export { serializeAgentContextForModel, isAgentToolResult, omitUndefinedObjectProperties, fromUiMessage, toUiMessage, toModelMessages, AGENT_API_GATEWAY_PREFIX, AGENT_API_ROUTES, createAgentApiGatewayCapability, isValidAgentApiGatewayCapability, isAllowedAgentApiRequest, AGENT_RESERVED_TOOL_NAMES, isAgentToolDefinition, validateAndNormalizeAgentToolInput, toolsFromProjectConfig, defineAgentTool, AGENT_CONTEXT_ESTIMATOR_VERSION, shouldCompactAgentContext, estimateAgentContextRequestTokens, estimateAgentContextMessagesTokens, selectAgentContextCompactionBoundary, serializeAgentMessagesForSummary, runModelLoop, agent, projectAgentThreadModelContext };
+export { serializeAgentContextForModel, isAgentToolResult, toModelMessages, AGENT_API_GATEWAY_PREFIX, AGENT_API_ROUTES, createAgentApiGatewayCapability, isValidAgentApiGatewayCapability, isAllowedAgentApiRequest, AGENT_RESERVED_TOOL_NAMES, isAgentToolDefinition, validateAndNormalizeAgentToolInput, toolsFromProjectConfig, defineAgentTool, AGENT_CONTEXT_ESTIMATOR_VERSION, shouldCompactAgentContext, estimateAgentContextRequestTokens, estimateAgentContextMessagesTokens, selectAgentContextCompactionBoundary, serializeAgentMessagesForSummary, runModelLoop, agent, projectAgentThreadModelContext };
 
-//# debugId=3D89DCE6FB76677D64756E2164756E21
+//# debugId=5E06D21E695131D964756E2164756E21