clanka 0.17.2 → 0.18.0

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.
Files changed (91) hide show
  1. package/README.md +24 -0
  2. package/dist/Acp.d.ts.map +1 -1
  3. package/dist/Acp.js +5 -0
  4. package/dist/Acp.js.map +1 -1
  5. package/dist/Agent.d.ts +11 -0
  6. package/dist/Agent.d.ts.map +1 -1
  7. package/dist/Agent.js +35 -15
  8. package/dist/Agent.js.map +1 -1
  9. package/dist/Agent.test.js +23 -0
  10. package/dist/Agent.test.js.map +1 -1
  11. package/dist/AgentExecutor.js +15 -2
  12. package/dist/AgentExecutor.js.map +1 -1
  13. package/dist/AgentExecutor.test.js +16 -0
  14. package/dist/AgentExecutor.test.js.map +1 -1
  15. package/dist/AgentOutput.d.ts +23 -4
  16. package/dist/AgentOutput.d.ts.map +1 -1
  17. package/dist/AgentOutput.js +19 -0
  18. package/dist/AgentOutput.js.map +1 -1
  19. package/dist/ClaudeAgent.d.ts.map +1 -1
  20. package/dist/ClaudeAgent.js +84 -13
  21. package/dist/ClaudeAgent.js.map +1 -1
  22. package/dist/ClaudeAgent.test.js +187 -4
  23. package/dist/ClaudeAgent.test.js.map +1 -1
  24. package/dist/Codex.js +9 -5
  25. package/dist/Codex.js.map +1 -1
  26. package/dist/Codex.test.js +26 -7
  27. package/dist/Codex.test.js.map +1 -1
  28. package/dist/Compaction.d.ts +41 -6
  29. package/dist/Compaction.d.ts.map +1 -1
  30. package/dist/Compaction.js +52 -11
  31. package/dist/Compaction.js.map +1 -1
  32. package/dist/Compaction.test.js +5 -4
  33. package/dist/Compaction.test.js.map +1 -1
  34. package/dist/CompactionTransport.test.js +11 -0
  35. package/dist/CompactionTransport.test.js.map +1 -1
  36. package/dist/Copilot.d.ts.map +1 -1
  37. package/dist/Copilot.js +3 -6
  38. package/dist/Copilot.js.map +1 -1
  39. package/dist/ModelLayer.d.ts +35 -6
  40. package/dist/ModelLayer.d.ts.map +1 -1
  41. package/dist/ModelLayer.js +30 -18
  42. package/dist/ModelLayer.js.map +1 -1
  43. package/dist/ModelLayer.test.js +11 -3
  44. package/dist/ModelLayer.test.js.map +1 -1
  45. package/dist/OutputFormatter.d.ts.map +1 -1
  46. package/dist/OutputFormatter.js +3 -0
  47. package/dist/OutputFormatter.js.map +1 -1
  48. package/dist/Xai.d.ts.map +1 -1
  49. package/dist/Xai.js +4 -12
  50. package/dist/Xai.js.map +1 -1
  51. package/dist/bin/{Effect-DNYYQ84C.mjs → Effect-5XYMLOiB.mjs} +31 -30
  52. package/dist/bin/Effect-5XYMLOiB.mjs.map +1 -0
  53. package/dist/bin/{Latch-BSlIwuxI.mjs → Latch-BnrpWMd1.mjs} +2 -2
  54. package/dist/bin/{Latch-BSlIwuxI.mjs.map → Latch-BnrpWMd1.mjs.map} +1 -1
  55. package/dist/bin/{McpClient-C7ctqJWo.mjs → McpClient-DoPNaNzW.mjs} +3 -3
  56. package/dist/bin/{McpClient-C7ctqJWo.mjs.map → McpClient-DoPNaNzW.mjs.map} +1 -1
  57. package/dist/bin/{OutputFormatter-DXej05JW.mjs → OutputFormatter-Dqxyk2qD.mjs} +4 -3
  58. package/dist/bin/{OutputFormatter-DXej05JW.mjs.map → OutputFormatter-Dqxyk2qD.mjs.map} +1 -1
  59. package/dist/bin/{Schema-CSQN_Zso.mjs → Schema-Box_9VZG.mjs} +6 -3
  60. package/dist/bin/{Schema-CSQN_Zso.mjs.map → Schema-Box_9VZG.mjs.map} +1 -1
  61. package/dist/bin/{SemanticSearch-BiwCnpKX.mjs → SemanticSearch-CH125AHH.mjs} +4 -4
  62. package/dist/bin/{SemanticSearch-BiwCnpKX.mjs.map → SemanticSearch-CH125AHH.mjs.map} +1 -1
  63. package/dist/bin/{Stream-Dwvj9X5X.mjs → Stream-C51usiew.mjs} +3 -3
  64. package/dist/bin/{Stream-Dwvj9X5X.mjs.map → Stream-C51usiew.mjs.map} +1 -1
  65. package/dist/bin/cli.mjs +339 -229
  66. package/dist/bin/cli.mjs.map +1 -1
  67. package/dist/bin/{upgrade-BSNjCnra.mjs → upgrade-HMRGSqq8.mjs} +4 -4
  68. package/dist/bin/{upgrade-BSNjCnra.mjs.map → upgrade-HMRGSqq8.mjs.map} +1 -1
  69. package/dist/cli.js +45 -5
  70. package/dist/cli.js.map +1 -1
  71. package/package.json +1 -1
  72. package/src/Acp.ts +7 -0
  73. package/src/Agent.test.ts +27 -0
  74. package/src/Agent.ts +49 -15
  75. package/src/AgentExecutor.test.ts +23 -1
  76. package/src/AgentExecutor.ts +16 -2
  77. package/src/AgentOutput.ts +23 -0
  78. package/src/ClaudeAgent.test.ts +271 -4
  79. package/src/ClaudeAgent.ts +114 -19
  80. package/src/Codex.test.ts +37 -9
  81. package/src/Codex.ts +25 -20
  82. package/src/Compaction.test.ts +18 -15
  83. package/src/Compaction.ts +89 -20
  84. package/src/CompactionTransport.test.ts +36 -0
  85. package/src/Copilot.ts +5 -6
  86. package/src/ModelLayer.test.ts +17 -2
  87. package/src/ModelLayer.ts +68 -22
  88. package/src/OutputFormatter.ts +3 -0
  89. package/src/Xai.ts +8 -12
  90. package/src/cli.ts +97 -5
  91. package/dist/bin/Effect-DNYYQ84C.mjs.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAA6B,EAAE,EAAE,CAChE,QAAQ,KAAK,QAAQ,CAAA;AA4BvB,MAAM,aAAa,GAAG,CACpB,QAA6B,EAC7B,KAAa,EACb,MAAiC,EACjC,MAA4B,EAC5B,QAAiB,EACjB,EAAE;IACF,MAAM,OAAO,GACX,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAa,EAAE,EAAE,CAAA;IACvE,MAAM,aAAa,GAAG,QAAQ;QAC5B,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE;QAC1C,CAAC,CAAC,OAAO,CAAA;IACX,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,MAAM,KAAK,SAAS;gBAChC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,IAAI,CACpC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAC1C;gBACH,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,IAAI,CAC7C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CACjC,CAAA;QACP,KAAK,KAAK;YACR,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAC5C,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAC/B,CAAA;QACH,KAAK,QAAQ;YACX,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC7C,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CACvC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CACnC,CAAA;IACL,CAAC;AACH,CAAC,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,QAA6B,EAC7B,KAAa,EACb,MAAiC,EACjC,MAA4B,EAC5B,QAAQ,GAAG,KAAK,EAChB,SAA2B,EAC3B,EAAE;IACF,MAAM,QAAQ,GAAG,CAAC,IAAe,EAAE,EAAE,CACnC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;IACzE,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;IACrE,OAAO,KAAK,CAAC,QAAQ,CACnB,IAAI,EACJ,KAAK,CAAC,kBAAkB,CACtB,SAAS,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CACxE,EACD,SAAS,EAAE,UAAU,KAAK,SAAS;QACjC,CAAC,CAAC,KAAK,CAAC,KAAK;QACb,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CACpE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE;IACjD,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACrD,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QACrE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;AACnB,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE,CACrD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACvD,gBAAgB,CAAC,QAAQ,CAAC,CAC3B,CAAA;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA2C,EAAE,EAAE,CACvE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrB,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,EAAE;IACxC,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,QAAQ,GAAG;CAC1C,CAAC,CAAC,CAAA;AAEL,MAAM,IAAI,GAAG,CAAC,KAAmB,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAE1E,kEAAkE;AAClE,4EAA4E;AAC5E,wBAAwB;AACxB,MAAM,aAAa,GAAG,CACpB,OAAoC,EACpC,YAA0B,EACL,EAAE;IACvB,MAAM,QAAQ,GAAG,CAAC,KAAmB,EAAE,EAAE,CACvC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;IAC5C,IAAI,QAAQ,GAAwB,IAAI,CAAA;IACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IACE,QAAQ,KAAK,IAAI;YACjB,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC;YACrC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAC1E,CAAC;YACD,QAAQ,GAAG,MAAM,CAAA;QACnB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,OAAO,GAClB,CAAC,OAIA,EAAE,EAAE,CACL,CAAC,OAAe,EAAE,YAA0B,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,CAChE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3D,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;IACrC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CACvB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,CAC7D,CAAA;IACD,OAAO,IAAI,CACT,QAAQ,EACR,KAAK,EACL,IAAI,KAAK,SAAS;QAChB,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAC7C,OAAO,CAAC,MAAM,EACd,QAAQ,EACR,OAAO,CAAC,SAAS,CAClB,CAAA;AACH,CAAC,CAAC,CACH,CACF,CAAA"}
@@ -9,6 +9,7 @@ import * as HttpClient from "effect/http/HttpClient";
9
9
  import * as HttpClientResponse from "effect/http/HttpClientResponse";
10
10
  import * as KeyValueStore from "effect/persistence/KeyValueStore";
11
11
  import * as Socket from "effect/socket/Socket";
12
+ import * as Agent from "./Agent.js";
12
13
  import { DeviceCodeHandler } from "./DeviceCodeHandler.js";
13
14
  import * as ModelLayer from "./ModelLayer.js";
14
15
  import * as ModelsRepo from "./ModelsRepo.js";
@@ -37,6 +38,7 @@ const makeModel = ModelLayer.makeAcp({
37
38
  apiKey: Redacted.make("test-key"),
38
39
  apiUrl: "https://codex.test",
39
40
  },
41
+ auxiliary: { subagent: { provider: "openai", model: "gpt-4.1" } },
40
42
  });
41
43
  // The other providers' login and socket services, which the API-key openai
42
44
  // path must not use.
@@ -46,17 +48,20 @@ const unused = Layer.mergeAll(KeyValueStore.layerMemory, Layer.succeed(DeviceCod
46
48
  throw new Error("Unexpected live WebSocket");
47
49
  }));
48
50
  // The request body the model for `modelId` sends at session thought level
49
- // `thoughtLevel`.
50
- const requestBody = Effect.fnUntraced(function* (modelId, thoughtLevel = "high", fastMode = false) {
51
+ // `thoughtLevel`, or its sub-agent model with `subagent`.
52
+ const requestBody = Effect.fnUntraced(function* (modelId, thoughtLevel = "high", fastMode = false, subagent = false) {
51
53
  const requests = [];
52
54
  const client = HttpClient.make((request) => Effect.sync(() => {
53
55
  requests.push(request);
54
56
  return HttpClientResponse.fromWeb(request, new Response(null, { status: 400 }));
55
57
  }));
56
58
  const model = Option.getOrThrow(makeModel(modelId, thoughtLevel, fastMode));
57
- yield* Effect.gen(function* () {
59
+ const send = Effect.gen(function* () {
58
60
  const ai = yield* LanguageModel.LanguageModel;
59
61
  yield* ai.streamText({ prompt: "hello" }).pipe(Stream.runDrain, Effect.exit);
62
+ });
63
+ yield* Effect.gen(function* () {
64
+ yield* subagent ? Effect.provide(send, yield* Agent.SubagentModel) : send;
60
65
  }).pipe(Effect.provide(model.pipe(Layer.provide([Layer.succeed(HttpClient.HttpClient, client), unused]))));
61
66
  assert.lengthOf(requests, 1);
62
67
  const body = requests[0].body;
@@ -80,6 +85,9 @@ describe("ModelLayer.makeAcp", () => {
80
85
  assert.strictEqual((yield* requestBody("openai:gpt-6-astra", "high", true)).service_tier, "priority");
81
86
  assert.isFalse("service_tier" in (yield* requestBody("openai:gpt-6-astra")));
82
87
  }));
88
+ it.effect("runs sub-agents on the auxiliary sub-agent model", () => Effect.gen(function* () {
89
+ assert.strictEqual((yield* requestBody("openai:gpt-6-astra", "high", false, true)).model, "gpt-4.1");
90
+ }));
83
91
  it("rejects ids that are not <provider>:<model>", () => {
84
92
  assert.isTrue(Option.isNone(makeModel("nope", "high")));
85
93
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAO7D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM,aAAc;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;CACzD,KAAG,eA2GH,CAAA;;QAoCO,CAAC,EAAE,CAAC,SACC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,GACjD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;qBACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;;AAV1C;;;GAGG;AACH,qBAAa,KAAM,SAAQ,UAQQ;CAAG;AAEtC;;;GAGG;AACH,eAAO,MAAM,UAAU,cAAe,eAAe,qCAsDlD,CAAA"}
1
+ {"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAO7D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM,aAAc;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;CACzD,KAAG,eA8GH,CAAA;;QAoCO,CAAC,EAAE,CAAC,SACC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,GACjD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;qBACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;;AAV1C;;;GAGG;AACH,qBAAa,KAAM,SAAQ,UAQQ;CAAG;AAEtC;;;GAGG;AACH,eAAO,MAAM,UAAU,cAAe,eAAe,qCAsDlD,CAAA"}
@@ -96,6 +96,9 @@ ${chalk.dim(output.summary)}\n\n`;
96
96
  case "CompactionEnded": {
97
97
  return `${prefix}${chalkInfoHeading(`${infoIcon} Context compacted (${output.reason}):`)} ~${numberFormat.format(output.tokensBefore)} tokens to ~${numberFormat.format(output.tokensAfter)}\n\n`;
98
98
  }
99
+ case "SessionRestarted": {
100
+ return `${prefix}${chalkInfoHeading(`${infoIcon} Session restarted (${output.reason}):`)} ${numberFormat.format(output.contextTokens)} context tokens resent, ${numberFormat.format(output.cacheWrite)} cache write\n\n`;
101
+ }
99
102
  case "EnvironmentUpdated": {
100
103
  return `${prefix}${chalkInfoHeading(`${infoIcon} Environment update:`)}\n\n${chalk.dim(truncate(output.update))}\n\n`;
101
104
  }
@@ -1 +1 @@
1
- {"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
package/dist/Xai.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Xai.d.ts","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,KAAK,aAAa,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,KAAK,iBAAiB,MAAM,6BAA6B,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,WAAW,4MAEmB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,EACrC,WAAW,CACZ,GAAG;IACF,QAAQ,CAAC,SAAS,CAAC,EACjB,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,CAAA;CACxE,GAAG,OAAO,gBAAgB,CAAC,OAAO,CAAA;AAEnC;;;GAGG;AACH,eAAO,MAAM,KAAK,UACT,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,YAAY,CA+BzE,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,UAClB,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CACZ,KAAK,EACH,aAAa,CAAC,aAAa,GAC3B,YAAY,CAAC,YAAY,GACzB,iBAAiB,CAAC,iBAAiB,EACrC,YAAY,CAAC,YAAY,GAAG,MAAM,CAAC,oBAAoB,CAmCtD,CAAA"}
1
+ {"version":3,"file":"Xai.d.ts","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,KAAK,aAAa,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,KAAK,iBAAiB,MAAM,6BAA6B,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,WAAW,4MAEmB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,EACrC,WAAW,CACZ,GAAG;IACF,QAAQ,CAAC,SAAS,CAAC,EACjB,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,CAAA;CACxE,GAAG,OAAO,gBAAgB,CAAC,OAAO,CAAA;AAEnC;;;GAGG;AACH,eAAO,MAAM,KAAK,UACT,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,YAAY,CA6BzE,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,UAClB,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CACZ,KAAK,EACH,aAAa,CAAC,aAAa,GAC3B,YAAY,CAAC,YAAY,GACzB,iBAAiB,CAAC,iBAAiB,EACrC,YAAY,CAAC,YAAY,GAAG,MAAM,CAAC,oBAAoB,CAiCtD,CAAA"}
package/dist/Xai.js CHANGED
@@ -24,18 +24,14 @@ export const model = (model, options) => Model.make("xai", model, Layer.mergeAll
24
24
  config: {
25
25
  ...Struct.omit(options ?? {}, [
26
26
  "reasoning",
27
- "systemPromptTransform",
28
- "supportsImages",
27
+ ...AgentModelConfig.optionKeys,
29
28
  ]),
30
29
  store: options?.store ?? false,
31
30
  reasoning: options?.reasoning === null
32
31
  ? undefined
33
32
  : { effort: "high", ...options?.reasoning },
34
33
  },
35
- }), AgentModelConfig.layer({
36
- systemPromptTransform: options?.systemPromptTransform,
37
- supportsImages: options?.supportsImages,
38
- }),
34
+ }), AgentModelConfig.layer(Struct.pick(options ?? {}, AgentModelConfig.optionKeys)),
39
35
  // Cap compaction summaries; xAI honours max_output_tokens.
40
36
  Layer.succeed(Compaction.SummarizerTransform, (effect) => OpenAiLanguageModel.withConfigOverride(effect, {
41
37
  max_output_tokens: Compaction.summarizerMaxOutputTokens,
@@ -49,8 +45,7 @@ export const modelWebSocket = (model, options) => Model.make("xai", model, Layer
49
45
  config: {
50
46
  ...Struct.omit(options ?? {}, [
51
47
  "reasoning",
52
- "systemPromptTransform",
53
- "supportsImages",
48
+ ...AgentModelConfig.optionKeys,
54
49
  ]),
55
50
  // xAI needs stored responses to resolve previous_response_id.
56
51
  store: true,
@@ -59,10 +54,7 @@ export const modelWebSocket = (model, options) => Model.make("xai", model, Layer
59
54
  ? undefined
60
55
  : { effort: "high", ...options?.reasoning },
61
56
  },
62
- }), AgentModelConfig.layer({
63
- systemPromptTransform: options?.systemPromptTransform,
64
- supportsImages: options?.supportsImages,
65
- }),
57
+ }), AgentModelConfig.layer(Struct.pick(options ?? {}, AgentModelConfig.optionKeys)),
66
58
  // Cap compaction summaries; xAI honours max_output_tokens.
67
59
  Layer.succeed(Compaction.SummarizerTransform, (effect) => OpenAiLanguageModel.withConfigOverride(effect, {
68
60
  max_output_tokens: Compaction.summarizerMaxOutputTokens,
package/dist/Xai.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Xai.js","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Xai.js","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"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"}
@@ -2768,7 +2768,7 @@ const sync$1 = makePrimitive({
2768
2768
  return cont ? cont[contA](value, fiber) : fiber.yieldWith(exitSucceed(value));
2769
2769
  }
2770
2770
  });
2771
- const suspend$1 = makePrimitive({
2771
+ const suspend$2 = makePrimitive({
2772
2772
  op: "Suspend",
2773
2773
  [evaluate](_fiber) {
2774
2774
  const thunk = this[args];
@@ -2796,14 +2796,14 @@ const yieldNowWith = makePrimitive({
2796
2796
  const yieldNow$1 = yieldNowWith(0);
2797
2797
  const succeedSome$1 = (a) => succeed$4(some(a));
2798
2798
  const succeedNone$1 = succeed$4(none());
2799
- const failCauseSync$1 = (evaluate) => suspend$1(() => failCause$3(evaluate()));
2799
+ const failCauseSync$1 = (evaluate) => suspend$2(() => failCause$3(evaluate()));
2800
2800
  const die$3 = (defect) => exitDie(defect);
2801
- const failSync$1 = (error) => suspend$1(() => fail$4(error()));
2801
+ const failSync$1 = (error) => suspend$2(() => fail$4(error()));
2802
2802
  const void_$2 = succeed$4(void 0);
2803
2803
  const try_$1 = (options) => {
2804
2804
  const evaluate = typeof options === "function" ? options : options.try;
2805
2805
  const catcher = typeof options === "function" ? (cause) => new UnknownError$1(cause, "An error occurred in Effect.try") : options.catch;
2806
- return suspend$1(() => {
2806
+ return suspend$2(() => {
2807
2807
  try {
2808
2808
  return succeed$4(evaluate());
2809
2809
  } catch (err) {
@@ -2818,7 +2818,7 @@ const tryPromise$1 = (options) => {
2818
2818
  const f = typeof options === "function" ? options : options.try;
2819
2819
  const catcher = typeof options === "function" ? (cause) => new UnknownError$1(cause, "An error occurred in Effect.tryPromise") : options.catch;
2820
2820
  return callbackOptions(function(resume, signal) {
2821
- const failWithCatch = (cause) => suspend$1(() => {
2821
+ const failWithCatch = (cause) => suspend$2(() => {
2822
2822
  try {
2823
2823
  return fail$4(internalCall(() => catcher(cause)));
2824
2824
  } catch (err) {
@@ -2885,18 +2885,18 @@ const never$1 = callback$1(constVoid);
2885
2885
  const gen$1 = (...args) => {
2886
2886
  if (args.length === 1) {
2887
2887
  const body = args[0];
2888
- return suspend$1(() => fromIteratorUnsafe(body()));
2888
+ return suspend$2(() => fromIteratorUnsafe(body()));
2889
2889
  }
2890
2890
  const [options, body] = args;
2891
- return suspend$1(() => fromIteratorUnsafe(body.call(options.self)));
2891
+ return suspend$2(() => fromIteratorUnsafe(body.call(options.self)));
2892
2892
  };
2893
2893
  const fnBody = (bodyOrOptions, pipeables) => typeof bodyOrOptions === "function" ? bodyOrOptions : pipeables.shift().bind(bodyOrOptions.self);
2894
2894
  const fnUntraced$1 = (bodyOrOptions, ...pipeables) => {
2895
2895
  const body = fnBody(bodyOrOptions, pipeables);
2896
2896
  const fn = pipeables.length === 0 ? function() {
2897
- return suspend$1(() => fromIteratorUnsafe(body.apply(this, arguments)));
2897
+ return suspend$2(() => fromIteratorUnsafe(body.apply(this, arguments)));
2898
2898
  } : function() {
2899
- let effect = suspend$1(() => fromIteratorUnsafe(body.apply(this, arguments)));
2899
+ let effect = suspend$2(() => fromIteratorUnsafe(body.apply(this, arguments)));
2900
2900
  for (let i = 0; i < pipeables.length; i++) effect = pipeables[i](effect, ...arguments);
2901
2901
  return effect;
2902
2902
  };
@@ -2935,7 +2935,7 @@ const makeFn = (name, bodyOrOptions, defError, pipeables, addSpan, spanOptions)
2935
2935
  }
2936
2936
  });
2937
2937
  return defineFunctionLength(body.length, function(...args) {
2938
- let result = suspend$1(() => {
2938
+ let result = suspend$2(() => {
2939
2939
  const iter = body.apply(this, arguments);
2940
2940
  return isEffect$1(iter) ? iter : fromIteratorUnsafe(iter);
2941
2941
  });
@@ -2975,11 +2975,11 @@ const fromIteratorEagerUnsafe = (evaluate) => {
2975
2975
  } else if (primitive && primitive._tag === "Failure") return state.value;
2976
2976
  else {
2977
2977
  let isFirstExecution = true;
2978
- return suspend$1(() => {
2978
+ return suspend$2(() => {
2979
2979
  if (isFirstExecution) {
2980
2980
  isFirstExecution = false;
2981
2981
  return flatMap$2(state.value, (value) => fromIteratorUnsafe(iterator, value));
2982
- } else return suspend$1(() => fromIteratorUnsafe(evaluate()));
2982
+ } else return suspend$2(() => fromIteratorUnsafe(evaluate()));
2983
2983
  });
2984
2984
  }
2985
2985
  }
@@ -3423,7 +3423,7 @@ const scopeForkUnsafe = (scope, finalizerStrategy) => {
3423
3423
  return child;
3424
3424
  };
3425
3425
  const scopeAddFinalizerExit = (scope, finalizer) => {
3426
- return suspend$1(() => {
3426
+ return suspend$2(() => {
3427
3427
  if (scope.state._tag === "Closed") return finalizer(scope.state.exit);
3428
3428
  scopeAddFinalizerUnsafe(scope, {}, finalizer);
3429
3429
  return void_$2;
@@ -3478,9 +3478,9 @@ const scoped$1 = (self) => withFiber$1((fiber) => {
3478
3478
  });
3479
3479
  return self;
3480
3480
  });
3481
- const scopedWith$1 = (f) => suspend$1(() => {
3481
+ const scopedWith$1 = (f) => suspend$2(() => {
3482
3482
  const scope = scopeMakeUnsafe();
3483
- return onExit$1(f(scope), (exit) => suspend$1(() => scopeCloseUnsafe(scope, exit) ?? void_$2));
3483
+ return onExit$1(f(scope), (exit) => suspend$2(() => scopeCloseUnsafe(scope, exit) ?? void_$2));
3484
3484
  });
3485
3485
  const acquireRelease$1 = (acquire, release, options) => contextWith$1((context) => uninterruptibleMask$1((restore) => flatMap$2(scope$1, (scope) => tap$1(options?.interruptible ? restore(acquire) : acquire, (a) => scopeAddFinalizerExit(scope, (exit) => provideContext$1(release(a, exit), context))))));
3486
3486
  const addFinalizer$2 = (finalizer) => flatMap$2(scope$1, (scope) => contextWith$1((context) => scopeAddFinalizerExit(scope, (exit) => provideContext$1(finalizer(exit), context))));
@@ -3543,7 +3543,7 @@ const onErrorFilter = dual(3, (self, filter, f) => onExit$1(self, (exit) => {
3543
3543
  return isFailure$1(result) ? void_$2 : f(result.success, exit.cause);
3544
3544
  }));
3545
3545
  const onInterrupt$1 = dual(2, (self, finalizer) => onErrorFilter(causeFilterInterruptors, finalizer)(self));
3546
- const acquireUseRelease$1 = (acquire, use, release) => uninterruptibleMask$1((restore) => flatMap$2(acquire, (a) => onExitPrimitive$1(suspend$1(() => restore(use(a))), (exit) => release(a, exit), true)));
3546
+ const acquireUseRelease$1 = (acquire, use, release) => uninterruptibleMask$1((restore) => flatMap$2(acquire, (a) => onExitPrimitive$1(suspend$2(() => restore(use(a))), (exit) => release(a, exit), true)));
3547
3547
  const cachedInvalidateWithTTL = dual(2, (self, ttl) => sync$1(() => makeCachedUnsafe(self, typeof ttl === "function" ? (exit) => toMillis(fromInputUnsafe(ttl(exit))) : constant(toMillis(fromInputUnsafe(ttl))))));
3548
3548
  const infiniteTTL = constant(Infinity);
3549
3549
  const makeCachedUnsafe = (self, ttlMillis) => {
@@ -3628,7 +3628,7 @@ const uninterruptibleMask$1 = (f) => withFiber$1((fiber) => {
3628
3628
  const all$1 = (arg, options) => {
3629
3629
  if (isIterable(arg)) return options?.mode === "result" ? forEach$2(arg, result$1, options) : forEach$2(arg, identity, options);
3630
3630
  else if (options?.discard) return options.mode === "result" ? forEach$2(Object.values(arg), result$1, options) : forEach$2(Object.values(arg), identity, options);
3631
- return suspend$1(() => map$2(forEach$2(Object.entries(arg), ([key, effect]) => map$2(options?.mode === "result" ? result$1(effect) : effect, (value) => [key, value]), { concurrency: options?.concurrency }), Object.fromEntries));
3631
+ return suspend$2(() => map$2(forEach$2(Object.entries(arg), ([key, effect]) => map$2(options?.mode === "result" ? result$1(effect) : effect, (value) => [key, value]), { concurrency: options?.concurrency }), Object.fromEntries));
3632
3632
  };
3633
3633
  const whileLoop$1 = makePrimitive({
3634
3634
  op: "While",
@@ -3648,7 +3648,7 @@ const whileLoop$1 = makePrimitive({
3648
3648
  return exitVoid;
3649
3649
  }
3650
3650
  });
3651
- const forEach$2 = dual((args) => typeof args[1] === "function", (iterable, f, options) => suspend$1(() => {
3651
+ const forEach$2 = dual((args) => typeof args[1] === "function", (iterable, f, options) => suspend$2(() => {
3652
3652
  const concurrency = resolveConcurrency(options?.concurrency);
3653
3653
  if (concurrency === 1) return forEachSequential(iterable, f, options);
3654
3654
  const items = fromIterable$1(iterable);
@@ -3661,7 +3661,7 @@ const forEach$2 = dual((args) => typeof args[1] === "function", (iterable, f, op
3661
3661
  }, items, { concurrency });
3662
3662
  return eff ? as$1(eff, out) : succeed$4(out);
3663
3663
  }));
3664
- const forEachSequential = (iterable, f, options) => suspend$1(() => {
3664
+ const forEachSequential = (iterable, f, options) => suspend$2(() => {
3665
3665
  const out = options?.discard ? void 0 : [];
3666
3666
  const iterator = iterable[Symbol.iterator]();
3667
3667
  let state = iterator.next();
@@ -3730,7 +3730,7 @@ const iterateConcurrentImpl = (options) => {
3730
3730
  return cb(failDefect(error));
3731
3731
  }
3732
3732
  if (result) return cb(result);
3733
- return suspend$1(() => {
3733
+ return suspend$2(() => {
3734
3734
  terminal ??= exitVoid;
3735
3735
  return flatMap$2(fibers ? fiberInterruptAll(fibers) : void_$2, () => terminal?._tag === "Failure" ? terminal : void_$2);
3736
3736
  });
@@ -4379,7 +4379,7 @@ const makeMemoMapEntry = (memoMap, layer) => {
4379
4379
  observers: 0,
4380
4380
  deferred: makeUnsafe$1(),
4381
4381
  scope: makeUnsafe(),
4382
- finalizer: (exit) => suspend$1(() => {
4382
+ finalizer: (exit) => suspend$2(() => {
4383
4383
  if (--entry.observers > 0) return void_$2;
4384
4384
  memoMap.map.delete(layer);
4385
4385
  return close(entry.scope, exit);
@@ -4434,9 +4434,9 @@ var MemoMapImpl = class {
4434
4434
  return this.parent?.get(layer, scope);
4435
4435
  }
4436
4436
  getOrElseMemoize(layer, scope, build) {
4437
- return suspend$1(() => {
4437
+ return suspend$2(() => {
4438
4438
  let deferred;
4439
- return onExitPrimitive$1(suspend$1(() => {
4439
+ return onExitPrimitive$1(suspend$2(() => {
4440
4440
  const existing = this.get(layer, scope);
4441
4441
  if (existing) return existing;
4442
4442
  const entry = makeMemoMapEntry(this, layer);
@@ -4458,7 +4458,7 @@ var CurrentMemoMap = class CurrentMemoMap extends Service()("effect/Layer/Curren
4458
4458
  return current ? forkMemoMapUnsafe(current) : makeMemoMapUnsafe();
4459
4459
  }
4460
4460
  };
4461
- const buildWithMemoMap = dual(3, (self, memoMap, scope) => provideService$1(map$2(suspend$1(() => self.build(memoMap, scope)), add(CurrentMemoMap, memoMap)), CurrentMemoMap, memoMap));
4461
+ const buildWithMemoMap = dual(3, (self, memoMap, scope) => provideService$1(map$2(suspend$2(() => self.build(memoMap, scope)), add(CurrentMemoMap, memoMap)), CurrentMemoMap, memoMap));
4462
4462
  const build = (self) => withFiber$1((fiber) => buildWithMemoMap(self, CurrentMemoMap.forkOrCreate(fiber.context), getUnsafe$1(fiber.context, Scope)));
4463
4463
  const buildWithScope = dual(2, (self, scope) => withFiber$1((fiber) => buildWithMemoMap(self, CurrentMemoMap.forkOrCreate(fiber.context), scope)));
4464
4464
  const succeed$1 = function() {
@@ -4474,6 +4474,7 @@ const effect = function() {
4474
4474
  const effectImpl = (service, effect) => effectContext(map$2(effect, (value) => make$5(service, value)));
4475
4475
  const effectContext = (effect) => fromBuildMemo((_, scope) => provide$3(effect, scope));
4476
4476
  const effectDiscard = (effect) => effectContext(as$1(effect, empty$4()));
4477
+ const suspend$1 = (evaluate) => fromBuildMemo((memoMap, scope) => suspend$2(() => evaluate().build(memoMap, scope)));
4477
4478
  const unwrapKey = Service("effect/Layer/unwrap");
4478
4479
  const unwrap = (self) => flatMap$1(effect(unwrapKey)(self), get$1(unwrapKey));
4479
4480
  const mergeAllEffect = (layers, memoMap, scope) => {
@@ -4684,7 +4685,7 @@ const fromStepWithMetadata = (step) => fromStep(map$2(step, (f) => {
4684
4685
  const toStep = (schedule) => catchCause$1(schedule.step, (cause) => succeed$4(() => failCause$3(cause)));
4685
4686
  const toStepWithMetadata = (schedule) => clockWith((clock) => map$2(toStep(schedule), (step) => {
4686
4687
  const metaFn = metadataFn();
4687
- return (input) => suspend$1(() => {
4688
+ return (input) => suspend$2(() => {
4688
4689
  const now = clock.currentTimeMillisUnsafe();
4689
4690
  return flatMap$2(step(now, input), ([output, duration]) => {
4690
4691
  const meta = metaFn(now, input);
@@ -4771,7 +4772,7 @@ const repeatOrElse = dual(3, (self, schedule, orElse) => flatMap$2(toStepWithMet
4771
4772
  const retryOrElse = dual(3, (self, policy, orElse) => flatMap$2(toStepWithMetadata(policy), (step) => {
4772
4773
  let meta = CurrentMetadata.defaultValue();
4773
4774
  let lastError;
4774
- const loop = catchCauseFilter(suspend$1(() => provideService$1(self, CurrentMetadata, meta)), findRecoverableError, (error) => {
4775
+ const loop = catchCauseFilter(suspend$2(() => provideService$1(self, CurrentMetadata, meta)), findRecoverableError, (error) => {
4775
4776
  lastError = error;
4776
4777
  return flatMap$2(step(error), (meta_) => {
4777
4778
  meta = meta_;
@@ -4957,7 +4958,7 @@ const makeBatch = (key, context, resolver, map) => {
4957
4958
  batch.fiber = delayFiber;
4958
4959
  return batch.resolver.delay;
4959
4960
  }), (_) => runBatch(batch)),
4960
- run: onExit$1(suspend$1(() => batch.resolver.runAll(Array.from(batch.entries), batch.key)), (exit) => {
4961
+ run: onExit$1(suspend$2(() => batch.resolver.runAll(Array.from(batch.entries), batch.key)), (exit) => {
4961
4962
  for (const entry of batch.entrySet) entry.completeUnsafe(exit._tag === "Success" ? exitDie(new Error("Effect.request: RequestResolver did not complete request", { cause: entry.request })) : exit);
4962
4963
  batch.entries.clear();
4963
4964
  return void_$2;
@@ -5037,7 +5038,7 @@ const tryPromise = tryPromise$1;
5037
5038
  const succeed = succeed$4;
5038
5039
  const succeedNone = succeedNone$1;
5039
5040
  const succeedSome = succeedSome$1;
5040
- const suspend = suspend$1;
5041
+ const suspend = suspend$2;
5041
5042
  const sync = sync$1;
5042
5043
  const void_ = void_$2;
5043
5044
  const undefined_ = undefined_$1;
@@ -5179,6 +5180,6 @@ const mapBothEager = mapBothEager$1;
5179
5180
  const flatMapEager = flatMapEager$1;
5180
5181
  const catchEager = catchEager$1;
5181
5182
  const fnUntracedEager = fnUntracedEager$1;
5182
- export { ignoreCause as $, try_$2 as $a, resolveConcurrency as $i, TimeoutError as $n, some as $o, _await as $r, random$1 as $s, tapError as $t, ensuring as A, isReadonlyArrayNonEmpty as Aa, constant as Ac, exitHasInterrupts as Ai, size as An, omit as Ao, empty$1 as Ar, getStackTraceLimit as As, raceFirst as At, fn as B, span as Ba, findRecoverableError as Bi, doneExitFromCause as Bn, getOrElse$1 as Bo, unwrap as Br, formatPropertyKey as Bs, scope as Bt, catchTags as C, findLast as Ca, isUndefined as Cc, andThen$1 as Ci, empty as Cn, getOption as Co, reasonAnnotations as Cr, exitFailCause as Cs, option as Ct, delay as D, isArray as Da, constTrue as Dc, currentTimeMillis as Di, make as Dn, make$5 as Do, effect as Dr, withFiber$1 as Ds, provide as Dt, contextWith as E, headNonEmpty as Ea, constFalse as Ec, contextWith$1 as Ei, isEmpty as En, getUnsafe$1 as Eo, buildWithScope as Er, makePrimitive as Es, promise as Et, failSync as F, map$3 as Fa, memoizeIdempotent as Fc, fiberInterrupt as Fi, jittered as Fn, flatMapNullishOr$1 as Fo, orDie$1 as Fr, toJson as Fs, runFork as Ft, forkChild as G, flatMap$4 as Ga, iterateEager as Gi, nextPow2 as Gn, isOption as Go, fork as Gr, byReferenceUnsafe as Gs, sleep as Gt, fnUntracedEager as H, headUnsafe as Ha, forkUnsafe$1 as Hi, isDoneCause as Hn, getOrThrow$1 as Ho, addFinalizer$1 as Hr, redact as Hs, scopedWith as Ht, filterOrFail as I, match$2 as Ia, pipe as Ic, fiberInterruptAll as Ii, min as In, flatten$3 as Io, provide$2 as Ir, format$1 as Is, runForkWith as It, forkScoped as J, isFailure$1 as Ja, makeSpanUnsafe as Ji, round as Jn, map$5 as Jo, makeUnsafe as Jr, array as Js, succeedSome as Jt, forkDetach as K, getOrThrow as Ka, makeLatch as Ki, parse as Kn, isSome as Ko, forkUnsafe as Kr, equals$1 as Ks, succeed as Kt, flatMap as L, of as La, Class$2 as Lc, fiberInterruptAllAs as Li, spaced as Ln, fromNullOr as Lo, provideMerge as Lr, formatDate as Ls, runPromiseWith as Lt, fail as M, last as Ma, flow as Mc, exitVoid as Mi, forever$1 as Mn, exists as Mo, merge as Mr, BaseProto as Ms, request as Mt, failCause as N, lastNonEmpty as Na, identity as Nc, exitZipRight as Ni, fromStep as Nn, filter as No, mergeAll as Nr, Class$1 as Ns, result as Nt, die as O, isArrayNonEmpty as Oa, constUndefined as Oc, effectIsExit as Oi, remove as On, makeUnsafe$2 as Oo, effectContext as Or, assignProperties as Os, provideContext as Ot, failCauseSync as P, makeEquivalence as Pa, memoize as Pc, fiberAwait as Pi, isSchedule as Pn, flatMap$5 as Po, mock as Pr, NodeInspectSymbol as Ps, retry as Pt, ignore as Q, succeed$5 as Qa, onExitUnsafe as Qi, StackTrace as Qn, orElseSome as Qo, TracerTimingEnabled as Qr, optimize as Qs, tapCause as Qt, flatMapEager as R, reduce as Ra, Prototype$1 as Rc, fiberJoin as Ri, toStep as Rn, fromNullishOr$1 as Ro, succeed$1 as Rr, formatJson as Rs, runSync as Rt, catchTag as S, findFirstIndex as Sa, isTagged as Sc, LogToStderr as Si, TaggedClass as Sn, get$1 as So, pretty as Sr, exitFail as Ss, onInterrupt as St, context as T, fromIterable$1 as Ta, or as Tc, callback$1 as Ti, get as Tn, getOrUndefinedUnsafe as To, build as Tr, isExit$1 as Ts, orElseSucceed as Tt, forEach as U, fail$5 as Ua, getCurrentFiber as Ui, matchEffect$1 as Un, getOrUndefined$2 as Uo, addFinalizerExit as Ur, symbolRedactable as Us, service as Ut, fnUntraced as V, empty$3 as Va, flatMap$2 as Vi, filterDone as Vn, getOrNull as Vo, Scope as Vr, currentFiberTypeId as Vs, scoped as Vt, forever as W, failVoid as Wa, iterateConcurrent as Wi, Random as Wn, isNone as Wo, close as Wr, asEquivalence as Ws, serviceOption as Wt, fromResult as X, map$4 as Xa, monotonicTimeNanos as Xi, IllegalArgumentError as Xn, none as Xo, CurrentLogAnnotations as Xr, hash as Xs, sync as Xt, fromOption as Y, isSuccess$1 as Ya, map$2 as Yi, Done as Yn, match$5 as Yo, provide$3 as Yr, combine$1 as Ys, suspend as Yt, gen as Z, match$3 as Za, onExitPrimitive$1 as Zi, NoSuchElementError as Zn, orElse as Zo, MinimumLogLevel as Zr, number as Zs, tap as Zt, catchEager as _, appendAll as _a, isObject as _c, isSuccess as _i, withSpan as _n, zero as _o, isTimeoutError as _r, PipeInspectableProto as _s, matchEffect as _t, andThen as a, sync$1 as aa, isBigInt as ac, isDoneUnsafe as ai, undefined_ as an, infinity as ao, fail$1 as ar, isGreaterThan as as, logFatal as at, catchNoSuchElement as b, ensure as ba, isString as bc, ClockRef as bi, equalBatchKeys as bn, add as bo, makeInterruptReason as br, causeFail as bs, onExit as bt, as as c, void_$2 as ca, isFunction as cc, succeed$2 as ci, updateContext as cn, isZero as co, fromReasons as cr, isLessThanOrEqualTo as cs, makeSpanScoped as ct, cached as d, encode as da, isNotNull as dc, fail$3 as di, void_ as dn, minutes as do, interruptors as dr, Tuple as ds, mapEager as dt, scope$1 as ea, string as ec, doneUnsafe as ei, timeout as en, normalize as eo, UnknownError as er, toArray as es, interrupt as et, cachedWithTTL as f, compose as fa, isNotNullish as fc, failCause$2 as fi, when as fn, nanos as fo, isCause as fr, make$7 as fs, mapError as ft, catchDefect as g, append as ga, isNumber as gc, isFailure as gi, withParentSpan as gn, toSeconds as go, isReason as gr, Error$1 as gs, matchCauseEffect as gt, catchCauseIf as h, Array$1 as ha, isNullish as hc, isExit as hi, withLogSpan as hn, toMillis as ho, isFailReason as hr, Done$1 as hs, matchCauseEager as ht, all as i, suspend$1 as ia, hasProperty as ic, isDone$1 as ii, try_ as in, hours as io, done as ir, String$1 as is, logError as it, exit as j, join as ja, dual as jc, exitInterrupt as ji, exponential as jn, all$2 as jo, fresh as jr, setStackTraceLimit as js, repeat as jt, effectify as k, isCanonicalArrayIndex as ka, constVoid as kc, endSpan as ki, set as kn, merge$1 as ko, effectDiscard as kr, assignProperty as ks, provideService as kt, asSome as l, DisablePropagation as la, isIterable as lc, asVoidAll as li, updateService as ln, max as lo, hasInterrupts as lr, make$6 as ls, map as lt, catchCause as m, toPredicate as ma, isNull as mc, interrupt$1 as mi, withFiber as mn, seconds as mo, isDone as mr, Prototype as ms, match as mt, acquireUseRelease as n, succeed$4 as na, structureKeys as nc, interruptWith as ni, timeoutOrElse as nn, format as no, combine as nr, Date$1 as ns, isEffect as nt, annotateCurrentSpan as o, uninterruptibleMask$1 as oa, isBoolean as oc, make$2 as oi, uninterruptible as on, isDuration as oo, filterInterruptors as or, isGreaterThanOrEqualTo as os, logInfo as ot, callback as p, has$1 as pa, isNotUndefined as pc, findErrorOption$1 as pi, whileLoop as pn, negativeInfinity as po, isDieReason as pr, strictEqual as ps, mapErrorEager as pt, forkIn as q, getOrUndefined as qa, makeLatchUnsafe as qi, remainder as qn, liftThrowable as qo, make$1 as qr, symbol as qs, succeedNone as qt, addFinalizer as r, succeedNone$1 as ra, symbol$1 as rc, into as ri, tryPromise as rn, fromInputUnsafe as ro, die$1 as rr, Number$2 as rs, logDebug as rt, annotateLogs as s, updateContext$1 as sa, isError as sc, makeUnsafe$1 as si, uninterruptibleMask as sn, isFinite as so, findErrorOption as sr, isLessThan as ss, logWarning as st, acquireRelease as t, scopeAddFinalizer as ta, structure as tc, fail$2 as ti, timeoutOption as tn, normalizeNonEmpty as to, annotate as tr, BigInt$1 as ts, interruptible as tt, asVoid as u, ParentSpan as ua, isNever as uc, die$2 as ui, useSpan as un, millis as uo, hasInterruptsOnly as ur, mapInput as us, mapBothEager as ut, catchFilter as v, dedupe as va, isObjectKeyword as vc, succeed$3 as vi, yieldNow as vn, Reference as vo, makeDieReason as vr, TaggedError as vs, never as vt, catch_ as w, flatMapNullishOr as wa, isUnknown as wc, asSome$1 as wi, forEach$1 as wn, getOrUndefined$1 as wo, squash as wr, exitSucceed as ws, orDie as wt, catchReason as x, findFirst as xa, isSymbol as xc, ConsoleRef as xi, Class as xn, empty$4 as xo, map$1 as xr, evaluate as xs, onExitPrimitive as xt, catchIf as y, empty$2 as ya, isPropertyKey as yc, void_$1 as yi, zipWith as yn, Service as yo, makeFailReason as yr, args as ys, onError as yt, flatten as z, sort as za, pipeArguments as zc, fiberRunIn as zi, catchDone as zn, fromUndefinedOr as zo, succeedContext as zr, formatPath as zs, runSyncExit as zt };
5183
+ export { ignoreCause as $, succeed$5 as $a, onExitUnsafe as $i, TimeoutError as $n, orElseSome as $o, TracerTimingEnabled as $r, optimize as $s, tapError as $t, ensuring as A, isCanonicalArrayIndex as Aa, constVoid as Ac, endSpan as Ai, size as An, merge$1 as Ao, empty$1 as Ar, assignProperty as As, raceFirst as At, fn as B, sort as Ba, pipeArguments as Bc, fiberRunIn as Bi, doneExitFromCause as Bn, fromUndefinedOr as Bo, suspend$1 as Br, formatPath as Bs, scope as Bt, catchTags as C, findFirstIndex as Ca, isTagged as Cc, LogToStderr as Ci, empty as Cn, get$1 as Co, reasonAnnotations as Cr, exitFail as Cs, option as Ct, delay as D, headNonEmpty as Da, constFalse as Dc, contextWith$1 as Di, make as Dn, getUnsafe$1 as Do, effect as Dr, makePrimitive as Ds, provide as Dt, contextWith as E, fromIterable$1 as Ea, or as Ec, callback$1 as Ei, isEmpty as En, getOrUndefinedUnsafe as Eo, buildWithScope as Er, isExit$1 as Es, promise as Et, failSync as F, makeEquivalence as Fa, memoize as Fc, fiberAwait as Fi, jittered as Fn, flatMap$5 as Fo, orDie$1 as Fr, NodeInspectSymbol as Fs, runFork as Ft, forkChild as G, failVoid as Ga, iterateConcurrent as Gi, nextPow2 as Gn, isNone as Go, close as Gr, asEquivalence as Gs, sleep as Gt, fnUntracedEager as H, empty$3 as Ha, flatMap$2 as Hi, isDoneCause as Hn, getOrNull as Ho, Scope as Hr, currentFiberTypeId as Hs, scopedWith as Ht, filterOrFail as I, map$3 as Ia, memoizeIdempotent as Ic, fiberInterrupt as Ii, min as In, flatMapNullishOr$1 as Io, provide$2 as Ir, toJson as Is, runForkWith as It, forkScoped as J, getOrUndefined as Ja, makeLatchUnsafe as Ji, round as Jn, liftThrowable as Jo, make$1 as Jr, symbol as Js, succeedSome as Jt, forkDetach as K, flatMap$4 as Ka, iterateEager as Ki, parse as Kn, isOption as Ko, fork as Kr, byReferenceUnsafe as Ks, succeed as Kt, flatMap as L, match$2 as La, pipe as Lc, fiberInterruptAll as Li, spaced as Ln, flatten$3 as Lo, provideMerge as Lr, format$1 as Ls, runPromiseWith as Lt, fail as M, join as Ma, dual as Mc, exitInterrupt as Mi, forever$1 as Mn, all$2 as Mo, merge as Mr, setStackTraceLimit as Ms, request as Mt, failCause as N, last as Na, flow as Nc, exitVoid as Ni, fromStep as Nn, exists as No, mergeAll as Nr, BaseProto as Ns, result as Nt, die as O, isArray as Oa, constTrue as Oc, currentTimeMillis as Oi, remove as On, make$5 as Oo, effectContext as Or, withFiber$1 as Os, provideContext as Ot, failCauseSync as P, lastNonEmpty as Pa, identity as Pc, exitZipRight as Pi, isSchedule as Pn, filter as Po, mock as Pr, Class$1 as Ps, retry as Pt, ignore as Q, match$3 as Qa, onExitPrimitive$1 as Qi, StackTrace as Qn, orElse as Qo, MinimumLogLevel as Qr, number as Qs, tapCause as Qt, flatMapEager as R, of as Ra, Class$2 as Rc, fiberInterruptAllAs as Ri, toStep as Rn, fromNullOr as Ro, succeed$1 as Rr, formatDate as Rs, runSync as Rt, catchTag as S, findFirst as Sa, isSymbol as Sc, ConsoleRef as Si, TaggedClass as Sn, empty$4 as So, pretty as Sr, evaluate as Ss, onInterrupt as St, context as T, flatMapNullishOr as Ta, isUnknown as Tc, asSome$1 as Ti, get as Tn, getOrUndefined$1 as To, build as Tr, exitSucceed as Ts, orElseSucceed as Tt, forEach as U, headUnsafe as Ua, forkUnsafe$1 as Ui, matchEffect$1 as Un, getOrThrow$1 as Uo, addFinalizer$1 as Ur, redact as Us, service as Ut, fnUntraced as V, span as Va, findRecoverableError as Vi, filterDone as Vn, getOrElse$1 as Vo, unwrap as Vr, formatPropertyKey as Vs, scoped as Vt, forever as W, fail$5 as Wa, getCurrentFiber as Wi, Random as Wn, getOrUndefined$2 as Wo, addFinalizerExit as Wr, symbolRedactable as Ws, serviceOption as Wt, fromResult as X, isSuccess$1 as Xa, map$2 as Xi, IllegalArgumentError as Xn, match$5 as Xo, provide$3 as Xr, combine$1 as Xs, sync as Xt, fromOption as Y, isFailure$1 as Ya, makeSpanUnsafe as Yi, Done as Yn, map$5 as Yo, makeUnsafe as Yr, array as Ys, suspend as Yt, gen as Z, map$4 as Za, monotonicTimeNanos as Zi, NoSuchElementError as Zn, none as Zo, CurrentLogAnnotations as Zr, hash as Zs, tap as Zt, catchEager as _, append as _a, isNumber as _c, isFailure as _i, withSpan as _n, toSeconds as _o, isTimeoutError as _r, Error$1 as _s, matchEffect as _t, andThen as a, suspend$2 as aa, hasProperty as ac, isDone$1 as ai, undefined_ as an, hours as ao, fail$1 as ar, String$1 as as, logFatal as at, catchNoSuchElement as b, empty$2 as ba, isPropertyKey as bc, void_$1 as bi, equalBatchKeys as bn, Service as bo, makeInterruptReason as br, args as bs, onExit as bt, as as c, updateContext$1 as ca, isError as cc, makeUnsafe$1 as ci, updateContext as cn, isFinite as co, fromReasons as cr, isLessThan as cs, makeSpanScoped as ct, cached as d, ParentSpan as da, isNever as dc, die$2 as di, void_ as dn, millis as do, interruptors as dr, mapInput as ds, mapEager as dt, resolveConcurrency as ea, random$1 as ec, _await as ei, timeout as en, try_$2 as eo, UnknownError as er, some as es, interrupt as et, cachedWithTTL as f, encode as fa, isNotNull as fc, fail$3 as fi, when as fn, minutes as fo, isCause as fr, Tuple as fs, mapError as ft, catchDefect as g, Array$1 as ga, isNullish as gc, isExit as gi, withParentSpan as gn, toMillis as go, isReason as gr, Done$1 as gs, matchCauseEffect as gt, catchCauseIf as h, toPredicate as ha, isNull as hc, interrupt$1 as hi, withLogSpan as hn, seconds as ho, isFailReason as hr, Prototype as hs, matchCauseEager as ht, all as i, succeedNone$1 as ia, symbol$1 as ic, into as ii, try_ as in, fromInputUnsafe as io, done as ir, Number$2 as is, logError as it, exit as j, isReadonlyArrayNonEmpty as ja, constant as jc, exitHasInterrupts as ji, exponential as jn, omit as jo, fresh as jr, getStackTraceLimit as js, repeat as jt, effectify as k, isArrayNonEmpty as ka, constUndefined as kc, effectIsExit as ki, set as kn, makeUnsafe$2 as ko, effectDiscard as kr, assignProperties as ks, provideService as kt, asSome as l, void_$2 as la, isFunction as lc, succeed$2 as li, updateService as ln, isZero as lo, hasInterrupts as lr, isLessThanOrEqualTo as ls, map as lt, catchCause as m, has$1 as ma, isNotUndefined as mc, findErrorOption$1 as mi, withFiber as mn, negativeInfinity as mo, isDone as mr, strictEqual as ms, match as mt, acquireUseRelease as n, scopeAddFinalizer as na, structure as nc, fail$2 as ni, timeoutOrElse as nn, normalizeNonEmpty as no, combine as nr, BigInt$1 as ns, isEffect as nt, annotateCurrentSpan as o, sync$1 as oa, isBigInt as oc, isDoneUnsafe as oi, uninterruptible as on, infinity as oo, filterInterruptors as or, isGreaterThan as os, logInfo as ot, callback as p, compose as pa, isNotNullish as pc, failCause$2 as pi, whileLoop as pn, nanos as po, isDieReason as pr, make$7 as ps, mapErrorEager as pt, forkIn as q, getOrThrow as qa, makeLatch as qi, remainder as qn, isSome as qo, forkUnsafe as qr, equals$1 as qs, succeedNone as qt, addFinalizer as r, succeed$4 as ra, structureKeys as rc, interruptWith as ri, tryPromise as rn, format as ro, die$1 as rr, Date$1 as rs, logDebug as rt, annotateLogs as s, uninterruptibleMask$1 as sa, isBoolean as sc, make$2 as si, uninterruptibleMask as sn, isDuration as so, findErrorOption as sr, isGreaterThanOrEqualTo as ss, logWarning as st, acquireRelease as t, scope$1 as ta, string as tc, doneUnsafe as ti, timeoutOption as tn, normalize as to, annotate as tr, toArray as ts, interruptible as tt, asVoid as u, DisablePropagation as ua, isIterable as uc, asVoidAll as ui, useSpan as un, max as uo, hasInterruptsOnly as ur, make$6 as us, mapBothEager as ut, catchFilter as v, appendAll as va, isObject as vc, isSuccess as vi, yieldNow as vn, zero as vo, makeDieReason as vr, PipeInspectableProto as vs, never as vt, catch_ as w, findLast as wa, isUndefined as wc, andThen$1 as wi, forEach$1 as wn, getOption as wo, squash as wr, exitFailCause as ws, orDie as wt, catchReason as x, ensure as xa, isString as xc, ClockRef as xi, Class as xn, add as xo, map$1 as xr, causeFail as xs, onExitPrimitive as xt, catchIf as y, dedupe as ya, isObjectKeyword as yc, succeed$3 as yi, zipWith as yn, Reference as yo, makeFailReason as yr, TaggedError as ys, onError as yt, flatten as z, reduce as za, Prototype$1 as zc, fiberJoin as zi, catchDone as zn, fromNullishOr$1 as zo, succeedContext as zr, formatJson as zs, runSyncExit as zt };
5183
5184
 
5184
- //# sourceMappingURL=Effect-DNYYQ84C.mjs.map
5185
+ //# sourceMappingURL=Effect-5XYMLOiB.mjs.map