weir-harness 1.2.2 → 2.0.0

package/src/context-guard/index.js

@@ -118,7 +118,7 @@ function apply(ctx, config = {}) {
     const request = state.request
     if (!live(agent) || request?.kind !== 'applied' || request.delivered) return
     fresh(agent)
-    if (request.kind !== 'applied' || request.controller.signal.aborted || ctx.get?.('weirEditLock')?.blocksContinuation?.(agent)) {
+    if (request.kind !== 'applied' || request.controller.signal.aborted) {
       state.blocked = true
       request.delivered = true
       record(agent, request, 'resume-blocked')
@@ -197,7 +197,7 @@ function apply(ctx, config = {}) {
     if (decision.kind !== 'enter') return decision
     let resume
     const current = state.request
-    if (current?.kind === 'applied' && !current.delivered && !signal?.aborted && !ctx.get?.('weirEditLock')?.blocksContinuation?.(agent)) {
+    if (current?.kind === 'applied' && !current.delivered && !signal?.aborted) {
       current.delivered = true
       current.detach?.(); current.detachMaintenance?.()
       resume = RESUME_AFTER_COMPACTION

package/src/delegate/supervision-mount.js

@@ -10,7 +10,6 @@ import { auditFilePathOf, isTerminalStatus, readAuditTail, readChildFinalText }
 import { AUDIT_TYPES } from '../shared/audit.js'
 import { userTextMessage } from '../shared/user-message.js'
 import { contentText } from '../shared/content-text.js'
-import { withSupervisedEditResume, settleDelegateEditLifecycle } from '../shared/delegate-edit-lifecycle.js'
 
 /**
  * Mount the supervision subsystem on the plugin ctx.
@@ -81,8 +80,8 @@ export function mountSupervision({ ctx, audit, settings, supervisionNow, onChild
           sendTo: async (childId, text) => {
             await ctx.subagents.sendMessage(parent, childId, [{ type: 'text', text }], { signal: new AbortController().signal })
           },
-          resumeTo: (childId, text) => withSupervisedEditResume(parent, childId, () =>
-            ctx.subagents.sendMessage(parent, childId, [{ type: 'text', text }], { signal: new AbortController().signal })),
+          resumeTo: (childId, text) =>
+            ctx.subagents.sendMessage(parent, childId, [{ type: 'text', text }], { signal: new AbortController().signal }),
           interruptChild: (childId) => {
             ctx.subagents.interrupt(childId, { kind: 'ancestor', agent: parent })
           },
@@ -107,8 +106,9 @@ export function mountSupervision({ ctx, audit, settings, supervisionNow, onChild
               const runtime = runtimeFor(fact.childId)
               // No observed quiescence means no automatic handoff, including
               // a cold bookkeeping fact. Lane reconciliation owns that case.
-              const disposition = settleDelegateEditLifecycle(parent, fact.childId, runtime.agent)
-              void Promise.all([runtime.promise, disposition])
+              // Runtime quiescence is the ONLY gate: the retired Edit Lock
+              // disposition acknowledgement used to join here as well.
+              void runtime.promise
                 .then(() => onChildSettled?.(fact.childId, parent))
                 .catch(error => {
                   const note = `child ${fact.childId}: terminal handoff failed; lane remains bound: ${error?.message ?? error}`

package/src/delegate/tool.js

@@ -5,7 +5,6 @@ import { parseEscalation } from './escalate.js'
 import { continuableLane, oneShotLane, spawnGuardedChild, supervisedLane } from './spawn-adapter.js'
 import { WORKTREE_CODES } from '../worktree/errors.js'
 import { contentText } from '../shared/content-text.js'
-import { settleDelegateEditLifecycle } from '../shared/delegate-edit-lifecycle.js'
 
 export const DELEGATE_TOOL_NAME = 'delegate'
 export const BATCH_LIMIT = 16
@@ -319,16 +318,9 @@ async function spawnBackground(item, args, deps, exec) {
   return { job_id: jobId, label }
 }
 
-async function settledResult(started, parent) {
-  try { return await started.result } finally {
-    // subagent/end is emit, not an awaited barrier. Explicitly join the
-    // incarnation's standard edit disposition before result/escalation/handoff.
-    await settleDelegateEditLifecycle(parent, started.id, started.agent)
-  }
-}
 /** Await one child, honoring the one-level ESCALATE contract. */
 async function withEscalation(started, item, deps, exec, binding = null) {
-  const first = await settledResult(started, exec.agent)
+  const first = await started.result
   const text = contentText(first.output)
   const escalation = parseEscalation(text)
   if (!escalation) {
@@ -345,7 +337,7 @@ async function withEscalation(started, item, deps, exec, binding = null) {
   // The escalated respawn works in the same lane under the same binding (the
   // lane's bound child stays the first child; it settles once, after this).
   const respawned = await spawnGuardedChild({ target, prompt, parent: exec.agent, signal: exec.signal, label: `${laneLabel(target.label, binding)} (escalated)`, laneGuard: laneGuardOf(binding, deps, exec) }, oneShotLane(), deps)
-  const second = await settledResult(respawned, exec.agent)
+  const second = await respawned.result
   return {
     id: respawned.id,
     status: second.stopReason,