clanka 0.1.4 → 0.1.6

package/dist/WebToMarkdown.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebToMarkdown.test.js","sourceRoot":"","sources":["../src/WebToMarkdown.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,MAAM,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAgB,EAAE,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAC5B,CAAC,OAA4C,EAAE,EAAE,CAC/C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;YAEnE,IAAI,OAAO,CAAC,GAAG,KAAK,2BAA2B,EAAE,CAAC;gBAChD,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACjB,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;iBAClC,CAAC,CACH,CAAA;YACH,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,KAAK,6BAA6B,EAAE,CAAC;gBAClD,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,yCAAyC,EAAE;oBACtD,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE;iBACzC,CAAC,CACH,CAAA;YACH,CAAC;YAED,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAC3C,CAAA;QACH,CAAC,CAAC,CACL,CAAA;QAED,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpD,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,aAAa,CAAA;YACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,UAAU,CAC9C,2BAA2B,CAC5B,CAAA;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,EACnC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,CACrD,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE;YAC3B,2BAA2B;YAC3B,6BAA6B;SAC9B,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,uBAAuB,CAAC,CAAA;IAC9D,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"WebToMarkdown.test.js","sourceRoot":"","sources":["../src/WebToMarkdown.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AACjC,OAAO,EACL,UAAU,EAEV,kBAAkB,GACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,MAAM,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAgB,EAAE,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAC5B,CAAC,OAA4C,EAAE,EAAE,CAC/C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;YAEnE,IAAI,OAAO,CAAC,GAAG,KAAK,2BAA2B,EAAE,CAAC;gBAChD,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACjB,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;iBAClC,CAAC,CACH,CAAA;YACH,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,KAAK,6BAA6B,EAAE,CAAC;gBAClD,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,yCAAyC,EAAE;oBACtD,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE;iBACzC,CAAC,CACH,CAAA;YACH,CAAC;YAED,OAAO,kBAAkB,CAAC,OAAO,CAC/B,OAAO,EACP,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAC3C,CAAA;QACH,CAAC,CAAC,CACL,CAAA;QAED,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpD,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,aAAa,CAAA;YACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,UAAU,CAC9C,2BAA2B,CAC5B,CAAA;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,EACnC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,CACrD,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE;YAC3B,2BAA2B;YAC3B,6BAA6B;SAC9B,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,uBAAuB,CAAC,CAAA;IAC9D,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clanka",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "publishConfig": {
     "access": "public"
   },

package/src/Agent.ts

@@ -1,41 +1,36 @@
 /**
  * @since 1.0.0
  */
-import {
-  Array,
-  Effect,
-  identity,
-  Layer,
-  MutableRef,
-  Option,
-  pipe,
-  Queue,
-  Schema,
-  Scope,
-  Semaphore,
-  ServiceMap,
-  Stream,
-} from "effect"
-import {
-  AiError,
-  LanguageModel,
-  Prompt,
-  Tool,
-  Toolkit,
-} from "effect/unstable/ai"
-import { ModelName, ProviderName } from "effect/unstable/ai/Model"
-import { type StreamPart } from "effect/unstable/ai/Response"
+import * as Model from "effect/unstable/ai/Model"
+import type * as Response from "effect/unstable/ai/Response"
 import * as AgentExecutor from "./AgentExecutor.ts"
 import { stripWrappingCodeFence } from "./ScriptExtraction.ts"
-import type { Path } from "effect/Path"
-import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
-import type { HttpClient } from "effect/unstable/http/HttpClient"
+import type * as Path from "effect/Path"
+import type * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import type * as HttpClient from "effect/unstable/http/HttpClient"
 import type {
   CurrentDirectory,
   SubagentExecutor,
   TaskCompleter,
 } from "./AgentTools.ts"
-import type { FileSystem } from "effect/FileSystem"
+import type * as FileSystem from "effect/FileSystem"
+import * as Prompt from "effect/unstable/ai/Prompt"
+import * as Effect from "effect/Effect"
+import * as Stream from "effect/Stream"
+import type * as Scope from "effect/Scope"
+import * as LanguageModel from "effect/unstable/ai/LanguageModel"
+import type * as AiError from "effect/unstable/ai/AiError"
+import * as ServiceMap from "effect/ServiceMap"
+import * as Option from "effect/Option"
+import { identity, pipe } from "effect/Function"
+import * as MutableRef from "effect/MutableRef"
+import * as Queue from "effect/Queue"
+import * as Array from "effect/Array"
+import * as Schema from "effect/Schema"
+import * as Layer from "effect/Layer"
+import * as Tool from "effect/unstable/ai/Tool"
+import * as Toolkit from "effect/unstable/ai/Toolkit"
+import * as Semaphore from "effect/Semaphore"
 
 /**
  * @since 1.0.0
@@ -78,7 +73,10 @@ export interface Agent {
   }): Effect.Effect<
     Stream.Stream<Output, AgentFinished | AiError.AiError>,
     never,
-    Scope.Scope | LanguageModel.LanguageModel | ProviderName | ModelName
+    | Scope.Scope
+    | LanguageModel.LanguageModel
+    | Model.ProviderName
+    | Model.ModelName
   >
 
   /**
@@ -158,14 +156,14 @@ ${content}
   }) => Stream.Stream<
     Output,
     AgentFinished | AiError.AiError,
-    LanguageModel.LanguageModel | ProviderName | ModelName
+    LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName
   > = Effect.fnUntraced(function* (opts) {
     const agentId = opts.agentId
     const ai = yield* LanguageModel.LanguageModel
     const subagentModel = yield* Effect.serviceOption(SubagentModel)
     const modelConfig = yield* AgentModelConfig
     const services = yield* Effect.services<
-      LanguageModel.LanguageModel | ProviderName | ModelName
+      LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName
     >()
     let finalSummary = Option.none<string>()
 
@@ -233,8 +231,8 @@ ${content}
           system: opts.system,
           disableHistory: true,
         })
-        const provider = yield* ProviderName
-        const model = yield* ModelName
+        const provider = yield* Model.ProviderName
+        const model = yield* Model.ModelName
         maybeSend({
           agentId: opts.agentId,
           part: new SubagentStart({ id, prompt, model, provider }),
@@ -341,7 +339,7 @@ ${content}
         }
 
         // oxlint-disable-next-line typescript/no-explicit-any
-        let response = Array.empty<StreamPart<any>>()
+        let response = Array.empty<Response.StreamPart<any>>()
         let reasoningStarted = false
         let hadReasoningDelta = false
         yield* pipe(
@@ -373,6 +371,14 @@ ${content}
               switch (part.type) {
                 case "text-start":
                   if (singleToolMode) {
+                    if (hadReasoningDelta) {
+                      hadReasoningDelta = false
+                      maybeSend({
+                        agentId,
+                        part: new ReasoningEnd(),
+                        release: true,
+                      })
+                    }
                     reasoningStarted = true
                     break
                   }
@@ -490,8 +496,8 @@ ${content}
       new AgentStart({
         id: opts.agentId,
         prompt: opts.prompt,
-        provider: yield* ProviderName,
-        model: yield* ModelName,
+        provider: yield* Model.ProviderName,
+        model: yield* Model.ModelName,
       }),
     )
 
@@ -574,7 +580,7 @@ ${systemToolsCommon(toolsDts)}`
 
 // oxlint-disable-next-line typescript/no-explicit-any
 const generateSystemSingle = (toolsDts: string) => {
-  return `Use the "execute" tool to run javascript code to do your work.
+  return `**YOU ONLY HAVE ACCESS TO ONE TOOL** "execute", to run javascript code to do your work.
 
 ${systemToolsCommon(toolsDts)}`
 }
@@ -585,6 +591,7 @@ const systemToolsCommon = (
 - Top level await is supported.
 - AVOID passing scripts into the "bash" function, and instead write javascript.
 - PREFER the "search" function over "rg" for finding information or code
+- Variables **are not shared** between executions, so you must include all necessary code in each script you execute.
 
 **When you have fully completed your task**, call the "taskComplete" function with the final output.
 Make sure every detail of the task is done before calling "taskComplete".
@@ -639,10 +646,10 @@ export const layerLocal = <Toolkit extends Toolkit.Any = never>(options: {
 }): Layer.Layer<
   Agent,
   never,
-  | FileSystem
-  | Path
-  | ChildProcessSpawner
-  | HttpClient
+  | FileSystem.FileSystem
+  | Path.Path
+  | ChildProcessSpawner.ChildProcessSpawner
+  | HttpClient.HttpClient
   | Exclude<
       Toolkit extends Toolkit.Toolkit<infer T>
         ? Tool.HandlersFor<T> | Tool.HandlerServices<T[keyof T]>
@@ -657,7 +664,9 @@ export const layerLocal = <Toolkit extends Toolkit.Any = never>(options: {
  */
 export class SubagentModel extends ServiceMap.Service<
   SubagentModel,
-  ServiceMap.ServiceMap<LanguageModel.LanguageModel | ProviderName | ModelName>
+  ServiceMap.ServiceMap<
+    LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName
+  >
 >()("clanka/Agent/SubagentModel") {}
 
 /**
@@ -666,7 +675,7 @@ export class SubagentModel extends ServiceMap.Service<
  */
 export const layerSubagentModel = <E, R>(
   layer: Layer.Layer<
-    LanguageModel.LanguageModel | ProviderName | ModelName,
+    LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName,
     E,
     R
   >,

package/src/AgentExecutor.ts

@@ -1,26 +1,6 @@
 /**
  * @since 1.0.0
  */
-import {
-  Cause,
-  Console,
-  Effect,
-  Exit,
-  Fiber,
-  FileSystem,
-  Layer,
-  Option,
-  Path,
-  pipe,
-  Queue,
-  Result,
-  Schema,
-  Scope,
-  ServiceMap,
-  Stream,
-} from "effect"
-import { Tool, Toolkit } from "effect/unstable/ai"
-import { Rpc, RpcClient, RpcGroup, RpcServer } from "effect/unstable/rpc"
 import * as NodeConsole from "node:console"
 import * as NodeVm from "node:vm"
 import { Writable } from "node:stream"
@@ -32,8 +12,30 @@ import {
   TaskCompleter,
 } from "./AgentTools.ts"
 import { ToolkitRenderer } from "./ToolkitRenderer.ts"
-import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
-import type { HttpClient } from "effect/unstable/http/HttpClient"
+import type * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import type * as HttpClient from "effect/unstable/http/HttpClient"
+import * as ServiceMap from "effect/ServiceMap"
+import * as Effect from "effect/Effect"
+import type * as Option from "effect/Option"
+import * as Stream from "effect/Stream"
+import * as FileSystem from "effect/FileSystem"
+import * as Toolkit from "effect/unstable/ai/Toolkit"
+import * as Path from "effect/Path"
+import type * as Tool from "effect/unstable/ai/Tool"
+import * as Queue from "effect/Queue"
+import * as Cause from "effect/Cause"
+import * as Scope from "effect/Scope"
+import * as Fiber from "effect/Fiber"
+import * as Console from "effect/Console"
+import * as Exit from "effect/Exit"
+import { pipe } from "effect/Function"
+import * as RpcClient from "effect/unstable/rpc/RpcClient"
+import * as Layer from "effect/Layer"
+import * as RpcServer from "effect/unstable/rpc/RpcServer"
+import * as Schema from "effect/Schema"
+import * as RpcGroup from "effect/unstable/rpc/RpcGroup"
+import * as Rpc from "effect/unstable/rpc/Rpc"
+import * as Result from "effect/Result"
 
 /**
  * @since 1.0.0
@@ -237,8 +239,8 @@ export const layerLocal = <Toolkit extends Toolkit.Any = never>(options: {
   never,
   | FileSystem.FileSystem
   | Path.Path
-  | ChildProcessSpawner
-  | HttpClient
+  | ChildProcessSpawner.ChildProcessSpawner
+  | HttpClient.HttpClient
   | Exclude<
       Toolkit extends Toolkit.Toolkit<infer T>
         ? Tool.HandlersFor<T> | Tool.HandlerServices<T[keyof T]>
@@ -276,9 +278,9 @@ export const layerRpcServer = <Toolkit extends Toolkit.Any = never>(options: {
   never,
   | RpcServer.Protocol
   | FileSystem.FileSystem
-  | HttpClient
+  | HttpClient.HttpClient
   | Path.Path
-  | ChildProcessSpawner
+  | ChildProcessSpawner.ChildProcessSpawner
   | Exclude<
       Toolkit extends Toolkit.Toolkit<infer T>
         ? Tool.HandlersFor<T> | Tool.HandlerServices<T[keyof T]>

package/src/AgentTools.ts

@@ -1,25 +1,25 @@
 /**
  * @since 1.0.0
  */
-import {
-  Array,
-  Data,
-  Effect,
-  FileSystem,
-  Layer,
-  Path,
-  pipe,
-  Schema,
-  ServiceMap,
-  Stream,
-} from "effect"
-import { Tool, Toolkit } from "effect/unstable/ai"
-import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import * as Glob from "glob"
 import { parsePatch, patchChunks } from "./ApplyPatch.ts"
 import * as ExaSearch from "./ExaSearch.ts"
 import * as WebToMarkdown from "./WebToMarkdown.ts"
-import type { HttpClient } from "effect/unstable/http/HttpClient"
+import type * as HttpClient from "effect/unstable/http/HttpClient"
+import * as ServiceMap from "effect/ServiceMap"
+import * as Effect from "effect/Effect"
+import * as Toolkit from "effect/unstable/ai/Toolkit"
+import * as Tool from "effect/unstable/ai/Tool"
+import * as Schema from "effect/Schema"
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import * as FileSystem from "effect/FileSystem"
+import * as Path from "effect/Path"
+import * as ChildProcess from "effect/unstable/process/ChildProcess"
+import * as Stream from "effect/Stream"
+import { pipe } from "effect/Function"
+import * as Array from "effect/Array"
+import * as Data from "effect/Data"
+import * as Layer from "effect/Layer"
 
 /**
  * @since 1.0.0
@@ -93,7 +93,7 @@ export const AgentTools = Toolkit.make(
   }),
   Tool.make("applyPatch", {
     description:
-      "Apply a git diff / unified diff patch, or a wrapped apply_patch patch, across one or more files.",
+      "Apply a git diff / unified diff patch, or a wrapped patch, across one or more files.",
     parameters: Schema.String.annotate({
       identifier: "patch",
     }),
@@ -414,7 +414,7 @@ export const AgentToolHandlersNoDeps = AgentTools.toLayer(
               readonly path: string
             }
         >
-        const out = [] as string[]
+        const out = [] as Array<string>
         const rel = (path: string) =>
           pathService.relative(cwd, path).replaceAll("\\", "/")
         const load = Effect.fn("AgentTools.applyPatch.load")(function* (
@@ -558,7 +558,7 @@ export const AgentToolHandlers: Layer.Layer<
   | FileSystem.FileSystem
   | Path.Path
   | ChildProcessSpawner.ChildProcessSpawner
-  | HttpClient
+  | HttpClient.HttpClient
 > = AgentToolHandlersNoDeps.pipe(
   Layer.provide([ExaSearch.layer, WebToMarkdown.layer]),
 )

package/src/ApplyPatch.ts

@@ -638,7 +638,7 @@ export const patchChunks = (
   }
 
   const out = [...lines]
-  for (const [at, size, next] of compute(file, lines, chunks).reverse()) {
+  for (const [at, size, next] of compute(file, lines, chunks).toReversed()) {
     out.splice(at, size, ...next)
   }
 

package/src/Codex.ts

@@ -2,13 +2,14 @@
  * @since 1.0.0
  */
 import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai"
-import { Layer } from "effect"
+import * as Layer from "effect/Layer"
+import * as Struct from "effect/Struct"
 import { CodexAuth } from "./CodexAuth.ts"
 import { AgentModelConfig } from "./Agent.ts"
-import { Model } from "effect/unstable/ai"
-import type { HttpClient } from "effect/unstable/http/HttpClient"
-import type { KeyValueStore } from "effect/unstable/persistence/KeyValueStore"
-import type { LanguageModel } from "effect/unstable/ai/LanguageModel"
+import * as Model from "effect/unstable/ai/Model"
+import type * as HttpClient from "effect/unstable/http/HttpClient"
+import type * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
 
 /**
  * @since 1.0.0
@@ -27,7 +28,11 @@ export const model = (
   options?:
     | (OpenAiLanguageModel.Config["Service"] & typeof AgentModelConfig.Service)
     | undefined,
-): Model.Model<"openai", LanguageModel, HttpClient | KeyValueStore> =>
+): Model.Model<
+  "openai",
+  LanguageModel.LanguageModel,
+  HttpClient.HttpClient | KeyValueStore.KeyValueStore
+> =>
   Model.make(
     "openai",
     model,
@@ -35,7 +40,11 @@ export const model = (
       OpenAiLanguageModel.layer({
         model,
         config: {
-          ...options,
+          ...Struct.omit(options ?? {}, [
+            "reasoning",
+            "supportsNoTools",
+            "supportsAssistantPrefill",
+          ]),
           store: false,
           reasoning: {
             effort: options?.reasoning?.effort ?? "medium",

package/src/CodexAuth.test.ts

@@ -1,11 +1,16 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Deferred, Effect, Encoding, Fiber, Option, Ref } from "effect"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Encoding from "effect/Encoding"
+import * as Fiber from "effect/Fiber"
+import * as Option from "effect/Option"
+import * as Ref from "effect/Ref"
 import {
   HttpClient,
-  HttpClientRequest,
+  type HttpClientRequest,
   HttpClientResponse,
 } from "effect/unstable/http"
-import { KeyValueStore } from "effect/unstable/persistence"
+import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
 import {
   CodexAuth,
   CodexAuthError,

package/src/CodexAuth.ts

@@ -1,25 +1,21 @@
 /**
  * @since 1.0.0
  */
-import {
-  Console,
-  Effect,
-  Encoding,
-  flow,
-  Layer,
-  Option,
-  Result,
-  Schedule,
-  Schema,
-  Semaphore,
-  ServiceMap,
-} from "effect"
-import {
-  HttpClient,
-  HttpClientRequest,
-  HttpClientResponse,
-} from "effect/unstable/http"
-import { KeyValueStore } from "effect/unstable/persistence"
+import * as Console from "effect/Console"
+import * as Effect from "effect/Effect"
+import * as Encoding from "effect/Encoding"
+import * as Function from "effect/Function"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+import * as Result from "effect/Result"
+import * as Schedule from "effect/Schedule"
+import * as Schema from "effect/Schema"
+import * as Semaphore from "effect/Semaphore"
+import * as ServiceMap from "effect/ServiceMap"
+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"
 
 export const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann"
 export const ISSUER = "https://auth.openai.com"
@@ -299,7 +295,9 @@ export class CodexAuth extends ServiceMap.Service<
   static readonly make = Effect.gen(function* () {
     const tokenStore = toTokenStore(yield* KeyValueStore.KeyValueStore)
     const httpClient = (yield* HttpClient.HttpClient).pipe(
-      HttpClient.mapRequest(flow(HttpClientRequest.prependUrl(ISSUER))),
+      HttpClient.mapRequest(
+        Function.flow(HttpClientRequest.prependUrl(ISSUER)),
+      ),
       HttpClient.filterStatusOk,
       HttpClient.retryTransient({
         times: 5,

package/src/Copilot.ts

@@ -2,13 +2,14 @@
  * @since 1.0.0
  */
 import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai-compat"
-import { Layer } from "effect"
+import * as Layer from "effect/Layer"
+import * as Struct from "effect/Struct"
 import { API_URL, GithubCopilotAuth } from "./CopilotAuth.ts"
 import { AgentModelConfig } from "./Agent.ts"
-import { Model } from "effect/unstable/ai"
-import type { HttpClient } from "effect/unstable/http/HttpClient"
-import type { KeyValueStore } from "effect/unstable/persistence/KeyValueStore"
-import type { LanguageModel } from "effect/unstable/ai/LanguageModel"
+import * as Model from "effect/unstable/ai/Model"
+import type * as HttpClient from "effect/unstable/http/HttpClient"
+import type * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import type * as LanguageModel from "effect/unstable/ai/LanguageModel"
 
 /**
  * @since 1.0.0
@@ -27,14 +28,21 @@ export const model = (
   options?:
     | (OpenAiLanguageModel.Config["Service"] & typeof AgentModelConfig.Service)
     | undefined,
-): Model.Model<"openai", LanguageModel, HttpClient | KeyValueStore> =>
+): Model.Model<
+  "openai",
+  LanguageModel.LanguageModel,
+  HttpClient.HttpClient | KeyValueStore.KeyValueStore
+> =>
   Model.make(
     "openai",
     model,
     Layer.merge(
       OpenAiLanguageModel.layer({
         model,
-        config: options,
+        config: Struct.omit(options ?? {}, [
+          "supportsNoTools",
+          "supportsAssistantPrefill",
+        ]),
       }),
       AgentModelConfig.layer({
         supportsAssistantPrefill: options?.supportsAssistantPrefill ?? false,

package/src/CopilotAuth.test.ts

@@ -1,11 +1,15 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Deferred, Effect, Fiber, Option, Ref } from "effect"
+import * as Deferred from "effect/Deferred"
+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 { KeyValueStore } from "effect/unstable/persistence"
+import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
 import {
   COPILOT_VISION_REQUEST_HEADER,
   DEFAULT_OPENAI_INTENT,

package/src/CopilotAuth.ts

@@ -1,23 +1,19 @@
 /**
  * @since 1.0.0
  */
-import {
-  Console,
-  Effect,
-  flow,
-  Layer,
-  Option,
-  Schedule,
-  Schema,
-  Semaphore,
-  ServiceMap,
-} from "effect"
-import {
-  HttpClient,
-  HttpClientRequest,
-  HttpClientResponse,
-} from "effect/unstable/http"
-import { KeyValueStore } from "effect/unstable/persistence"
+import * as Console from "effect/Console"
+import * as Effect from "effect/Effect"
+import * as Function from "effect/Function"
+import * as Layer from "effect/Layer"
+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 ServiceMap from "effect/ServiceMap"
+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"
 
 export const CLIENT_ID = "Ov23li8tweQw6odWQebz"
 export const ISSUER = "https://github.com"
@@ -229,7 +225,7 @@ export class GithubCopilotAuth extends ServiceMap.Service<
     const tokenStore = toTokenStore(yield* KeyValueStore.KeyValueStore)
     const httpClient = (yield* HttpClient.HttpClient).pipe(
       HttpClient.mapRequest(
-        flow(
+        Function.flow(
           HttpClientRequest.prependUrl(ISSUER),
           HttpClientRequest.acceptJson,
         ),

package/src/ExaSearch.ts

@@ -1,7 +1,11 @@
 /**
  * @since 1.0.0
  */
-import { Effect, Layer, pipe, Schema, ServiceMap } from "effect"
+import * as Effect from "effect/Effect"
+import { pipe } from "effect/Function"
+import * as Layer from "effect/Layer"
+import * as Schema from "effect/Schema"
+import * as ServiceMap from "effect/ServiceMap"
 import * as McpClient from "./McpClient.ts"
 
 /**

package/src/McpClient.ts

@@ -1,7 +1,10 @@
 /**
  * @since 1.0.0
  */
-import { Effect, Layer, Schema, ServiceMap } from "effect"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as Schema from "effect/Schema"
+import * as ServiceMap from "effect/ServiceMap"
 import { Client } from "@modelcontextprotocol/sdk/client"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"

package/src/OutputFormatter.ts

@@ -1,10 +1,15 @@
 /**
  * @since 1.0.0
  */
-import { Effect, Layer, PubSub, Semaphore, ServiceMap, Stream } from "effect"
-import { type Output, AgentFinished } from "./Agent.ts"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as PubSub from "effect/PubSub"
+import * as Semaphore from "effect/Semaphore"
+import * as ServiceMap from "effect/ServiceMap"
+import * as Stream from "effect/Stream"
+import type { AgentFinished, Output } from "./Agent.ts"
 import chalk from "chalk"
-import type { Prompt } from "effect/unstable/ai"
+import type * as Prompt from "effect/unstable/ai/Prompt"
 
 /**
  * @since 1.0.0
@@ -78,7 +83,7 @@ ${output.summary}\n\n`
   )
 
 const promptToString = (prompt: Prompt.Prompt): string => {
-  let textParts: string[] = []
+  let textParts: Array<string> = []
   for (const message of prompt.content) {
     if (message.role !== "user") continue
     let content = message.content