Merge branch 'main' into investigate-premature-stop-issue

.changeset/grok-4.5-reasoning-variants.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Fix Grok 4.5 reasoning variants not showing up in the model picker.

packages/opencode/src/provider/transform.ts

@@ -735,7 +735,11 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
       high: { reasoningEffort: "high" },
     }
   }
-  if (id.includes("grok")) return {}
+  // kilocode_change start
+  if (id.includes("grok") && !id.includes("grok-4.5")) {
+    return {}
+  }
+  // kilocode_change end
 
   switch (model.api.npm) {
     case "@kilocode/kilo-gateway": // kilocode_change

packages/opencode/test/kilocode/session-prompt-permission-refresh.test.ts

@@ -1040,7 +1040,9 @@ it.live(
 
         yield* permission.reply({ requestID: pending.id, reply: "always" })
         expect(
-          Exit.isSuccess(yield* awaitWithTimeout(Fiber.await(first), "first global skill run did not finish")),
+          Exit.isSuccess(
+            yield* awaitWithTimeout(Fiber.await(first), "first global skill run did not finish", "15 seconds"),
+          ),
         ).toBe(true)
 
         yield* llm.push(reply().tool("bash", call), reply().text("second complete").stop())
@@ -1052,7 +1054,13 @@ it.live(
         })
         const second = yield* prompt.loop({ sessionID: chat.id }).pipe(Effect.forkScoped)
         expect(
-          Exit.isSuccess(yield* awaitWithTimeout(Fiber.await(second), "trusted global skill prompted a second time")),
+          Exit.isSuccess(
+            yield* awaitWithTimeout(
+              Fiber.await(second),
+              "trusted global skill prompted a second time",
+              "15 seconds",
+            ),
+          ),
         ).toBe(true)
         expect(yield* permission.list()).toEqual([])
       }),
@@ -1064,7 +1072,7 @@ it.live(
         }),
       },
     ),
-  { timeout: 15_000 },
+  { timeout: 30_000 },
 )
 
 it.live("active tool calls use permissions changed after model streaming starts", () =>

packages/opencode/test/provider/transform.test.ts

@@ -3443,6 +3443,25 @@ describe("ProviderTransform.variants", () => {
       expect(result.low).toEqual({ reasoningEffort: "low" })
       expect(result.high).toEqual({ reasoningEffort: "high" })
     })
+
+    // kilocode_change start
+    test("grok-4.5 uses standard reasoning efforts", () => {
+      const model = createMockModel({
+        id: "xai/grok-4.5",
+        providerID: "xai",
+        api: {
+          id: "grok-4.5",
+          url: "https://api.x.ai",
+          npm: "@ai-sdk/xai",
+        },
+      })
+
+      const result = ProviderTransform.variants(model)
+
+      expect(Object.keys(result)).toEqual(["low", "medium", "high"])
+      expect(result.medium).toEqual({ reasoningEffort: "medium" })
+    })
+    // kilocode_change end
   })
 
   describe("@ai-sdk/deepinfra", () => {