@quolu/lattice 0.63.2 → 0.63.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.63.2",
+  "version": "0.63.3",
   "description": "Schedulability compiler for multi-agent development: observe real code boundaries, refactor the conflicting seam, recompile the plan for parallel execution",
   "author": {
     "name": "Quo / クオ at kitepon.dev",

package/src/runtime-control-store.mjs

@@ -319,6 +319,15 @@ async function replaceCanonical({ pathname, expectedBytes, value, validator, cra
   }
 }
 
+/**
+ * control-events.jsonを書く他module（gate storeのatomic commit）が、このstoreのappendと
+ * 同じper-directory直列化を共有するための入口。同一process内で書き手が2つの規律に
+ * 分かれると、appendがcommitの読みと置換の間へ挟まり偽のcommitted prefix衝突になる。
+ */
+export function withControlJournalMutation(runDir, mutation) {
+  return enqueue(path.resolve(runDir), mutation);
+}
+
 function enqueue(runDir, mutation) {
   const previous = mutationQueues.get(runDir) ?? Promise.resolve();
   const result = previous.then(mutation);

package/src/runtime-gate-store.mjs

@@ -4,6 +4,7 @@ import { lstat, mkdir, open, readFile, rename, unlink } from 'node:fs/promises';
 import path from 'node:path';
 
 import { canonicalizeArtifact } from './artifact-contracts.mjs';
+import { withControlJournalMutation } from './runtime-control-store.mjs';
 import { selfDigest } from './runtime-contracts.mjs';
 
 const SHA256 = /^[0-9a-f]{64}$/;
@@ -407,9 +408,17 @@ async function commitBuilt({ runDir, built, crashInjector, controlEventsPath = n
 }
 
 export async function commitRuntimeGateActivation(options) {
-  const built = await buildCommit(options);
-  return commitBuilt({ runDir: options.runDir, built, crashInjector: options.crashInjector,
-    controlEventsPath: options.controlEventsPath ?? null });
+  // control journalの読み(buildCommit)と置換(commitBuilt)の間へ、同一process内の
+  // control store appendが挟まると、committed prefix検査が偽のGATE_COMMIT_CONFLICTに
+  // なる（2026-08-22 CI負荷下で実被弾: managed recompileのepoch activationへdaemonの
+  // 並行appendが割り込んだ）。appendと同じper-directory直列化を共有して排除する。
+  // 別process間の競合検査は従来どおりprefix比較が持つ。
+  const eventsPath = options.controlEventsPath ?? path.join(options.runDir, 'control-events.json');
+  return withControlJournalMutation(path.dirname(eventsPath), async () => {
+    const built = await buildCommit(options);
+    return commitBuilt({ runDir: options.runDir, built, crashInjector: options.crashInjector,
+      controlEventsPath: options.controlEventsPath ?? null });
+  });
 }
 
 export async function recoverRuntimeGateCommit(options) {

package/src/runtime-managed-supervisor.mjs

@@ -1011,8 +1011,33 @@ async function activateManagedSupervisorController({ repoRoot, runDir, runId, ad
         fail('ADAPTER_LAUNCH_INVALID', 'existing endpoint ownerが一意でない');
       }
     }
-    const handshake = await exchangeControllerHandshake({ socketPath: handshakeConnectPath, runId,
-      supervisorSessionNonce, controllerSocketRef, timeoutMs });
+    // socket fileの出現はbindの証拠でありlistenの証拠ではない。負荷下ではcontrollerが
+    // bindとlistenの間でpreemptされ、fileを見て接続した一回だけECONNREFUSEDになる
+    // （2026-08-22 CI負荷下で実被弾）。起動したchildに限り、listen受理までを起動待ちに
+    // 含めてdeadline内はECONNREFUSEDだけを待ち直す。死んだcontrollerはexitCode検査が、
+    // 起動しないcontrollerはdeadlineが従来どおり落とす。既存endpoint（child無し）は
+    // owner検証済みのlistener前提なので単発のまま。
+    const handshakeDeadline = Date.now() + timeoutMs;
+    let handshake;
+    for (;;) {
+      try {
+        handshake = await exchangeControllerHandshake({ socketPath: handshakeConnectPath, runId,
+          supervisorSessionNonce, controllerSocketRef, timeoutMs });
+        break;
+      } catch (error) {
+        const listenPending = child !== null && error instanceof ManagedRuntimeError
+          && ['ECONNREFUSED', 'ENOENT'].some((code) => String(error.message).includes(code))
+          && Date.now() < handshakeDeadline;
+        if (!listenPending) throw error;
+        if (child.exitCode !== null) {
+          fail(
+            'ADAPTER_CONTROLLER_UNAVAILABLE',
+            `controller exited: ${child.exitCode}${childStderr ? `: ${childStderr.trim()}` : ''}`,
+          );
+        }
+        await new Promise((resolve) => setTimeout(resolve, 20));
+      }
+    }
     const controllerDescriptor = handshake.descriptor;
     if (controllerDescriptor.adapter_kind !== adapterKind || controllerDescriptor.socket_ref !== controllerSocketRef
       || controllerDescriptor.capabilities.capabilities_digest !== launch.capabilities_digest

package/src/runtime-multi-epoch-store.mjs

@@ -490,18 +490,11 @@ export async function activateEpochOneStore({
     }
   }
 
-  const meta = {
-    schema: 'lattice.run_meta.v2',
-    run_id: normalizedMeta.run_id,
-    executor_adapter: normalizedMeta.executor_adapter,
-    run_event_schema: 'lattice.run_event.v1',
-    control_event_schema: 'lattice.runtime_control_event.v1',
-    epoch_bundle_schema: 'lattice.runtime_epoch_bundle.v1',
-    created_plan_digest: compileArtifact.plan.plan_digest,
-  };
-  meta.meta_digest = digestArtifact(meta);
-  await replaceDurableJson(runDir, 'run-meta.json', meta);
-
+  // pointerをmetaより先に書く。読み手はmeta v2を見てからpointerを読むので、逆順だと
+  // 2書き込みの間にmeta v2だけが見え、並行するreaderがINVALID_RUN_STORE
+  // （committed epoch pointerを読めない）で落ちる（2026-08-22 CI負荷下で実被弾）。
+  // この順ならmeta v2の可視がpointer実在を含意し、途中crashはmeta v1のまま
+  // （余剰のpointerはlegacy読取りに影響せず、再activationが置換する）。
   const pointer = {
     schema: 'lattice.committed_epoch_pointer.v1',
     run_id: normalizedMeta.run_id,
@@ -513,6 +506,18 @@ export async function activateEpochOneStore({
   };
   pointer.pointer_digest = digestArtifact(pointer);
   await replaceDurableJson(runDir, 'committed-epoch.json', pointer);
+
+  const meta = {
+    schema: 'lattice.run_meta.v2',
+    run_id: normalizedMeta.run_id,
+    executor_adapter: normalizedMeta.executor_adapter,
+    run_event_schema: 'lattice.run_event.v1',
+    control_event_schema: 'lattice.runtime_control_event.v1',
+    epoch_bundle_schema: 'lattice.runtime_epoch_bundle.v1',
+    created_plan_digest: compileArtifact.plan.plan_digest,
+  };
+  meta.meta_digest = digestArtifact(meta);
+  await replaceDurableJson(runDir, 'run-meta.json', meta);
   return { bundle, meta, pointer };
 }