chore(remotes): move kernel-level modules to kernel/

Move RemoteManager, RemoteHandle, OcapURLManager, and remote-comms
to the kernel/ subdirectory. These modules interact with kernel
concepts like KernelStore, KernelQueue, and krefs.

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: sirtimid

packages/ocap-kernel/src/Kernel.test.ts

@@ -66,7 +66,7 @@ vi.mock('./KernelQueue.ts', () => {
   return { KernelQueue: mocks.KernelQueue };
 });
 
-vi.mock('./remotes/RemoteManager.ts', () => {
+vi.mock('./remotes/kernel/RemoteManager.ts', () => {
   return { RemoteManager: mocks.RemoteManager };
 });
 

packages/ocap-kernel/src/Kernel.ts

@@ -12,8 +12,8 @@ import { KernelQueue } from './KernelQueue.ts';
 import { KernelRouter } from './KernelRouter.ts';
 import { KernelServiceManager } from './KernelServiceManager.ts';
 import type { KernelService } from './KernelServiceManager.ts';
-import { OcapURLManager } from './remotes/OcapURLManager.ts';
-import { RemoteManager } from './remotes/RemoteManager.ts';
+import { OcapURLManager } from './remotes/kernel/OcapURLManager.ts';
+import { RemoteManager } from './remotes/kernel/RemoteManager.ts';
 import type { RemoteCommsOptions } from './remotes/types.ts';
 import { kernelHandlers } from './rpc/index.ts';
 import type { PingVatResult } from './rpc/index.ts';

…ernel/src/remotes/OcapURLManager.test.ts …rc/remotes/kernel/OcapURLManager.test.tspackages/ocap-kernel/src/remotes/OcapURLManager.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/OcapURLManager.test.ts packages/ocap-kernel/src/remotes/OcapURLManager.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/OcapURLManager.test.ts

@@ -4,10 +4,10 @@ import type { Mock } from 'vitest';
 import { OcapURLManager } from './OcapURLManager.ts';
 import type { RemoteHandle } from './RemoteHandle.ts';
 import type { RemoteManager } from './RemoteManager.ts';
-import type { RemoteComms } from './types.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { SlotValue } from '../liveslots/kernel-marshal.ts';
-import { kslot } from '../liveslots/kernel-marshal.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { SlotValue } from '../../liveslots/kernel-marshal.ts';
+import { kslot } from '../../liveslots/kernel-marshal.ts';
+import type { RemoteComms } from '../types.ts';
 
 type RedeemService = {
   redeem: (url: string) => Promise<SlotValue>;

…cap-kernel/src/remotes/OcapURLManager.ts …nel/src/remotes/kernel/OcapURLManager.tspackages/ocap-kernel/src/remotes/OcapURLManager.ts renamed to packages/ocap-kernel/src/remotes/kernel/OcapURLManager.ts packages/ocap-kernel/src/remotes/OcapURLManager.ts renamed to packages/ocap-kernel/src/remotes/kernel/OcapURLManager.ts

@@ -1,10 +1,10 @@
 import { Far } from '@endo/marshal';
 
-import { kslot, krefOf } from '../liveslots/kernel-marshal.ts';
-import type { SlotValue } from '../liveslots/kernel-marshal.ts';
-import type { KRef } from '../types.ts';
 import { parseOcapURL } from './remote-comms.ts';
 import type { RemoteManager } from './RemoteManager.ts';
+import { kslot, krefOf } from '../../liveslots/kernel-marshal.ts';
+import type { SlotValue } from '../../liveslots/kernel-marshal.ts';
+import type { KRef } from '../../types.ts';
 
 type OcapURLManagerConstructorProps = {
   remoteManager: RemoteManager;

…-kernel/src/remotes/RemoteHandle.test.ts …/src/remotes/kernel/RemoteHandle.test.tspackages/ocap-kernel/src/remotes/RemoteHandle.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteHandle.test.ts packages/ocap-kernel/src/remotes/RemoteHandle.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteHandle.test.ts

@@ -3,13 +3,13 @@ import type { Logger } from '@metamask/logger';
 import { makeAbortSignalMock } from '@ocap/repo-tools/test-utils';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
-import type { KernelQueue } from '../KernelQueue.ts';
 import { RemoteHandle } from './RemoteHandle.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { KernelStore } from '../store/index.ts';
-import { parseRef } from '../store/utils/parse-ref.ts';
-import type { Message, RRef } from '../types.ts';
-import type { RemoteComms } from './types.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import type { KernelStore } from '../../store/index.ts';
+import { parseRef } from '../../store/utils/parse-ref.ts';
+import type { Message, RRef } from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 let mockKernelStore: KernelStore;
 let mockRemoteComms: RemoteComms;

…/ocap-kernel/src/remotes/RemoteHandle.ts …ernel/src/remotes/kernel/RemoteHandle.tspackages/ocap-kernel/src/remotes/RemoteHandle.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteHandle.ts packages/ocap-kernel/src/remotes/RemoteHandle.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteHandle.ts

@@ -7,17 +7,17 @@ import {
   performDropImports,
   performRetireImports,
   performExportCleanup,
-} from '../garbage-collection/gc-handlers.ts';
-import type { KernelQueue } from '../KernelQueue.ts';
-import type { KernelStore } from '../store/index.ts';
+} from '../../garbage-collection/gc-handlers.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import type { KernelStore } from '../../store/index.ts';
 import type {
   RemoteId,
   ERef,
   EndpointHandle,
   Message,
   CrankResults,
-} from '../types.ts';
-import type { RemoteComms } from './types.ts';
+} from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 type RemoteHandleConstructorProps = {
   remoteId: RemoteId;

…kernel/src/remotes/RemoteManager.test.ts …src/remotes/kernel/RemoteManager.test.tspackages/ocap-kernel/src/remotes/RemoteManager.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteManager.test.ts packages/ocap-kernel/src/remotes/RemoteManager.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteManager.test.ts

@@ -1,14 +1,14 @@
 import { Logger } from '@metamask/logger';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
-import { makeMapKernelDatabase } from '../../test/storage.ts';
-import type { KernelQueue } from '../KernelQueue.ts';
 import * as remoteComms from './remote-comms.ts';
-import type { RemoteComms } from './types.ts';
-import { makeKernelStore } from '../store/index.ts';
-import type { PlatformServices } from '../types.ts';
 import { RemoteManager } from './RemoteManager.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import { makeMapKernelDatabase } from '../../../test/storage.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import { makeKernelStore } from '../../store/index.ts';
+import type { PlatformServices } from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 vi.mock('./remote-comms.ts', async () => {
   const actual = await vi.importActual('./remote-comms.ts');

…ocap-kernel/src/remotes/RemoteManager.ts …rnel/src/remotes/kernel/RemoteManager.tspackages/ocap-kernel/src/remotes/RemoteManager.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteManager.ts packages/ocap-kernel/src/remotes/RemoteManager.ts renamed to packages/ocap-kernel/src/remotes/kernel/RemoteManager.ts

@@ -1,17 +1,17 @@
 import type { Logger } from '@metamask/logger';
 
-import type { KernelQueue } from '../KernelQueue.ts';
 import { initRemoteComms } from './remote-comms.ts';
 import { RemoteHandle } from './RemoteHandle.ts';
-import { kser } from '../liveslots/kernel-marshal.ts';
-import type { PlatformServices, RemoteId } from '../types.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import { kser } from '../../liveslots/kernel-marshal.ts';
+import type { KernelStore } from '../../store/index.ts';
+import type { PlatformServices, RemoteId } from '../../types.ts';
 import type {
   RemoteComms,
   RemoteMessageHandler,
   RemoteInfo,
   RemoteCommsOptions,
-} from './types.ts';
-import type { KernelStore } from '../store/index.ts';
+} from '../types.ts';
 
 type RemoteManagerConstructorProps = {
   platformServices: PlatformServices;

…-kernel/src/remotes/remote-comms.test.ts …/src/remotes/kernel/remote-comms.test.tspackages/ocap-kernel/src/remotes/remote-comms.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/remote-comms.test.ts packages/ocap-kernel/src/remotes/remote-comms.test.ts renamed to packages/ocap-kernel/src/remotes/kernel/remote-comms.test.ts

@@ -9,10 +9,10 @@ import {
   parseOcapURL,
   getKnownRelays,
 } from './remote-comms.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { KernelStore } from '../store/index.ts';
-import type { PlatformServices } from '../types.ts';
-import type { RemoteMessageHandler } from './types.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { KernelStore } from '../../store/index.ts';
+import type { PlatformServices } from '../../types.ts';
+import type { RemoteMessageHandler } from '../types.ts';
 
 describe('remote-comms', () => {
   let mockKernelStore: KernelStore;

…/ocap-kernel/src/remotes/remote-comms.ts …ernel/src/remotes/kernel/remote-comms.tspackages/ocap-kernel/src/remotes/remote-comms.ts renamed to packages/ocap-kernel/src/remotes/kernel/remote-comms.ts packages/ocap-kernel/src/remotes/remote-comms.ts renamed to packages/ocap-kernel/src/remotes/kernel/remote-comms.ts

@@ -6,14 +6,14 @@ import { toHex, fromHex } from '@metamask/kernel-utils';
 import type { Logger } from '@metamask/logger';
 import { base58btc } from 'multiformats/bases/base58';
 
-import type { KernelStore } from '../store/index.ts';
-import type { PlatformServices } from '../types.ts';
+import type { KernelStore } from '../../store/index.ts';
+import type { PlatformServices } from '../../types.ts';
 import type {
   RemoteComms,
   RemoteMessageHandler,
   OnRemoteGiveUp,
   RemoteCommsOptions,
-} from './types.ts';
+} from '../types.ts';
 
 export type OcapURLParts = {
   oid: string;