@quolu/lattice 0.62.1 → 0.62.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.62.1",
+  "version": "0.62.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-pull-intake.mjs

@@ -990,9 +990,24 @@ export async function attachPullWorker({ runDir, taskId, input, environment = pr
     const occupied = state.intakes.find((entry) => (
       entry.task_id !== taskId && entry.accepted === null && entry.worker?.pid === input.pid
     ));
-    if (occupied) {
+    if (occupied && occupied.intervention.state !== 'hold') {
       fail('WORKER_ALREADY_ATTACHED', `同じworkerは複数active intakeへattachできない: ${occupied.task_id}`);
     }
+    if (occupied && occupied.intervention.state === 'hold') {
+      if (occupied.worker.stopped) {
+        await signalAttachedWorker(occupied, 'SIGCONT');
+        current = await appendEvent(runDir, current, buildEvent({
+          events: current.events, meta: current.meta, kind: 'worker_resumed',
+          taskId: occupied.task_id, payload: { released_by: 'stale_hold_reattach' },
+        }));
+      }
+      current = await appendEvent(runDir, current, buildEvent({
+        events: current.events, meta: current.meta, kind: 'worker_detached',
+        taskId: occupied.task_id,
+        payload: { detached_by: actor, pid: occupied.worker.pid, resumed: occupied.worker.stopped },
+      }));
+      state = project(current.events, current.meta);
+    }
     if (intake.worker !== null) {
       if (digestArtifact(binding) !== digestArtifact({
         pid: intake.worker.pid, process_group_id: intake.worker.process_group_id,
@@ -1082,6 +1097,16 @@ export async function detachPullWorker({ runDir, taskId, environment = process.e
   } finally { await lock.release(); }
 }
 
+export function concurrentAttachBlocked(occupied) {
+  if (!occupied) return false;
+  return occupied.intervention?.state !== 'hold';
+}
+
+export function remainingRuntimeConflictFindings(findings, acceptedTaskId) {
+  if (!Array.isArray(findings)) return [];
+  return findings.filter((finding) => !(finding.todo_ids ?? []).includes(acceptedTaskId));
+}
+
 export function observationIntakes(state, includeTaskId = null) {
   return state.intakes.filter((entry) => {
     if (entry.accepted !== null) return false;
@@ -1247,6 +1272,34 @@ export async function acceptPullTask({ repoRoot, runDir, taskId, environment = p
         }));
       }
     }
+    state = project(current.events, current.meta);
+    for (const waiting of state.intakes.filter((entry) => (
+      entry.accepted === null && entry.intervention.reason === 'runtime_conflict'
+    ))) {
+      const remaining = remainingRuntimeConflictFindings(
+        waiting.intervention.detail?.findings, taskId,
+      );
+      if (remaining.length > 0) {
+        if (remaining.length === (waiting.intervention.detail?.findings ?? []).length) continue;
+        current = await changeIntervention(runDir, current, waiting.task_id, {
+          ...waiting.intervention,
+          detail: { ...waiting.intervention.detail, findings: remaining },
+        });
+        continue;
+      }
+      const intervention = { state: 'none', reason: null, next_action: null,
+        lease_state: 'granted', detail: { released_by_accepted_task: taskId } };
+      current = await changeIntervention(runDir, current, waiting.task_id, intervention);
+      const resumed = project(current.events, current.meta).intakes
+        .find((entry) => entry.task_id === waiting.task_id);
+      if (resumed.worker?.stopped) {
+        await signalAttachedWorker(resumed, 'SIGCONT');
+        current = await appendEvent(runDir, current, buildEvent({
+          events: current.events, meta: current.meta, kind: 'worker_resumed', taskId: waiting.task_id,
+          payload: { released_by_accepted_task: taskId },
+        }));
+      }
+    }
     const result = { schema: 'lattice.pull_accept_result.v1', outcome: 'accepted',
       already_accepted: false, task_id: taskId, head_sha: checkpoint.diff.head_sha,
       done_event_digest: done.event_digest, checkpoint_digest: checkpoint.checkpoint_digest };