clanka 0.6.0 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ExaSearch.d.ts +0 -3
- package/dist/ExaSearch.d.ts.map +1 -1
- package/dist/ExaSearch.js +4 -1
- package/dist/ExaSearch.js.map +1 -1
- package/dist/ExaSearch.test.d.ts +2 -0
- package/dist/ExaSearch.test.d.ts.map +1 -0
- package/dist/ExaSearch.test.js +75 -0
- package/dist/ExaSearch.test.js.map +1 -0
- package/dist/cli.js +2 -1
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
- package/src/ExaSearch.test.ts +106 -0
- package/src/ExaSearch.ts +7 -1
- package/src/cli.ts +2 -1
package/dist/ExaSearch.d.ts
CHANGED
package/dist/ExaSearch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExaSearch.d.ts","sourceRoot":"","sources":["../src/ExaSearch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import * as Duration from "effect/Duration";
|
|
4
5
|
import * as Effect from "effect/Effect";
|
|
6
|
+
import * as Exit from "effect/Exit";
|
|
5
7
|
import { pipe } from "effect/Function";
|
|
6
8
|
import * as Layer from "effect/Layer";
|
|
7
9
|
import * as Schema from "effect/Schema";
|
|
@@ -43,10 +45,11 @@ export class ExaError extends Schema.TaggedError()("ExaError", {
|
|
|
43
45
|
*/
|
|
44
46
|
export const layer = Layer.effect(ExaSearch, Effect.gen(function* () {
|
|
45
47
|
const client = yield* McpClient.McpClient;
|
|
46
|
-
yield* client.connect({ url: "https://mcp.exa.ai/mcp" }).
|
|
48
|
+
const connect = yield* Effect.cachedWithTTL(client.connect({ url: "https://mcp.exa.ai/mcp" }), (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero));
|
|
47
49
|
const decode = Schema.decodeUnknownEffect(Schema.NonEmptyArray(ExaSearchResult));
|
|
48
50
|
return ExaSearch.of({
|
|
49
51
|
search: Effect.fn("ExaSearch.search")(function* (options) {
|
|
52
|
+
yield* connect;
|
|
50
53
|
const results = yield* pipe(client.toolCall({
|
|
51
54
|
name: "web_search_exa",
|
|
52
55
|
arguments: {
|
package/dist/ExaSearch.js.map
CHANGED
|
@@ -1 +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,
|
|
1
|
+
{"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExaSearch.test.d.ts","sourceRoot":"","sources":["../src/ExaSearch.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { assert, describe, it } from "@effect/vitest";
|
|
2
|
+
import { Client } from "@modelcontextprotocol/sdk/client";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import * as Cause from "effect/Cause";
|
|
5
|
+
import * as Exit from "effect/Exit";
|
|
6
|
+
import * as Fiber from "effect/Fiber";
|
|
7
|
+
import { afterAll, afterEach, beforeEach, vi } from "vitest";
|
|
8
|
+
import * as ExaSearch from "./ExaSearch.js";
|
|
9
|
+
describe("ExaSearch lazy connection", () => {
|
|
10
|
+
const connect = vi.spyOn(Client.prototype, "connect");
|
|
11
|
+
const callTool = vi.spyOn(Client.prototype, "callTool");
|
|
12
|
+
const close = vi.spyOn(Client.prototype, "close");
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
connect.mockResolvedValue(undefined);
|
|
15
|
+
callTool.mockResolvedValue({
|
|
16
|
+
content: [{ type: "text", text: "Search results" }],
|
|
17
|
+
});
|
|
18
|
+
close.mockResolvedValue(undefined);
|
|
19
|
+
});
|
|
20
|
+
afterEach(() => {
|
|
21
|
+
vi.resetAllMocks();
|
|
22
|
+
});
|
|
23
|
+
afterAll(() => {
|
|
24
|
+
vi.restoreAllMocks();
|
|
25
|
+
});
|
|
26
|
+
it.effect("connects lazily and reuses the connection", () => Effect.gen(function* () {
|
|
27
|
+
const exa = yield* ExaSearch.ExaSearch;
|
|
28
|
+
assert.strictEqual(connect.mock.calls.length, 0);
|
|
29
|
+
assert.strictEqual(yield* exa.search({ query: "first" }), "Search results");
|
|
30
|
+
assert.strictEqual(yield* exa.search({ query: "second" }), "Search results");
|
|
31
|
+
assert.strictEqual(connect.mock.calls.length, 1);
|
|
32
|
+
assert.strictEqual(callTool.mock.calls.length, 2);
|
|
33
|
+
}).pipe(Effect.provide(ExaSearch.layer)));
|
|
34
|
+
it.effect("retries after a failed first connection and then reuses success", () => Effect.gen(function* () {
|
|
35
|
+
connect.mockRejectedValueOnce(new Error("temporary failure"));
|
|
36
|
+
const exa = yield* ExaSearch.ExaSearch;
|
|
37
|
+
yield* Effect.flip(exa.search({ query: "first" }));
|
|
38
|
+
const retry = yield* Effect.exit(exa.search({ query: "retry" }));
|
|
39
|
+
assert.strictEqual(connect.mock.calls.length, 2);
|
|
40
|
+
assert.deepStrictEqual(retry, Exit.succeed("Search results"));
|
|
41
|
+
assert.strictEqual(yield* exa.search({ query: "third" }), "Search results");
|
|
42
|
+
assert.strictEqual(connect.mock.calls.length, 2);
|
|
43
|
+
assert.strictEqual(callTool.mock.calls.length, 2);
|
|
44
|
+
}).pipe(Effect.provide(ExaSearch.layer)));
|
|
45
|
+
it.effect("retries after interruption instead of cancelling later searches", () => Effect.gen(function* () {
|
|
46
|
+
const started = Promise.withResolvers();
|
|
47
|
+
let signal;
|
|
48
|
+
connect.mockImplementationOnce((_transport, options) => {
|
|
49
|
+
signal = options?.signal;
|
|
50
|
+
started.resolve();
|
|
51
|
+
return new Promise((_resolve, reject) => {
|
|
52
|
+
signal?.addEventListener("abort", () => reject(signal?.reason), {
|
|
53
|
+
once: true,
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
const exa = yield* ExaSearch.ExaSearch;
|
|
58
|
+
const first = yield* exa
|
|
59
|
+
.search({ query: "first" })
|
|
60
|
+
.pipe(Effect.forkChild);
|
|
61
|
+
yield* Effect.promise(() => started.promise);
|
|
62
|
+
yield* Fiber.interrupt(first);
|
|
63
|
+
const interrupted = yield* Fiber.await(first);
|
|
64
|
+
assert.isTrue(Exit.isFailure(interrupted) &&
|
|
65
|
+
Cause.hasInterruptsOnly(interrupted.cause));
|
|
66
|
+
assert.isTrue(signal?.aborted);
|
|
67
|
+
assert.strictEqual(callTool.mock.calls.length, 0);
|
|
68
|
+
const retry = yield* Effect.exit(exa.search({ query: "retry" }));
|
|
69
|
+
assert.strictEqual(connect.mock.calls.length, 2);
|
|
70
|
+
assert.deepStrictEqual(retry, Exit.succeed("Search results"));
|
|
71
|
+
assert.strictEqual(yield* exa.search({ query: "third" }), "Search results");
|
|
72
|
+
assert.strictEqual(connect.mock.calls.length, 2);
|
|
73
|
+
}).pipe(Effect.provide(ExaSearch.layer)));
|
|
74
|
+
});
|
|
75
|
+
//# sourceMappingURL=ExaSearch.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExaSearch.test.js","sourceRoot":"","sources":["../src/ExaSearch.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -26,7 +26,8 @@ import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore";
|
|
|
26
26
|
import * as Option from "effect/Option";
|
|
27
27
|
import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai";
|
|
28
28
|
import { DeviceCodeHandler } from "./index.js";
|
|
29
|
-
|
|
29
|
+
import packageJson from "../package.json" with { type: "json" };
|
|
30
|
+
const version = packageJson.version;
|
|
30
31
|
const providers = ["openai", "copilot"];
|
|
31
32
|
const withSubagentModel = (model) => Layer.merge(model, Agent.layerSubagentModel(model));
|
|
32
33
|
const modelLayer = (provider, model, effort) => provider === "openai"
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAA;AACtE,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAA;AAChD,OAAO,KAAK,YAAY,MAAM,oCAAoC,CAAA;AAClE,OAAO,KAAK,WAAW,MAAM,mCAAmC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,aAAa,MAAM,2CAA2C,CAAA;AAC1E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { assert, describe, it } from "@effect/vitest"
|
|
2
|
+
import { Client } from "@modelcontextprotocol/sdk/client"
|
|
3
|
+
import * as Effect from "effect/Effect"
|
|
4
|
+
import * as Cause from "effect/Cause"
|
|
5
|
+
import * as Exit from "effect/Exit"
|
|
6
|
+
import * as Fiber from "effect/Fiber"
|
|
7
|
+
import { afterAll, afterEach, beforeEach, vi } from "vitest"
|
|
8
|
+
import * as ExaSearch from "./ExaSearch.ts"
|
|
9
|
+
|
|
10
|
+
describe("ExaSearch lazy connection", () => {
|
|
11
|
+
const connect = vi.spyOn(Client.prototype, "connect")
|
|
12
|
+
const callTool = vi.spyOn(Client.prototype, "callTool")
|
|
13
|
+
const close = vi.spyOn(Client.prototype, "close")
|
|
14
|
+
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
connect.mockResolvedValue(undefined)
|
|
17
|
+
callTool.mockResolvedValue({
|
|
18
|
+
content: [{ type: "text", text: "Search results" }],
|
|
19
|
+
})
|
|
20
|
+
close.mockResolvedValue(undefined)
|
|
21
|
+
})
|
|
22
|
+
|
|
23
|
+
afterEach(() => {
|
|
24
|
+
vi.resetAllMocks()
|
|
25
|
+
})
|
|
26
|
+
|
|
27
|
+
afterAll(() => {
|
|
28
|
+
vi.restoreAllMocks()
|
|
29
|
+
})
|
|
30
|
+
|
|
31
|
+
it.effect("connects lazily and reuses the connection", () =>
|
|
32
|
+
Effect.gen(function* () {
|
|
33
|
+
const exa = yield* ExaSearch.ExaSearch
|
|
34
|
+
assert.strictEqual(connect.mock.calls.length, 0)
|
|
35
|
+
|
|
36
|
+
assert.strictEqual(
|
|
37
|
+
yield* exa.search({ query: "first" }),
|
|
38
|
+
"Search results",
|
|
39
|
+
)
|
|
40
|
+
assert.strictEqual(
|
|
41
|
+
yield* exa.search({ query: "second" }),
|
|
42
|
+
"Search results",
|
|
43
|
+
)
|
|
44
|
+
assert.strictEqual(connect.mock.calls.length, 1)
|
|
45
|
+
assert.strictEqual(callTool.mock.calls.length, 2)
|
|
46
|
+
}).pipe(Effect.provide(ExaSearch.layer)),
|
|
47
|
+
)
|
|
48
|
+
|
|
49
|
+
it.effect(
|
|
50
|
+
"retries after a failed first connection and then reuses success",
|
|
51
|
+
() =>
|
|
52
|
+
Effect.gen(function* () {
|
|
53
|
+
connect.mockRejectedValueOnce(new Error("temporary failure"))
|
|
54
|
+
const exa = yield* ExaSearch.ExaSearch
|
|
55
|
+
yield* Effect.flip(exa.search({ query: "first" }))
|
|
56
|
+
const retry = yield* Effect.exit(exa.search({ query: "retry" }))
|
|
57
|
+
assert.strictEqual(connect.mock.calls.length, 2)
|
|
58
|
+
assert.deepStrictEqual(retry, Exit.succeed("Search results"))
|
|
59
|
+
assert.strictEqual(
|
|
60
|
+
yield* exa.search({ query: "third" }),
|
|
61
|
+
"Search results",
|
|
62
|
+
)
|
|
63
|
+
assert.strictEqual(connect.mock.calls.length, 2)
|
|
64
|
+
assert.strictEqual(callTool.mock.calls.length, 2)
|
|
65
|
+
}).pipe(Effect.provide(ExaSearch.layer)),
|
|
66
|
+
)
|
|
67
|
+
|
|
68
|
+
it.effect(
|
|
69
|
+
"retries after interruption instead of cancelling later searches",
|
|
70
|
+
() =>
|
|
71
|
+
Effect.gen(function* () {
|
|
72
|
+
const started = Promise.withResolvers<void>()
|
|
73
|
+
let signal: AbortSignal | undefined
|
|
74
|
+
connect.mockImplementationOnce((_transport, options) => {
|
|
75
|
+
signal = options?.signal
|
|
76
|
+
started.resolve()
|
|
77
|
+
return new Promise<void>((_resolve, reject) => {
|
|
78
|
+
signal?.addEventListener("abort", () => reject(signal?.reason), {
|
|
79
|
+
once: true,
|
|
80
|
+
})
|
|
81
|
+
})
|
|
82
|
+
})
|
|
83
|
+
const exa = yield* ExaSearch.ExaSearch
|
|
84
|
+
const first = yield* exa
|
|
85
|
+
.search({ query: "first" })
|
|
86
|
+
.pipe(Effect.forkChild)
|
|
87
|
+
yield* Effect.promise(() => started.promise)
|
|
88
|
+
yield* Fiber.interrupt(first)
|
|
89
|
+
const interrupted = yield* Fiber.await(first)
|
|
90
|
+
assert.isTrue(
|
|
91
|
+
Exit.isFailure(interrupted) &&
|
|
92
|
+
Cause.hasInterruptsOnly(interrupted.cause),
|
|
93
|
+
)
|
|
94
|
+
assert.isTrue(signal?.aborted)
|
|
95
|
+
assert.strictEqual(callTool.mock.calls.length, 0)
|
|
96
|
+
const retry = yield* Effect.exit(exa.search({ query: "retry" }))
|
|
97
|
+
assert.strictEqual(connect.mock.calls.length, 2)
|
|
98
|
+
assert.deepStrictEqual(retry, Exit.succeed("Search results"))
|
|
99
|
+
assert.strictEqual(
|
|
100
|
+
yield* exa.search({ query: "third" }),
|
|
101
|
+
"Search results",
|
|
102
|
+
)
|
|
103
|
+
assert.strictEqual(connect.mock.calls.length, 2)
|
|
104
|
+
}).pipe(Effect.provide(ExaSearch.layer)),
|
|
105
|
+
)
|
|
106
|
+
})
|
package/src/ExaSearch.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import * as Duration from "effect/Duration"
|
|
4
5
|
import * as Effect from "effect/Effect"
|
|
6
|
+
import * as Exit from "effect/Exit"
|
|
5
7
|
import { pipe } from "effect/Function"
|
|
6
8
|
import * as Layer from "effect/Layer"
|
|
7
9
|
import * as Schema from "effect/Schema"
|
|
@@ -55,7 +57,10 @@ export const layer = Layer.effect(
|
|
|
55
57
|
Effect.gen(function* () {
|
|
56
58
|
const client = yield* McpClient.McpClient
|
|
57
59
|
|
|
58
|
-
|
|
60
|
+
const connect = yield* Effect.cachedWithTTL(
|
|
61
|
+
client.connect({ url: "https://mcp.exa.ai/mcp" }),
|
|
62
|
+
(exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
|
|
63
|
+
)
|
|
59
64
|
|
|
60
65
|
const decode = Schema.decodeUnknownEffect(
|
|
61
66
|
Schema.NonEmptyArray(ExaSearchResult),
|
|
@@ -64,6 +69,7 @@ export const layer = Layer.effect(
|
|
|
64
69
|
return ExaSearch.of({
|
|
65
70
|
search: Effect.fn("ExaSearch.search")(
|
|
66
71
|
function* (options) {
|
|
72
|
+
yield* connect
|
|
67
73
|
const results = yield* pipe(
|
|
68
74
|
client.toolCall({
|
|
69
75
|
name: "web_search_exa",
|
package/src/cli.ts
CHANGED
|
@@ -28,8 +28,9 @@ import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
|
|
|
28
28
|
import * as Option from "effect/Option"
|
|
29
29
|
import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai"
|
|
30
30
|
import { DeviceCodeHandler } from "./index.ts"
|
|
31
|
+
import packageJson from "../package.json" with { type: "json" }
|
|
31
32
|
|
|
32
|
-
const version =
|
|
33
|
+
const version = packageJson.version
|
|
33
34
|
|
|
34
35
|
type Provider = "openai" | "copilot"
|
|
35
36
|
|