@mindstudio-ai/remy 0.1.241 → 0.1.243

package/dist/headless.js

@@ -3035,7 +3035,7 @@ function startStatusWatcher(config) {
       if (!data.label) {
         return;
       }
-      if (pauseCount > 0) {
+      if (pauseCount > 0 || stopped || signal?.aborted) {
         return;
       }
       onStatus(data.label);
@@ -3314,6 +3314,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       let currentToolNames = "";
       let lastUsage;
       let lastProviderMetadata;
+      let lastModelId;
       const statusWatcher = startStatusWatcher({
         apiConfig,
         getContext: () => {
@@ -3427,6 +3428,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
                 llmCalls: 1
               };
               lastProviderMetadata = event.providerMetadata;
+              lastModelId = event.modelId;
               recordUsage({
                 ts: Date.now(),
                 requestId,
@@ -3465,7 +3467,8 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
         role: "assistant",
         content: contentBlocks,
         ...lastUsage ? { usage: lastUsage } : {},
-        ...lastProviderMetadata ? { providerMetadata: lastProviderMetadata } : {}
+        ...lastProviderMetadata ? { providerMetadata: lastProviderMetadata } : {},
+        model: lastModelId ?? model
       });
       const toolCalls = contentBlocks.filter(
         (b) => b.type === "tool"
@@ -7059,6 +7062,7 @@ async function runTurn(params) {
     apiConfig,
     system,
     model,
+    buildModel,
     onboardingState,
     signal,
     onEvent,
@@ -7070,15 +7074,24 @@ async function runTurn(params) {
   } = params;
   const tools2 = getToolDefinitions(onboardingState);
   const excludeToolsFromClearing = tools2.filter((t) => !CLEARABLE_TOOLS.has(t.name)).map((t) => t.name);
+  const buildModelOverride = buildModel ? filterModelPicks({ parent: buildModel }).parent : void 0;
+  const baseline = resolveModel("parent", state.models, model);
+  const parentModel = buildModelOverride ?? baseline;
+  const modelOverride = buildModelOverride && buildModelOverride !== baseline ? { from: baseline } : void 0;
   log13.info("Turn started", {
     requestId,
     model,
+    buildModel: buildModelOverride,
     toolCount: tools2.length,
     ...attachments && attachments.length > 0 && {
       attachmentCount: attachments.length
     }
   });
-  onEvent({ type: "turn_started" });
+  onEvent({
+    type: "turn_started",
+    model: parentModel,
+    ...modelOverride && { modelOverride }
+  });
   const hasText = userMessage.trim().length > 0;
   const hasAttachments = attachments && attachments.length > 0;
   if (!hasText && !hasAttachments) {
@@ -7145,6 +7158,7 @@ async function runTurn(params) {
     const toolInputAccumulators = /* @__PURE__ */ new Map();
     let stopReason = "end_turn";
     let turnProviderMetadata;
+    let turnModelId;
     let subAgentText = "";
     let currentToolNames = "";
     const statusWatcher = isFirstMessage ? { stop() {
@@ -7226,7 +7240,6 @@ async function runTurn(params) {
         onEvent({ type: "tool_input_delta", id, name, result: content });
       }
     }
-    const parentModel = resolveModel("parent", state.models, model);
     try {
       for await (const event of streamChatWithRetry(
         {
@@ -7346,6 +7359,7 @@ async function runTurn(params) {
           case "done":
             stopReason = event.stopReason;
             turnProviderMetadata = event.providerMetadata;
+            turnModelId = event.modelId;
             turnLlmCalls++;
             lastCallInputTokens = event.usage.inputTokens;
             lastCallCacheCreation = event.usage.cacheCreationTokens ?? 0;
@@ -7406,7 +7420,9 @@ async function runTurn(params) {
           },
           ...turnProviderMetadata && {
             providerMetadata: turnProviderMetadata
-          }
+          },
+          model: turnModelId ?? parentModel,
+          ...modelOverride && { modelOverride }
         });
       }
       onEvent({ type: "turn_cancelled" });
@@ -7424,7 +7440,9 @@ async function runTurn(params) {
           cacheReadTokens: turnCacheRead || void 0,
           llmCalls: turnLlmCalls
         },
-        ...turnProviderMetadata && { providerMetadata: turnProviderMetadata }
+        ...turnProviderMetadata && { providerMetadata: turnProviderMetadata },
+        model: turnModelId ?? parentModel,
+        ...modelOverride && { modelOverride }
       });
     }
     const toolCalls = getToolCalls(contentBlocks);
@@ -8219,7 +8237,14 @@ var HeadlessSession = class {
     const rid = this.currentRequestId;
     switch (e.type) {
       case "turn_started":
-        this.emit("turn_started", {}, rid);
+        this.emit(
+          "turn_started",
+          {
+            ...e.model && { model: e.model },
+            ...e.modelOverride && { modelOverride: e.modelOverride }
+          },
+          rid
+        );
         return;
       case "user_message":
         this.emit(
@@ -8423,7 +8448,9 @@ var HeadlessSession = class {
       userMessage = resolved.message;
     }
     const isHidden = !!parsed.hidden;
-    applyPlanFileSideEffect(parsed.text ?? "");
+    const rawText = parsed.text ?? "";
+    applyPlanFileSideEffect(rawText);
+    const buildModel = hasSentinel(rawText, "approvePlan") ? parsed.buildModel : void 0;
     const onboardingState = parsed.onboardingState ?? "onboardingFinished";
     this.currentOnboardingState = onboardingState;
     const system = buildSystemPrompt(
@@ -8452,6 +8479,7 @@ var HeadlessSession = class {
         apiConfig: this.config,
         system,
         model: this.opts.model,
+        buildModel,
         onboardingState,
         requestId,
         signal: this.currentAbort.signal,

package/dist/index.js

@@ -3774,7 +3774,7 @@ function startStatusWatcher(config) {
       if (!data.label) {
         return;
       }
-      if (pauseCount > 0) {
+      if (pauseCount > 0 || stopped || signal?.aborted) {
         return;
       }
       onStatus(data.label);
@@ -3884,6 +3884,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       let currentToolNames = "";
       let lastUsage;
       let lastProviderMetadata;
+      let lastModelId;
       const statusWatcher = startStatusWatcher({
         apiConfig,
         getContext: () => {
@@ -3997,6 +3998,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
                 llmCalls: 1
               };
               lastProviderMetadata = event.providerMetadata;
+              lastModelId = event.modelId;
               recordUsage({
                 ts: Date.now(),
                 requestId,
@@ -4035,7 +4037,8 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
         role: "assistant",
         content: contentBlocks,
         ...lastUsage ? { usage: lastUsage } : {},
-        ...lastProviderMetadata ? { providerMetadata: lastProviderMetadata } : {}
+        ...lastProviderMetadata ? { providerMetadata: lastProviderMetadata } : {},
+        model: lastModelId ?? model
       });
       const toolCalls = contentBlocks.filter(
         (b) => b.type === "tool"
@@ -7502,6 +7505,7 @@ async function runTurn(params) {
     apiConfig,
     system,
     model,
+    buildModel,
     onboardingState,
     signal,
     onEvent,
@@ -7513,15 +7517,24 @@ async function runTurn(params) {
   } = params;
   const tools2 = getToolDefinitions(onboardingState);
   const excludeToolsFromClearing = tools2.filter((t) => !CLEARABLE_TOOLS.has(t.name)).map((t) => t.name);
+  const buildModelOverride = buildModel ? filterModelPicks({ parent: buildModel }).parent : void 0;
+  const baseline = resolveModel("parent", state.models, model);
+  const parentModel = buildModelOverride ?? baseline;
+  const modelOverride = buildModelOverride && buildModelOverride !== baseline ? { from: baseline } : void 0;
   log12.info("Turn started", {
     requestId,
     model,
+    buildModel: buildModelOverride,
     toolCount: tools2.length,
     ...attachments && attachments.length > 0 && {
       attachmentCount: attachments.length
     }
   });
-  onEvent({ type: "turn_started" });
+  onEvent({
+    type: "turn_started",
+    model: parentModel,
+    ...modelOverride && { modelOverride }
+  });
   const hasText = userMessage.trim().length > 0;
   const hasAttachments = attachments && attachments.length > 0;
   if (!hasText && !hasAttachments) {
@@ -7588,6 +7601,7 @@ async function runTurn(params) {
     const toolInputAccumulators = /* @__PURE__ */ new Map();
     let stopReason = "end_turn";
     let turnProviderMetadata;
+    let turnModelId;
     let subAgentText = "";
     let currentToolNames = "";
     const statusWatcher = isFirstMessage ? { stop() {
@@ -7669,7 +7683,6 @@ async function runTurn(params) {
         onEvent({ type: "tool_input_delta", id, name, result: content });
       }
     }
-    const parentModel = resolveModel("parent", state.models, model);
     try {
       for await (const event of streamChatWithRetry(
         {
@@ -7789,6 +7802,7 @@ async function runTurn(params) {
           case "done":
             stopReason = event.stopReason;
             turnProviderMetadata = event.providerMetadata;
+            turnModelId = event.modelId;
             turnLlmCalls++;
             lastCallInputTokens = event.usage.inputTokens;
             lastCallCacheCreation = event.usage.cacheCreationTokens ?? 0;
@@ -7849,7 +7863,9 @@ async function runTurn(params) {
           },
           ...turnProviderMetadata && {
             providerMetadata: turnProviderMetadata
-          }
+          },
+          model: turnModelId ?? parentModel,
+          ...modelOverride && { modelOverride }
         });
       }
       onEvent({ type: "turn_cancelled" });
@@ -7867,7 +7883,9 @@ async function runTurn(params) {
           cacheReadTokens: turnCacheRead || void 0,
           llmCalls: turnLlmCalls
         },
-        ...turnProviderMetadata && { providerMetadata: turnProviderMetadata }
+        ...turnProviderMetadata && { providerMetadata: turnProviderMetadata },
+        model: turnModelId ?? parentModel,
+        ...modelOverride && { modelOverride }
       });
     }
     const toolCalls = getToolCalls(contentBlocks);
@@ -9108,7 +9126,14 @@ var init_headless = __esm({
         const rid = this.currentRequestId;
         switch (e.type) {
           case "turn_started":
-            this.emit("turn_started", {}, rid);
+            this.emit(
+              "turn_started",
+              {
+                ...e.model && { model: e.model },
+                ...e.modelOverride && { modelOverride: e.modelOverride }
+              },
+              rid
+            );
             return;
           case "user_message":
             this.emit(
@@ -9312,7 +9337,9 @@ var init_headless = __esm({
           userMessage = resolved.message;
         }
         const isHidden = !!parsed.hidden;
-        applyPlanFileSideEffect(parsed.text ?? "");
+        const rawText = parsed.text ?? "";
+        applyPlanFileSideEffect(rawText);
+        const buildModel = hasSentinel(rawText, "approvePlan") ? parsed.buildModel : void 0;
         const onboardingState = parsed.onboardingState ?? "onboardingFinished";
         this.currentOnboardingState = onboardingState;
         const system = buildSystemPrompt(
@@ -9341,6 +9368,7 @@ var init_headless = __esm({
             apiConfig: this.config,
             system,
             model: this.opts.model,
+            buildModel,
             onboardingState,
             requestId,
             signal: this.currentAbort.signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindstudio-ai/remy",
-  "version": "0.1.241",
+  "version": "0.1.243",
   "description": "Remy coding agent",
   "repository": {
     "type": "git",