@mindstudio-ai/remy 0.1.178 → 0.1.180

package/dist/headless.js

@@ -404,7 +404,7 @@ async function* streamChat(params) {
   const url = `${baseUrl2}/_internal/v2/agent/remy/chat`;
   const startTime = Date.now();
   const subAgentId = rest.subAgentId;
-  const requestBody = { ...rest, ...model && { modelId: model } };
+  const requestBody = { ...rest, modelId: model };
   log2.info("API request", {
     requestId,
     ...subAgentId && { subAgentId },
@@ -2787,13 +2787,8 @@ var queryDatabaseTool = {
 };
 
 // src/subagents/common/analyzeImage.ts
-var VISION_MODEL = "claude-4-6-sonnet";
-var VISION_MODEL_OVERRIDE = {
-  model: VISION_MODEL,
-  config: { thinkingBudget: "off" }
-};
 async function analyzeImage(params) {
-  const { prompt, imageUrl, timeout = 2e5, onLog } = params;
+  const { prompt, imageUrl, model, timeout = 2e5, onLog } = params;
   return runMindstudioCli(
     [
       "analyze-image",
@@ -2802,7 +2797,7 @@ async function analyzeImage(params) {
       "--image-url",
       imageUrl,
       "--vision-model-override",
-      JSON.stringify(VISION_MODEL_OVERRIDE)
+      JSON.stringify({ model })
     ],
     { outputKey: "analysis", timeout, onLog }
   );
@@ -2830,13 +2825,14 @@ ${TEXT_WRAP_DISCLAIMER}`;
   return p;
 }
 async function streamScreenshotAnalysis(opts) {
-  const { url, prompt, styleMap, onLog } = opts;
+  const { url, prompt, styleMap, onLog, model } = opts;
   onLog?.(JSON.stringify({ url, analysis: null }));
   const analysisPrompt = buildScreenshotAnalysisPrompt({ prompt, styleMap });
   let accumulated = "";
   const analysis = await analyzeImage({
     prompt: analysisPrompt,
     imageUrl: url,
+    model,
     onLog: (chunk) => {
       accumulated += chunk;
       onLog?.(JSON.stringify({ url, analysis: accumulated }));
@@ -2848,12 +2844,14 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let prompt;
   let existingUrl;
   let onLog;
+  let model;
   let path12;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
     existingUrl = promptOrOptions.imageUrl;
     path12 = promptOrOptions.path;
     onLog = promptOrOptions.onLog;
+    model = promptOrOptions.model;
   } else {
     prompt = promptOrOptions;
   }
@@ -2878,11 +2876,17 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   if (prompt === false) {
     return url;
   }
+  if (!model) {
+    throw new Error(
+      "captureAndAnalyzeScreenshot: `model` is required when analysis is enabled"
+    );
+  }
   return streamScreenshotAnalysis({
     url,
     prompt: prompt || void 0,
     styleMap,
-    onLog
+    onLog,
+    model
   });
 }
 
@@ -3715,8 +3719,215 @@ ${appSpec}
   }
 }
 
+// src/models/surfaces.ts
+var MODEL_SURFACES = {
+  parent: {
+    default: "claude-4-7-opus",
+    label: "Remy",
+    description: "The main Remy agent you chat with about your product. Writes code and manages delegation to other agents.",
+    modelType: "text",
+    userPickable: true
+  },
+  visualDesignExpert: {
+    default: "claude-4-7-opus",
+    label: "Design Agent",
+    description: "Designs your product's interfaces, including components, layouts, typography, color, and visual identity.",
+    modelType: "text",
+    userPickable: true
+  },
+  productVision: {
+    default: "claude-4-6-sonnet",
+    label: "Roadmap Agent",
+    description: "Owns your product's roadmap and pitch deck. Helps decide what to build next and how to frame the big picture.",
+    modelType: "text",
+    userPickable: true
+  },
+  browserAutomation: {
+    default: "claude-4-6-sonnet",
+    label: "QA Agent",
+    description: "Tests features and UI flows in an automated browser to verify they work end to end.",
+    modelType: "text",
+    userPickable: true
+  },
+  codeSanityCheck: {
+    default: "claude-4-6-sonnet",
+    label: "Architecture Agent",
+    description: "Reviews the architecture and structure of code changes to avoid technical debt.",
+    modelType: "text",
+    userPickable: true
+  },
+  imageGeneration: {
+    default: "seedream-4.5",
+    label: "Image Generation",
+    description: "Creates images for your product \u2014 icons, illustrations, photos, and any other visual assets.",
+    modelType: "image_generation",
+    userPickable: true
+  },
+  imageAnalysis: {
+    default: "claude-4-6-sonnet",
+    label: "Image Analysis",
+    description: "Reads screenshots taken by the QA agent during automated browser tests. Other agents use their own built-in image analysis when they need to read images.",
+    modelType: "vision",
+    userPickable: true
+  },
+  conversationSummarizer: {
+    default: "claude-4-6-sonnet",
+    label: "Compaction Utility",
+    description: "Compresses long conversations into summaries to keep things responsive.",
+    modelType: "text",
+    userPickable: true
+  },
+  brandExtractor: {
+    default: "claude-4-6-sonnet",
+    label: "Brand Utility",
+    description: "Extracts your product's name, colors, and fonts from your spec for use in branded documents.",
+    modelType: "text",
+    userPickable: true
+  },
+  // Internal surface — not user-pickable. Remy uses this to rewrite design
+  // briefs into model-optimized image prompts before image generation.
+  imagePromptEnhancer: {
+    default: "claude-4-6-sonnet",
+    label: "Image Prompt Enhancer",
+    description: "Rewrites image briefs into model-optimized prompts before image generation.",
+    modelType: "text",
+    userPickable: false
+  }
+};
+var ALLOWED_MODELS_BY_TYPE = {
+  text: [
+    "claude-4-7-opus",
+    "claude-4-6-opus",
+    "claude-4-6-sonnet",
+    "gpt-5.5",
+    "gemini-3-pro",
+    "gemini-3.1-pro",
+    "gemini-3-flash"
+  ]
+  // vision: undefined — unconstrained
+  // image_generation: undefined — unconstrained
+};
+function resolveModel(surfaceId, models, fallback) {
+  return models?.[surfaceId] ?? fallback ?? MODEL_SURFACES[surfaceId].default;
+}
+
 // src/subagents/browserAutomation/index.ts
 var log6 = createLogger("browser-automation");
+async function runBrowserAutomation(task, context) {
+  const release = await acquireBrowserLock();
+  try {
+    const result = await runSubAgent({
+      system: getBrowserAutomationPrompt(),
+      task,
+      tools: BROWSER_TOOLS,
+      externalTools: BROWSER_EXTERNAL_TOOLS,
+      executeTool: async (name, _input, _toolCallId, onLog) => {
+        if (name === "setupBrowser") {
+          try {
+            const result2 = await sidecarRequest(
+              "/setup-browser",
+              {
+                auth: _input.auth,
+                path: _input.path
+              },
+              { timeout: 15e3 }
+            );
+            return JSON.stringify(result2);
+          } catch (err) {
+            return `Error setting up browser: ${err.message}`;
+          }
+        }
+        if (name === "screenshotFullPage") {
+          try {
+            return await captureAndAnalyzeScreenshot({
+              path: _input.path,
+              onLog,
+              model: resolveModel(
+                "imageAnalysis",
+                context.models,
+                context.model
+              )
+            });
+          } catch (err) {
+            return `Error taking screenshot: ${err.message}`;
+          }
+        }
+        return `Error: unknown local tool "${name}"`;
+      },
+      apiConfig: context.apiConfig,
+      model: resolveModel("browserAutomation", context.models, context.model),
+      subAgentId: "browserAutomation",
+      signal: context.signal,
+      parentToolId: context.toolCallId,
+      requestId: context.requestId,
+      onEvent: context.onEvent,
+      resolveExternalTool: async (id, name, input) => {
+        if (!context.resolveExternalTool) {
+          return "Error: no external tool resolver";
+        }
+        const result2 = await context.resolveExternalTool(id, name, input);
+        if (name === "browserCommand") {
+          try {
+            const parsed = JSON.parse(result2);
+            const screenshotSteps = (parsed.steps || []).filter(
+              (s) => s.command === "screenshotViewport" && s.result?.url
+            );
+            if (screenshotSteps.length > 0) {
+              const visionOverride = {
+                model: resolveModel(
+                  "imageAnalysis",
+                  context.models,
+                  context.model
+                )
+              };
+              const batchInput = screenshotSteps.map((s) => ({
+                stepType: "analyzeImage",
+                step: {
+                  imageUrl: s.result.url,
+                  prompt: buildScreenshotAnalysisPrompt({
+                    styleMap: s.result.styleMap
+                  }),
+                  visionModelOverride: visionOverride
+                }
+              }));
+              const batchResult = await runMindstudioCli(
+                ["batch", JSON.stringify(batchInput)],
+                { timeout: 2e5, caller: "browserAutomation" }
+              );
+              try {
+                const analyses = JSON.parse(batchResult);
+                let ai = 0;
+                for (const step of parsed.steps) {
+                  if (step.command === "screenshotViewport" && step.result?.url && ai < analyses.length) {
+                    step.result.analysis = analyses[ai]?.output?.analysis || analyses[ai]?.output || "";
+                    ai++;
+                  }
+                }
+              } catch {
+                log6.debug("Failed to parse batch analysis result", {
+                  batchResult
+                });
+              }
+              return JSON.stringify(parsed);
+            }
+          } catch {
+          }
+        }
+        return result2;
+      },
+      toolRegistry: context.toolRegistry,
+      captureArtifacts: ["screenshotFullPage"]
+    });
+    context.subAgentMessages?.set(context.toolCallId, result.messages);
+    const ss = result.artifacts?.screenshotFullPage;
+    return {
+      text: result.text,
+      ...ss?.url ? { screenshot: { url: ss.url, styleMap: ss.styleMap } } : {}
+    };
+  } finally {
+    release();
+  }
+}
 var browserAutomationTool = {
   clearable: true,
   definition: {
@@ -3737,109 +3948,13 @@ var browserAutomationTool = {
     if (!context) {
       return "Error: browser automation requires execution context (only available in headless mode)";
     }
-    const release = await acquireBrowserLock();
-    try {
-      const result = await runSubAgent({
-        system: getBrowserAutomationPrompt(),
-        task: input.task,
-        tools: BROWSER_TOOLS,
-        externalTools: BROWSER_EXTERNAL_TOOLS,
-        executeTool: async (name, _input, _toolCallId, onLog) => {
-          if (name === "setupBrowser") {
-            try {
-              const result2 = await sidecarRequest(
-                "/setup-browser",
-                {
-                  auth: _input.auth,
-                  path: _input.path
-                },
-                { timeout: 15e3 }
-              );
-              return JSON.stringify(result2);
-            } catch (err) {
-              return `Error setting up browser: ${err.message}`;
-            }
-          }
-          if (name === "screenshotFullPage") {
-            try {
-              return await captureAndAnalyzeScreenshot({
-                path: _input.path,
-                onLog
-              });
-            } catch (err) {
-              return `Error taking screenshot: ${err.message}`;
-            }
-          }
-          return `Error: unknown local tool "${name}"`;
-        },
-        apiConfig: context.apiConfig,
-        model: context.models?.browserAutomation ?? context.model,
-        subAgentId: "browserAutomation",
-        signal: context.signal,
-        parentToolId: context.toolCallId,
-        requestId: context.requestId,
-        onEvent: context.onEvent,
-        resolveExternalTool: async (id, name, input2) => {
-          if (!context.resolveExternalTool) {
-            return "Error: no external tool resolver";
-          }
-          const result2 = await context.resolveExternalTool(id, name, input2);
-          if (name === "browserCommand") {
-            try {
-              const parsed = JSON.parse(result2);
-              const screenshotSteps = (parsed.steps || []).filter(
-                (s) => s.command === "screenshotViewport" && s.result?.url
-              );
-              if (screenshotSteps.length > 0) {
-                const batchInput = screenshotSteps.map((s) => ({
-                  stepType: "analyzeImage",
-                  step: {
-                    imageUrl: s.result.url,
-                    prompt: buildScreenshotAnalysisPrompt({
-                      styleMap: s.result.styleMap
-                    }),
-                    visionModelOverride: VISION_MODEL_OVERRIDE
-                  }
-                }));
-                const batchResult = await runMindstudioCli(
-                  ["batch", JSON.stringify(batchInput)],
-                  { timeout: 2e5, caller: "browserAutomation" }
-                );
-                try {
-                  const analyses = JSON.parse(batchResult);
-                  let ai = 0;
-                  for (const step of parsed.steps) {
-                    if (step.command === "screenshotViewport" && step.result?.url && ai < analyses.length) {
-                      step.result.analysis = analyses[ai]?.output?.analysis || analyses[ai]?.output || "";
-                      ai++;
-                    }
-                  }
-                } catch {
-                  log6.debug("Failed to parse batch analysis result", {
-                    batchResult
-                  });
-                }
-                return JSON.stringify(parsed);
-              }
-            } catch {
-            }
-          }
-          return result2;
-        },
-        toolRegistry: context.toolRegistry,
-        captureArtifacts: ["screenshotFullPage"]
-      });
-      context.subAgentMessages?.set(context.toolCallId, result.messages);
-      const ss = result.artifacts?.screenshotFullPage;
-      if (ss?.url) {
-        return `${result.text}
+    const result = await runBrowserAutomation(input.task, context);
+    if (result.screenshot) {
+      return `${result.text}
 
-![Final state](${ss.url})`;
-      }
-      return result.text;
-    } finally {
-      release();
+![Final state](${result.screenshot.url})`;
     }
+    return result.text;
   }
 };
 
@@ -3877,29 +3992,22 @@ var screenshotTool = {
         return await captureAndAnalyzeScreenshot({
           prompt: input.prompt,
           imageUrl: input.imageUrl,
-          onLog: context?.onLog
+          onLog: context?.onLog,
+          model: resolveModel("imageAnalysis", context?.models, context?.model)
         });
       }
       if (input.instructions && context) {
         const task = input.path ? `Navigate to "${input.path}", then: ${input.instructions}. After completing these steps, take a full-page screenshot.` : `${input.instructions}. After completing these steps, take a full-page screenshot.`;
-        const result = await browserAutomationTool.execute({ task }, context);
-        const resultStr = result;
-        let url;
-        let styleMap;
-        try {
-          const parsed = JSON.parse(resultStr);
-          url = parsed.screenshotUrl;
-          styleMap = parsed.styleMap;
-        } catch {
-        }
-        if (!url) {
-          return `Error: browser navigation completed but no screenshot URL was returned. Agent output: ${resultStr}`;
+        const result = await runBrowserAutomation(task, context);
+        if (!result.screenshot) {
+          return result.text;
         }
         return await streamScreenshotAnalysis({
-          url,
+          url: result.screenshot.url,
           prompt: input.prompt,
-          styleMap,
-          onLog: context?.onLog
+          styleMap: result.screenshot.styleMap,
+          onLog: context?.onLog,
+          model: resolveModel("imageAnalysis", context?.models, context?.model)
         });
       }
       const release = await acquireBrowserLock();
@@ -3907,7 +4015,8 @@ var screenshotTool = {
         return await captureAndAnalyzeScreenshot({
           prompt: input.prompt,
           path: input.path,
-          onLog: context?.onLog
+          onLog: context?.onLog,
+          model: resolveModel("imageAnalysis", context?.models, context?.model)
         });
       } finally {
         release();
@@ -4118,7 +4227,7 @@ var definition3 = {
     required: ["url"]
   }
 };
-async function execute3(input, onLog) {
+async function execute3(input, onLog, context) {
   const url = input.url;
   const analysisPrompt = input.prompt || DESIGN_REFERENCE_PROMPT;
   const isImageUrl = /\.(png|jpe?g|webp|gif|svg|avif)(\?|$)/i.test(url);
@@ -4151,7 +4260,8 @@ async function execute3(input, onLog) {
   const analysis = await analyzeImage({
     prompt: analysisPrompt,
     imageUrl,
-    onLog
+    onLog,
+    model: resolveModel("imageAnalysis", context?.models, context?.model)
   });
   return JSON.stringify({ url: imageUrl, analysis });
 }
@@ -4181,7 +4291,7 @@ var definition4 = {
     required: ["imageUrl"]
   }
 };
-async function execute4(input, onLog) {
+async function execute4(input, onLog, context) {
   const imageUrl = input.imageUrl;
   const prompt = buildScreenshotAnalysisPrompt({
     prompt: input.prompt
@@ -4189,7 +4299,8 @@ async function execute4(input, onLog) {
   const analysis = await analyzeImage({
     prompt,
     imageUrl,
-    onLog
+    onLog,
+    model: resolveModel("imageAnalysis", context?.models, context?.model)
   });
   return JSON.stringify({ url: imageUrl, analysis });
 }
@@ -4226,24 +4337,16 @@ async function execute5(input, onLog, context) {
   if (input.instructions && context) {
     try {
       const task = input.path ? `Navigate to "${input.path}", then: ${input.instructions}. After completing these steps, take a full-page screenshot.` : `${input.instructions}. After completing these steps, take a full-page screenshot.`;
-      const result = await browserAutomationTool.execute({ task }, context);
-      const resultStr = result;
-      let url;
-      let styleMap;
-      try {
-        const parsed = JSON.parse(resultStr);
-        url = parsed.screenshotUrl;
-        styleMap = parsed.styleMap;
-      } catch {
-      }
-      if (!url) {
-        return `Error: browser navigation completed but no screenshot URL was returned. Agent output: ${resultStr}`;
+      const result = await runBrowserAutomation(task, context);
+      if (!result.screenshot) {
+        return result.text;
       }
       return await streamScreenshotAnalysis({
-        url,
+        url: result.screenshot.url,
         prompt: input.prompt,
-        styleMap,
-        onLog
+        styleMap: result.screenshot.styleMap,
+        onLog,
+        model: resolveModel("imageAnalysis", context?.models, context?.model)
       });
     } catch (err) {
       return `Error taking interactive screenshot: ${err.message}`;
@@ -4254,7 +4357,8 @@ async function execute5(input, onLog, context) {
     return await captureAndAnalyzeScreenshot({
       prompt: input.prompt,
       path: input.path,
-      onLog
+      onLog,
+      model: resolveModel("imageAnalysis", context?.models, context?.model)
     });
   } catch (err) {
     return `Error taking screenshot: ${err.message}`;
@@ -4271,16 +4375,11 @@ __export(generateImages_exports, {
 });
 
 // src/subagents/designExpert/tools/images/enhancePrompt.ts
-var ENHANCE_MODEL = "claude-4-6-sonnet";
-var MODEL_OVERRIDE = {
-  model: ENHANCE_MODEL,
-  config: { reasoning: "false" }
-};
 var SYSTEM_PROMPT = readAsset(
   "subagents/designExpert/tools/images/enhance-image-prompt.md"
 );
 async function enhanceImagePrompt(params) {
-  const { brief, width, height, transparentBackground, onLog } = params;
+  const { brief, width, height, transparentBackground, onLog, model } = params;
   const contextParts = [
     `Dimensions: ${width}x${height}${width > height ? " (landscape)" : width < height ? " (portrait)" : " (square)"}`
   ];
@@ -4305,7 +4404,7 @@ ${brief}
       "--message",
       message,
       "--model-override",
-      JSON.stringify(MODEL_OVERRIDE)
+      JSON.stringify({ model, config: { reasoning: "false" } })
     ],
     { outputKey: "content", timeout: 6e4, onLog, caller: "designExpert" }
   );
@@ -4315,7 +4414,15 @@ ${brief}
 // src/subagents/designExpert/tools/images/imageGenerator.ts
 var ANALYZE_PROMPT = 'You are reviewing this image for a visual designer sourcing assets for a project. Describe: what the image depicts, the mood and color palette, how the lighting and composition work, any text present in the image, whether there are any issues (artifacts, distortions), and how it could be used in a layout for an app or website. Be concise and practical. Respond only with your analysis as Markdown (starting with the title "Asset Review") and absolutely no other text. Do not use emojis - use unicode if you need symbols.';
 async function generateImageAssets(opts) {
-  const { prompts, sourceImages, transparentBackground, onLog } = opts;
+  const {
+    prompts,
+    sourceImages,
+    transparentBackground,
+    onLog,
+    imageGenerationModel: genModel,
+    imageAnalysisModel,
+    imagePromptEnhancerModel
+  } = opts;
   const width = opts.width || 2048;
   const height = opts.height || 2048;
   const config = { width, height };
@@ -4330,7 +4437,8 @@ async function generateImageAssets(opts) {
         width,
         height,
         transparentBackground,
-        onLog
+        onLog,
+        model: imagePromptEnhancerModel
       })
     )
   );
@@ -4339,7 +4447,7 @@ async function generateImageAssets(opts) {
     const step = JSON.stringify({
       prompt: enhancedPrompts[0],
       imageModelOverride: {
-        model: "seedream-4.5",
+        model: genModel,
         config
       }
     });
@@ -4358,7 +4466,7 @@ async function generateImageAssets(opts) {
       step: {
         prompt,
         imageModelOverride: {
-          model: "seedream-4.5",
+          model: genModel,
           config
         }
       }
@@ -4410,7 +4518,8 @@ async function generateImageAssets(opts) {
       const analysis = await analyzeImage({
         prompt: ANALYZE_PROMPT,
         imageUrl: url,
-        onLog
+        onLog,
+        model: imageAnalysisModel
       });
       return {
         url,
@@ -4456,13 +4565,28 @@ var definition6 = {
     required: ["prompts"]
   }
 };
-async function execute6(input, onLog) {
+async function execute6(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     width: input.width,
     height: input.height,
     transparentBackground: input.transparentBackground,
-    onLog
+    onLog,
+    imageGenerationModel: resolveModel(
+      "imageGeneration",
+      context?.models,
+      context?.model
+    ),
+    imageAnalysisModel: resolveModel(
+      "imageAnalysis",
+      context?.models,
+      context?.model
+    ),
+    imagePromptEnhancerModel: resolveModel(
+      "imagePromptEnhancer",
+      context?.models,
+      context?.model
+    )
   });
 }
 
@@ -4509,14 +4633,29 @@ var definition7 = {
     required: ["prompts", "sourceImages"]
   }
 };
-async function execute7(input, onLog) {
+async function execute7(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     sourceImages: input.sourceImages,
     width: input.width,
     height: input.height,
     transparentBackground: input.transparentBackground,
-    onLog
+    onLog,
+    imageGenerationModel: resolveModel(
+      "imageGeneration",
+      context?.models,
+      context?.model
+    ),
+    imageAnalysisModel: resolveModel(
+      "imageAnalysis",
+      context?.models,
+      context?.model
+    ),
+    imagePromptEnhancerModel: resolveModel(
+      "imagePromptEnhancer",
+      context?.models,
+      context?.model
+    )
   });
 }
 
@@ -4989,7 +5128,7 @@ var designExpertTool = {
         );
       },
       apiConfig: context.apiConfig,
-      model: context.models?.visualDesignExpert ?? context.model,
+      model: resolveModel("visualDesignExpert", context.models, context.model),
       subAgentId: "visualDesignExpert",
       signal: context.signal,
       parentToolId: context.toolCallId,
@@ -5207,7 +5346,7 @@ var productVisionTool = {
         return executeVisionTool(name, input2, childCtx);
       },
       apiConfig: context.apiConfig,
-      model: context.models?.productVision ?? context.model,
+      model: resolveModel("productVision", context.models, context.model),
       subAgentId: "productVision",
       signal: context.signal,
       parentToolId: context.toolCallId,
@@ -5315,7 +5454,7 @@ var codeSanityCheckTool = {
       externalTools: /* @__PURE__ */ new Set(),
       executeTool: (name, toolInput) => executeTool(name, toolInput, context),
       apiConfig: context.apiConfig,
-      model: context.models?.codeSanityCheck ?? context.model,
+      model: resolveModel("codeSanityCheck", context.models, context.model),
       subAgentId: "codeSanityCheck",
       signal: context.signal,
       parentToolId: context.toolCallId,
@@ -5455,7 +5594,7 @@ function triggerCompaction(state, apiConfig, opts = {}) {
     apiConfig,
     system,
     tools2,
-    state.models?.conversationSummarizer ?? model
+    resolveModel("conversationSummarizer", state.models, model)
   ).then((summaries) => {
     pendingSummaries.push(...summaries);
     listener?.({ type: "complete", requestId });
@@ -6252,7 +6391,7 @@ async function runTurn(params) {
         onEvent({ type: "tool_input_delta", id, name, result: content });
       }
     }
-    const parentModel = state.models?.parent ?? model;
+    const parentModel = resolveModel("parent", state.models, model);
     try {
       for await (const event of streamChatWithRetry(
         {
@@ -6596,7 +6735,10 @@ async function runTurn(params) {
           isError: r.isError
         });
         if (!r.isError && BRAND_TRIGGERING_TOOLS.has(tc.name)) {
-          triggerBrandExtraction(apiConfig);
+          triggerBrandExtraction(
+            apiConfig,
+            resolveModel("brandExtractor", state.models, model)
+          );
         }
         return r;
       })
@@ -7039,12 +7181,14 @@ var HeadlessSession = class {
       this.emit("session_restored", {
         messageCount: this.state.messages.length,
         ...this.state.models && { models: this.state.models },
+        modelSurfaces: MODEL_SURFACES,
+        allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
         ...this.queueFields()
       });
     }
     triggerBrandExtraction(
       this.config,
-      this.state.models?.brandExtractor ?? this.opts.model
+      resolveModel("brandExtractor", this.state.models, this.opts.model)
     );
     this.toolRegistry.onEvent = this.onEvent;
     setCompactionListener((event) => {
@@ -7722,6 +7866,8 @@ var HeadlessSession = class {
         running: this.running,
         ...this.running && this.currentRequestId ? { currentRequestId: this.currentRequestId } : {},
         ...this.state.models && { models: this.state.models },
+        modelSurfaces: MODEL_SURFACES,
+        allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
         ...this.queueFields()
       }));
       return;