@desplega.ai/agent-swarm 1.152.2 → 1.153.0

package/dist/{cli-j8dggbcr.js → cli-k0g1sjzm.js}

@@ -1,3 +1,7 @@
+import {
+  getSystemMessageText
+} from "./cli-mcnhgnn1.js";
+
 // node_modules/@earendil-works/pi-ai/dist/api/constrained-sampling.js
 class UnsupportedStrictJsonSchemaError extends Error {
 }
@@ -243,6 +247,9 @@ function estimateTextAndImageContentTokens(content) {
 }
 function estimateMessageTokens(message) {
   let chars = 0;
+  if (message.role === "system") {
+    return estimateTextTokens(getSystemMessageText(message)) + estimateToolsTokens(message.toolsAdded) + estimateToolsTokens(message.toolsRemoved);
+  }
   if (message.role === "user")
     return estimateTextAndImageContentTokens(message.content);
   if (message.role === "toolResult")
@@ -274,7 +281,8 @@ function getLastAssistantUsageInfo(messages) {
   }
   return usageInfo;
 }
-function estimateMessages(messages) {
+function estimateContextTokens(context) {
+  const messages = "messages" in context ? context.messages : context;
   const usageInfo = getLastAssistantUsageInfo(messages);
   if (usageInfo) {
     const usageTokens = calculateContextTokens(usageInfo.usage);
@@ -294,31 +302,6 @@ function estimateToolsTokens(tools) {
     return 0;
   return estimateTextTokens(safeJsonStringify(tools));
 }
-function isMessageArray(value) {
-  return Array.isArray(value);
-}
-function estimateContextTokens(context) {
-  if (isMessageArray(context))
-    return estimateMessages(context);
-  const estimate = estimateMessages(context.messages);
-  if (estimate.lastUsageIndex !== null) {
-    const addedNames = new Set(context.messages.slice(estimate.lastUsageIndex + 1).filter((message) => message.role === "toolResult").flatMap((message) => message.addedToolNames ?? []));
-    const addedToolTokens = estimateToolsTokens(context.tools?.filter((tool) => addedNames.has(tool.name)));
-    return {
-      tokens: estimate.tokens + addedToolTokens,
-      usageTokens: estimate.usageTokens,
-      trailingTokens: estimate.trailingTokens + addedToolTokens,
-      lastUsageIndex: estimate.lastUsageIndex
-    };
-  }
-  const prefixTokens = (context.systemPrompt ? estimateTextTokens(context.systemPrompt) : 0) + estimateToolsTokens(context.tools);
-  return {
-    tokens: estimate.tokens + prefixTokens,
-    usageTokens: estimate.usageTokens,
-    trailingTokens: estimate.trailingTokens + prefixTokens,
-    lastUsageIndex: estimate.lastUsageIndex
-  };
-}
 
 // node_modules/@earendil-works/pi-ai/dist/api/simple-options.js
 var CONTEXT_SAFETY_TOKENS = 4096;
@@ -424,7 +407,7 @@ function transformMessages(messages, model, normalizeToolCallId) {
   const normalizedMessages = messages.map((msg) => msg.content == null ? { ...msg, content: [] } : msg);
   const imageAwareMessages = downgradeUnsupportedImages(normalizedMessages, model);
   const transformed = imageAwareMessages.map((msg) => {
-    if (msg.role === "user") {
+    if (msg.role === "system" || msg.role === "user") {
       return msg;
     }
     if (msg.role === "toolResult") {
@@ -489,7 +472,8 @@ function transformMessages(messages, model, normalizeToolCallId) {
   const result = [];
   let pendingToolCalls = [];
   let existingToolResultIds = new Set;
-  const insertSyntheticToolResults = () => {
+  const heldSystemMessages = [];
+  const closePendingToolCalls = () => {
     if (pendingToolCalls.length > 0) {
       for (const tc of pendingToolCalls) {
         if (!existingToolResultIds.has(tc.id)) {
@@ -506,11 +490,13 @@ function transformMessages(messages, model, normalizeToolCallId) {
       pendingToolCalls = [];
       existingToolResultIds = new Set;
     }
+    result.push(...heldSystemMessages);
+    heldSystemMessages.length = 0;
   };
   for (let i = 0;i < transformed.length; i++) {
     const msg = transformed[i];
     if (msg.role === "assistant") {
-      insertSyntheticToolResults();
+      closePendingToolCalls();
       const assistantMsg = msg;
       if (assistantMsg.stopReason === "error" || assistantMsg.stopReason === "aborted") {
         continue;
@@ -524,14 +510,20 @@ function transformMessages(messages, model, normalizeToolCallId) {
     } else if (msg.role === "toolResult") {
       existingToolResultIds.add(msg.toolCallId);
       result.push(msg);
+    } else if (msg.role === "system") {
+      if (pendingToolCalls.length > 0) {
+        heldSystemMessages.push(msg);
+      } else {
+        result.push(msg);
+      }
     } else if (msg.role === "user") {
-      insertSyntheticToolResults();
+      closePendingToolCalls();
       result.push(msg);
     } else {
       result.push(msg);
     }
   }
-  insertSyntheticToolResults();
+  closePendingToolCalls();
   return result;
 }
 

package/dist/{cli-gphgnvpf.js → cli-m04pt18h.js}

@@ -15,7 +15,7 @@ import {
   recoverIncompleteRuns,
   repointTrackerSyncBySwarmId,
   resolveLeadOnlyRecoveryAssignment
-} from "./cli-z3wkng35.js";
+} from "./cli-qrqhc31j.js";
 import {
   isMultiRuntimeEnabled
 } from "./cli-re8z5p8p.js";
@@ -61,7 +61,7 @@ import {
   releaseStaleReviewingTasks,
   supersedeTask,
   updateAgentStatus
-} from "./cli-zvgj5zg8.js";
+} from "./cli-djvxhnc4.js";
 import {
   init_registry,
   init_resolver,

package/dist/{cli-rgvp6r2x.js → cli-mcnhgnn1.js}

@@ -1,7 +1,194 @@
 import {
   AssistantMessageEventStream,
   formatThrownValue
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
+
+// node_modules/@earendil-works/pi-ai/dist/utils/text.js
+function contentText(content, separator = `
+`) {
+  if (typeof content === "string")
+    return content;
+  return content.filter((block) => block.type === "text").map((block) => block.text).join(separator);
+}
+function getSystemMessageText(message) {
+  const parts = [contentText(message.content)];
+  for (const text of Object.values(message.sections ?? {})) {
+    if (text !== null)
+      parts.push(text);
+  }
+  return parts.filter((part) => part.length > 0).join(`
+
+`);
+}
+function renderSystemMessageUpdate(message) {
+  const parts = [];
+  const text = contentText(message.content);
+  if (text.length > 0)
+    parts.push(text);
+  for (const [name, value] of Object.entries(message.sections ?? {})) {
+    parts.push(value === null ? `Removed system prompt section "${name}".` : `Updated system prompt section "${name}":
+
+${value}`);
+  }
+  return parts.join(`
+
+`);
+}
+
+// node_modules/@earendil-works/pi-ai/dist/utils/transcript.js
+function createInitialSystemMessage(systemPrompt, tools) {
+  const hasSystemPrompt = systemPrompt !== undefined && systemPrompt.length > 0;
+  const hasTools = tools !== undefined && tools.length > 0;
+  if (!hasSystemPrompt && !hasTools)
+    return;
+  return {
+    role: "system",
+    content: systemPrompt ?? "",
+    ...hasTools ? { toolsAdded: tools } : {},
+    timestamp: 0
+  };
+}
+function normalizeContext(context) {
+  const initialMessage = createInitialSystemMessage(context.systemPrompt, context.tools);
+  const messages = initialMessage ? [initialMessage, ...context.messages] : context.messages;
+  return { messages };
+}
+function isSystemMessage(message) {
+  return message.role === "system";
+}
+function getInitialSystemMessage(messages) {
+  const first = messages[0];
+  return first && isSystemMessage(first) ? first : undefined;
+}
+function withoutInitialSystemMessage(messages) {
+  return getInitialSystemMessage(messages) ? messages.slice(1) : messages;
+}
+function getCurrentTools(messages) {
+  const tools = new Map;
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    for (const tool of message.toolsRemoved ?? [])
+      tools.delete(tool.name);
+    for (const tool of message.toolsAdded ?? [])
+      tools.set(tool.name, tool);
+  }
+  return [...tools.values()];
+}
+function getCurrentSystemMessage(messages) {
+  const content = [];
+  const sections = new Map;
+  let timestamp;
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    timestamp ??= message.timestamp;
+    const text = contentText(message.content);
+    if (text.length > 0)
+      content.push(text);
+    for (const [name, value] of Object.entries(message.sections ?? {})) {
+      if (value === null)
+        sections.delete(name);
+      else
+        sections.set(name, value);
+    }
+  }
+  const tools = getCurrentTools(messages);
+  if (timestamp === undefined && tools.length === 0)
+    return;
+  return {
+    role: "system",
+    content: content.join(`
+
+`),
+    ...sections.size > 0 ? { sections: Object.fromEntries(sections) } : {},
+    ...tools.length > 0 ? { toolsAdded: tools } : {},
+    timestamp: timestamp ?? 0
+  };
+}
+function getCurrentSystemPrompt(messages) {
+  const message = getCurrentSystemMessage(messages);
+  return message ? getSystemMessageText(message) : "";
+}
+function collapseSystemMessages(context) {
+  const head = getCurrentSystemMessage(context.messages);
+  const messages = context.messages.filter((message) => message.role !== "system");
+  return { messages: head ? [head, ...messages] : messages };
+}
+function resolveTranscript(context, supportsMidConvoSystemMessages) {
+  return supportsMidConvoSystemMessages ? context : collapseSystemMessages(context);
+}
+function toToolDeclaration(tool) {
+  return {
+    name: tool.name,
+    description: tool.description,
+    parameters: JSON.parse(JSON.stringify(tool.parameters)),
+    ...tool.constrainedSampling === undefined ? {} : { constrainedSampling: tool.constrainedSampling }
+  };
+}
+function declarationsEqual(left, right) {
+  return JSON.stringify(toToolDeclaration(left)) === JSON.stringify(toToolDeclaration(right));
+}
+function getToolStateChanges(previous, current) {
+  const previousTools = new Map(previous.map((tool) => [tool.name, tool]));
+  const currentTools = new Map(current.map((tool) => [tool.name, tool]));
+  return {
+    toolsAdded: current.filter((tool) => {
+      const previousTool = previousTools.get(tool.name);
+      return previousTool === undefined || !declarationsEqual(previousTool, tool);
+    }).map(toToolDeclaration),
+    toolsRemoved: previous.filter((tool) => {
+      const currentTool = currentTools.get(tool.name);
+      return currentTool === undefined || !declarationsEqual(tool, currentTool);
+    }).map((tool) => ({ name: tool.name }))
+  };
+}
+function getDeclaredTools(messages) {
+  const definitions = new Map;
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    for (const tool of message.toolsAdded ?? [])
+      definitions.set(tool.name, tool);
+  }
+  return [...definitions.values()];
+}
+function hasToolRedefinitions(messages) {
+  const declared = new Map;
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    for (const tool of message.toolsAdded ?? []) {
+      const previous = declared.get(tool.name);
+      if (previous !== undefined && !declarationsEqual(previous, tool))
+        return true;
+      declared.set(tool.name, tool);
+    }
+  }
+  return false;
+}
+function hasNonAdditiveToolChanges(messages) {
+  const declared = new Set;
+  for (const message of messages) {
+    if (!isSystemMessage(message))
+      continue;
+    if ((message.toolsRemoved?.length ?? 0) > 0)
+      return true;
+    for (const tool of message.toolsAdded ?? []) {
+      if (declared.has(tool.name))
+        return true;
+      declared.add(tool.name);
+    }
+  }
+  return false;
+}
+function resolveTranscriptTools(messages, supportsToolAdditions) {
+  const anchorsAdditions = supportsToolAdditions && !hasNonAdditiveToolChanges(messages);
+  return {
+    requestTools: anchorsAdditions ? getInitialSystemMessage(messages)?.toolsAdded ?? [] : getCurrentTools(messages),
+    anchorsAdditions
+  };
+}
 
 // node_modules/@earendil-works/pi-ai/dist/api/lazy.js
 function createSetupErrorMessage(model, error) {
@@ -674,20 +861,22 @@ class ModelsImpl {
     return { requestModel, requestOptions };
   }
   stream(model, context, options) {
+    const transcript = normalizeContext(context);
     return lazyStream(model, async () => {
       const provider = this.requireProvider(model);
       const { requestModel, requestOptions } = await this.applyAuth(model, options);
-      return provider.stream(requestModel, context, requestOptions);
+      return provider.stream(requestModel, transcript, requestOptions);
     });
   }
   async complete(model, context, options) {
     return this.stream(model, context, options).result();
   }
   streamSimple(model, context, options) {
+    const transcript = normalizeContext(context);
     return lazyStream(model, async () => {
       const provider = this.requireProvider(model);
       const { requestModel, requestOptions } = await this.applyAuth(model, options);
-      return provider.streamSimple(requestModel, context, requestOptions);
+      return provider.streamSimple(requestModel, transcript, requestOptions);
     });
   }
   async completeSimple(model, context, options) {
@@ -860,4 +1049,4 @@ function modelsAreEqual(a, b) {
   return a.id === b.id && a.provider === b.provider;
 }
 
-export { lazyStream, lazyApi, defaultProviderAuthContext, InMemoryCredentialStore, ModelsError, resolveProviderAuth, InMemoryModelsStore, createModels, createProvider, hasApi, calculateCost, getSupportedThinkingLevels, clampThinkingLevel, modelsAreEqual };
+export { lazyStream, lazyApi, defaultProviderAuthContext, InMemoryCredentialStore, ModelsError, resolveProviderAuth, InMemoryModelsStore, contentText, getSystemMessageText, renderSystemMessageUpdate, createInitialSystemMessage, normalizeContext, getInitialSystemMessage, withoutInitialSystemMessage, getCurrentTools, getCurrentSystemMessage, getCurrentSystemPrompt, collapseSystemMessages, resolveTranscript, toToolDeclaration, declarationsEqual, getToolStateChanges, getDeclaredTools, hasToolRedefinitions, hasNonAdditiveToolChanges, resolveTranscriptTools, createModels, createProvider, hasApi, calculateCost, getSupportedThinkingLevels, clampThinkingLevel, modelsAreEqual };

package/dist/{cli-j4nv2wqy.js → cli-mzgyhxbe.js}

@@ -2,16 +2,18 @@ import {
   BASE_SUMMARIZE_PROMPT,
   SummaryWithRatingsSchema,
   buildSummaryWithRatingsPrompt,
-  complete,
-  exports_typebox,
-  getBuiltinModel,
   parseModelStr,
   resolveCredential
-} from "./cli-4wppfkcm.js";
+} from "./cli-7g9s78jf.js";
 import {
   DEFAULT_OPENROUTER_BASE_URL,
   getOpenRouterBaseUrl
 } from "./cli-3dpj7atn.js";
+import {
+  complete,
+  exports_typebox,
+  getBuiltinModel
+} from "./cli-d6hk10xx.js";
 import {
   init_zod
 } from "./cli-sd0mxa3c.js";
@@ -159,6 +161,10 @@ ${claudeUserPrompt}`, cred.modelDefault, opts.signal, jsonSchema);
     console.error(`internal-ai: getModel(${provider}, ${modelId}) threw (callerTag=${callerTag})`, err);
     return null;
   }
+  if (!model) {
+    console.error(scrubSecrets(`internal-ai: unknown model ${provider}/${modelId} (callerTag=${callerTag})`));
+    return null;
+  }
   const openRouterBaseUrl = getOpenRouterBaseUrl(opts.env ?? process.env);
   if (provider === "openrouter" && openRouterBaseUrl !== DEFAULT_OPENROUTER_BASE_URL) {
     model = { ...model, baseUrl: openRouterBaseUrl };