@quolu/lattice 0.12.23 → 0.12.25

package/src/runtime-cli.mjs

@@ -29,14 +29,18 @@ import {
   validateRuntimeBoundaryManifest,
   validateRuntimePlan,
   validRuntimeAbandonReason,
+  validateExecutorReceipt,
   verifyRuntimePlanBinding,
   selfDigest,
 } from './runtime-contracts.mjs';
 import {
+  adjudicatePendingReceipts,
   buildNextRunEvent,
   buildExecutorPackets,
   closeRunIfComplete,
+  dispatchReadyFrontier,
   initializeRunEvents,
+  observeExecutor,
 } from './runtime-engine.mjs';
 import {
   computeReadyFrontier,
@@ -68,6 +72,11 @@ import { createRuntimeControlRequest, validateRuntimeControlResponse } from './r
 import { createRuntimeControlStore } from './runtime-control-store.mjs';
 import { createRuntimeGateStore } from './runtime-gate-store.mjs';
 import { acquireRuntimeLifecycleLock } from './runtime-lifecycle-lock.mjs';
+import {
+  AdapterRegistryError,
+  listRuntimeAdapters,
+  registerRuntimeAdapter,
+} from './runtime-adapter-registry.mjs';
 import {
   ManagedRuntimeError,
   launchDurableSupervisor,
@@ -84,6 +93,8 @@ import {
  *   lattice plan compile --request <run-request.json>
  *   lattice plan verify  --request <run-request.json> --plan <plan.json>
  *   lattice run start    --request <run-request.json> --executor <adapter>
+ *   lattice run adapter register --input <descriptor.json>
+ *   lattice run adapter list --json
  *   lattice run observe  --run .lattice/runs/<run-id>
  *   lattice run status   --run .lattice/runs/<run-id>
  *   lattice run resume   --run .lattice/runs/<run-id>
@@ -262,6 +273,58 @@ async function runRequestSchema({ stdout }) {
   return 0;
 }
 
+/** 公開登録入力を推測させないため、配布物に同梱したJSON Schemaをそのまま返す（ADR 0125）。 */
+async function runAdapterRegisterSchema({ stdout }) {
+  const schemaUrl = new URL(
+    '../docs/schemas/lattice.runtime_adapter_registration_input.v1.schema.json',
+    import.meta.url,
+  );
+  const schema = JSON.parse(await readFile(schemaUrl, 'utf8'));
+  if (schema?.title !== 'lattice.runtime_adapter_registration_input.v1') {
+    throw new CliContractError('CONTRACT_VIOLATION', '同梱adapter registration input schemaが不正');
+  }
+  stdout.write(`${JSON.stringify(schema)}\n`);
+  return 0;
+}
+
+async function runAdapterRegister({ cwd, inputPath, stdout }) {
+  try {
+    const repoRoot = await resolveRepoRoot(cwd);
+    const input = await readBoundedJson(inputPath, 'adapter registration input');
+    const result = await registerRuntimeAdapter({ repoRoot, input });
+    stdout.write(`${JSON.stringify(result)}\n`);
+    return 0;
+  } catch (error) {
+    if (error instanceof AdapterRegistryError) throw error;
+    if (error instanceof CliContractError) {
+      if (error.detail !== undefined) throw error;
+      throw new CliContractError(error.code, error.message, {
+        path: inputPath,
+        reason: error.code.toLowerCase(),
+      });
+    }
+    throw new CliContractError('ADAPTER_REGISTRY_WRITE_FAILED', 'adapter registryを書けない', {
+      path: '.lattice/runtime/adapter-registry/registry.json',
+      reason: typeof error?.code === 'string' ? error.code : 'unexpected_write_failure',
+    });
+  }
+}
+
+async function runAdapterList({ cwd, stdout }) {
+  try {
+    const repoRoot = await resolveRepoRoot(cwd);
+    const result = await listRuntimeAdapters({ repoRoot });
+    stdout.write(`${JSON.stringify(result)}\n`);
+    return 0;
+  } catch (error) {
+    if (error instanceof AdapterRegistryError || error instanceof CliContractError) throw error;
+    throw new CliContractError('ADAPTER_REGISTRY_READ_FAILED', 'adapter registryを読めない', {
+      path: '.lattice/runtime/adapter-registry/registry.json',
+      reason: typeof error?.code === 'string' ? error.code : 'unexpected_read_failure',
+    });
+  }
+}
+
 async function loadRequest(requestPath) {
   const request = await readBoundedJson(requestPath, 'run request');
   const verdict = explainRunRequest(request);
@@ -619,6 +682,236 @@ async function withLifecycleLock(runDir, action) {
   }
 }
 
+async function readScriptedControllerReceipt({
+  runDir,
+  controllerId,
+  payloadDigest,
+}) {
+  const receiptPath = path.join(
+    runDir,
+    'controllers',
+    controllerId,
+    'receipts',
+    `${payloadDigest}.json`,
+  );
+  const info = await lstat(receiptPath);
+  if (!info.isFile() || info.isSymbolicLink()) {
+    throw new ManagedRuntimeError(
+      'ADAPTER_CONTROLLER_UNAVAILABLE',
+      'scripted controller receipt sidecarがregular fileではない',
+    );
+  }
+  const bytes = await readFile(receiptPath);
+  let receipt;
+  try {
+    receipt = JSON.parse(bytes.toString('utf8'));
+  } catch {
+    throw new ManagedRuntimeError(
+      'ADAPTER_CONTROLLER_UNAVAILABLE',
+      'scripted controller receipt sidecarのJSONが不正',
+    );
+  }
+  if (bytes.toString('utf8') !== `${canonicalizeArtifact(receipt)}\n`
+    || !validateExecutorReceipt(receipt)
+    || digestArtifact(receipt) !== payloadDigest) {
+    throw new ManagedRuntimeError(
+      'ADAPTER_CONTROLLER_UNAVAILABLE',
+      'scripted controller receipt sidecarのdigest bindingが不正',
+    );
+  }
+  return receipt;
+}
+
+async function driveInitialScriptedManagedEpoch({
+  runDir,
+  repoRoot,
+  request,
+  committed,
+  activation,
+  managedSupervisor,
+  initialEvents,
+  controlEvents,
+}) {
+  let events = [...initialEvents];
+  const { plan, manifests, executor_packets: packets } = committed.bundle;
+  const controllerId = activation.controllerDescriptor.controller_id;
+  const registrationDigest = activation.registration.registration_digest;
+  const sessionNonceDigest = digestArtifact(activation.sessionNonce);
+  const processGroupId = activation.childPid;
+  for (;;) {
+    const frontier = computeReadyFrontier({ plan, events }).dispatchable;
+    if (frontier.length === 0) break;
+    await managedSupervisor.barrierAll({
+      barrierId: `dispatch-${plan.plan_epoch}-${events.length}`,
+      reason: 'initial_scripted_dispatch',
+      frozenEventDigest: events.at(-1).event_digest,
+    });
+    const issuedControlDigest = controlEvents().at(-1)?.event_digest;
+    if (typeof issuedControlDigest !== 'string') {
+      throw new ManagedRuntimeError(
+        'EPOCH_ACTIVATION_INCOMPLETE',
+        'initial dispatch leaseのcontrol bindingが無い',
+      );
+    }
+    const stagedLeases = [];
+    for (const todoId of frontier) {
+      const packet = packets[todoId];
+      const staged = {
+        schema: 'lattice.runtime_write_lease.v1',
+        lease_id: `lease-${packet.packet_digest.slice(0, 24)}`,
+        run_id: request.request_id,
+        todo_id: todoId,
+        plan_epoch: plan.plan_epoch,
+        packet_digest: packet.packet_digest,
+        controller_registration_digest: registrationDigest,
+        supervisor_session_nonce_digest: sessionNonceDigest,
+        state: 'staged',
+        ttl_ms: 60_000,
+        issued_control_digest: issuedControlDigest,
+        lease_digest: '',
+      };
+      staged.lease_digest = selfDigest(staged, 'lease_digest');
+      await managedSupervisor.prepareController({
+        controllerId,
+        executorPacket: packet,
+        stagedLease: staged,
+      });
+      stagedLeases.push(staged);
+    }
+    const activationDigest = digestArtifact({
+      schema: 'lattice.initial_scripted_activation.v1',
+      committed_epoch_pointer_digest: committed.pointer.pointer_digest,
+      staged_lease_digests: stagedLeases.map((lease) => lease.lease_digest).sort(),
+    });
+    const activated = await managedSupervisor.commitWriteGate({
+      planEpoch: plan.plan_epoch,
+      committedEpochDigest: committed.pointer.pointer_digest,
+      activationDigest,
+      commitReleaseBarrier: (barrier) => commitReleaseEpochBarrier({ runDir, barrier }),
+      committedAt: canonicalNow(),
+    });
+    const armedByPacket = new Map(activated.armedLeases.map((lease) => [
+      lease.packet_digest,
+      lease,
+    ]));
+    const managedAdapter = {
+      async dispatch({ packet }) {
+        const lease = armedByPacket.get(packet.packet_digest);
+        if (lease === undefined) {
+          throw new ManagedRuntimeError(
+            'EPOCH_ACTIVATION_INCOMPLETE',
+            `armed leaseが無い: ${packet.todo_id}`,
+          );
+        }
+        await managedSupervisor.authorizeWrite({ leaseDigest: lease.lease_digest });
+        const response = await managedSupervisor.route('dispatch', controllerId, {
+          packet,
+          write_lease: lease,
+        });
+        if (response.packet_digest !== packet.packet_digest
+          || response.lease_digest !== lease.lease_digest) {
+          throw new ManagedRuntimeError(
+            'ADAPTER_CONTROLLER_UNAVAILABLE',
+            `dispatch response binding不一致: ${packet.todo_id}`,
+          );
+        }
+        return {
+          executor_handle: response.executor_handle,
+          worktree_id: response.worktree_id,
+          write_lease_id: lease.lease_id,
+          write_lease_digest: lease.lease_digest,
+          controller_registration_digest: registrationDigest,
+          controller_session_nonce_digest:
+            activation.controllerDescriptor.controller_session_nonce_digest,
+          direct_os_observation_binding: {
+            process_pid: activation.childPid,
+            process_group_id: processGroupId,
+            process_start_identity:
+              structuredClone(activation.controllerDescriptor.process_start_identity),
+            worktree_path: repoRoot,
+            base_sha: packet.base_sha,
+          },
+        };
+      },
+      async observe({ executor_handle: executorHandle }) {
+        const dispatch = events.findLast((event) => (
+          event.kind === 'executor_dispatched'
+          && event.payload?.executor_handle === executorHandle
+        ));
+        const response = await managedSupervisor.route('observe', controllerId, {
+          executor_handle: executorHandle,
+          expected_epoch: dispatch.plan_epoch,
+          expected_lease_digest: dispatch.payload.write_lease_digest,
+        });
+        if (response.observation.state !== 'terminal') {
+          throw new ManagedRuntimeError(
+            'ADAPTER_CONTROLLER_UNAVAILABLE',
+            `scripted controllerがterminal以外を返した: ${response.observation.state}`,
+          );
+        }
+        const receipt = await readScriptedControllerReceipt({
+          runDir,
+          controllerId,
+          payloadDigest: response.observation.payload_digest,
+        });
+        return { state: 'terminal', receipt };
+      },
+    };
+    const dispatched = await dispatchReadyFrontier({
+      runId: request.request_id,
+      plan,
+      events,
+      packets,
+      manifests,
+      adapter: managedAdapter,
+      recordedAt: canonicalNow(),
+    });
+    if (dispatched.failure !== null) {
+      throw new ManagedRuntimeError(
+        'ADAPTER_CONTROLLER_UNAVAILABLE',
+        `scripted dispatch失敗: ${dispatched.failure.todo_id}: ${dispatched.failure.message}`,
+      );
+    }
+    events = dispatched.events;
+    await replaceEventsAtomically(runDir, events);
+    for (const todoId of dispatched.dispatched) {
+      const observed = await observeExecutor({
+        runId: request.request_id,
+        todoId,
+        plan,
+        events,
+        adapter: managedAdapter,
+        recordedAt: canonicalNow(),
+      });
+      events = observed.events;
+      await replaceEventsAtomically(runDir, events);
+    }
+    const adjudicated = adjudicatePendingReceipts({
+      runId: request.request_id,
+      plan,
+      events,
+      recordedAt: canonicalNow(),
+    });
+    if (adjudicated.decisions.some((decision) => decision.decision !== 'accepted')) {
+      throw new ManagedRuntimeError(
+        'ADAPTER_CONTROLLER_UNAVAILABLE',
+        'scripted controller receiptが受理されなかった',
+      );
+    }
+    events = adjudicated.events;
+    await replaceEventsAtomically(runDir, events);
+  }
+  return events;
+}
+
+function isDistributedScriptedControllerActivation(activation) {
+  return activation?.controllerDescriptor?.adapter_kind === 'scripted'
+    && activation?.launchDescriptor?.launch_kind === 'host_binary'
+    && activation.launchDescriptor.argv.some((argument) => (
+      path.basename(argument) === 'lattice-scripted-adapter.mjs'
+    ));
+}
+
 async function runStart({ requestPath, executorAdapter, cwd, stdout }) {
   // --executor省略時の暗黙fallbackは持たない（Decision 8）。未知adapterはtyped reject。
   if (!KNOWN_ADAPTERS.includes(executorAdapter)) {
@@ -1302,7 +1595,7 @@ async function runActivate({ runDir, runRef, repoRoot, stdout, requestId = null
         adapter_kind: meta?.executor_adapter ?? null,
         required_artifact: '.lattice/runtime/adapter-registry/registry.json',
         registered_adapters: await registeredAdapterKinds(repoRoot),
-        reason: 'run activateは登録済みexecutor adapterを要求する。adapter登録は現時点で公開CLI面ではない',
+        reason: 'run activateは登録済みexecutor adapterを要求する。run adapter registerで登録する',
       });
     }
     throw new CliContractError(code, `managed activateが${response.outcome}で終了した: ${response.result?.unmet?.[1] ?? code}`);
@@ -1461,6 +1754,18 @@ export async function runManagedSupervisorDaemon({
         for (const extra of additionalActivations) {
           await extra.registerWithManagedSupervisor(managedSupervisor);
         }
+        if (!restarting && isDistributedScriptedControllerActivation(activation)) {
+          await driveInitialScriptedManagedEpoch({
+            runDir,
+            repoRoot,
+            request,
+            committed,
+            activation,
+            managedSupervisor,
+            initialEvents: events,
+            controlEvents: () => controlEvents,
+          });
+        }
         if (restarting) {
           await managedSupervisor.recoveryBarrier({ barrierId: `recovery-${randomUUID()}`,
             frozenEventDigest: events.at(-1).event_digest });
@@ -2803,6 +3108,22 @@ export async function runRuntimeCli({ argv, cwd, stdout, stderr }) {
     && argv[0] === 'plan' && argv[1] === 'compile'
     && argv[2] === '--schema' && argv[3] === '--json') {
     action = () => runRequestSchema({ stdout });
+  } else if (argv.length === 5
+    && argv[0] === 'run' && argv[1] === 'adapter' && argv[2] === 'register'
+    && argv[3] === '--schema' && argv[4] === '--json') {
+    action = () => runAdapterRegisterSchema({ stdout });
+  } else if (argv.length === 5
+    && argv[0] === 'run' && argv[1] === 'adapter' && argv[2] === 'register'
+    && argv[3] === '--input' && typeof argv[4] === 'string' && argv[4].length > 0) {
+    action = () => runAdapterRegister({
+      cwd,
+      inputPath: path.resolve(cwd, argv[4]),
+      stdout,
+    });
+  } else if (argv.length === 4
+    && argv[0] === 'run' && argv[1] === 'adapter' && argv[2] === 'list'
+    && argv[3] === '--json') {
+    action = () => runAdapterList({ cwd, stdout });
   } else if (argv.length === 4
     && argv[0] === 'run' && argv[1] === 'start'
     && argv[2] === '--schema' && argv[3] === '--json') {
@@ -2937,6 +3258,9 @@ export async function runRuntimeCli({ argv, cwd, stdout, stderr }) {
     if (error instanceof RuntimeEpochStoreError) {
       return typedFailure(stderr, error.code, error.message);
     }
+    if (error instanceof AdapterRegistryError) {
+      return typedFailure(stderr, error.code, error.message, error.detail);
+    }
     if (error instanceof ManagedRuntimeError) {
       return typedFailure(stderr, error.code, error.message);
     }

package/src/runtime-engine.mjs

@@ -292,18 +292,34 @@ export async function dispatchReadyFrontier(options = {}) {
       || dispatchResult.worktree_id.length === 0) {
       fail(`adapter dispatchがopaque handle／worktreeを返さない: ${todoId}`);
     }
+    const dispatchPayload = {
+      executor_handle: dispatchResult.executor_handle,
+      worktree_id: dispatchResult.worktree_id,
+      packet_digest: packet.packet_digest,
+      context_content_digest: packet.context_content_digest,
+    };
+    const managedFields = [
+      'write_lease_id',
+      'write_lease_digest',
+      'controller_registration_digest',
+      'controller_session_nonce_digest',
+      'direct_os_observation_binding',
+    ];
+    if (managedFields.some((field) => Object.hasOwn(dispatchResult, field))) {
+      if (!managedFields.every((field) => Object.hasOwn(dispatchResult, field))) {
+        fail(`managed adapter dispatch bindingが不足する: ${todoId}`);
+      }
+      Object.assign(dispatchPayload, Object.fromEntries(
+        managedFields.map((field) => [field, structuredClone(dispatchResult[field])]),
+      ));
+    }
     next.push(buildNextRunEvent({
       events: next,
       runId,
       kind: 'executor_dispatched',
       planEpoch: plan.plan_epoch,
       subject: { kind: 'todo', ref: todoId },
-      payload: {
-        executor_handle: dispatchResult.executor_handle,
-        worktree_id: dispatchResult.worktree_id,
-        packet_digest: packet.packet_digest,
-        context_content_digest: packet.context_content_digest,
-      },
+      payload: dispatchPayload,
       recordedAt,
     }));
     dispatchedNow.push(todoId);

package/src/runtime-managed-supervisor.mjs

@@ -699,6 +699,13 @@ function createControllerSocketTransport(socketPath, timeoutMs) {
       const line = buffer.slice(0, newline); buffer = buffer.slice(newline + 1);
       let document;
       try { document = JSON.parse(line); } catch { failPending('controller document JSON不正'); socket.destroy(); return; }
+      if (document?.schema === 'lattice.scripted_adapter_error.v1'
+        && typeof document.code === 'string'
+        && typeof document.message === 'string') {
+        failPending(`${document.code}: ${document.message}`);
+        socket.destroy();
+        return;
+      }
       if (validateControllerHeartbeat(document)) {
         Promise.resolve(heartbeatHandler?.(structuredClone(document))).catch(() => socket.destroy());
         continue;
@@ -755,6 +762,7 @@ async function activateManagedSupervisorController({ repoRoot, runDir, runId, ad
   const controllerSocketPath = path.join(runDir, controllerSocketRef);
   const supervisorSocketRef = 'supervisor/control.sock';
   let child = null;
+  let childStderr = '';
   try {
     await mkdir(controllerDir, { recursive: true, mode: 0o700 });
     let handshakeSocket = launch.endpoint;
@@ -775,7 +783,15 @@ async function activateManagedSupervisorController({ repoRoot, runDir, runId, ad
       if (!config.isFile() || config.isSymbolicLink() || sha256Bytes(await readFile(configPath)) !== launch.config_digest) fail('ADAPTER_LAUNCH_INVALID', 'config digest不一致');
       const bootstrap = createControllerBootstrap({ requestId: randomUUID(), runId, controllerSocketRef, supervisorSocketRef, supervisorSessionNonce });
       // controller hostのcwdはrun store。bootstrapの固定relative socket refを任意absolute pathへ拡張しない。
-      child = spawn(binaryReal, launch.argv, { cwd: runDir, detached: true, stdio: ['ignore', 'ignore', 'ignore', 'pipe'] });
+      child = spawn(binaryReal, launch.argv, {
+        cwd: runDir,
+        detached: true,
+        stdio: ['ignore', 'ignore', 'pipe', 'pipe'],
+      });
+      child.stderr.setEncoding('utf8');
+      child.stderr.on('data', (chunk) => {
+        childStderr = `${childStderr}${chunk}`.slice(-8_192);
+      });
       child.stdio[3].write(`${canonicalizeArtifact(bootstrap)}\n`);
       child.stdio[3].end();
       handshakeSocket = controllerSocketPath;
@@ -783,11 +799,23 @@ async function activateManagedSupervisorController({ repoRoot, runDir, runId, ad
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         try { if ((await lstat(handshakeSocket)).isSocket()) break; } catch (error) { if (error?.code !== 'ENOENT') throw error; }
-        if (child.exitCode !== null) fail('ADAPTER_CONTROLLER_UNAVAILABLE', `controller exited: ${child.exitCode}`);
+        if (child.exitCode !== null) {
+          fail(
+            'ADAPTER_CONTROLLER_UNAVAILABLE',
+            `controller exited: ${child.exitCode}${childStderr ? `: ${childStderr.trim()}` : ''}`,
+          );
+        }
         await new Promise((resolve) => setTimeout(resolve, 20));
       }
       let socketInfo;
-      try { socketInfo = await lstat(handshakeSocket); } catch { fail('ADAPTER_CONTROLLER_UNAVAILABLE', 'controller socket未生成'); }
+      try {
+        socketInfo = await lstat(handshakeSocket);
+      } catch {
+        fail(
+          'ADAPTER_CONTROLLER_UNAVAILABLE',
+          `controller socket未生成${childStderr ? `: ${childStderr.trim()}` : ''}`,
+        );
+      }
       if (!socketInfo.isSocket()) fail('ADAPTER_CONTROLLER_UNAVAILABLE', 'controller endpointがsocketでない');
       // exec後にも同じ実行image bytesを再検証する。PID生存も同時に要求する。
       try { process.kill(child.pid, 0); } catch { fail('ADAPTER_CONTROLLER_UNAVAILABLE', 'controller process不達'); }
@@ -902,7 +930,18 @@ async function activateManagedSupervisorController({ repoRoot, runDir, runId, ad
       await registerWithManagedSupervisor(managedSupervisor);
       return managedSupervisor;
     };
-    return { supervisorDescriptor, activationControlEvent, controllerDescriptor, registration, sessionNonce: supervisorSessionNonce, childPid: child?.pid ?? controllerDescriptor.pid, createManagedSupervisor, registerWithManagedSupervisor, disposeController };
+    return {
+      supervisorDescriptor,
+      activationControlEvent,
+      controllerDescriptor,
+      registration,
+      launchDescriptor: structuredClone(launch),
+      sessionNonce: supervisorSessionNonce,
+      childPid: child?.pid ?? controllerDescriptor.pid,
+      createManagedSupervisor,
+      registerWithManagedSupervisor,
+      disposeController,
+    };
   } catch (error) {
     if (child?.pid) { try { process.kill(child.pid, 'SIGTERM'); } catch { /* already exited */ } }
     await rm(controllerSocketPath, { force: true }).catch(() => {});