From 5f3034771875268cd9ab9b025fcde19f4e588625 Mon Sep 17 00:00:00 2001 From: grypez <143971198+grypez@users.noreply.github.com> Date: Wed, 14 Jan 2026 12:32:53 -0600 Subject: [PATCH 1/2] refactor: Enable makeJsonAgent to be bundled with @endo/bundle-source This refactors kernel-utils and kernel-errors to enable makeJsonAgent to be bundled into vats using @endo/bundle-source. Changes: - kernel-utils: Added subpath exports (counter, merge-disjoint-records, schema) - kernel-errors: Added bundleable subpath with simplified error classes - kernel-errors: Extracted ErrorCode to error-codes.ts (no @metamask/utils dep) - ocap-kernel: Moved isRetryableNetworkError from kernel-errors to utils - kernel-agents: Updated to use subpath imports The bundler was failing due to transitive dependencies on @noble/hashes which has ESM/CJS compatibility issues. By using subpath exports and moving libp2p-specific code to ocap-kernel, we avoid pulling in unbundleable dependencies. --- packages/kernel-agents/src/agent.ts | 2 +- packages/kernel-agents/src/attempt.ts | 2 +- .../src/capabilities/discover.ts | 3 +- .../src/strategies/json/prepare-attempt.ts | 2 +- .../src/strategies/json/sample-collector.ts | 2 +- packages/kernel-agents/src/task.ts | 2 +- .../kernel-agents/src/types/capability.ts | 2 +- packages/kernel-errors/package.json | 11 ++++- packages/kernel-errors/src/BaseError.ts | 2 +- .../src/bundleable/SampleGenerationError.ts | 46 +++++++++++++++++++ .../kernel-errors/src/bundleable/index.ts | 11 +++++ packages/kernel-errors/src/constants.ts | 27 ++--------- packages/kernel-errors/src/error-codes.ts | 22 +++++++++ packages/kernel-errors/src/index.test.ts | 1 - packages/kernel-errors/src/index.ts | 1 - packages/kernel-test/package.json | 1 + packages/kernel-utils/package.json | 30 ++++++++++++ packages/kernel-utils/src/counter.ts | 13 ++++++ packages/kernel-utils/src/misc.ts | 15 +----- .../src/remotes/ConnectionFactory.ts | 3 +- packages/ocap-kernel/src/remotes/network.ts | 7 +-- .../src/utils/isRetryableNetworkError.test.ts | 0 .../src/utils/isRetryableNetworkError.ts | 0 yarn.lock | 41 ++++++++++++++++- 24 files changed, 192 insertions(+), 54 deletions(-) create mode 100644 packages/kernel-errors/src/bundleable/SampleGenerationError.ts create mode 100644 packages/kernel-errors/src/bundleable/index.ts create mode 100644 packages/kernel-errors/src/error-codes.ts create mode 100644 packages/kernel-utils/src/counter.ts rename packages/{kernel-errors => ocap-kernel}/src/utils/isRetryableNetworkError.test.ts (100%) rename packages/{kernel-errors => ocap-kernel}/src/utils/isRetryableNetworkError.ts (100%) diff --git a/packages/kernel-agents/src/agent.ts b/packages/kernel-agents/src/agent.ts index 74ffe74b6..bc2041097 100644 --- a/packages/kernel-agents/src/agent.ts +++ b/packages/kernel-agents/src/agent.ts @@ -1,4 +1,4 @@ -import { mergeDisjointRecords } from '@metamask/kernel-utils'; +import { mergeDisjointRecords } from '@metamask/kernel-utils/merge-disjoint-records'; import type { Logger } from '@metamask/logger'; import type { LanguageModel } from '@ocap/kernel-language-model-service'; diff --git a/packages/kernel-agents/src/attempt.ts b/packages/kernel-agents/src/attempt.ts index ff6bcafee..c2fa95214 100644 --- a/packages/kernel-agents/src/attempt.ts +++ b/packages/kernel-agents/src/attempt.ts @@ -1,4 +1,4 @@ -import { SampleGenerationError } from '@metamask/kernel-errors'; +import { SampleGenerationError } from '@metamask/kernel-errors/bundleable'; import type { Logger } from '@metamask/logger'; import type { LanguageModel } from '@ocap/kernel-language-model-service'; diff --git a/packages/kernel-agents/src/capabilities/discover.ts b/packages/kernel-agents/src/capabilities/discover.ts index a8e71e703..d6081b511 100644 --- a/packages/kernel-agents/src/capabilities/discover.ts +++ b/packages/kernel-agents/src/capabilities/discover.ts @@ -1,5 +1,6 @@ import { E } from '@endo/eventual-send'; -import type { DiscoverableExo, MethodSchema } from '@metamask/kernel-utils'; +import type { DiscoverableExo } from '@metamask/kernel-utils/discoverable'; +import type { MethodSchema } from '@metamask/kernel-utils/schema'; import type { CapabilityRecord, CapabilitySpec } from '../types.ts'; diff --git a/packages/kernel-agents/src/strategies/json/prepare-attempt.ts b/packages/kernel-agents/src/strategies/json/prepare-attempt.ts index 7cd98730d..af0f24984 100644 --- a/packages/kernel-agents/src/strategies/json/prepare-attempt.ts +++ b/packages/kernel-agents/src/strategies/json/prepare-attempt.ts @@ -1,4 +1,4 @@ -import { mergeDisjointRecords } from '@metamask/kernel-utils'; +import { mergeDisjointRecords } from '@metamask/kernel-utils/merge-disjoint-records'; import type { Logger } from '@metamask/logger'; import { makeEvaluator } from './evaluator.ts'; diff --git a/packages/kernel-agents/src/strategies/json/sample-collector.ts b/packages/kernel-agents/src/strategies/json/sample-collector.ts index 8449196e5..954495f4f 100644 --- a/packages/kernel-agents/src/strategies/json/sample-collector.ts +++ b/packages/kernel-agents/src/strategies/json/sample-collector.ts @@ -1,4 +1,4 @@ -import { SampleGenerationError } from '@metamask/kernel-errors'; +import { SampleGenerationError } from '@metamask/kernel-errors/bundleable'; import type { Logger } from '@metamask/logger'; import type { SampleCollector } from '../../types.ts'; diff --git a/packages/kernel-agents/src/task.ts b/packages/kernel-agents/src/task.ts index d96a97eaf..847fc0491 100644 --- a/packages/kernel-agents/src/task.ts +++ b/packages/kernel-agents/src/task.ts @@ -1,4 +1,4 @@ -import { makeCounter } from '@metamask/kernel-utils'; +import { makeCounter } from '@metamask/kernel-utils/counter'; import type { Task, CapabilityRecord } from './types.ts'; diff --git a/packages/kernel-agents/src/types/capability.ts b/packages/kernel-agents/src/types/capability.ts index 9d6dbc928..386e7add8 100644 --- a/packages/kernel-agents/src/types/capability.ts +++ b/packages/kernel-agents/src/types/capability.ts @@ -1,4 +1,4 @@ -import type { JsonSchema } from '@metamask/kernel-utils'; +import type { JsonSchema } from '@metamask/kernel-utils/schema'; export type Capability, Return = null> = ( args: Args, diff --git a/packages/kernel-errors/package.json b/packages/kernel-errors/package.json index 527c90db7..3e1d66a0a 100644 --- a/packages/kernel-errors/package.json +++ b/packages/kernel-errors/package.json @@ -29,6 +29,16 @@ "default": "./dist/index.cjs" } }, + "./bundleable": { + "import": { + "types": "./dist/bundleable/index.d.mts", + "default": "./dist/bundleable/index.mjs" + }, + "require": { + "types": "./dist/bundleable/index.d.cts", + "default": "./dist/bundleable/index.cjs" + } + }, "./package.json": "./package.json" }, "main": "./dist/index.cjs", @@ -56,7 +66,6 @@ "test:watch": "vitest --config vitest.config.ts" }, "dependencies": { - "@libp2p/interface": "2.11.0", "@metamask/superstruct": "^3.2.1", "@metamask/utils": "^11.9.0" }, diff --git a/packages/kernel-errors/src/BaseError.ts b/packages/kernel-errors/src/BaseError.ts index 91f8baab9..6c9249a12 100644 --- a/packages/kernel-errors/src/BaseError.ts +++ b/packages/kernel-errors/src/BaseError.ts @@ -1,6 +1,6 @@ import type { Json } from '@metamask/utils'; -import { ErrorCode } from './constants.ts'; +import { ErrorCode } from './error-codes.ts'; import type { MarshaledOcapError, OcapError, diff --git a/packages/kernel-errors/src/bundleable/SampleGenerationError.ts b/packages/kernel-errors/src/bundleable/SampleGenerationError.ts new file mode 100644 index 000000000..fb86b6d79 --- /dev/null +++ b/packages/kernel-errors/src/bundleable/SampleGenerationError.ts @@ -0,0 +1,46 @@ +import { ErrorCode } from '../error-codes.ts'; + +/** + * Error options with optional stack trace. + */ +type ErrorOptionsWithStack = { + cause?: Error; + stack?: string; +}; + +/** + * Bundleable version of SampleGenerationError. + * This version does not include marshaling logic to avoid dependencies + * on @metamask/utils that prevent vat bundling. + * + * An error indicating that the LLM generated invalid response. + * This error should trigger resampling from the LLM. + */ +export class SampleGenerationError extends Error { + public readonly code: typeof ErrorCode.SampleGenerationError; + + public readonly data: { sample: string }; + + /** + * Creates a new SampleGenerationError. + * + * @param sample - The invalid sample text generated by the LLM. + * @param cause - The underlying error that caused sample generation to fail. + * @param options - Additional error options including stack. + * @param options.stack - The stack trace of the error. + */ + constructor(sample: string, cause: Error, options?: ErrorOptionsWithStack) { + super('LLM generated invalid response.', { cause }); + + this.name = 'SampleGenerationError'; + this.code = ErrorCode.SampleGenerationError; + this.data = { sample }; + + if (options?.stack) { + this.stack = options.stack; + } + + harden(this); + } +} +harden(SampleGenerationError); diff --git a/packages/kernel-errors/src/bundleable/index.ts b/packages/kernel-errors/src/bundleable/index.ts new file mode 100644 index 000000000..a3123d4cf --- /dev/null +++ b/packages/kernel-errors/src/bundleable/index.ts @@ -0,0 +1,11 @@ +/** + * Bundleable versions of kernel-errors. + * + * These versions do not include marshaling logic to avoid dependencies + * on @metamask/utils that prevent vat bundling with @endo/bundle-source. + * + * Use these exports when bundling vat code: + * import { SampleGenerationError } from '@metamask/kernel-errors/bundleable'; + */ +export { SampleGenerationError } from './SampleGenerationError.ts'; +export { ErrorCode, ErrorSentinel } from '../error-codes.ts'; diff --git a/packages/kernel-errors/src/constants.ts b/packages/kernel-errors/src/constants.ts index fc5c55f8d..3e39d7bb7 100644 --- a/packages/kernel-errors/src/constants.ts +++ b/packages/kernel-errors/src/constants.ts @@ -10,8 +10,12 @@ import { import { JsonStruct, object } from '@metamask/utils'; import type { NonEmptyArray } from '@metamask/utils'; +import { ErrorCode, ErrorSentinel } from './error-codes.ts'; import type { MarshaledError, MarshaledOcapError } from './types.ts'; +// Re-export for backward compatibility +export { ErrorCode, ErrorSentinel } from './error-codes.ts'; + /** * Struct to validate plain {@link Error} objects. */ @@ -20,29 +24,6 @@ export const ErrorStruct = define( (value) => value instanceof Error, ); -/** - * Enum defining all error codes for Ocap errors. - */ -export const ErrorCode = { - AbortError: 'ABORT_ERROR', - DuplicateEndowment: 'DUPLICATE_ENDOWMENT', - StreamReadError: 'STREAM_READ_ERROR', - VatAlreadyExists: 'VAT_ALREADY_EXISTS', - VatDeleted: 'VAT_DELETED', - VatNotFound: 'VAT_NOT_FOUND', - SubclusterNotFound: 'SUBCLUSTER_NOT_FOUND', - SampleGenerationError: 'SAMPLE_GENERATION_ERROR', - InternalError: 'INTERNAL_ERROR', - ResourceLimitError: 'RESOURCE_LIMIT_ERROR', -} as const; - -export type ErrorCode = (typeof ErrorCode)[keyof typeof ErrorCode]; - -/** - * A sentinel value used to identify marshaled errors. - */ -export const ErrorSentinel = '@@MARSHALED_ERROR'; - const ErrorCodeStruct = union( Object.values(ErrorCode).map((code) => literal(code)) as NonEmptyArray< Struct diff --git a/packages/kernel-errors/src/error-codes.ts b/packages/kernel-errors/src/error-codes.ts new file mode 100644 index 000000000..5eaaeb044 --- /dev/null +++ b/packages/kernel-errors/src/error-codes.ts @@ -0,0 +1,22 @@ +/** + * Enum defining all error codes for Ocap errors. + */ +export const ErrorCode = { + AbortError: 'ABORT_ERROR', + DuplicateEndowment: 'DUPLICATE_ENDOWMENT', + StreamReadError: 'STREAM_READ_ERROR', + VatAlreadyExists: 'VAT_ALREADY_EXISTS', + VatDeleted: 'VAT_DELETED', + VatNotFound: 'VAT_NOT_FOUND', + SubclusterNotFound: 'SUBCLUSTER_NOT_FOUND', + SampleGenerationError: 'SAMPLE_GENERATION_ERROR', + InternalError: 'INTERNAL_ERROR', + ResourceLimitError: 'RESOURCE_LIMIT_ERROR', +} as const; + +export type ErrorCode = (typeof ErrorCode)[keyof typeof ErrorCode]; + +/** + * A sentinel value used to identify marshaled errors. + */ +export const ErrorSentinel = '@@MARSHALED_ERROR'; diff --git a/packages/kernel-errors/src/index.test.ts b/packages/kernel-errors/src/index.test.ts index 96a79688c..ead609857 100644 --- a/packages/kernel-errors/src/index.test.ts +++ b/packages/kernel-errors/src/index.test.ts @@ -23,7 +23,6 @@ describe('index', () => { 'isMarshaledError', 'isMarshaledOcapError', 'isOcapError', - 'isRetryableNetworkError', 'marshalError', 'toError', 'unmarshalError', diff --git a/packages/kernel-errors/src/index.ts b/packages/kernel-errors/src/index.ts index 9f3e40694..217799237 100644 --- a/packages/kernel-errors/src/index.ts +++ b/packages/kernel-errors/src/index.ts @@ -22,4 +22,3 @@ export { marshalError } from './marshal/marshalError.ts'; export { unmarshalError } from './marshal/unmarshalError.ts'; export { isMarshaledError } from './marshal/isMarshaledError.ts'; export { isMarshaledOcapError } from './marshal/isMarshaledOcapError.ts'; -export { isRetryableNetworkError } from './utils/isRetryableNetworkError.ts'; diff --git a/packages/kernel-test/package.json b/packages/kernel-test/package.json index 12138472c..5a137235a 100644 --- a/packages/kernel-test/package.json +++ b/packages/kernel-test/package.json @@ -59,6 +59,7 @@ "@metamask/ocap-kernel": "workspace:^", "@metamask/streams": "workspace:^", "@metamask/utils": "^11.9.0", + "@ocap/kernel-agents": "workspace:^", "@ocap/kernel-language-model-service": "workspace:^", "@ocap/nodejs": "workspace:^", "@ocap/nodejs-test-workers": "workspace:^", diff --git a/packages/kernel-utils/package.json b/packages/kernel-utils/package.json index 0a68dacfc..e0c09a4c8 100644 --- a/packages/kernel-utils/package.json +++ b/packages/kernel-utils/package.json @@ -49,6 +49,36 @@ "default": "./dist/discoverable.cjs" } }, + "./counter": { + "import": { + "types": "./dist/counter.d.mts", + "default": "./dist/counter.mjs" + }, + "require": { + "types": "./dist/counter.d.cts", + "default": "./dist/counter.cjs" + } + }, + "./merge-disjoint-records": { + "import": { + "types": "./dist/merge-disjoint-records.d.mts", + "default": "./dist/merge-disjoint-records.mjs" + }, + "require": { + "types": "./dist/merge-disjoint-records.d.cts", + "default": "./dist/merge-disjoint-records.cjs" + } + }, + "./schema": { + "import": { + "types": "./dist/schema.d.mts", + "default": "./dist/schema.mjs" + }, + "require": { + "types": "./dist/schema.d.cts", + "default": "./dist/schema.cjs" + } + }, "./package.json": "./package.json" }, "main": "./dist/index.cjs", diff --git a/packages/kernel-utils/src/counter.ts b/packages/kernel-utils/src/counter.ts new file mode 100644 index 000000000..0a74c3737 --- /dev/null +++ b/packages/kernel-utils/src/counter.ts @@ -0,0 +1,13 @@ +/** + * A simple counter which increments and returns when called. + * + * @param start - One less than the first returned number. + * @returns A counter. + */ +export const makeCounter = (start: number = 0) => { + let counter: number = start; + return () => { + counter += 1; + return counter; + }; +}; diff --git a/packages/kernel-utils/src/misc.ts b/packages/kernel-utils/src/misc.ts index 5f5893adb..49346fc69 100644 --- a/packages/kernel-utils/src/misc.ts +++ b/packages/kernel-utils/src/misc.ts @@ -1,18 +1,7 @@ import { AbortError } from '@metamask/kernel-errors'; -/** - * A simple counter which increments and returns when called. - * - * @param start - One less than the first returned number. - * @returns A counter. - */ -export const makeCounter = (start: number = 0) => { - let counter: number = start; - return () => { - counter += 1; - return counter; - }; -}; +// Re-export makeCounter for backward compatibility +export { makeCounter } from './counter.ts'; /** * Delay execution by the specified number of milliseconds. diff --git a/packages/ocap-kernel/src/remotes/ConnectionFactory.ts b/packages/ocap-kernel/src/remotes/ConnectionFactory.ts index db3ffe2a0..a7c64bc14 100644 --- a/packages/ocap-kernel/src/remotes/ConnectionFactory.ts +++ b/packages/ocap-kernel/src/remotes/ConnectionFactory.ts @@ -10,7 +10,7 @@ import { ping } from '@libp2p/ping'; import { webRTC } from '@libp2p/webrtc'; import { webSockets } from '@libp2p/websockets'; import { webTransport } from '@libp2p/webtransport'; -import { AbortError, isRetryableNetworkError } from '@metamask/kernel-errors'; +import { AbortError } from '@metamask/kernel-errors'; import { fromHex, retryWithBackoff } from '@metamask/kernel-utils'; import { Logger } from '@metamask/logger'; import { multiaddr } from '@multiformats/multiaddr'; @@ -18,6 +18,7 @@ import { byteStream } from 'it-byte-stream'; import { createLibp2p } from 'libp2p'; import type { Channel, InboundConnectionHandler } from './types.ts'; +import { isRetryableNetworkError } from '../utils/isRetryableNetworkError.ts'; /** * Connection factory for libp2p network operations. diff --git a/packages/ocap-kernel/src/remotes/network.ts b/packages/ocap-kernel/src/remotes/network.ts index be2355a90..c0d705c16 100644 --- a/packages/ocap-kernel/src/remotes/network.ts +++ b/packages/ocap-kernel/src/remotes/network.ts @@ -1,8 +1,4 @@ -import { - AbortError, - isRetryableNetworkError, - ResourceLimitError, -} from '@metamask/kernel-errors'; +import { AbortError, ResourceLimitError } from '@metamask/kernel-errors'; import { abortableDelay, DEFAULT_MAX_RETRY_ATTEMPTS, @@ -22,6 +18,7 @@ import type { OnRemoteGiveUp, RemoteCommsOptions, } from './types.ts'; +import { isRetryableNetworkError } from '../utils/isRetryableNetworkError.ts'; /** Default upper bound for queued outbound messages while reconnecting */ const DEFAULT_MAX_QUEUE = 200; diff --git a/packages/kernel-errors/src/utils/isRetryableNetworkError.test.ts b/packages/ocap-kernel/src/utils/isRetryableNetworkError.test.ts similarity index 100% rename from packages/kernel-errors/src/utils/isRetryableNetworkError.test.ts rename to packages/ocap-kernel/src/utils/isRetryableNetworkError.test.ts diff --git a/packages/kernel-errors/src/utils/isRetryableNetworkError.ts b/packages/ocap-kernel/src/utils/isRetryableNetworkError.ts similarity index 100% rename from packages/kernel-errors/src/utils/isRetryableNetworkError.ts rename to packages/ocap-kernel/src/utils/isRetryableNetworkError.ts diff --git a/yarn.lock b/yarn.lock index 652cb58e7..81acbf85a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2337,7 +2337,6 @@ __metadata: resolution: "@metamask/kernel-errors@workspace:packages/kernel-errors" dependencies: "@arethetypeswrong/cli": "npm:^0.17.4" - "@libp2p/interface": "npm:2.11.0" "@metamask/auto-changelog": "npm:^5.3.0" "@metamask/eslint-config": "npm:^15.0.0" "@metamask/eslint-config-nodejs": "npm:^15.0.0" @@ -2373,6 +2372,44 @@ __metadata: languageName: unknown linkType: soft +"@metamask/kernel-network-errors@workspace:^, @metamask/kernel-network-errors@workspace:packages/kernel-network-errors": + version: 0.0.0-use.local + resolution: "@metamask/kernel-network-errors@workspace:packages/kernel-network-errors" + dependencies: + "@arethetypeswrong/cli": "npm:^0.17.4" + "@libp2p/interface": "npm:2.11.0" + "@metamask/auto-changelog": "npm:^5.3.0" + "@metamask/eslint-config": "npm:^15.0.0" + "@metamask/eslint-config-nodejs": "npm:^15.0.0" + "@metamask/eslint-config-typescript": "npm:^15.0.0" + "@ocap/repo-tools": "workspace:^" + "@ts-bridge/cli": "npm:^0.6.3" + "@ts-bridge/shims": "npm:^0.1.1" + "@types/node": "npm:^22.13.1" + "@typescript-eslint/eslint-plugin": "npm:^8.29.0" + "@typescript-eslint/parser": "npm:^8.29.0" + "@typescript-eslint/utils": "npm:^8.29.0" + "@vitest/eslint-plugin": "npm:^1.6.5" + depcheck: "npm:^1.4.7" + eslint: "npm:^9.23.0" + eslint-config-prettier: "npm:^10.1.1" + eslint-import-resolver-typescript: "npm:^4.3.1" + eslint-plugin-import-x: "npm:^4.10.0" + eslint-plugin-jsdoc: "npm:^50.6.9" + eslint-plugin-n: "npm:^17.17.0" + eslint-plugin-prettier: "npm:^5.2.6" + eslint-plugin-promise: "npm:^7.2.1" + prettier: "npm:^3.5.3" + rimraf: "npm:^6.0.1" + turbo: "npm:^2.5.6" + typedoc: "npm:^0.28.1" + typescript: "npm:~5.8.2" + typescript-eslint: "npm:^8.29.0" + vite: "npm:^7.3.0" + vitest: "npm:^4.0.16" + languageName: unknown + linkType: soft + "@metamask/kernel-rpc-methods@workspace:^, @metamask/kernel-rpc-methods@workspace:packages/kernel-rpc-methods": version: 0.0.0-use.local resolution: "@metamask/kernel-rpc-methods@workspace:packages/kernel-rpc-methods" @@ -2713,6 +2750,7 @@ __metadata: "@metamask/eslint-config-nodejs": "npm:^15.0.0" "@metamask/eslint-config-typescript": "npm:^15.0.0" "@metamask/kernel-errors": "workspace:^" + "@metamask/kernel-network-errors": "workspace:^" "@metamask/kernel-rpc-methods": "workspace:^" "@metamask/kernel-store": "workspace:^" "@metamask/kernel-utils": "workspace:^" @@ -3736,6 +3774,7 @@ __metadata: "@metamask/streams": "workspace:^" "@metamask/utils": "npm:^11.9.0" "@ocap/cli": "workspace:^" + "@ocap/kernel-agents": "workspace:^" "@ocap/kernel-language-model-service": "workspace:^" "@ocap/nodejs": "workspace:^" "@ocap/nodejs-test-workers": "workspace:^" From 6c9d512303ffad9b6ec0880357be5fe849a903c7 Mon Sep 17 00:00:00 2001 From: grypez <143971198+grypez@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:08:07 -0600 Subject: [PATCH 2/2] cleanup yarn lock --- packages/kernel-test/package.json | 1 - yarn.lock | 40 ------------------------------- 2 files changed, 41 deletions(-) diff --git a/packages/kernel-test/package.json b/packages/kernel-test/package.json index 5a137235a..12138472c 100644 --- a/packages/kernel-test/package.json +++ b/packages/kernel-test/package.json @@ -59,7 +59,6 @@ "@metamask/ocap-kernel": "workspace:^", "@metamask/streams": "workspace:^", "@metamask/utils": "^11.9.0", - "@ocap/kernel-agents": "workspace:^", "@ocap/kernel-language-model-service": "workspace:^", "@ocap/nodejs": "workspace:^", "@ocap/nodejs-test-workers": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 81acbf85a..eecc916fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2372,44 +2372,6 @@ __metadata: languageName: unknown linkType: soft -"@metamask/kernel-network-errors@workspace:^, @metamask/kernel-network-errors@workspace:packages/kernel-network-errors": - version: 0.0.0-use.local - resolution: "@metamask/kernel-network-errors@workspace:packages/kernel-network-errors" - dependencies: - "@arethetypeswrong/cli": "npm:^0.17.4" - "@libp2p/interface": "npm:2.11.0" - "@metamask/auto-changelog": "npm:^5.3.0" - "@metamask/eslint-config": "npm:^15.0.0" - "@metamask/eslint-config-nodejs": "npm:^15.0.0" - "@metamask/eslint-config-typescript": "npm:^15.0.0" - "@ocap/repo-tools": "workspace:^" - "@ts-bridge/cli": "npm:^0.6.3" - "@ts-bridge/shims": "npm:^0.1.1" - "@types/node": "npm:^22.13.1" - "@typescript-eslint/eslint-plugin": "npm:^8.29.0" - "@typescript-eslint/parser": "npm:^8.29.0" - "@typescript-eslint/utils": "npm:^8.29.0" - "@vitest/eslint-plugin": "npm:^1.6.5" - depcheck: "npm:^1.4.7" - eslint: "npm:^9.23.0" - eslint-config-prettier: "npm:^10.1.1" - eslint-import-resolver-typescript: "npm:^4.3.1" - eslint-plugin-import-x: "npm:^4.10.0" - eslint-plugin-jsdoc: "npm:^50.6.9" - eslint-plugin-n: "npm:^17.17.0" - eslint-plugin-prettier: "npm:^5.2.6" - eslint-plugin-promise: "npm:^7.2.1" - prettier: "npm:^3.5.3" - rimraf: "npm:^6.0.1" - turbo: "npm:^2.5.6" - typedoc: "npm:^0.28.1" - typescript: "npm:~5.8.2" - typescript-eslint: "npm:^8.29.0" - vite: "npm:^7.3.0" - vitest: "npm:^4.0.16" - languageName: unknown - linkType: soft - "@metamask/kernel-rpc-methods@workspace:^, @metamask/kernel-rpc-methods@workspace:packages/kernel-rpc-methods": version: 0.0.0-use.local resolution: "@metamask/kernel-rpc-methods@workspace:packages/kernel-rpc-methods" @@ -2750,7 +2712,6 @@ __metadata: "@metamask/eslint-config-nodejs": "npm:^15.0.0" "@metamask/eslint-config-typescript": "npm:^15.0.0" "@metamask/kernel-errors": "workspace:^" - "@metamask/kernel-network-errors": "workspace:^" "@metamask/kernel-rpc-methods": "workspace:^" "@metamask/kernel-store": "workspace:^" "@metamask/kernel-utils": "workspace:^" @@ -3774,7 +3735,6 @@ __metadata: "@metamask/streams": "workspace:^" "@metamask/utils": "npm:^11.9.0" "@ocap/cli": "workspace:^" - "@ocap/kernel-agents": "workspace:^" "@ocap/kernel-language-model-service": "workspace:^" "@ocap/nodejs": "workspace:^" "@ocap/nodejs-test-workers": "workspace:^"