clanka 0.2.50 → 0.2.52

package/dist/WebToMarkdown.js

@@ -3,14 +3,14 @@
  */
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import * as HttpClient from "effect/unstable/http/HttpClient";
 import TurndownService from "turndown";
 /**
  * @since 1.0.0
  * @category Services
  */
-export class WebToMarkdown extends ServiceMap.Service()("clanka/WebToMarkdown") {
+export class WebToMarkdown extends Context.Service()("clanka/WebToMarkdown") {
 }
 /**
  * @since 1.0.0

package/dist/WebToMarkdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebToMarkdown.js","sourceRoot":"","sources":["../src/WebToMarkdown.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAE7D,OAAO,eAAe,MAAM,UAAU,CAAA;AAEtC;;;GAGG;AACH,MAAM,OAAO,aAAc,SAAQ,UAAU,CAAC,OAAO,EAQlD,CAAC,sBAAsB,CAAC;CAAG;AAE9B;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,aAAa,EACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAChD,UAAU,CAAC,eAAe,EAAE,EAC5B,UAAU,CAAC,cAAc,EACzB,UAAU,CAAC,cAAc,CAAC;QACxB,KAAK,EAAE,CAAC;KACT,CAAC,CACH,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC;QACvB,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,MAAM;QACN,MAAM;QACN,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,KAAK;QACL,QAAQ;QACR,OAAO;QACP,OAAO;QACP,QAAQ;QACR,OAAO;QACP,KAAK;QACL,MAAM;QACN,MAAM;QACN,MAAM;QACN,OAAO;QACP,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,OAAO;KACR,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAC1C,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAY,EAAE,EAAE,CAC1E,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3C,CAAA;IAED,OAAO,aAAa,CAAC,EAAE,CAAC;QACtB,WAAW;QACX,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG;YAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;YACjC,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC,CAAC;KACH,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA"}
+{"version":3,"file":"WebToMarkdown.js","sourceRoot":"","sources":["../src/WebToMarkdown.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAE7D,OAAO,eAAe,MAAM,UAAU,CAAA;AAEtC;;;GAGG;AACH,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,OAAO,EAQ/C,CAAC,sBAAsB,CAAC;CAAG;AAE9B;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,aAAa,EACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAChD,UAAU,CAAC,eAAe,EAAE,EAC5B,UAAU,CAAC,cAAc,EACzB,UAAU,CAAC,cAAc,CAAC;QACxB,KAAK,EAAE,CAAC;KACT,CAAC,CACH,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC;QACvB,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,MAAM;QACN,MAAM;QACN,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,KAAK;QACL,QAAQ;QACR,OAAO;QACP,OAAO;QACP,QAAQ;QACR,OAAO;QACP,KAAK;QACL,MAAM;QACN,MAAM;QACN,MAAM;QACN,OAAO;QACP,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,OAAO;KACR,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAC1C,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAY,EAAE,EAAE,CAC1E,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3C,CAAA;IAED,OAAO,aAAa,CAAC,EAAE,CAAC;QACtB,WAAW;QACX,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG;YAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;YACjC,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC,CAAC;KACH,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clanka",
   "type": "module",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "publishConfig": {
     "access": "public"
   },
@@ -25,9 +25,6 @@
     "url": "https://github.com/Effectful-Tech/clanka.git"
   },
   "dependencies": {
-    "@effect/ai-openai": "4.0.0-beta.43",
-    "@effect/platform-node": "4.0.0-beta.43",
-    "@effect/sql-sqlite-node": "4.0.0-beta.43",
     "@modelcontextprotocol/sdk": "^1.27.1",
     "@vscode/ripgrep": "^1.17.1",
     "chalk": "^5.6.2",
@@ -47,20 +44,25 @@
     "@sqliteai/sqlite-vector-win32-x86_64": "0.9.93"
   },
   "peerDependencies": {
-    "@effect/ai-openai": "4.0.0-beta.43",
-    "@effect/ai-openai-compat": "4.0.0-beta.43",
-    "effect": "4.0.0-beta.43"
+    "@effect/platform-node": "*",
+    "@effect/sql-sqlite-node": "*",
+    "@effect/ai-openai": "*",
+    "@effect/ai-openai-compat": "*",
+    "effect": "*"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.6.0",
     "@changesets/cli": "^2.29.8",
-    "@effect/ai-openai-compat": "4.0.0-beta.43",
+    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@acc7fff",
+    "@effect/sql-sqlite-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/sql-sqlite-node@acc7fff",
+    "@effect/ai-openai": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/ai-openai@acc7fff",
+    "@effect/ai-openai-compat": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/ai-openai-compat@acc7fff",
     "@effect/language-service": "^0.83.1",
     "@effect/vitest": "4.0.0-beta.43",
     "@types/node": "^25.5.0",
     "@types/turndown": "^5.0.6",
     "@typescript/native-preview": "7.0.0-dev.20260324.1",
-    "effect": "4.0.0-beta.43",
+    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@acc7fff",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
     "oxlint": "^1.57.0",

package/src/Agent.ts

@@ -20,7 +20,7 @@ import * as Stream from "effect/Stream"
 import type * as Scope from "effect/Scope"
 import * as LanguageModel from "effect/unstable/ai/LanguageModel"
 import * as AiError from "effect/unstable/ai/AiError"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 import * as Option from "effect/Option"
 import { identity, pipe } from "effect/Function"
 import * as MutableRef from "effect/MutableRef"
@@ -102,7 +102,7 @@ export interface Agent {
  * @since 1.0.0
  * @category Service
  */
-export const Agent = ServiceMap.Service<Agent>("clanka/Agent")
+export const Agent = Context.Service<Agent>("clanka/Agent")
 
 /**
  * @since 1.0.0
@@ -607,7 +607,7 @@ ${capabilities.toolsDts}
 declare const fetch: typeof globalThis.fetch
 \`\`\``
 
-class ScriptExecutor extends ServiceMap.Service<
+class ScriptExecutor extends Context.Service<
   ScriptExecutor,
   (script: string) => Effect.Effect<string>
 >()("clanka/Agent/ScriptExecutor") {}
@@ -664,7 +664,7 @@ export const layerLocal = <Toolkit extends Toolkit.Any = never>(options: {
  * @since 1.0.0
  * @category Subagent model
  */
-export class SubagentModel extends ServiceMap.Service<
+export class SubagentModel extends Context.Service<
   SubagentModel,
   Layer.Layer<
     LanguageModel.LanguageModel | Model.ProviderName | Model.ModelName
@@ -685,9 +685,9 @@ export const layerSubagentModel = <E, R>(
   Layer.effect(
     SubagentModel,
     Effect.gen(function* () {
-      const services = yield* Effect.services<R>()
+      const services = yield* Effect.context<R>()
       return Layer.orDie(layer).pipe(
-        Layer.provide(Layer.succeedServices(services)),
+        Layer.provide(Layer.succeedContext(services)),
       )
     }),
   )
@@ -696,7 +696,7 @@ export const layerSubagentModel = <E, R>(
  * @since 1.0.0
  * @category Conversation mode
  */
-export class ConversationMode extends ServiceMap.Reference<boolean>(
+export class ConversationMode extends Context.Reference<boolean>(
   "clanka/Agent/ConversationMode",
   {
     defaultValue: () => false,
@@ -712,7 +712,7 @@ export class ConversationMode extends ServiceMap.Reference<boolean>(
  * @since 1.0.0
  * @category Turn timeout
  */
-export class TurnTimeout extends ServiceMap.Reference<Duration.Duration>(
+export class TurnTimeout extends Context.Reference<Duration.Duration>(
   "clanka/Agent/TurnTimeout",
   {
     defaultValue: () => Duration.minutes(5),
@@ -726,7 +726,7 @@ export class TurnTimeout extends ServiceMap.Reference<Duration.Duration>(
  * @since 1.0.0
  * @category System prompts
  */
-export class AgentModelConfig extends ServiceMap.Reference<{
+export class AgentModelConfig extends Context.Reference<{
   readonly systemPromptTransform?:
     | (<A, E, R>(
         system: string,

package/src/AgentExecutor.ts

@@ -15,7 +15,7 @@ import {
 import { ToolkitRenderer } from "./ToolkitRenderer.ts"
 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 Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
 import * as Stream from "effect/Stream"
@@ -45,7 +45,7 @@ import * as References from "effect/References"
  * @since 1.0.0
  * @category Services
  */
-export class AgentExecutor extends ServiceMap.Service<
+export class AgentExecutor extends Context.Service<
   AgentExecutor,
   {
     readonly capabilities: Effect.Effect<Capabilities>
@@ -106,13 +106,13 @@ export const makeLocal = Effect.fnUntraced(function* <
   const tools = yield* AllTools
   const toolsDts = renderer.render(AllTools)
 
-  const services = yield* Effect.services()
+  const services = yield* Effect.context()
 
   const toolEntries = Object.entries(tools.tools).map(([name, tool]) => {
     const handler = services.mapUnsafe.get(tool.id) as Tool.Handler<string>
     return {
       name,
-      services: ServiceMap.merge(services, handler.services),
+      services: Context.merge(services, handler.context),
       handler: handler.handler,
     }
   })
@@ -131,16 +131,16 @@ export const makeLocal = Effect.fnUntraced(function* <
     const handlerScope = Scope.makeUnsafe("parallel")
     const trackFiber = Fiber.runIn(handlerScope)
 
-    const taskServices = ServiceMap.mutate(
-      ServiceMap.empty(),
+    const taskServices = Context.mutate(
+      Context.empty(),
       flow(
-        ServiceMap.add(TaskCompleter, opts.onTaskComplete),
-        ServiceMap.add(CurrentDirectory, options.directory),
-        ServiceMap.add(SubagentExecutor, opts.onSubagent),
-        ServiceMap.add(Console.Console, console),
-        ServiceMap.add(References.CurrentLogAnnotations, {}),
+        Context.add(TaskCompleter, opts.onTaskComplete),
+        Context.add(CurrentDirectory, options.directory),
+        Context.add(SubagentExecutor, opts.onSubagent),
+        Context.add(Console.Console, console),
+        Context.add(References.CurrentLogAnnotations, {}),
         Option.isSome(search)
-          ? ServiceMap.add(SemanticSearch, search.value)
+          ? Context.add(SemanticSearch, search.value)
           : identity,
       ),
     )
@@ -160,7 +160,7 @@ export const makeLocal = Effect.fnUntraced(function* <
       for (let i = 0; i < toolEntries.length; i++) {
         const { name, handler, services } = toolEntries[i]!
         const runFork = Effect.runForkWith(
-          ServiceMap.merge(services, taskServices),
+          Context.merge(services, taskServices),
         )
 
         // oxlint-disable-next-line typescript/no-explicit-any
@@ -223,7 +223,7 @@ export const makeLocal = Effect.fnUntraced(function* <
       return pipe(
         handler.handler(opts.params, {}),
         Effect.flatMap(encodeSuccess),
-        Effect.provideServices(handler.services),
+        Effect.provideContext(handler.context),
         Effect.orDie,
       ) as Effect.Effect<Schema.Json>
     },

package/src/AgentTools.ts

@@ -6,7 +6,7 @@ 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 * as ServiceMap from "effect/ServiceMap"
+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"
@@ -26,7 +26,7 @@ import * as SemanticSearch from "./SemanticSearch/Service.ts"
  * @since 1.0.0
  * @category Context
  */
-export class CurrentDirectory extends ServiceMap.Service<
+export class CurrentDirectory extends Context.Service<
   CurrentDirectory,
   string
 >()("clanka/AgentTools/CurrentDirectory") {}
@@ -35,7 +35,7 @@ export class CurrentDirectory extends ServiceMap.Service<
  * @since 1.0.0
  * @category Context
  */
-export class TaskCompleter extends ServiceMap.Service<
+export class TaskCompleter extends Context.Service<
   TaskCompleter,
   (output: string) => Effect.Effect<void>
 >()("clanka/AgentTools/TaskCompleter") {}
@@ -44,7 +44,7 @@ export class TaskCompleter extends ServiceMap.Service<
  * @since 1.0.0
  * @category Context
  */
-export class SubagentExecutor extends ServiceMap.Service<
+export class SubagentExecutor extends Context.Service<
   SubagentExecutor,
   (prompt: string) => Effect.Effect<string>
 >()("clanka/AgentTools/SubagentExecutor") {}
@@ -54,9 +54,9 @@ export class SubagentExecutor extends ServiceMap.Service<
  * @category Context
  */
 export const makeContextNoop = (cwd?: string) =>
-  SubagentExecutor.serviceMap(() => Effect.die("Not implemented")).pipe(
-    ServiceMap.add(CurrentDirectory, cwd ?? "/"),
-    ServiceMap.add(TaskCompleter, () => Effect.void),
+  SubagentExecutor.context(() => Effect.die("Not implemented")).pipe(
+    Context.add(CurrentDirectory, cwd ?? "/"),
+    Context.add(TaskCompleter, () => Effect.void),
   )
 
 class TodoItem extends Schema.Opaque<TodoItem>()(

package/src/ApplyPatch.test.ts

@@ -35,7 +35,7 @@ describe("patchContent", () => {
           "*** Begin Patch",
           "*** Update File: src/ExaSearch.ts",
           "@@",
-          " export class ExaSearch extends ServiceMap.Service<",
+          " export class ExaSearch extends Context.Service<",
           "   ExaSearch,",
           "   {",
           "-    search(query: string): Effect.Effect<Array<SearchResponse<{}>>, ExaError>",
@@ -51,7 +51,7 @@ describe("patchContent", () => {
         chunks: [
           {
             old: [
-              "export class ExaSearch extends ServiceMap.Service<",
+              "export class ExaSearch extends Context.Service<",
               "  ExaSearch,",
               "  {",
               "    search(query: string): Effect.Effect<Array<SearchResponse<{}>>, ExaError>",
@@ -59,7 +59,7 @@ describe("patchContent", () => {
               '>()("clanka/ExaSearch") {}',
             ],
             next: [
-              "export class ExaSearch extends ServiceMap.Service<",
+              "export class ExaSearch extends Context.Service<",
               "  ExaSearch,",
               "  {",
               "    search(query: string): Effect.Effect<SearchResponse<{}>, ExaError>",

package/src/ChunkRepo.ts

@@ -2,7 +2,7 @@ import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import * as SchemaTransformation from "effect/SchemaTransformation"
-import * as ServiceMap from "effect/ServiceMap"
+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"
@@ -87,7 +87,7 @@ export class Chunk extends Model.Class<Chunk>("Chunk")({
  * @since 1.0.0
  * @category Services
  */
-export class ChunkRepo extends ServiceMap.Service<
+export class ChunkRepo extends Context.Service<
   ChunkRepo,
   {
     insert(
@@ -139,10 +139,9 @@ export const layer = Layer.effect(
   Effect.gen(function* () {
     const sql = yield* SqlClient.SqlClient
     const dimensions = yield* EmbeddingModel.Dimensions
-    const loaders = yield* SqlModel.makeDataLoaders(Chunk, {
+    const loaders = yield* SqlModel.makeResolvers(Chunk, {
       tableName: "chunks",
       idColumn: "id",
-      window: 10,
       spanPrefix: "ChunkRepo",
     })
 
@@ -185,10 +184,13 @@ export const layer = Layer.effect(
         sql`select id, hash from chunks where ${sql.in("hash", hashes)}`,
     }).pipe(RequestResolver.setDelay(5))
 
+    const insertResolver = loaders.insert.pipe(RequestResolver.setDelay(5))
+    const findByIdResolver = loaders.findById.pipe(RequestResolver.setDelay(5))
+
     return ChunkRepo.of({
       insert: (insert) => {
         needsQuantization = true
-        return loaders.insert(insert).pipe(
+        return SqlResolver.request(insert, insertResolver).pipe(
           Effect.catchTags({
             SqlError: (reason) => Effect.fail(new ChunkRepoError({ reason })),
             SchemaError: Effect.die,
@@ -196,7 +198,7 @@ export const layer = Layer.effect(
         )
       },
       findById: (id) =>
-        loaders.findById(id).pipe(
+        SqlResolver.request(id, findByIdResolver).pipe(
           Effect.catchTags({
             SchemaError: Effect.die,
           }),

package/src/CodeChunker.ts

@@ -7,7 +7,7 @@ import * as FileSystem from "effect/FileSystem"
 import { pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
-import * as ServiceMap from "effect/ServiceMap"
+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"
@@ -47,7 +47,7 @@ export type ChunkType =
  * @since 1.0.0
  * @category Services
  */
-export class CodeChunker extends ServiceMap.Service<
+export class CodeChunker extends Context.Service<
   CodeChunker,
   {
     listFiles(options: {

package/src/CodexAuth.ts

@@ -10,7 +10,7 @@ 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 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"
@@ -284,7 +284,7 @@ export const toCodexAuthKeyValueStore = (store: KeyValueStore.KeyValueStore) =>
 export const toTokenStore = (store: KeyValueStore.KeyValueStore) =>
   KeyValueStore.toSchemaStore(toCodexAuthKeyValueStore(store), TokenData)
 
-export class CodexAuth extends ServiceMap.Service<
+export class CodexAuth extends Context.Service<
   CodexAuth,
   {
     readonly verifyUrl: string

package/src/CopilotAuth.ts

@@ -8,7 +8,7 @@ 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 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"
@@ -213,7 +213,7 @@ export const toTokenStore = (store: KeyValueStore.KeyValueStore) =>
     TokenData,
   )
 
-export class GithubCopilotAuth extends ServiceMap.Service<
+export class GithubCopilotAuth extends Context.Service<
   GithubCopilotAuth,
   {
     readonly verifyUrl: string

package/src/DeviceCodeHandler.ts

@@ -1,9 +1,9 @@
 import * as Console from "effect/Console"
 import type * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 
-export class DeviceCodeHandler extends ServiceMap.Service<
+export class DeviceCodeHandler extends Context.Service<
   DeviceCodeHandler,
   {
     onCode(options: {

package/src/ExaSearch.ts

@@ -5,14 +5,14 @@ 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 Context from "effect/Context"
 import * as McpClient from "./McpClient.ts"
 
 /**
  * @since 1.0.0
  * @category Services
  */
-export class ExaSearch extends ServiceMap.Service<
+export class ExaSearch extends Context.Service<
   ExaSearch,
   {
     search(

package/src/McpClient.ts

@@ -4,7 +4,7 @@
 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 * as Context from "effect/Context"
 import { Client } from "@modelcontextprotocol/sdk/client"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"
@@ -13,7 +13,7 @@ import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"
  * @since 1.0.0
  * @category Services
  */
-export class McpClient extends ServiceMap.Service<
+export class McpClient extends Context.Service<
   McpClient,
   {
     connect(options: {

package/src/OutputFormatter.ts

@@ -5,7 +5,7 @@ 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 Context from "effect/Context"
 import * as Stream from "effect/Stream"
 import type { AgentFinished, Output } from "./Agent.ts"
 import chalk from "chalk"
@@ -138,7 +138,7 @@ const infoIcon = "\u{f05a}"
  * @since 1.0.0
  * @category Muxer
  */
-export class Muxer extends ServiceMap.Service<
+export class Muxer extends Context.Service<
   Muxer,
   {
     add<E, R>(

package/src/SemanticSearch/Service.ts

@@ -3,13 +3,13 @@
  */
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 
 /**
  * @since 1.0.0
  * @category Services
  */
-export class SemanticSearch extends ServiceMap.Service<
+export class SemanticSearch extends Context.Service<
   SemanticSearch,
   {
     search(options: {

package/src/SemanticSearch.ts

@@ -157,7 +157,7 @@ export const layer = (options: {
           )
           const vector = new Float32Array(result.vector)
           yield* repo.insert(
-            ChunkRepo.Chunk.insert.makeUnsafe({
+            ChunkRepo.Chunk.insert.make({
               path: options.chunk.path,
               hash,
               content: input,
@@ -177,7 +177,7 @@ export const layer = (options: {
       )
 
       const index = Effect.gen(function* () {
-        const syncId = ChunkRepo.SyncId.makeUnsafe(crypto.randomUUID())
+        const syncId = ChunkRepo.SyncId.make(crypto.randomUUID())
         yield* Effect.logInfo("Starting SemanticSearch index")
 
         yield* pipe(
@@ -246,7 +246,7 @@ export const layer = (options: {
             return
           }
 
-          const syncId = ChunkRepo.SyncId.makeUnsafe(crypto.randomUUID())
+          const syncId = ChunkRepo.SyncId.make(crypto.randomUUID())
 
           yield* pipe(
             Stream.fromArray(chunks),

package/src/ToolkitRenderer.ts

@@ -4,7 +4,7 @@
 import * as Array from "effect/Array"
 import * as Layer from "effect/Layer"
 import * as SchemaAST from "effect/SchemaAST"
-import * as ServiceMap from "effect/ServiceMap"
+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 * as TypeBuilder from "./TypeBuilder.ts"
@@ -14,7 +14,7 @@ import * as Function from "effect/Function"
  * @since 1.0.0
  * @category Services
  */
-export class ToolkitRenderer extends ServiceMap.Service<
+export class ToolkitRenderer extends Context.Service<
   ToolkitRenderer,
   {
     render<Tools extends Record<string, Tool.Any>>(

package/src/WebToMarkdown.ts

@@ -3,7 +3,7 @@
  */
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 import * as HttpClient from "effect/unstable/http/HttpClient"
 import type * as HttpClientError from "effect/unstable/http/HttpClientError"
 import TurndownService from "turndown"
@@ -12,7 +12,7 @@ import TurndownService from "turndown"
  * @since 1.0.0
  * @category Services
  */
-export class WebToMarkdown extends ServiceMap.Service<
+export class WebToMarkdown extends Context.Service<
   WebToMarkdown,
   {
     convertHtml(html: string): Effect.Effect<string>

package/src/fixtures/fiber.txt

@@ -19,7 +19,7 @@ export const getCurrentFiber = (): Fiber.Fiber<any, any> | undefined =>
 /** @internal */
 export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
   constructor(
-    services: ServiceMap.ServiceMap<never>,
+    services: Context.Context<never>,
     interruptible: boolean = true,
   ) {
     this[FiberTypeId] = fiberVariance as any
@@ -51,7 +51,7 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
   _yielded: Exit.Exit<any, any> | (() => void) | undefined
 
   // set in setServices
-  services!: ServiceMap.ServiceMap<never>
+  services!: Context.Context<never>
   currentScheduler!: Scheduler.Scheduler
   currentTracerContext: Tracer.Tracer["context"]
   currentSpan: Tracer.AnySpan | undefined
@@ -67,8 +67,8 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     return (this._dispatcher ??= this.currentScheduler.makeDispatcher())
   }
 
-  getRef<X>(ref: ServiceMap.Reference<X>): X {
-    return ServiceMap.getReferenceUnsafe(this.services, ref)
+  getRef<X>(ref: Context.Reference<X>): X {
+    return Context.getReferenceUnsafe(this.services, ref)
   }
   addObserver(cb: (exit: Exit.Exit<A, E>) => void): () => void {
     if (this._exit) {
@@ -85,7 +85,7 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
   }
   interruptUnsafe(
     fiberId?: number | undefined,
-    annotations?: ServiceMap.ServiceMap<never> | undefined,
+    annotations?: Context.Context<never> | undefined,
   ): void {
     if (this._exit) {
       return
@@ -94,7 +94,7 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     if (this.currentStackFrame) {
       cause = causeAnnotate(
         cause,
-        ServiceMap.make(CauseStackTrace, this.currentStackFrame),
+        Context.make(CauseStackTrace, this.currentStackFrame),
       )
     }
     if (annotations) {
@@ -208,7 +208,7 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
   pipe() {
     return pipeArguments(this, arguments)
   }
-  setServices(services: ServiceMap.ServiceMap<never>): void {
+  setServices(services: Context.Context<never>): void {
     this.services = services
     const scheduler = this.getRef(Scheduler.Scheduler)
     if (scheduler !== this.currentScheduler) {
@@ -244,7 +244,7 @@ const fiberStackAnnotations = (fiber: Fiber.Fiber<any, any>) => {
   if (!fiber.currentStackFrame) return undefined
   const annotations = new Map<string, unknown>()
   annotations.set(CauseStackTrace.key, fiber.currentStackFrame)
-  return ServiceMap.makeUnsafe(annotations)
+  return Context.makeUnsafe(annotations)
 }
 
 const fiberInterruptChildren = (fiber: FiberImpl) => {
@@ -252,4 +252,4 @@ const fiberInterruptChildren = (fiber: FiberImpl) => {
     return undefined
   }
   return fiberInterruptAll(fiber._children)
-}
+}