clanka 0.6.1 → 0.6.2

package/dist/ExaSearch.d.ts

@@ -1,6 +1,3 @@
-/**
- * @since 1.0.0
- */
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";

package/dist/ExaSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExaSearch.d.ts","sourceRoot":"","sources":["../src/ExaSearch.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;;oBAW1B,OAAO,gBAAgB,CAAC,IAAI,GACpC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;;AATtC;;;GAGG;AACH,qBAAa,SAAU,SAAQ,cAOR;CAAG;AAE1B;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;EAM3B,CAAA;;;;AAOF;;;GAGG;AACH,qBAAa,QAAS,SAAQ,aAE5B;CAAG;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,sCA8BoB,CAAA"}
+{"version":3,"file":"ExaSearch.d.ts","sourceRoot":"","sources":["../src/ExaSearch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;;oBAW1B,OAAO,gBAAgB,CAAC,IAAI,GACpC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;;AATtC;;;GAGG;AACH,qBAAa,SAAU,SAAQ,cAOR;CAAG;AAE1B;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;EAM3B,CAAA;;;;AAOF;;;GAGG;AACH,qBAAa,QAAS,SAAQ,aAE5B;CAAG;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,sCAkCoB,CAAA"}

package/dist/ExaSearch.js

@@ -1,7 +1,9 @@
 /**
  * @since 1.0.0
  */
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
 import { pipe } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
@@ -43,10 +45,11 @@ export class ExaError extends Schema.TaggedError()("ExaError", {
  */
 export const layer = Layer.effect(ExaSearch, Effect.gen(function* () {
     const client = yield* McpClient.McpClient;
-    yield* client.connect({ url: "https://mcp.exa.ai/mcp" }).pipe(Effect.orDie);
+    const connect = yield* Effect.cachedWithTTL(client.connect({ url: "https://mcp.exa.ai/mcp" }), (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero));
     const decode = Schema.decodeUnknownEffect(Schema.NonEmptyArray(ExaSearchResult));
     return ExaSearch.of({
         search: Effect.fn("ExaSearch.search")(function* (options) {
+            yield* connect;
             const results = yield* pipe(client.toolCall({
                 name: "web_search_exa",
                 arguments: {

package/dist/ExaSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExaSearch.js","sourceRoot":"","sources":["../src/ExaSearch.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C;;;GAGG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,OAAO,EAO3C,CAAC,kBAAkB,CAAC;CAAG;AAE1B;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;QAClD,aAAa,EAAE,wDAAwD;KACxE,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,eAAgB,SAAQ,MAAM,CAAC,KAAK,CAAkB,iBAAiB,CAAC,CAAC;IAC7E,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,OAAO,QAAS,SAAQ,MAAM,CAAC,WAAW,EAAY,CAAC,UAAU,EAAE;IACvE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;CACvB,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,SAAS,EACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAA;IAEzC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAE3E,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,CACvC,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CACtC,CAAA;IAED,OAAO,SAAS,CAAC,EAAE,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,CACnC,QAAQ,CAAC,EAAE,OAAO;YAChB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,IAAI,CACzB,MAAM,CAAC,QAAQ,CAAC;gBACd,IAAI,EAAE,gBAAgB;gBACtB,SAAS,EAAE;oBACT,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,WAAW,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC;iBACrC;aACF,CAAC,EACF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CACvB,CAAA;YACD,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACxB,CAAC,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CACpD;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA"}
+{"version":3,"file":"ExaSearch.js","sourceRoot":"","sources":["../src/ExaSearch.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C;;;GAGG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,OAAO,EAO3C,CAAC,kBAAkB,CAAC;CAAG;AAE1B;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;QAClD,aAAa,EAAE,wDAAwD;KACxE,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,eAAgB,SAAQ,MAAM,CAAC,KAAK,CAAkB,iBAAiB,CAAC,CAAC;IAC7E,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,OAAO,QAAS,SAAQ,MAAM,CAAC,WAAW,EAAY,CAAC,UAAU,EAAE;IACvE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;CACvB,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,SAAS,EACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAA;IAEzC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CACzC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,EACjD,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CACrE,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,CACvC,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CACtC,CAAA;IAED,OAAO,SAAS,CAAC,EAAE,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,CACnC,QAAQ,CAAC,EAAE,OAAO;YAChB,KAAK,CAAC,CAAC,OAAO,CAAA;YACd,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,IAAI,CACzB,MAAM,CAAC,QAAQ,CAAC;gBACd,IAAI,EAAE,gBAAgB;gBACtB,SAAS,EAAE;oBACT,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,WAAW,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC;iBACrC;aACF,CAAC,EACF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CACvB,CAAA;YACD,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACxB,CAAC,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CACpD;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA"}

package/dist/ExaSearch.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ExaSearch.test.d.ts.map

package/dist/ExaSearch.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExaSearch.test.d.ts","sourceRoot":"","sources":["../src/ExaSearch.test.ts"],"names":[],"mappings":""}

package/dist/ExaSearch.test.js

@@ -0,0 +1,75 @@
+import { assert, describe, it } from "@effect/vitest";
+import { Client } from "@modelcontextprotocol/sdk/client";
+import * as Effect from "effect/Effect";
+import * as Cause from "effect/Cause";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import { afterAll, afterEach, beforeEach, vi } from "vitest";
+import * as ExaSearch from "./ExaSearch.js";
+describe("ExaSearch lazy connection", () => {
+    const connect = vi.spyOn(Client.prototype, "connect");
+    const callTool = vi.spyOn(Client.prototype, "callTool");
+    const close = vi.spyOn(Client.prototype, "close");
+    beforeEach(() => {
+        connect.mockResolvedValue(undefined);
+        callTool.mockResolvedValue({
+            content: [{ type: "text", text: "Search results" }],
+        });
+        close.mockResolvedValue(undefined);
+    });
+    afterEach(() => {
+        vi.resetAllMocks();
+    });
+    afterAll(() => {
+        vi.restoreAllMocks();
+    });
+    it.effect("connects lazily and reuses the connection", () => Effect.gen(function* () {
+        const exa = yield* ExaSearch.ExaSearch;
+        assert.strictEqual(connect.mock.calls.length, 0);
+        assert.strictEqual(yield* exa.search({ query: "first" }), "Search results");
+        assert.strictEqual(yield* exa.search({ query: "second" }), "Search results");
+        assert.strictEqual(connect.mock.calls.length, 1);
+        assert.strictEqual(callTool.mock.calls.length, 2);
+    }).pipe(Effect.provide(ExaSearch.layer)));
+    it.effect("retries after a failed first connection and then reuses success", () => Effect.gen(function* () {
+        connect.mockRejectedValueOnce(new Error("temporary failure"));
+        const exa = yield* ExaSearch.ExaSearch;
+        yield* Effect.flip(exa.search({ query: "first" }));
+        const retry = yield* Effect.exit(exa.search({ query: "retry" }));
+        assert.strictEqual(connect.mock.calls.length, 2);
+        assert.deepStrictEqual(retry, Exit.succeed("Search results"));
+        assert.strictEqual(yield* exa.search({ query: "third" }), "Search results");
+        assert.strictEqual(connect.mock.calls.length, 2);
+        assert.strictEqual(callTool.mock.calls.length, 2);
+    }).pipe(Effect.provide(ExaSearch.layer)));
+    it.effect("retries after interruption instead of cancelling later searches", () => Effect.gen(function* () {
+        const started = Promise.withResolvers();
+        let signal;
+        connect.mockImplementationOnce((_transport, options) => {
+            signal = options?.signal;
+            started.resolve();
+            return new Promise((_resolve, reject) => {
+                signal?.addEventListener("abort", () => reject(signal?.reason), {
+                    once: true,
+                });
+            });
+        });
+        const exa = yield* ExaSearch.ExaSearch;
+        const first = yield* exa
+            .search({ query: "first" })
+            .pipe(Effect.forkChild);
+        yield* Effect.promise(() => started.promise);
+        yield* Fiber.interrupt(first);
+        const interrupted = yield* Fiber.await(first);
+        assert.isTrue(Exit.isFailure(interrupted) &&
+            Cause.hasInterruptsOnly(interrupted.cause));
+        assert.isTrue(signal?.aborted);
+        assert.strictEqual(callTool.mock.calls.length, 0);
+        const retry = yield* Effect.exit(exa.search({ query: "retry" }));
+        assert.strictEqual(connect.mock.calls.length, 2);
+        assert.deepStrictEqual(retry, Exit.succeed("Search results"));
+        assert.strictEqual(yield* exa.search({ query: "third" }), "Search results");
+        assert.strictEqual(connect.mock.calls.length, 2);
+    }).pipe(Effect.provide(ExaSearch.layer)));
+});
+//# sourceMappingURL=ExaSearch.test.js.map

package/dist/ExaSearch.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExaSearch.test.js","sourceRoot":"","sources":["../src/ExaSearch.test.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/ExaSearch.test.ts

@@ -0,0 +1,106 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Client } from "@modelcontextprotocol/sdk/client"
+import * as Effect from "effect/Effect"
+import * as Cause from "effect/Cause"
+import * as Exit from "effect/Exit"
+import * as Fiber from "effect/Fiber"
+import { afterAll, afterEach, beforeEach, vi } from "vitest"
+import * as ExaSearch from "./ExaSearch.ts"
+
+describe("ExaSearch lazy connection", () => {
+  const connect = vi.spyOn(Client.prototype, "connect")
+  const callTool = vi.spyOn(Client.prototype, "callTool")
+  const close = vi.spyOn(Client.prototype, "close")
+
+  beforeEach(() => {
+    connect.mockResolvedValue(undefined)
+    callTool.mockResolvedValue({
+      content: [{ type: "text", text: "Search results" }],
+    })
+    close.mockResolvedValue(undefined)
+  })
+
+  afterEach(() => {
+    vi.resetAllMocks()
+  })
+
+  afterAll(() => {
+    vi.restoreAllMocks()
+  })
+
+  it.effect("connects lazily and reuses the connection", () =>
+    Effect.gen(function* () {
+      const exa = yield* ExaSearch.ExaSearch
+      assert.strictEqual(connect.mock.calls.length, 0)
+
+      assert.strictEqual(
+        yield* exa.search({ query: "first" }),
+        "Search results",
+      )
+      assert.strictEqual(
+        yield* exa.search({ query: "second" }),
+        "Search results",
+      )
+      assert.strictEqual(connect.mock.calls.length, 1)
+      assert.strictEqual(callTool.mock.calls.length, 2)
+    }).pipe(Effect.provide(ExaSearch.layer)),
+  )
+
+  it.effect(
+    "retries after a failed first connection and then reuses success",
+    () =>
+      Effect.gen(function* () {
+        connect.mockRejectedValueOnce(new Error("temporary failure"))
+        const exa = yield* ExaSearch.ExaSearch
+        yield* Effect.flip(exa.search({ query: "first" }))
+        const retry = yield* Effect.exit(exa.search({ query: "retry" }))
+        assert.strictEqual(connect.mock.calls.length, 2)
+        assert.deepStrictEqual(retry, Exit.succeed("Search results"))
+        assert.strictEqual(
+          yield* exa.search({ query: "third" }),
+          "Search results",
+        )
+        assert.strictEqual(connect.mock.calls.length, 2)
+        assert.strictEqual(callTool.mock.calls.length, 2)
+      }).pipe(Effect.provide(ExaSearch.layer)),
+  )
+
+  it.effect(
+    "retries after interruption instead of cancelling later searches",
+    () =>
+      Effect.gen(function* () {
+        const started = Promise.withResolvers<void>()
+        let signal: AbortSignal | undefined
+        connect.mockImplementationOnce((_transport, options) => {
+          signal = options?.signal
+          started.resolve()
+          return new Promise<void>((_resolve, reject) => {
+            signal?.addEventListener("abort", () => reject(signal?.reason), {
+              once: true,
+            })
+          })
+        })
+        const exa = yield* ExaSearch.ExaSearch
+        const first = yield* exa
+          .search({ query: "first" })
+          .pipe(Effect.forkChild)
+        yield* Effect.promise(() => started.promise)
+        yield* Fiber.interrupt(first)
+        const interrupted = yield* Fiber.await(first)
+        assert.isTrue(
+          Exit.isFailure(interrupted) &&
+            Cause.hasInterruptsOnly(interrupted.cause),
+        )
+        assert.isTrue(signal?.aborted)
+        assert.strictEqual(callTool.mock.calls.length, 0)
+        const retry = yield* Effect.exit(exa.search({ query: "retry" }))
+        assert.strictEqual(connect.mock.calls.length, 2)
+        assert.deepStrictEqual(retry, Exit.succeed("Search results"))
+        assert.strictEqual(
+          yield* exa.search({ query: "third" }),
+          "Search results",
+        )
+        assert.strictEqual(connect.mock.calls.length, 2)
+      }).pipe(Effect.provide(ExaSearch.layer)),
+  )
+})

package/src/ExaSearch.ts

@@ -1,7 +1,9 @@
 /**
  * @since 1.0.0
  */
+import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
 import { pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
@@ -55,7 +57,10 @@ export const layer = Layer.effect(
   Effect.gen(function* () {
     const client = yield* McpClient.McpClient
 
-    yield* client.connect({ url: "https://mcp.exa.ai/mcp" }).pipe(Effect.orDie)
+    const connect = yield* Effect.cachedWithTTL(
+      client.connect({ url: "https://mcp.exa.ai/mcp" }),
+      (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
+    )
 
     const decode = Schema.decodeUnknownEffect(
       Schema.NonEmptyArray(ExaSearchResult),
@@ -64,6 +69,7 @@ export const layer = Layer.effect(
     return ExaSearch.of({
       search: Effect.fn("ExaSearch.search")(
         function* (options) {
+          yield* connect
           const results = yield* pipe(
             client.toolCall({
               name: "web_search_exa",