refactor(ocap-kernel): add KernelOneResolution type for kernel-space promise resolutions

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: rekmarks

packages/ocap-kernel/src/KernelQueue.ts

@@ -1,16 +1,15 @@
-import type { VatOneResolution } from '@agoric/swingset-liveslots';
 import type { CapData } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
 
 import { processGCActionSet } from './garbage-collection/garbage-collection.ts';
 import { kser } from './liveslots/kernel-marshal.ts';
 import type { KernelStore } from './store/index.ts';
-import { insistKRef } from './types.ts';
 import type {
   CrankResult,
   EndpointId,
   KRef,
   KernelMessage,
+  KernelOneResolution,
   RunQueueItem,
   RunQueueItemNotify,
   RunQueueItemSend,
@@ -323,14 +322,11 @@ export class KernelQueue {
    */
   resolvePromises(
     endpointId: EndpointId | 'kernel' | undefined,
-    resolutions: VatOneResolution[],
+    resolutions: KernelOneResolution[],
     immediate = true,
   ): void {
     for (const resolution of resolutions) {
-      const [kpidRaw, rejected, dataRaw] = resolution;
-      insistKRef(kpidRaw);
-      const kpid = kpidRaw;
-      const data = dataRaw as CapData<KRef>;
+      const [kpid, rejected, data] = resolution;
 
       this.#kernelStore.incrementRefCount(kpid, 'resolve|kpid');
       for (const slot of data.slots || []) {

packages/ocap-kernel/src/KernelServiceManager.ts

@@ -153,9 +153,6 @@ export class KernelServiceManager {
     const { methargs, result } = message;
     const [method, args] = kunser(methargs) as [string, unknown[]];
     assert.typeof(method, 'string');
-    if (result) {
-      assert.typeof(result, 'string');
-    }
     assert(Array.isArray(args));
 
     // Use E() so this works for both local objects and remote presences

packages/ocap-kernel/src/remotes/kernel/RemoteHandle.ts

@@ -16,6 +16,7 @@ import type {
   KRef,
   EndpointHandle,
   EndpointMessage,
+  KernelOneResolution,
   CrankResult,
 } from '../../types.ts';
 import { insistKRef, insistERef } from '../../types.ts';
@@ -752,7 +753,7 @@ export class RemoteHandle implements EndpointHandle {
       }
       case 'notify': {
         const [, resolutions] = params;
-        const kResolutions: VatOneResolution[] = resolutions.map(
+        const kResolutions: KernelOneResolution[] = resolutions.map(
           (resolution) => {
             const [rpid, rejected, data] = resolution;
             insistERef(rpid);

packages/ocap-kernel/src/types.ts

@@ -159,6 +159,12 @@ export const VatOneResolutionStruct = tuple([
   CapDataStruct,
 ]);
 
+/**
+ * A single kernel-space promise resolution: [promiseKRef, rejected, data].
+ * Kernel-space counterpart of Agoric's `VatOneResolution`.
+ */
+export type KernelOneResolution = [KRef, boolean, CapData<KRef>];
+
 // Kernel-space message: refs are KRefs
 export const KernelCapDataStruct = object({
   body: string(),

packages/ocap-kernel/src/vats/VatSyscall.ts

@@ -1,6 +1,5 @@
 import type {
   SwingSetCapData,
-  VatOneResolution,
   VatSyscallObject,
   VatSyscallResult,
 } from '@agoric/swingset-liveslots';
@@ -14,7 +13,12 @@ import {
 import type { KernelQueue } from '../KernelQueue.ts';
 import { makeError } from '../liveslots/kernel-marshal.ts';
 import type { KernelStore } from '../store/index.ts';
-import type { KernelMessage, VatId, KRef } from '../types.ts';
+import type {
+  KernelMessage,
+  KernelOneResolution,
+  VatId,
+  KRef,
+} from '../types.ts';
 
 type VatSyscallProps = {
   vatId: VatId;
@@ -91,7 +95,7 @@ export class VatSyscall {
    *
    * @param resolutions - One or more promise resolutions.
    */
-  #handleSyscallResolve(resolutions: VatOneResolution[]): void {
+  #handleSyscallResolve(resolutions: KernelOneResolution[]): void {
     const immediate = !this.#kernelStore.isInCrank();
     this.#kernelQueue.resolvePromises(this.vatId, resolutions, immediate);
   }
@@ -193,7 +197,7 @@ export class VatSyscall {
           this.#logger?.log(
             `@@@@ ${vatId} syscall resolve ${JSON.stringify(resolutions)}`,
           );
-          this.#handleSyscallResolve(resolutions as VatOneResolution[]);
+          this.#handleSyscallResolve(resolutions as KernelOneResolution[]);
           break;
         }
         case 'exit': {