clanka 0.7.7 → 0.8.1

package/src/ToolkitRenderer.ts

@@ -5,8 +5,8 @@ import * as Array from "effect/Array"
 import * as Layer from "effect/Layer"
 import * as SchemaAST from "effect/SchemaAST"
 import * as Context from "effect/Context"
-import type * as Tool from "effect/unstable/ai/Tool"
-import type * as Toolkit from "effect/unstable/ai/Toolkit"
+import type * as Tool from "effect/ai/Tool"
+import type * as Toolkit from "effect/ai/Toolkit"
 import * as TypeBuilder from "./TypeBuilder.ts"
 import * as Function from "effect/Function"
 

package/src/WebToMarkdown.test.ts

@@ -5,7 +5,7 @@ import {
   HttpClient,
   type HttpClientRequest,
   HttpClientResponse,
-} from "effect/unstable/http"
+} from "effect/http"
 import * as WebToMarkdown from "./WebToMarkdown.ts"
 
 describe("WebToMarkdown", () => {

package/src/WebToMarkdown.ts

@@ -4,8 +4,8 @@
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Context from "effect/Context"
-import * as HttpClient from "effect/unstable/http/HttpClient"
-import type * as HttpClientError from "effect/unstable/http/HttpClientError"
+import * as HttpClient from "effect/http/HttpClient"
+import type * as HttpClientError from "effect/http/HttpClientError"
 
 /**
  * @since 1.0.0

package/src/Xai.test.ts

@@ -1,16 +1,14 @@
 import { assert, describe, it } from "@effect/vitest"
+import { OpenAiClient } from "@effect/ai-openai"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Layer from "effect/Layer"
 import * as Stream from "effect/Stream"
-import * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import * as Model from "effect/unstable/ai/Model"
-import {
-  HttpClient,
-  type HttpClientRequest,
-  HttpClientResponse,
-} from "effect/unstable/http"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import * as LanguageModel from "effect/ai/LanguageModel"
+import * as Model from "effect/ai/Model"
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
+import * as Socket from "effect/socket/Socket"
 import * as Compaction from "./Compaction.ts"
 import { DeviceCodeHandler } from "./DeviceCodeHandler.ts"
 import * as Public from "./index.ts"
@@ -61,6 +59,67 @@ const noLogin = Layer.succeed(DeviceCodeHandler, {
 })
 
 describe("Xai provider", () => {
+  it.todo(
+    "replays WebSocket history inline with storage enabled once upstream supports disabling item references",
+  )
+
+  for (const store of [undefined, false, true] as const) {
+    it.effect("always stores WebSocket responses with store=" + store, () =>
+      Effect.gen(function* () {
+        const http = capture()
+        const requests: Array<
+          Parameters<
+            OpenAiClient.OpenAiSocket["Service"]["createResponseStream"]
+          >[0]
+        > = []
+        yield* Effect.gen(function* () {
+          const ai = yield* LanguageModel.LanguageModel
+          const summarize = yield* Compaction.SummarizerTransform
+          const request = ai
+            .streamText({ prompt: "hello" })
+            .pipe(Stream.runDrain)
+          yield* request.pipe(Effect.exit)
+          yield* summarize(request).pipe(Effect.exit)
+        }).pipe(
+          Effect.provideService(OpenAiClient.OpenAiSocket, {
+            createResponseStream: (request) =>
+              Effect.sync(() => {
+                requests.push(request)
+                return [
+                  HttpClientResponse.fromWeb(
+                    HttpClientRequest.post("https://api.x.ai/v1/responses"),
+                    new Response(),
+                  ),
+                  Stream.empty,
+                ] as const
+              }),
+          }),
+          Effect.provide(
+            Xai.modelWebSocket(
+              "grok-4.6",
+              store === undefined ? undefined : { store },
+            ).pipe(
+              Layer.provide(
+                OpenAiClient.layer({ apiUrl: "https://api.x.ai/v1" }),
+              ),
+              Layer.provide(http.layer),
+              Layer.provide(
+                Layer.succeed(Socket.WebSocketConstructor, () => {
+                  throw new Error("Unexpected live WebSocket")
+                }),
+              ),
+            ),
+          ),
+        )
+        assert.lengthOf(http.requests, 0)
+        assert.lengthOf(requests, 2)
+        for (const request of requests) assert.strictEqual(request.store, true)
+        assert.isUndefined(requests[0]!.max_output_tokens)
+        assert.strictEqual(requests[1]!.max_output_tokens, 4000)
+      }),
+    )
+  }
+
   it("exports Xai, but not XaiAuth, from the public entry point", () => {
     assert.strictEqual(Public.Xai, Xai)
     assert.isFalse("XaiAuth" in Public)

package/src/Xai.ts

@@ -7,8 +7,10 @@ import * as Struct from "effect/Struct"
 import { XaiAuth } from "./XaiAuth.ts"
 import { AgentModelConfig } from "./Agent.ts"
 import * as Compaction from "./Compaction.ts"
-import * as Model from "effect/unstable/ai/Model"
-import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
+import * as Model from "effect/ai/Model"
+import type * as LanguageModel from "effect/ai/LanguageModel"
+import type * as Socket from "effect/socket/Socket"
+import type * as ResponseIdTracker from "effect/ai/ResponseIdTracker"
 
 /**
  * @since 1.0.0
@@ -39,7 +41,7 @@ export const model = (
             "systemPromptTransform",
             "supportsImages",
           ]),
-          store: false,
+          store: options?.store ?? false,
           reasoning: { effort: "high", ...options?.reasoning },
         },
       }),
@@ -55,3 +57,50 @@ export const model = (
       ),
     ),
   )
+
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export const modelWebSocket = (
+  model: string,
+  options?:
+    | (OpenAiLanguageModel.Config["Service"] & typeof AgentModelConfig.Service)
+    | undefined,
+): Model.Model<
+  "xai",
+  | LanguageModel.LanguageModel
+  | OpenAiClient.OpenAiSocket
+  | ResponseIdTracker.ResponseIdTracker,
+  OpenAiClient.OpenAiClient | Socket.WebSocketConstructor
+> =>
+  Model.make(
+    "xai",
+    model,
+    Layer.mergeAll(
+      OpenAiLanguageModel.layer({
+        model,
+        config: {
+          ...Struct.omit(options ?? {}, [
+            "systemPromptTransform",
+            "supportsImages",
+          ]),
+          // xAI needs stored responses to resolve previous_response_id.
+          store: true,
+          useItemReferences: false,
+          reasoning: { effort: "high", ...options?.reasoning },
+        },
+      }),
+      AgentModelConfig.layer({
+        systemPromptTransform: options?.systemPromptTransform,
+        supportsImages: options?.supportsImages,
+      }),
+      // Cap compaction summaries; xAI honours max_output_tokens.
+      Layer.succeed(Compaction.SummarizerTransform, (effect) =>
+        OpenAiLanguageModel.withConfigOverride(effect, {
+          max_output_tokens: Compaction.summarizerMaxOutputTokens,
+        }),
+      ),
+      Layer.fresh(OpenAiClient.layerWebSocketMode),
+    ),
+  )

package/src/XaiAuth.test.ts

@@ -9,8 +9,8 @@ import {
   HttpClientError,
   type HttpClientRequest,
   HttpClientResponse,
-} from "effect/unstable/http"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+} from "effect/http"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
 import { DeviceCodeHandler } from "./DeviceCodeHandler.ts"
 import { XaiAuth, TokenData, toTokenStore } from "./XaiAuth.ts"
 

package/src/XaiAuth.ts

@@ -9,10 +9,10 @@ import * as Option from "effect/Option"
 import * as Schedule from "effect/Schedule"
 import * as Schema from "effect/Schema"
 import * as Semaphore from "effect/Semaphore"
-import * as HttpClient from "effect/unstable/http/HttpClient"
-import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
-import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import * as HttpClient from "effect/http/HttpClient"
+import * as HttpClientRequest from "effect/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/http/HttpClientResponse"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
 import { DeviceCodeHandler } from "./DeviceCodeHandler.ts"
 
 const CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828"

package/src/cli.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env -S node --optimize-for-size
 import * as Effect from "effect/Effect"
-import * as Prompt from "effect/unstable/cli/Prompt"
+import * as Prompt from "effect/cli/Prompt"
 import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient"
-import * as Command from "effect/unstable/cli/Command"
-import * as Flag from "effect/unstable/cli/Flag"
+import * as Command from "effect/cli/Command"
+import * as Flag from "effect/cli/Flag"
 import * as NodeServices from "@effect/platform-node/NodeServices"
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime"
 import * as GlobalWebSocket from "./GlobalWebSocket.ts"
@@ -21,10 +21,10 @@ import * as Layer from "effect/Layer"
 import * as Logger from "effect/Logger"
 import * as Path from "effect/Path"
 import * as Schema from "effect/Schema"
-import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import type * as Model from "effect/unstable/ai/Model"
+import type * as LanguageModel from "effect/ai/LanguageModel"
+import type * as Model from "effect/ai/Model"
 import * as Config from "effect/Config"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
 import * as Option from "effect/Option"
 import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai"
 import * as DeviceCodeHandler from "./DeviceCodeHandler.ts"
@@ -58,7 +58,9 @@ const modelLayer = (provider: Provider, model: string, effort: string) =>
       ).pipe(Layer.provide(Codex.layerClient))
     : provider === "xai"
       ? withSubagentModel(
-          Xai.model(model, { reasoning: { effort: effort as any } }),
+          Xai.modelWebSocket(model, {
+            reasoning: { effort: effort as any },
+          }),
         ).pipe(Layer.provide(Xai.layerClient))
       : withSubagentModel(Copilot.model(model, { reasoning: { effort } })).pipe(
           Layer.provide(Copilot.layerClient),

package/src/fixtures/TestImages.ts

@@ -1,6 +1,6 @@
 import * as Photon from "@silvia-odwyer/photon-node"
 import * as Zlib from "node:zlib"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 
 export const encodePng = (options: {
   readonly width: number
@@ -278,7 +278,7 @@ export const bytesOf = (data: string | Uint8Array | URL): Uint8Array => {
   const base64 = data.startsWith("data:")
     ? data.slice(data.indexOf(",") + 1)
     : data
-  const decoded = Encoding.decodeBase64(base64)
+  const decoded = Base64.decode(base64)
   if (decoded._tag === "Failure") throw new Error("Invalid base64 image data")
   return decoded.success
 }

package/src/fixtures/patch13-broken.txt

@@ -3,8 +3,8 @@ await applyPatch(`*** Begin Patch
 @@
  import * as ExaSearch from "./ExaSearch.ts"
  import * as WebToMarkdown from "./WebToMarkdown.ts"
--import type * as HttpClient from "effect/unstable/http/HttpClient"
-+import * as HttpClient from "effect/unstable/http/HttpClient"
+-import type * as HttpClient from "effect/http/HttpClient"
++import * as HttpClient from "effect/http/HttpClient"
 @@
    Tool.make("fetchMarkdown", {
      description: "Fetch a web page and convert it to markdown.",
@@ -64,7 +64,7 @@ await applyPatch(`*** Begin Patch
 +  HttpClient,
 +  type HttpClientRequest,
 +  HttpClientResponse,
-+} from "effect/unstable/http"
++} from "effect/http"
 +import * as AgentTools from "./AgentTools.ts"
 +import * as ToolkitRenderer from "./ToolkitRenderer.ts"
 +
@@ -146,4 +146,4 @@ await applyPatch(`*** Begin Patch
 +
 +Add a built-in `fetchJson` agent tool for fetching and parsing JSON responses.
 *** End Patch`);
-console.log('patch applied');
+console.log('patch applied');

package/src/fixtures/patch13-fixed.txt

@@ -3,8 +3,8 @@ await applyPatch(`*** Begin Patch
 @@
  import * as ExaSearch from "./ExaSearch.ts"
  import * as WebToMarkdown from "./WebToMarkdown.ts"
--import type * as HttpClient from "effect/unstable/http/HttpClient"
-+import * as HttpClient from "effect/unstable/http/HttpClient"
+-import type * as HttpClient from "effect/http/HttpClient"
++import * as HttpClient from "effect/http/HttpClient"
 @@
    Tool.make("fetchMarkdown", {
      description: "Fetch a web page and convert it to markdown.",
@@ -64,7 +64,7 @@ await applyPatch(`*** Begin Patch
 +  HttpClient,
 +  type HttpClientRequest,
 +  HttpClientResponse,
-+} from "effect/unstable/http"
++} from "effect/http"
 +import * as AgentTools from "./AgentTools.ts"
 +import * as ToolkitRenderer from "./ToolkitRenderer.ts"
 +
@@ -146,4 +146,4 @@ await applyPatch(`*** Begin Patch
 +
 +Add a built-in \`fetchJson\` agent tool for fetching and parsing JSON responses.
 *** End Patch`);
-console.log('patch applied');
+console.log('patch applied');