clanka 0.8.0 → 0.8.1

package/src/AgentSkills.ts

@@ -9,7 +9,7 @@ import * as Option from "effect/Option"
 import * as Path from "effect/Path"
 import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
-import * as Yaml from "effect/unstable/encoding/Yaml"
+import * as Yaml from "effect/encoding/Yaml"
 
 /**
  * @since 1.0.0
@@ -90,6 +90,10 @@ export const discover: (options: {
       .pipe(Effect.orElseSucceed(() => []))
     entries.sort()
     for (const entry of entries) {
+      const files = yield* fs
+        .readDirectory(path.join(skillsDir, entry))
+        .pipe(Effect.orElseSucceed((): Array<string> => []))
+      if (!files.includes("SKILL.md")) continue
       const location = path.join(skillsDir, entry, "SKILL.md")
       const content = yield* Effect.option(
         fs.stat(location).pipe(

package/src/AgentTools.ts

@@ -5,16 +5,16 @@
 import { parsePatch, patchChunks } from "./ApplyPatch.ts"
 import * as ExaSearch from "./ExaSearch.ts"
 import * as WebToMarkdown from "./WebToMarkdown.ts"
-import type * as HttpClient from "effect/unstable/http/HttpClient"
+import type * as HttpClient from "effect/http/HttpClient"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
-import * as Toolkit from "effect/unstable/ai/Toolkit"
-import * as Tool from "effect/unstable/ai/Tool"
+import * as Toolkit from "effect/ai/Toolkit"
+import * as Tool from "effect/ai/Tool"
 import * as Schema from "effect/Schema"
-import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"
 import * as FileSystem from "effect/FileSystem"
 import * as Path from "effect/Path"
-import * as ChildProcess from "effect/unstable/process/ChildProcess"
+import * as ChildProcess from "effect/process/ChildProcess"
 import * as Stream from "effect/Stream"
 import { pipe } from "effect/Function"
 import * as Array from "effect/Array"

package/src/AgentToolsImage.test.ts

@@ -10,10 +10,10 @@ import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
 import * as Stream from "effect/Stream"
-import * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import * as Model from "effect/unstable/ai/Model"
-import type * as Prompt from "effect/unstable/ai/Prompt"
-import type * as Response from "effect/unstable/ai/Response"
+import * as LanguageModel from "effect/ai/LanguageModel"
+import * as Model from "effect/ai/Model"
+import type * as Prompt from "effect/ai/Prompt"
+import type * as Response from "effect/ai/Response"
 import * as Agent from "./Agent.ts"
 import * as AgentExecutor from "./AgentExecutor.ts"
 import type * as AgentOutput from "./AgentOutput.ts"

package/src/ChunkRepo.test.ts

@@ -5,8 +5,8 @@ import * as NodeServices from "@effect/platform-node/NodeServices"
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as EmbeddingModel from "effect/unstable/ai/EmbeddingModel"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as EmbeddingModel from "effect/ai/EmbeddingModel"
+import * as SqlClient from "effect/sql/SqlClient"
 import { Chunk, ChunkRepo, layer, SyncId } from "./ChunkRepo.ts"
 import { SqliteLayer } from "./Sqlite.ts"
 

package/src/ChunkRepo.ts

@@ -4,15 +4,15 @@ import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import * as SchemaTransformation from "effect/SchemaTransformation"
 import * as Context from "effect/Context"
-import * as Model from "effect/unstable/schema/Model"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
-import * as SqlError from "effect/unstable/sql/SqlError"
-import * as SqlModel from "effect/unstable/sql/SqlModel"
-import * as SqlSchema from "effect/unstable/sql/SqlSchema"
+import * as Model from "effect/schema/Model"
+import * as SqlClient from "effect/sql/SqlClient"
+import * as SqlError from "effect/sql/SqlError"
+import * as SqlModel from "effect/sql/SqlModel"
+import * as SqlSchema from "effect/sql/SqlSchema"
 import type * as Cause from "effect/Cause"
 import type * as Option from "effect/Option"
-import * as EmbeddingModel from "effect/unstable/ai/EmbeddingModel"
-import * as SqlResolver from "effect/unstable/sql/SqlResolver"
+import * as EmbeddingModel from "effect/ai/EmbeddingModel"
+import * as SqlResolver from "effect/sql/SqlResolver"
 import * as RequestResolver from "effect/RequestResolver"
 
 /**

package/src/CodeChunker.ts

@@ -9,8 +9,8 @@ import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
 import * as Context from "effect/Context"
 import * as Stream from "effect/Stream"
-import * as ChildProcess from "effect/unstable/process/ChildProcess"
-import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import * as ChildProcess from "effect/process/ChildProcess"
+import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"
 import TreeSitter, { type SyntaxNode } from "tree-sitter"
 import TreeSitterJavaScript from "tree-sitter-javascript"
 import TreeSitterTypeScript from "tree-sitter-typescript"

package/src/Codex.ts

@@ -6,10 +6,10 @@ import * as Layer from "effect/Layer"
 import * as Struct from "effect/Struct"
 import { CodexAuth } from "./CodexAuth.ts"
 import { AgentModelConfig } from "./Agent.ts"
-import * as Model from "effect/unstable/ai/Model"
-import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import type * as Socket from "effect/unstable/socket/Socket"
-import type * as ResponseIdTracker from "effect/unstable/ai/ResponseIdTracker"
+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

package/src/CodexAuth.test.ts

@@ -1,8 +1,8 @@
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64Url from "effect/encoding/Base64Url"
 import * as Option from "effect/Option"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
 import {
   CodexAuthError,
   STORE_PREFIX,
@@ -17,7 +17,7 @@ import {
 } from "./CodexAuth.ts"
 
 const createJwt = (payload: string): string =>
-  `${Encoding.encodeBase64Url(JSON.stringify({ alg: "none" }))}.${Encoding.encodeBase64Url(payload)}.sig`
+  `${Base64Url.encode(JSON.stringify({ alg: "none" }))}.${Base64Url.encode(payload)}.sig`
 
 const createTestJwt = (payload: Record<string, unknown>): string =>
   createJwt(JSON.stringify(payload))

package/src/CodexAuth.ts

@@ -3,7 +3,7 @@
  */
 /** @effect-diagnostics schemaNumber:off */
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64Url from "effect/encoding/Base64Url"
 import * as Function from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
@@ -12,10 +12,10 @@ import * as Schedule from "effect/Schedule"
 import * as Schema from "effect/Schema"
 import * as Semaphore from "effect/Semaphore"
 import * as Context from "effect/Context"
-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"
 
 export const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann"
@@ -158,7 +158,7 @@ const decodeJwtPayload = (token: string): Option.Option<string> => {
   }
 
   return Option.fromNullishOr(
-    Result.getOrUndefined(Encoding.decodeBase64UrlString(payload)),
+    Result.getOrUndefined(Base64Url.decodeString(payload)),
   )
 }
 

package/src/Compaction.test.ts

@@ -1,9 +1,9 @@
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
-import * as AiError from "effect/unstable/ai/AiError"
-import * as Prompt from "effect/unstable/ai/Prompt"
-import * as ResponseIdTracker from "effect/unstable/ai/ResponseIdTracker"
+import * as AiError from "effect/ai/AiError"
+import * as Prompt from "effect/ai/Prompt"
+import * as ResponseIdTracker from "effect/ai/ResponseIdTracker"
 import * as Compaction from "./Compaction.ts"
 
 // -----------------------------------------------------------------------------

package/src/Compaction.ts

@@ -19,9 +19,9 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Predicate from "effect/Predicate"
 import * as Stream from "effect/Stream"
-import * as AiError from "effect/unstable/ai/AiError"
-import * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import * as Prompt from "effect/unstable/ai/Prompt"
+import * as AiError from "effect/ai/AiError"
+import * as LanguageModel from "effect/ai/LanguageModel"
+import * as Prompt from "effect/ai/Prompt"
 import type * as AgentOutput from "./AgentOutput.ts"
 import * as Image from "./Image.ts"
 

package/src/CompactionImage.test.ts

@@ -1,15 +1,15 @@
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Stream from "effect/Stream"
-import * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import * as Prompt from "effect/unstable/ai/Prompt"
+import * as LanguageModel from "effect/ai/LanguageModel"
+import * as Prompt from "effect/ai/Prompt"
 import * as Compaction from "./Compaction.ts"
 import { tinyPng } from "./fixtures/TestImages.ts"
 
-const base64 = Encoding.encodeBase64(tinyPng)
+const base64 = Base64.encode(tinyPng)
 
 const user = (text: string) =>
   Prompt.makeMessage("user", {

package/src/CompactionTokens.test.ts

@@ -1,8 +1,8 @@
 import { assert, describe, it } from "@effect/vitest"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 import * as Option from "effect/Option"
 import * as Schema from "effect/Schema"
-import * as Prompt from "effect/unstable/ai/Prompt"
+import * as Prompt from "effect/ai/Prompt"
 import * as Compaction from "./Compaction.ts"
 
 const text = (value: string) => Prompt.makePart("text", { text: value })
@@ -141,7 +141,7 @@ describe("Compaction image token estimates", () => {
     if (image.type !== "file") return
     assert.strictEqual(
       image.data,
-      Encoding.encodeBase64(new Uint8Array(1024).fill(137)),
+      Base64.encode(new Uint8Array(1024).fill(137)),
     )
     assert.strictEqual(
       Compaction.estimateTokens(restored),

package/src/CompactionTransport.test.ts

@@ -6,12 +6,12 @@ import * as Exit from "effect/Exit"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Stream from "effect/Stream"
-import * as AiError from "effect/unstable/ai/AiError"
-import * as LanguageModel from "effect/unstable/ai/LanguageModel"
-import * as Prompt from "effect/unstable/ai/Prompt"
-import * as HttpClient from "effect/unstable/http/HttpClient"
-import type * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
-import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import * as AiError from "effect/ai/AiError"
+import * as LanguageModel from "effect/ai/LanguageModel"
+import * as Prompt from "effect/ai/Prompt"
+import * as HttpClient from "effect/http/HttpClient"
+import type * as HttpClientRequest from "effect/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/http/HttpClientResponse"
 import * as Codex from "./Codex.ts"
 import * as Compaction from "./Compaction.ts"
 import * as Copilot from "./Copilot.ts"

package/src/Copilot.ts

@@ -7,8 +7,8 @@ import * as Struct from "effect/Struct"
 import { API_URL, GithubCopilotAuth } from "./CopilotAuth.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"
 
 /**
  * @since 1.0.0

package/src/CopilotAuth.test.ts

@@ -4,12 +4,8 @@ import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as Option from "effect/Option"
 import * as Ref from "effect/Ref"
-import {
-  HttpClient,
-  HttpClientRequest,
-  HttpClientResponse,
-} from "effect/unstable/http"
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http"
+import * as KeyValueStore from "effect/persistence/KeyValueStore"
 import {
   COPILOT_VISION_REQUEST_HEADER,
   DEFAULT_OPENAI_INTENT,

package/src/CopilotAuth.ts

@@ -10,10 +10,10 @@ import * as Schedule from "effect/Schedule"
 import * as Schema from "effect/Schema"
 import * as Semaphore from "effect/Semaphore"
 import * as Context from "effect/Context"
-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"
 
 export const CLIENT_ID = "Ov23li8tweQw6odWQebz"

package/src/GlobalWebSocket.ts

@@ -2,7 +2,7 @@
  * @since 1.0.0
  */
 import * as Layer from "effect/Layer"
-import * as Socket from "effect/unstable/socket/Socket"
+import * as Socket from "effect/socket/Socket"
 
 type GlobalWebSocket = InstanceType<typeof globalThis.WebSocket>
 

package/src/Image.test.ts

@@ -1,7 +1,7 @@
 import * as Photon from "@silvia-odwyer/photon-node"
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 import * as Option from "effect/Option"
 import { vi } from "vitest"
 import * as Image from "./Image.ts"
@@ -32,7 +32,7 @@ const withDecoderSpy = <A, E, R>(
     )
   })
 
-const base64Length = (bytes: Uint8Array) => Encoding.encodeBase64(bytes).length
+const base64Length = (bytes: Uint8Array) => Base64.encode(bytes).length
 
 describe("Image.prepare", () => {
   it.effect("passes an in-limit image through unchanged", () =>

package/src/Image.ts

@@ -14,13 +14,13 @@
  */
 import type * as Photon from "@silvia-odwyer/photon-node"
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 import type * as FileSystem from "effect/FileSystem"
 import * as Option from "effect/Option"
 import * as Schema from "effect/Schema"
 import * as Stream from "effect/Stream"
-import type * as AiError from "effect/unstable/ai/AiError"
-import * as Prompt from "effect/unstable/ai/Prompt"
+import type * as AiError from "effect/ai/AiError"
+import * as Prompt from "effect/ai/Prompt"
 
 /**
  * @since 1.0.0
@@ -677,7 +677,7 @@ export const partBytes = (part: Prompt.FilePart): Option.Option<Uint8Array> => {
   const base64 = part.data.startsWith("data:")
     ? part.data.slice(part.data.indexOf(",") + 1)
     : part.data
-  const decoded = Encoding.decodeBase64(base64)
+  const decoded = Base64.decode(base64)
   return decoded._tag === "Success"
     ? Option.some(decoded.success)
     : Option.none()

package/src/OutputFormatter.ts

@@ -9,7 +9,7 @@ import * as Context from "effect/Context"
 import * as Stream from "effect/Stream"
 import type { AgentFinished, Output } from "./AgentOutput.ts"
 import chalk from "chalk"
-import type * as Prompt from "effect/unstable/ai/Prompt"
+import type * as Prompt from "effect/ai/Prompt"
 import * as Cause from "effect/Cause"
 import { identity } from "effect/Function"
 import * as Predicate from "effect/Predicate"

package/src/SemanticSearch.test.ts

@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as RequestResolver from "effect/RequestResolver"
 import { TestClock } from "effect/testing"
-import type * as EmbeddingModel from "effect/unstable/ai/EmbeddingModel"
+import type * as EmbeddingModel from "effect/ai/EmbeddingModel"
 import { makeEmbeddingResolver } from "./SemanticSearch.ts"
 
 const baseResolver = RequestResolver.make<EmbeddingModel.EmbeddingRequest>(

package/src/SemanticSearch.ts

@@ -8,7 +8,7 @@ import * as CodeChunker from "./CodeChunker.ts"
 import * as Layer from "effect/Layer"
 import * as Stream from "effect/Stream"
 import { pipe } from "effect/Function"
-import * as EmbeddingModel from "effect/unstable/ai/EmbeddingModel"
+import * as EmbeddingModel from "effect/ai/EmbeddingModel"
 import * as RequestResolver from "effect/RequestResolver"
 import * as Option from "effect/Option"
 import * as Path from "effect/Path"
@@ -16,10 +16,10 @@ import * as Fiber from "effect/Fiber"
 import * as Duration from "effect/Duration"
 import * as FiberHandle from "effect/FiberHandle"
 import { SqliteLayer } from "./Sqlite.ts"
-import type * as SqlError from "effect/unstable/sql/SqlError"
+import type * as SqlError from "effect/sql/SqlError"
 import type * as SqliteMigrator from "@effect/sql-sqlite-node/SqliteMigrator"
 import type * as PlatformError from "effect/PlatformError"
-import type * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import type * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"
 import type * as FileSystem from "effect/FileSystem"
 import * as Console from "effect/Console"
 import { SemanticSearch } from "./SemanticSearch/Service.ts"

package/src/Sqlite.ts

@@ -5,7 +5,7 @@ import * as SqliteClient from "@effect/sql-sqlite-node/SqliteClient"
 import * as SqliteMigrator from "@effect/sql-sqlite-node/SqliteMigrator"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as FileSystem from "effect/FileSystem"
 import * as Path from "effect/Path"
 import { getLoadablePath } from "sqlite-vec"

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"