clanka 0.2.71 → 0.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clanka",
   "type": "module",
-  "version": "0.2.71",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -25,9 +25,9 @@
     "url": "https://github.com/Effectful-Tech/clanka.git"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/sdk": "^1.30.0",
     "@vscode/ripgrep": "^1.18.0",
-    "chalk": "^5.6.2",
+    "chalk": "^6.0.0",
     "glob": "^13.0.6",
     "sqlite-vec": "0.1.9",
     "tree-sitter": "^0.21.1",
@@ -36,30 +36,30 @@
     "turndown": "^7.2.4"
   },
   "peerDependencies": {
-    "@effect/ai-openai": ">=4.0.0-beta.100 <4.0.1",
-    "@effect/ai-openai-compat": ">=4.0.0-beta.100 <4.0.1",
-    "@effect/platform-node": ">=4.0.0-beta.100 <4.0.1",
-    "@effect/sql-sqlite-node": ">=4.0.0-beta.100 <4.0.1",
-    "effect": ">=4.0.0-beta.100 <4.0.1"
+    "@effect/ai-openai": ">=4.0.0-rc.115 <4.0.1",
+    "@effect/ai-openai-compat": ">=4.0.0-rc.115 <4.0.1",
+    "@effect/platform-node": ">=4.0.0-rc.115 <4.0.1",
+    "@effect/sql-sqlite-node": ">=4.0.0-rc.115 <4.0.1",
+    "effect": ">=4.0.0-rc.115 <4.0.1"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.7.0",
-    "@changesets/cli": "^2.31.1",
-    "@effect/ai-openai": "4.0.0-beta.100",
-    "@effect/ai-openai-compat": "4.0.0-beta.100",
-    "@effect/platform-node": "4.0.0-beta.100",
-    "@effect/sql-sqlite-node": "4.0.0-beta.100",
-    "@effect/tsgo": "0.24.2",
-    "@effect/vitest": "4.0.0-beta.100",
+    "@changesets/changelog-github": "^1.0.1",
+    "@changesets/cli": "^3.0.3",
+    "@effect/ai-openai": "4.0.0-rc.115",
+    "@effect/ai-openai-compat": "4.0.0-rc.115",
+    "@effect/platform-node": "4.0.0-rc.115",
+    "@effect/sql-sqlite-node": "4.0.0-rc.115",
+    "@effect/tsgo": "0.45.0",
+    "@effect/vitest": "4.0.0-rc.115",
     "@types/node": "^26.1.1",
     "@types/turndown": "^5.0.6",
-    "effect": "4.0.0-beta.100",
+    "effect": "4.0.0-rc.115",
     "husky": "^9.1.7",
-    "lint-staged": "^17.1.1",
-    "oxlint": "^1.75.0",
-    "prettier": "^3.9.6",
+    "lint-staged": "^17.5.1",
+    "oxlint": "^1.83.0",
+    "prettier": "^3.9.7",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.10"
+    "vitest": "^5.0.1"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

package/src/Acp.test.ts

@@ -0,0 +1,288 @@
+import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as Fiber from "effect/Fiber"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+import * as Stream from "effect/Stream"
+import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
+import * as LanguageModel from "effect/unstable/ai/LanguageModel"
+import * as Model from "effect/unstable/ai/Model"
+import type * as Response from "effect/unstable/ai/Response"
+import * as Acp from "./Acp.ts"
+import * as Agent from "./Agent.ts"
+import * as AgentExecutor from "./AgentExecutor.ts"
+
+type Message = {
+  readonly id?: number
+  readonly method?: string
+  readonly result?: any
+  readonly error?: { readonly code: number; readonly message: string }
+  readonly params?: any
+}
+
+const capabilities = new AgentExecutor.Capabilities({
+  toolsDts: "",
+  agentsMd: Option.none(),
+  supportsSearch: false,
+})
+
+const executor = AgentExecutor.AgentExecutor.of({
+  capabilities: Effect.succeed(capabilities),
+  execute: () => Stream.make("script output"),
+  executeUnsafe: () => Effect.die("executeUnsafe not implemented"),
+})
+
+const makeServer = (
+  streamText: Parameters<typeof LanguageModel.make>[0]["streamText"],
+) =>
+  Effect.gen(function* () {
+    const sent: Array<Message> = []
+    const languageModel = yield* LanguageModel.make({
+      generateText: () => Effect.succeed([]),
+      streamText,
+    })
+    const modelLayer = Layer.mergeAll(
+      Layer.succeed(LanguageModel.LanguageModel, languageModel),
+      Layer.succeed(Model.ProviderName, "test"),
+      Layer.succeed(Model.ModelName, "model"),
+    )
+    const server = yield* Acp.make({
+      version: "test",
+      defaultModel: "test/model",
+      send: (message) =>
+        Effect.sync(() => {
+          sent.push(message as Message)
+        }),
+      makeAgent: () =>
+        Agent.make.pipe(
+          Effect.provideService(AgentExecutor.AgentExecutor, executor),
+        ),
+      makeModel: (modelId) =>
+        modelId === "test/model"
+          ? Option.some(
+              Layer.merge(modelLayer, Agent.layerSubagentModel(modelLayer)),
+            )
+          : Option.none(),
+    })
+    const request = (id: number, method: string, params?: unknown) =>
+      server
+        .handle(JSON.stringify({ jsonrpc: "2.0", id, method, params }))
+        .pipe(Effect.map(() => sent.find((m) => m.id === id)!))
+    const notify = (method: string, params?: unknown) =>
+      server.handle(JSON.stringify({ jsonrpc: "2.0", method, params }))
+    const updates = (sessionId: string) =>
+      sent
+        .filter(
+          (m) =>
+            m.method === "session/update" && m.params.sessionId === sessionId,
+        )
+        .map((m) => m.params.update)
+    return { sent, request, notify, updates }
+  })
+
+const parts = (
+  ...items: ReadonlyArray<Response.StreamPartEncoded>
+): Stream.Stream<Response.StreamPartEncoded> => Stream.fromIterable(items)
+
+const assistantSays = (text: string) =>
+  parts(
+    { type: "text-start", id: "1" },
+    { type: "text-delta", id: "1", delta: text },
+    { type: "text-end", id: "1" },
+  )
+
+const withStore = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  effect.pipe(
+    Effect.provide(
+      Layer.merge(
+        KeyValueStore.layerMemory,
+        Agent.ConversationMode.layer(true),
+      ),
+    ),
+  )
+
+describe("Acp", () => {
+  it.effect("runs a prompt turn", () =>
+    withStore(
+      Effect.scoped(
+        Effect.gen(function* () {
+          const server = yield* makeServer(() => assistantSays("hi there"))
+
+          const init = yield* server.request(1, "initialize", {
+            protocolVersion: 1,
+          })
+          assert.strictEqual(init.result.protocolVersion, 1)
+          assert.strictEqual(init.result.agentCapabilities.loadSession, true)
+
+          const created = yield* server.request(2, "session/new", {
+            cwd: "/tmp",
+            mcpServers: [],
+          })
+          const sessionId: string = created.result.sessionId
+          assert.strictEqual(created.result.models.currentModelId, "test/model")
+
+          const done = yield* server.request(3, "session/prompt", {
+            sessionId,
+            prompt: [{ type: "text", text: "hello" }],
+          })
+          assert.deepStrictEqual(done.result, { stopReason: "end_turn" })
+
+          const updates = server.updates(sessionId)
+          assert.deepStrictEqual(
+            updates.filter((u) => u.sessionUpdate === "agent_thought_chunk"),
+            [
+              {
+                sessionUpdate: "agent_thought_chunk",
+                content: { type: "text", text: "hi there" },
+              },
+            ],
+          )
+          assert.deepStrictEqual(updates.at(-1), {
+            sessionUpdate: "agent_message_chunk",
+            content: { type: "text", text: "hi there" },
+          })
+        }),
+      ),
+    ),
+  )
+
+  it.effect("reports script execution as tool calls", () =>
+    withStore(
+      Effect.scoped(
+        Effect.gen(function* () {
+          let calls = 0
+          const server = yield* makeServer(() =>
+            calls++ === 0
+              ? parts({
+                  type: "tool-call",
+                  id: "call-1",
+                  name: "execute",
+                  params: { script: "console.log(1)" },
+                })
+              : assistantSays("done"),
+          )
+          const created = yield* server.request(1, "session/new", {
+            cwd: "/tmp",
+          })
+          const sessionId: string = created.result.sessionId
+          yield* server.request(2, "session/prompt", {
+            sessionId,
+            prompt: [{ type: "text", text: "run it" }],
+          })
+          const tools = server
+            .updates(sessionId)
+            .filter((u) => u.sessionUpdate.startsWith("tool_call"))
+          assert.strictEqual(tools.length, 2)
+          assert.deepStrictEqual(tools[0].rawInput, {
+            script: "console.log(1)",
+          })
+          assert.strictEqual(tools[0].status, "in_progress")
+          assert.strictEqual(tools[1].toolCallId, tools[0].toolCallId)
+          assert.strictEqual(tools[1].status, "completed")
+          assert.deepStrictEqual(tools[1].rawOutput, {
+            output: "script output",
+          })
+        }),
+      ),
+    ),
+  )
+
+  it.effect("loads a persisted session into a new server", () =>
+    withStore(
+      Effect.gen(function* () {
+        const sessionId = yield* Effect.scoped(
+          Effect.gen(function* () {
+            const server = yield* makeServer(() => assistantSays("first"))
+            const created = yield* server.request(1, "session/new", {
+              cwd: "/tmp",
+            })
+            yield* server.request(2, "session/prompt", {
+              sessionId: created.result.sessionId,
+              prompt: [{ type: "text", text: "hello" }],
+            })
+            return created.result.sessionId as string
+          }),
+        )
+
+        yield* Effect.scoped(
+          Effect.gen(function* () {
+            const server = yield* makeServer(() => assistantSays("second"))
+            const loaded = yield* server.request(1, "session/load", {
+              sessionId,
+              cwd: "/tmp",
+              mcpServers: [],
+            })
+            assert.strictEqual(
+              loaded.result.models.currentModelId,
+              "test/model",
+            )
+            assert.deepStrictEqual(
+              server.updates(sessionId).map((u) => u.sessionUpdate),
+              ["user_message_chunk", "agent_message_chunk"],
+            )
+
+            const missing = yield* server.request(2, "session/load", {
+              sessionId: "nope",
+              cwd: "/tmp",
+            })
+            assert.strictEqual(missing.error!.code, -32602)
+            assert.match(missing.error!.message, /Session not found/)
+          }),
+        )
+      }),
+    ),
+  )
+
+  it.effect("rejects unknown models and methods", () =>
+    withStore(
+      Effect.scoped(
+        Effect.gen(function* () {
+          const server = yield* makeServer(() => assistantSays("x"))
+          const created = yield* server.request(1, "session/new", {
+            cwd: "/tmp",
+            model: "unknown/model",
+          })
+          assert.strictEqual(created.error!.code, -32602)
+
+          const ok = yield* server.request(2, "session/new", { cwd: "/tmp" })
+          const set = yield* server.request(3, "session/set_model", {
+            sessionId: ok.result.sessionId,
+            modelId: "unknown/model",
+          })
+          assert.strictEqual(set.error!.code, -32602)
+
+          const missing = yield* server.request(4, "session/nope", {})
+          assert.strictEqual(missing.error!.code, -32601)
+        }),
+      ),
+    ),
+  )
+
+  it.live("cancels a running prompt", () =>
+    withStore(
+      Effect.scoped(
+        Effect.gen(function* () {
+          const server = yield* makeServer(() =>
+            parts({ type: "text-start", id: "1" }).pipe(
+              Stream.concat(Stream.never),
+            ),
+          )
+          const created = yield* server.request(1, "session/new", {
+            cwd: "/tmp",
+          })
+          const sessionId: string = created.result.sessionId
+          const prompt = yield* server
+            .request(2, "session/prompt", {
+              sessionId,
+              prompt: [{ type: "text", text: "hello" }],
+            })
+            .pipe(Effect.forkScoped)
+          yield* Effect.sleep(10)
+          yield* server.notify("session/cancel", { sessionId })
+          const done = yield* Fiber.join(prompt)
+          assert.deepStrictEqual(done.result, { stopReason: "cancelled" })
+        }),
+      ),
+    ),
+  )
+})