openfox 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/{chunk-HGAMIPFO.js → chunk-7FDY3EOH.js}

@@ -1,6 +1,3 @@
-import {
-  describeImageFromDataUrl
-} from "./chunk-SZKEGZIB.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -362,6 +359,9 @@ function getModelProfile(modelName) {
   }
   return DEFAULT_PROFILE;
 }
+function modelSupportsVision(modelName) {
+  return getModelProfile(modelName).supportsVision;
+}
 
 // src/server/llm/client-pure.ts
 function buildModelParams(params) {
@@ -372,27 +372,16 @@ function buildModelParams(params) {
     ...params.maxTokens !== void 0 && { maxTokens: params.maxTokens }
   };
 }
-function buildAttachmentContent(msgContent, attachments, modelSupportsVision) {
+function buildAttachmentContent(msgContent, attachments, modelSupportsVision2) {
   const content = [];
   if (msgContent?.trim()) {
     content.push({ type: "text", text: msgContent });
   }
   for (const attachment of attachments) {
-    content.push(convertAttachmentSync(attachment, modelSupportsVision));
+    content.push(convertAttachmentSync(attachment, modelSupportsVision2));
   }
   return content;
 }
-async function convertMessagesWithOptions(messages, profile, visionFallbackEnabled, userVisionOverride, signal, onVisionFallbackStart, onVisionFallbackDone) {
-  const modelSupportsVision = userVisionOverride ?? profile.supportsVision ?? false;
-  const options = {
-    modelSupportsVision,
-    visionFallbackEnabled,
-    signal,
-    onVisionFallbackStart,
-    onVisionFallbackDone
-  };
-  return needsVisionFallback(messages, modelSupportsVision, visionFallbackEnabled) ? await convertMessagesWithFallback(messages, options) : convertMessages(messages, { modelSupportsVision, visionFallbackEnabled: false });
-}
 function convertToolCalls(toolCalls) {
   return toolCalls.map((toolCall) => ({
     id: toolCall.id,
@@ -416,8 +405,8 @@ function buildAssistantMessage(msg) {
   }
   return result;
 }
-function convertAttachmentSync(attachment, modelSupportsVision) {
-  if (modelSupportsVision) {
+function convertAttachmentSync(attachment, modelSupportsVision2) {
+  if (modelSupportsVision2) {
     return {
       type: "image_url",
       image_url: { url: attachment.data }
@@ -428,68 +417,14 @@ function convertAttachmentSync(attachment, modelSupportsVision) {
     text: `[Image: ${attachment.filename || "image"}] (vision not supported, cannot describe)`
   };
 }
-function createAttachmentForConversion(data, filename, id) {
-  return {
-    data,
-    ...filename !== void 0 && { filename },
-    ...id !== void 0 && { id }
-  };
-}
-async function convertAttachmentWithFallback(attachment, options) {
-  logger.debug("[VisionFallback] convertAttachmentWithFallback called", {
-    filename: attachment.filename,
-    id: attachment.id,
-    hasCallbacks: !!options.onVisionFallbackStart
-  });
-  if (options.modelSupportsVision) {
-    logger.debug("[VisionFallback] Model supports vision - passing image directly");
-    return {
-      type: "image_url",
-      image_url: { url: attachment.data }
-    };
-  }
-  if (!options.visionFallbackEnabled) {
-    logger.debug("[VisionFallback] Fallback disabled - returning placeholder");
-    return {
-      type: "text",
-      text: `[Image: ${attachment.filename || "image"}] (vision not supported)`
-    };
-  }
-  const attachmentId = attachment.id ?? crypto.randomUUID();
-  const filename = attachment.filename;
-  logger.debug("[VisionFallback] Starting delegation for:", { attachmentId, filename });
-  options.onVisionFallbackStart?.(attachmentId, filename);
-  const context = filename ? `File: ${filename}` : void 0;
-  const description = await describeImageFromDataUrl(attachment.data, { context, signal: options.signal });
-  logger.debug("[VisionFallback] Delegation complete:", { attachmentId, descriptionLength: description.length });
-  options.onVisionFallbackDone?.(attachmentId, description);
-  return {
-    type: "text",
-    text: `[Image: ${attachment.filename || "image"}] ${description}`
-  };
-}
-async function buildAttachmentContentWithFallback(msgContent, attachments, options) {
-  const content = [];
-  if (msgContent?.trim()) {
-    content.push({ type: "text", text: msgContent });
-  }
-  for (const attachment of attachments) {
-    const convertedContent = await convertAttachmentWithFallback(
-      createAttachmentForConversion(attachment.data, attachment.filename, attachment.id),
-      options
-    );
-    content.push(convertedContent);
-  }
-  return content;
-}
-function convertMessages(messages, options) {
+function convertMessages(messages, modelSupportsVision2) {
   const filtered = messages.filter((msg) => {
     return !(msg.role === "assistant" && !msg.content?.trim() && (!msg.toolCalls || msg.toolCalls.length === 0));
   });
   return filtered.map((msg) => {
     if (msg.role === "tool") {
       if (msg.attachments && msg.attachments.length > 0) {
-        const content = buildAttachmentContent(msg.content, msg.attachments, options.modelSupportsVision);
+        const content = buildAttachmentContent(msg.content, msg.attachments, modelSupportsVision2);
         return {
           role: "tool",
           content,
@@ -506,7 +441,7 @@ function convertMessages(messages, options) {
       return buildAssistantMessage(msg);
     }
     if (msg.role === "user" && msg.attachments && msg.attachments.length > 0) {
-      const content = buildAttachmentContent(msg.content, msg.attachments, options.modelSupportsVision);
+      const content = buildAttachmentContent(msg.content, msg.attachments, modelSupportsVision2);
       return {
         role: "user",
         content
@@ -518,49 +453,6 @@ function convertMessages(messages, options) {
     };
   });
 }
-async function convertMessagesWithFallback(messages, options) {
-  logger.debug("[VisionFallback] convertMessagesWithFallback called", { messageCount: messages.length });
-  const filtered = messages.filter((msg) => {
-    return !(msg.role === "assistant" && !msg.content?.trim() && (!msg.toolCalls || msg.toolCalls.length === 0));
-  });
-  const converted = [];
-  for (const msg of filtered) {
-    if (msg.role === "tool") {
-      if (msg.attachments && msg.attachments.length > 0) {
-        const content = await buildAttachmentContentWithFallback(msg.content, msg.attachments, options);
-        converted.push({
-          role: "tool",
-          content,
-          tool_call_id: msg.toolCallId
-        });
-      } else {
-        converted.push({
-          role: "tool",
-          content: msg.content,
-          tool_call_id: msg.toolCallId
-        });
-      }
-      continue;
-    }
-    if (msg.role === "assistant") {
-      converted.push(buildAssistantMessage(msg));
-      continue;
-    }
-    if (msg.role === "user" && msg.attachments && msg.attachments.length > 0) {
-      const content = await buildAttachmentContentWithFallback(msg.content, msg.attachments, options);
-      converted.push({
-        role: "user",
-        content
-      });
-      continue;
-    }
-    converted.push({
-      role: msg.role,
-      content: msg.content
-    });
-  }
-  return converted;
-}
 function convertTools(tools) {
   return tools.map((tool) => ({
     type: "function",
@@ -571,30 +463,10 @@ function convertTools(tools) {
     }
   }));
 }
-function needsVisionFallback(messages, modelSupportsVision, visionFallbackEnabled) {
-  const hasAttachments = messages.some(
-    (msg) => msg.attachments && msg.attachments.length > 0 || msg.role === "tool" && msg.attachments && msg.attachments.length > 0
-  );
-  const result = hasAttachments && !modelSupportsVision && visionFallbackEnabled;
-  logger.debug("[VisionFallback] needsVisionFallback check", {
-    hasAttachments,
-    modelSupportsVision,
-    visionFallbackEnabled,
-    result
-  });
-  return result;
-}
-async function buildChatCompletionCreateParams(model, request, profile, capabilities, disableThinking, visionFallbackEnabled, isStreaming, onVisionFallbackStart, onVisionFallbackDone) {
+async function buildChatCompletionCreateParams(model, request, profile, capabilities, disableThinking, isStreaming) {
   const userVisionOverride = request.modelSettings?.supportsVision;
-  const convertedMessages = await convertMessagesWithOptions(
-    request.messages,
-    profile,
-    visionFallbackEnabled,
-    userVisionOverride,
-    request.signal,
-    onVisionFallbackStart,
-    onVisionFallbackDone
-  );
+  const modelSupportsVision2 = userVisionOverride ?? profile.supportsVision ?? false;
+  const convertedMessages = convertMessages(request.messages, modelSupportsVision2);
   const temperature = request.modelSettings?.temperature ?? request.temperature ?? profile.temperature;
   const maxTokens = request.modelSettings?.maxTokens ?? request.maxTokens ?? profile.defaultMaxTokens;
   const topP = request.modelSettings?.topP ?? profile.topP;
@@ -623,26 +495,14 @@ async function buildChatCompletionCreateParams(model, request, profile, capabili
   return { params, modelParams };
 }
 async function buildCreateParamsFromInput(input, isStreaming) {
-  const {
-    model,
-    request,
-    profile,
-    capabilities,
-    disableThinking,
-    visionFallbackEnabled = false,
-    onVisionFallbackStart,
-    onVisionFallbackDone
-  } = input;
+  const { model, request, profile, capabilities, disableThinking } = input;
   return buildChatCompletionCreateParams(
     model,
     request,
     profile,
     capabilities,
     !!disableThinking,
-    visionFallbackEnabled,
-    isStreaming,
-    onVisionFallbackStart,
-    onVisionFallbackDone
+    isStreaming
   );
 }
 var buildNonStreamingCreateParams = (input) => buildCreateParamsFromInput(input, false);
@@ -677,13 +537,7 @@ function extractThinking(content) {
 }
 
 // src/server/llm/streaming.ts
-var XML_TOOL_PATTERNS = ["<tool_call>", "<function=", "</tool_call>", "<parameter="];
-function hasXmlToolPattern(text) {
-  return XML_TOOL_PATTERNS.some((p) => text.includes(p));
-}
 async function* streamWithSegments(client, request) {
-  const xmlAbortController = new AbortController();
-  const combinedSignal = request.signal ? AbortSignal.any([request.signal, xmlAbortController.signal]) : xmlAbortController.signal;
   let content = "";
   let thinkingContent = "";
   let response = null;
@@ -705,7 +559,7 @@ async function* streamWithSegments(client, request) {
     currentThinkingSegment = "";
   };
   try {
-    for await (const event of client.stream({ ...request, signal: combinedSignal })) {
+    for await (const event of client.stream(request)) {
       switch (event.type) {
         case "text_delta":
           if (firstTokenTime === null) {
@@ -714,11 +568,6 @@ async function* streamWithSegments(client, request) {
           flushThinking();
           content += event.content;
           currentTextSegment += event.content;
-          if (!request.disableXmlProtection && hasXmlToolPattern(content)) {
-            xmlAbortController.abort();
-            yield { type: "xml_tool_abort" };
-            return null;
-          }
           yield { type: "text_delta", content: event.content };
           break;
         case "thinking_delta":
@@ -728,11 +577,6 @@ async function* streamWithSegments(client, request) {
           flushText();
           thinkingContent += event.content;
           currentThinkingSegment += event.content;
-          if (!request.disableXmlProtection && hasXmlToolPattern(thinkingContent)) {
-            xmlAbortController.abort();
-            yield { type: "xml_tool_abort" };
-            return null;
-          }
           yield { type: "thinking_delta", content: event.content };
           break;
         case "tool_call_delta":
@@ -756,9 +600,6 @@ async function* streamWithSegments(client, request) {
       }
     }
   } catch (error) {
-    if (error instanceof Error && error.name === "AbortError") {
-      return null;
-    }
     yield { type: "error", error: error instanceof Error ? error.message : "Unknown error" };
     return null;
   }
@@ -791,6 +632,7 @@ async function* streamWithSegments(client, request) {
 
 export {
   getModelProfile,
+  modelSupportsVision,
   getBackendCapabilities,
   detectBackend,
   getBackendDisplayName,
@@ -801,4 +643,4 @@ export {
   extractThinking,
   streamWithSegments
 };
-//# sourceMappingURL=chunk-HGAMIPFO.js.map
+//# sourceMappingURL=chunk-7FDY3EOH.js.map

package/dist/{chunk-CEZNMLOO.js → chunk-7TTEGAO6.js}

@@ -1,7 +1,7 @@
 import {
   createServerMessage,
   isClientMessage
-} from "./chunk-FQLK5GL5.js";
+} from "./chunk-BVHFMAVN.js";
 
 // src/server/ws/protocol.ts
 function enrichMessagesWithToolResults(messages) {
@@ -94,8 +94,14 @@ function createChatTodoMessage(todos) {
 function createChatProgressMessage(message, phase) {
   return createServerMessage("chat.progress", { message, ...phase ? { phase } : {} });
 }
-function createChatFormatRetryMessage(attempt, maxAttempts) {
-  return createServerMessage("chat.format_retry", { attempt, maxAttempts });
+function createChatFormatRetryMessage(attempt, maxAttempts, pattern, field, matchedContent) {
+  return createServerMessage("chat.format_retry", {
+    attempt,
+    maxAttempts,
+    ...pattern !== void 0 ? { pattern } : {},
+    ...field !== void 0 ? { field } : {},
+    ...matchedContent !== void 0 ? { matchedContent } : {}
+  });
 }
 function createChatMessageMessage(message) {
   return createServerMessage("chat.message", { message });
@@ -120,9 +126,6 @@ function createChatPathConfirmationMessage(callId, tool, paths, workdir, reason)
 function createChatAskUserMessage(callId, question) {
   return createServerMessage("chat.ask_user", { callId, question });
 }
-function createChatVisionFallbackMessage(payload) {
-  return createServerMessage("chat.vision_fallback", payload);
-}
 function createModeChangedMessage(mode, auto, reason) {
   return createServerMessage("mode.changed", { mode, auto, ...reason ? { reason } : {} });
 }
@@ -198,9 +201,6 @@ function storedEventToServerMessage(event) {
       if (data.stats) {
         updates.stats = data.stats;
       }
-      if (data.promptContext) {
-        updates.promptContext = data.promptContext;
-      }
       return createChatMessageUpdatedMessage(data.messageId, updates);
     }
     case "tool.preparing": {
@@ -283,9 +283,9 @@ function storedEventToServerMessage(event) {
       const data = event.data;
       return createChatAskUserMessage(data.callId, data.question);
     }
-    case "format.retry": {
+    case "pattern.retry": {
       const data = event.data;
-      return createChatFormatRetryMessage(data.attempt, data.maxAttempts);
+      return createChatFormatRetryMessage(data.attempt, data.maxAttempts, data.pattern, data.field, data.matchedContent);
     }
     case "turn.snapshot":
     case "context.compacted":
@@ -320,7 +320,6 @@ export {
   createChatErrorMessage,
   createChatPathConfirmationMessage,
   createChatAskUserMessage,
-  createChatVisionFallbackMessage,
   createModeChangedMessage,
   createPhaseChangedMessage,
   createCriteriaUpdatedMessage,
@@ -334,4 +333,4 @@ export {
   createQueueStateMessage,
   storedEventToServerMessage
 };
-//# sourceMappingURL=chunk-CEZNMLOO.js.map
+//# sourceMappingURL=chunk-7TTEGAO6.js.map

package/dist/{chunk-FQLK5GL5.js → chunk-BVHFMAVN.js}

@@ -26,4 +26,4 @@ export {
   isClientMessage,
   isServerMessage
 };
-//# sourceMappingURL=chunk-FQLK5GL5.js.map
+//# sourceMappingURL=chunk-BVHFMAVN.js.map

package/dist/{chunk-HW3U4XSZ.js → chunk-CDDMHSZF.js}

@@ -1,15 +1,15 @@
 import {
   getEventStore,
   updateSessionMetadata
-} from "./chunk-HLZV4S2I.js";
+} from "./chunk-NPHYEUYE.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-26DZZZDC.js";
+} from "./chunk-XJEOP6XU.js";
 import {
   createContextStateMessage,
   createSessionStateMessage
-} from "./chunk-CEZNMLOO.js";
+} from "./chunk-7TTEGAO6.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -143,4 +143,4 @@ export {
   needsNameGenerationCheck,
   applyGeneratedSessionName
 };
-//# sourceMappingURL=chunk-HW3U4XSZ.js.map
+//# sourceMappingURL=chunk-CDDMHSZF.js.map

package/dist/{chunk-HHAJ3QF6.js → chunk-EMJGF3A7.js}

@@ -5,10 +5,7 @@ import {
   getBackendCapabilities,
   getModelProfile,
   mapFinishReason
-} from "./chunk-HGAMIPFO.js";
-import {
-  ensureVisionFallbackConfigLoaded
-} from "./chunk-SZKEGZIB.js";
+} from "./chunk-7FDY3EOH.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -187,23 +184,13 @@ function createLLMClient(config, initialBackend = "unknown") {
       });
       try {
         const shouldDisableThinking = disableThinking || request.disableThinking === true;
-        await ensureVisionFallbackConfigLoaded();
-        const { isVisionFallbackEnabled } = await import("./vision-fallback-3MIZZ6NQ.js");
-        const paramsOptions = {
+        const { params: createParams } = await buildNonStreamingCreateParams({
           model,
           request,
           profile,
           capabilities,
-          disableThinking: shouldDisableThinking,
-          visionFallbackEnabled: isVisionFallbackEnabled()
-        };
-        if (request.onVisionFallbackStart) {
-          paramsOptions.onVisionFallbackStart = request.onVisionFallbackStart;
-        }
-        if (request.onVisionFallbackDone) {
-          paramsOptions.onVisionFallbackDone = request.onVisionFallbackDone;
-        }
-        const { params: createParams } = await buildNonStreamingCreateParams(paramsOptions);
+          disableThinking: shouldDisableThinking
+        });
         const response = await openai.chat.completions.create(createParams, {
           signal: request.signal
         });
@@ -264,18 +251,13 @@ function createLLMClient(config, initialBackend = "unknown") {
         idleTimeout
       });
       try {
-        await ensureVisionFallbackConfigLoaded();
-        const { isVisionFallbackEnabled } = await import("./vision-fallback-3MIZZ6NQ.js");
         const shouldDisableThinking = disableThinking || request.disableThinking === true;
         const createParams = await buildStreamingCreateParams({
           model,
           request,
           profile,
           capabilities,
-          disableThinking: shouldDisableThinking,
-          visionFallbackEnabled: isVisionFallbackEnabled(),
-          onVisionFallbackStart: request.onVisionFallbackStart,
-          onVisionFallbackDone: request.onVisionFallbackDone
+          disableThinking: shouldDisableThinking
         });
         const { params: streamingParams } = createParams;
         const stream = await openai.chat.completions.create(streamingParams, {
@@ -298,6 +280,8 @@ function createLLMClient(config, initialBackend = "unknown") {
             idleTimeoutController.abort();
           }
         }, 100);
+        const onAbort = () => clearInterval(idleTimer);
+        request.signal?.addEventListener("abort", onAbort, { once: true });
         try {
           for await (const chunk of stream) {
             if (idleTimeoutController.signal.aborted) {
@@ -412,6 +396,7 @@ function createLLMClient(config, initialBackend = "unknown") {
           }
         } finally {
           clearInterval(idleTimer);
+          request.signal?.removeEventListener("abort", onAbort);
         }
         if (tagBuffer) {
           if (inThinking) {
@@ -478,4 +463,4 @@ export {
   getLlmStatus,
   clearModelCache
 };
-//# sourceMappingURL=chunk-HHAJ3QF6.js.map
+//# sourceMappingURL=chunk-EMJGF3A7.js.map