diff --git a/bun.lock b/bun.lock index 0d6a3e4..7fdfa15 100644 --- a/bun.lock +++ b/bun.lock @@ -380,7 +380,7 @@ "@pulumi/pulumi": "3.231.0", "ai": "6.0.199", "commander": "14.0.3", - "effect": "4.0.0-beta.107", + "effect": "4.0.0", "minimatch": "10.1.1", "typescript": "5.9.3", "zod": "4.5.4", @@ -692,17 +692,17 @@ "@mongodb-js/zstd": ["@mongodb-js/zstd@7.0.0", "", { "dependencies": { "node-addon-api": "^8.5.0", "prebuild-install": "^7.1.3" } }, "sha512-mQ2s0pYYiav+tzCDR05Zptem8Ey2v8s11lri5RKGhTtL4COVCvVCk5vtyRYNT+9L8qSfyOqqefF9UtnW8mC5jA=="], - "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="], + "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw=="], - "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="], + "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw=="], - "@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/msgpackr-extract-linux-arm@3.0.4", "", { "os": "linux", "cpu": "arm" }, "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw=="], + "@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3", "", { "os": "linux", "cpu": "arm" }, "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw=="], - "@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw=="], + "@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg=="], - "@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/msgpackr-extract-linux-x64@3.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ=="], + "@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg=="], - "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="], + "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3", "", { "os": "win32", "cpu": "x64" }, "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ=="], "@neophi/sieve-cache": ["@neophi/sieve-cache@1.5.0", "", {}, "sha512-9T3nD5q51X1d4QYW6vouKW9hBSb2Tb/wB/2XoTr4oP5SCGtp3a7aTHHewQFylred1B21/Bhev6gy4x01FPBcbQ=="], @@ -1434,7 +1434,7 @@ "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], - "effect": ["effect@4.0.0-beta.107", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.9.0", "kubernetes-types": "^1.30.0", "msgpackr": "^2.0.4", "uuid": "^14.0.1" } }, "sha512-OoBAv8eF+yanc+C6xhgEUnWeXUSHA6ynnscYqpkAY9GSnzZWystsIjBowVqCkLpHGlnRtdIqYT3wHwpOY6JDnQ=="], + "effect": ["effect@4.0.0", "", {}, "sha512-ooc1TG5t+FfzgYnFz2ff6BBKyZ7EwBRVXC7c4RhQUAD6/TZ2gTXXMeb4WX7a19ozQo4J73/QW+S00YAIresoMQ=="], "electron-to-chromium": ["electron-to-chromium@1.5.344", "", {}, "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg=="], @@ -1666,8 +1666,6 @@ "kind-of": ["kind-of@6.0.3", "", {}, "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="], - "kubernetes-types": ["kubernetes-types@1.30.0", "", {}, "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q=="], - "langium": ["langium@4.2.2", "", { "dependencies": { "@chevrotain/regexp-to-ast": "~12.0.0", "chevrotain": "~12.0.0", "chevrotain-allstar": "~0.4.1", "vscode-languageserver": "~9.0.1", "vscode-languageserver-textdocument": "~1.0.11", "vscode-uri": "~3.1.0" } }, "sha512-JUshTRAfHI4/MF9dH2WupvjSXyn8JBuUEWazB8ZVJUtXutT0doDlAv1XKbZ1Pb5sMexa8FF4CFBc0iiul7gbUQ=="], "layout-base": ["layout-base@1.0.2", "", {}, "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="], @@ -1818,9 +1816,9 @@ "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], - "msgpackr": ["msgpackr@2.0.5", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-cef05H/dSYpLpqp3sj/qyZh5vhUYCalnaLO7j1yOmpsR0y/XwLVtK7r5gn+U/F7CTEfMowcGhlUQJDLcLf7jcA=="], + "msgpackr": ["msgpackr@1.11.9", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.2" } }, "sha512-FkoAAyyA6HM8wL882EcEyFZ9s7hVADSwG9xrVx3dxxNQAtgADTrJoEWivID82Iv1zWDsv/OtbrrcZAzGzOMdNw=="], - "msgpackr-extract": ["msgpackr-extract@3.0.4", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw=="], + "msgpackr-extract": ["msgpackr-extract@3.0.3", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA=="], "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], @@ -2454,8 +2452,6 @@ "diffie-hellman/bn.js": ["bn.js@4.12.3", "", {}, "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g=="], - "effect/uuid": ["uuid@14.0.1", "", { "bin": { "uuid": "dist-node/bin/uuid" } }, "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew=="], - "elliptic/bn.js": ["bn.js@4.12.3", "", {}, "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g=="], "foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], @@ -2472,8 +2468,6 @@ "katex/commander": ["commander@8.3.0", "", {}, "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="], - "lmdb/msgpackr": ["msgpackr@1.11.9", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.2" } }, "sha512-FkoAAyyA6HM8wL882EcEyFZ9s7hVADSwG9xrVx3dxxNQAtgADTrJoEWivID82Iv1zWDsv/OtbrrcZAzGzOMdNw=="], - "lmdb/node-addon-api": ["node-addon-api@6.1.0", "", {}, "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="], "markdown-it/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], @@ -2624,8 +2618,6 @@ "d3-sankey/d3-shape/d3-path": ["d3-path@1.0.9", "", {}, "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="], - "lmdb/msgpackr/msgpackr-extract": ["msgpackr-extract@3.0.3", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA=="], - "md5.js/hash-base/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="], "minipass-flush/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], @@ -2650,18 +2642,6 @@ "vitepress/vite/esbuild": ["esbuild@0.21.5", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.21.5", "@esbuild/android-arm": "0.21.5", "@esbuild/android-arm64": "0.21.5", "@esbuild/android-x64": "0.21.5", "@esbuild/darwin-arm64": "0.21.5", "@esbuild/darwin-x64": "0.21.5", "@esbuild/freebsd-arm64": "0.21.5", "@esbuild/freebsd-x64": "0.21.5", "@esbuild/linux-arm": "0.21.5", "@esbuild/linux-arm64": "0.21.5", "@esbuild/linux-ia32": "0.21.5", "@esbuild/linux-loong64": "0.21.5", "@esbuild/linux-mips64el": "0.21.5", "@esbuild/linux-ppc64": "0.21.5", "@esbuild/linux-riscv64": "0.21.5", "@esbuild/linux-s390x": "0.21.5", "@esbuild/linux-x64": "0.21.5", "@esbuild/netbsd-x64": "0.21.5", "@esbuild/openbsd-x64": "0.21.5", "@esbuild/sunos-x64": "0.21.5", "@esbuild/win32-arm64": "0.21.5", "@esbuild/win32-ia32": "0.21.5", "@esbuild/win32-x64": "0.21.5" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="], - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw=="], - - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw=="], - - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3", "", { "os": "linux", "cpu": "arm" }, "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw=="], - - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg=="], - - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg=="], - - "lmdb/msgpackr/msgpackr-extract/@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3", "", { "os": "win32", "cpu": "x64" }, "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ=="], - "md5.js/hash-base/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "md5.js/hash-base/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], diff --git a/package.json b/package.json index 2c7100e..3607322 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@pulumi/pulumi": "3.231.0", "ai": "6.0.199", "commander": "14.0.3", - "effect": "4.0.0-beta.107", + "effect": "4.0.0", "minimatch": "10.1.1", "typescript": "5.9.3", "zod": "4.5.4" diff --git a/packages/agentlayer-provider-openai-codex/src/shared/adapter.ts b/packages/agentlayer-provider-openai-codex/src/shared/adapter.ts index c87cc59..e502a33 100644 --- a/packages/agentlayer-provider-openai-codex/src/shared/adapter.ts +++ b/packages/agentlayer-provider-openai-codex/src/shared/adapter.ts @@ -114,7 +114,7 @@ export function convertPromptMessages(prompt: LanguageModelV3Prompt): { for (const message of prompt) { switch (message.role) { case 'system': { - systemParts.push(SystemPart.make(message.content)) + systemParts.push(SystemPart.text(message.content)) break } diff --git a/packages/opencode-llm-vendor/src/protocols/shared.ts b/packages/opencode-llm-vendor/src/protocols/shared.ts index a002a8e..f4c5494 100644 --- a/packages/opencode-llm-vendor/src/protocols/shared.ts +++ b/packages/opencode-llm-vendor/src/protocols/shared.ts @@ -1,8 +1,8 @@ import { Buffer } from 'node:buffer' import { Effect, Schema, Stream } from 'effect' +import * as Sse from 'effect/encoding/Sse' +import { Headers, HttpClientRequest } from 'effect/http' import * as Option from 'effect/Option' -import * as Sse from 'effect/unstable/encoding/Sse' -import { Headers, HttpClientRequest } from 'effect/unstable/http' import { type Interface as DiagnosticsInterface, LLMDiagnostics, noopDiagnostics } from '../route/diagnostics' import { type ContentPart, diff --git a/packages/opencode-llm-vendor/src/route/auth.ts b/packages/opencode-llm-vendor/src/route/auth.ts index 37adab9..ff01e15 100644 --- a/packages/opencode-llm-vendor/src/route/auth.ts +++ b/packages/opencode-llm-vendor/src/route/auth.ts @@ -1,7 +1,7 @@ // @ts-nocheck — vendored from opencode, tested upstream under different tsconfig import { Config, Effect, Redacted } from 'effect' +import { Headers } from 'effect/http' import * as Option from 'effect/Option' -import { Headers } from 'effect/unstable/http' import { AuthenticationReason, InvalidRequestReason, LLMError, type LLMRequest } from '../schema' import { type Interface as DiagnosticsInterface, LLMDiagnostics, noopDiagnostics } from './diagnostics' diff --git a/packages/opencode-llm-vendor/src/route/executor.ts b/packages/opencode-llm-vendor/src/route/executor.ts index a23752e..a54953a 100644 --- a/packages/opencode-llm-vendor/src/route/executor.ts +++ b/packages/opencode-llm-vendor/src/route/executor.ts @@ -1,6 +1,5 @@ // @ts-nocheck — vendored from opencode, tested upstream under different tsconfig import { Cause, Context, Effect, Layer, Random } from 'effect' -import * as Option from 'effect/Option' import { FetchHttpClient, Headers, @@ -8,7 +7,8 @@ import { HttpClientError, type HttpClientRequest, type HttpClientResponse, -} from 'effect/unstable/http' +} from 'effect/http' +import * as Option from 'effect/Option' import { AuthenticationReason, ContentPolicyReason, diff --git a/packages/opencode-llm-vendor/src/route/transport/http.ts b/packages/opencode-llm-vendor/src/route/transport/http.ts index 45d642c..50b1e2a 100644 --- a/packages/opencode-llm-vendor/src/route/transport/http.ts +++ b/packages/opencode-llm-vendor/src/route/transport/http.ts @@ -1,5 +1,5 @@ import { Effect, Stream } from 'effect' -import { Headers, type HttpClientRequest } from 'effect/unstable/http' +import { Headers, type HttpClientRequest } from 'effect/http' import * as ProviderShared from '../../protocols/shared' import type { LLMRequest } from '../../schema' import { LLMError, mergeJsonRecords, TransportReason } from '../../schema' diff --git a/packages/opencode-llm-vendor/src/route/transport/websocket.ts b/packages/opencode-llm-vendor/src/route/transport/websocket.ts index 3c7210b..89e37e2 100644 --- a/packages/opencode-llm-vendor/src/route/transport/websocket.ts +++ b/packages/opencode-llm-vendor/src/route/transport/websocket.ts @@ -1,7 +1,7 @@ // @ts-nocheck — vendored from opencode, tested upstream under different tsconfig import { Cause, Context, Duration, Effect, Layer, Queue, Schedule, Stream } from 'effect' +import type { Headers } from 'effect/http' import * as Option from 'effect/Option' -import type { Headers } from 'effect/unstable/http' import { LLMError, TransportReason } from '../../schema' import { LLMDiagnostics, llmErrorMetadata, noopDiagnostics } from '../diagnostics' import * as HttpTransport from './http' diff --git a/packages/opencode-llm-vendor/src/schema/messages.ts b/packages/opencode-llm-vendor/src/schema/messages.ts index adde99f..3aff4d8 100644 --- a/packages/opencode-llm-vendor/src/schema/messages.ts +++ b/packages/opencode-llm-vendor/src/schema/messages.ts @@ -20,13 +20,13 @@ const systemPartSchema = Schema.Struct({ }).annotate({ identifier: 'LLM.SystemPart' }) export type SystemPart = Schema.Schema.Type -const makeSystemPart = (text: string): SystemPart => ({ type: 'text', text }) +const systemText = (text: string): SystemPart => ({ type: 'text', text }) export const SystemPart = Object.assign(systemPartSchema, { - make: makeSystemPart, + text: systemText, content: (input?: string | SystemPart | ReadonlyArray) => { if (input === undefined) return [] - return typeof input === 'string' ? [makeSystemPart(input)] : Array.isArray(input) ? [...input] : [input] + return typeof input === 'string' ? [systemText(input)] : Array.isArray(input) ? [...input] : [input] }, }) @@ -86,7 +86,7 @@ export const ToolResultValue = Object.assign( ]).annotate({ identifier: 'LLM.ToolResult' }), { is: isToolResultValue, - make: (value: unknown, type: ToolResultValue['type'] = 'json'): ToolResultValue => { + from: (value: unknown, type: ToolResultValue['type'] = 'json'): ToolResultValue => { if (isToolResultValue(value)) return value if (type === 'content') return { type, value: Array.isArray(value) ? value : [] } return { type, value } @@ -95,20 +95,15 @@ export const ToolResultValue = Object.assign( ) export type ToolResultValue = Schema.Schema.Type -export const ToolCallPart = Object.assign( - Schema.Struct({ - type: Schema.Literal('tool-call'), - id: Schema.String, - name: Schema.String, - input: Schema.Unknown, - providerExecuted: Schema.optional(Schema.Boolean), - metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)), - providerMetadata: Schema.optional(ProviderMetadata), - }).annotate({ identifier: 'LLM.Content.ToolCall' }), - { - make: (input: Omit): ToolCallPart => ({ type: 'tool-call', ...input }), - }, -) +export const ToolCallPart = Schema.Struct({ + type: Schema.tag('tool-call'), + id: Schema.String, + name: Schema.String, + input: Schema.Unknown, + providerExecuted: Schema.optional(Schema.Boolean), + metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)), + providerMetadata: Schema.optional(ProviderMetadata), +}).annotate({ identifier: 'LLM.Content.ToolCall' }) export type ToolCallPart = Schema.Schema.Type export const ToolResultPart = Object.assign( @@ -123,7 +118,7 @@ export const ToolResultPart = Object.assign( providerMetadata: Schema.optional(ProviderMetadata), }).annotate({ identifier: 'LLM.Content.ToolResult' }), { - make: ( + from: ( input: Omit & { readonly result: unknown readonly resultType?: ToolResultValue['type'] @@ -132,7 +127,7 @@ export const ToolResultPart = Object.assign( type: 'tool-result', id: input.id, name: input.name, - result: ToolResultValue.make(input.result, input.resultType), + result: ToolResultValue.from(input.result, input.resultType), providerExecuted: input.providerExecuted, cache: input.cache, metadata: input.metadata, @@ -184,8 +179,8 @@ export namespace Message { export const assistant = (content: ContentInput) => make({ role: 'assistant', content }) - export const tool = (result: ToolResultPart | Parameters[0]) => - make({ role: 'tool', content: ['type' in result ? result : ToolResultPart.make(result)] }) + export const tool = (result: ToolResultPart | Parameters[0]) => + make({ role: 'tool', content: ['type' in result ? result : ToolResultPart.from(result)] }) } export class ToolDefinition extends Schema.Class('LLM.ToolDefinition')({ diff --git a/packages/opencode-llm-vendor/src/tool-runtime.ts b/packages/opencode-llm-vendor/src/tool-runtime.ts index 029c4da..8568c00 100644 --- a/packages/opencode-llm-vendor/src/tool-runtime.ts +++ b/packages/opencode-llm-vendor/src/tool-runtime.ts @@ -200,7 +200,7 @@ const accumulate = (state: StepState, event: LLMEvent) => { } if (event.type === 'tool-result' && event.providerExecuted) { state.assistantContent.push( - ToolResultPart.make({ + ToolResultPart.from({ id: event.id, name: event.name, result: event.result,