fix: preserve queued Goal steering across scheduler dispatch

.github/workflows/bundle-gate.yml

@@ -44,10 +44,9 @@ jobs:
       - name: Build a single-file stable plugin from source
         run: npm run build:plugin
 
-      - name: Verify generated entry syntax and tests
+      - name: Verify generated entry syntax and import
         run: |
           node --check src/index.js
-          npm test
           bun -e "await import('./src/index.js')"
 
       - name: Install current OpenCode CLI
@@ -56,8 +55,14 @@ jobs:
       - name: Show OpenCode version
         run: npx --no-install opencode --version
 
-      - name: Run real-host canary against generated bundle
-        run: node scripts/host-loop-canary.mjs
+      - name: Verify real-host Loop and QUEUED Goal steering against clean generated bundle
+        run: npm run canary:host
         env:
           OPENCODE_PRINT_LOGS: "1"
           OPENCODE_LOG_LEVEL: DEBUG
+
+      - name: Restore locked test dependencies
+        run: npm ci
+
+      - name: Run generated-bundle regression suite
+        run: npm test

.github/workflows/ci.yml

@@ -160,8 +160,8 @@ jobs:
       - name: Show OpenCode version
         run: npx --no-install opencode --version
 
-      - name: Run real-host Loop canary
-        run: node scripts/host-loop-canary.mjs
+      - name: Run real-host Loop and queued Goal steering canaries
+        run: npm run canary:host
         env:
           OPENCODE_PRINT_LOGS: "1"
           OPENCODE_LOG_LEVEL: DEBUG

package.json

@@ -21,9 +21,9 @@
     "build:plugin": "bun build src/source/v1.js --outfile=src/index.js --target=bun --format=esm --external=@opencode-ai/plugin/tool",
     "build:plugin:npm": "npm run build:plugin",
     "prepack": "node --check src/index.js",
-    "check": "node --check src/source/v1.js && node --check src/source/core/args.js && node --check src/source/core/state.js && node --check src/source/core/jobs.js && node --check src/source/core/process.js && node --check src/source/opencode/sdk.js && node --check src/source/opencode/session-context.js && node --check src/source/opencode/command-router.js && node --check src/source/opencode/goal-commands.js && node --check src/source/opencode/loop-commands.js && node --check src/source/opencode/loop-registration.js && node --check src/source/runtime/session-activity.js && node --check src/source/runtime/session-status.js && node --check src/source/runtime/compaction.js && node --check src/source/runtime/executor.js && node --check src/source/runtime/scheduler.js && node --check src/source/runtime/goal-runtime.js && node --check src/source/runtime/goal-policy.js && node --check src/source/runtime/goal-steering.js && node --check src/source/runtime/job-workspace.js && node --check src/source/opencode2/prompt-runtime.js && node --check src/source/legacy-v1.js && node --check src/index.js && node --check scripts/install-node.mjs && node --check scripts/loopd.mjs && node --check scripts/install-test.mjs && node --check scripts/loopd-test.mjs && node --check scripts/smoke-test.mjs && node --check scripts/host-adapter-contract-test.mjs && node --check scripts/command-router-test.mjs && node --check scripts/goal-command-handlers-test.mjs && node --check scripts/loop-command-handlers-test.mjs && node --check scripts/loop-registration-test.mjs && node --check scripts/session-activity-test.mjs && node --check scripts/session-status-test.mjs && node --check scripts/compaction-runtime-test.mjs && node --check scripts/executor-runtime-test.mjs && node --check scripts/scheduler-runtime-test.mjs && node --check scripts/goal-runtime-test.mjs && node --check scripts/goal-policy-test.mjs && node --check scripts/goal-steering-test.mjs && node --check scripts/job-workspace-test.mjs && node --check scripts/v2-prompt-runtime-test.mjs && node --check scripts/v2-prompt-interval-test.mjs && node --check scripts/v2-command-runtime-test.mjs && node --check scripts/v2-command-adapter-test.mjs && node --check scripts/comprehensive-watchdog.mjs && node --check scripts/comprehensive-test.mjs && node --check scripts/host-loop-canary.mjs",
+    "check": "node --check src/source/v1.js && node --check src/source/core/args.js && node --check src/source/core/state.js && node --check src/source/core/jobs.js && node --check src/source/core/process.js && node --check src/source/opencode/sdk.js && node --check src/source/opencode/session-context.js && node --check src/source/opencode/command-router.js && node --check src/source/opencode/goal-commands.js && node --check src/source/opencode/loop-commands.js && node --check src/source/opencode/loop-registration.js && node --check src/source/runtime/session-activity.js && node --check src/source/runtime/session-status.js && node --check src/source/runtime/compaction.js && node --check src/source/runtime/executor.js && node --check src/source/runtime/scheduler.js && node --check src/source/runtime/goal-runtime.js && node --check src/source/runtime/goal-policy.js && node --check src/source/runtime/goal-steering.js && node --check src/source/runtime/job-workspace.js && node --check src/source/opencode2/prompt-runtime.js && node --check src/source/legacy-v1.js && node --check src/index.js && node --check scripts/install-node.mjs && node --check scripts/loopd.mjs && node --check scripts/install-test.mjs && node --check scripts/loopd-test.mjs && node --check scripts/smoke-test.mjs && node --check scripts/host-adapter-contract-test.mjs && node --check scripts/command-router-test.mjs && node --check scripts/goal-command-handlers-test.mjs && node --check scripts/loop-command-handlers-test.mjs && node --check scripts/loop-registration-test.mjs && node --check scripts/session-activity-test.mjs && node --check scripts/session-status-test.mjs && node --check scripts/compaction-runtime-test.mjs && node --check scripts/executor-runtime-test.mjs && node --check scripts/scheduler-runtime-test.mjs && node --check scripts/goal-runtime-test.mjs && node --check scripts/goal-policy-test.mjs && node --check scripts/goal-steering-test.mjs && node --check scripts/job-workspace-test.mjs && node --check scripts/v2-prompt-runtime-test.mjs && node --check scripts/v2-prompt-interval-test.mjs && node --check scripts/v2-command-runtime-test.mjs && node --check scripts/v2-command-adapter-test.mjs && node --check scripts/comprehensive-watchdog.mjs && node --check scripts/comprehensive-test.mjs && node --check scripts/host-loop-canary.mjs && node --check scripts/host-goal-steering-canary.mjs",
     "test": "node scripts/command-router-test.mjs && node scripts/goal-command-handlers-test.mjs && node scripts/loop-command-handlers-test.mjs && node scripts/loop-registration-test.mjs && node scripts/session-activity-test.mjs && node scripts/session-status-test.mjs && node scripts/compaction-runtime-test.mjs && node scripts/executor-runtime-test.mjs && node scripts/scheduler-runtime-test.mjs && node scripts/goal-runtime-test.mjs && node scripts/goal-policy-test.mjs && node scripts/goal-steering-test.mjs && node scripts/job-workspace-test.mjs && node scripts/v2-prompt-runtime-test.mjs && node scripts/v2-prompt-interval-test.mjs && node scripts/v2-command-runtime-test.mjs && node scripts/v2-command-adapter-test.mjs && node scripts/install-test.mjs && node scripts/loopd-test.mjs && node scripts/smoke-test.mjs && node scripts/host-adapter-contract-test.mjs && node scripts/comprehensive-watchdog.mjs",
-    "canary:host": "node scripts/host-loop-canary.mjs",
+    "canary:host": "node scripts/host-loop-canary.mjs && node scripts/host-goal-steering-canary.mjs",
     "install:global": "node scripts/install-node.mjs",
     "pack:zip": "node scripts/make-zip.mjs"
   },

scripts/goal-steering-test.mjs

@@ -1,5 +1,6 @@
 import assert from "node:assert/strict"
 import { createGoalSteeringRuntime } from "../src/source/runtime/goal-steering.js"
+import { guardLoopOwnedUserMessage, loopOwnedUserMessageGuardActive, clearLoopOwnedUserMessageGuard } from "../src/source/opencode/messages.js"
 
 function goal(id = "goal-1") {
   return {
@@ -49,17 +50,22 @@ function assistantEvent(sessionID = "ses-steering", parentID = "user-steering")
     now: () => 1000,
   })
 
-  const result = await runtime.handleEvent("/workspace", client, userEvent())
+  const result = await runtime.handleUserMessage("/workspace", client, { sessionID: "ses-steering", messageID: "user-steering" })
   assert.equal(result.handled, true)
   assert.equal(result.preempted, true)
-  assert.equal(aborts, 1, "queued user steering should abort only the active Goal turn")
+  assert.equal(aborts, 1, "chat.message steering should abort only the active Goal turn before the new prompt dispatches")
   assert.equal(clears, 1, "the aborted Goal run must no longer be finalized as a completed loop run")
   assert.equal(runtime.shouldSuppressIdle("ses-steering"), true, "abort-generated idle must be suppressed while steering is queued")
   assert.deepEqual(state.jobs[0], originalGoal, "normal steering must not pause or rewrite the Goal contract")
   assert.equal(logs.at(-1)?.type, "goal-user-steering")
   assert.equal(logs.at(-1)?.detail?.preempted, true)
 
-  runtime.handleEvent("/workspace", client, assistantEvent())
+  const duplicate = await runtime.handleEvent("/workspace", client, userEvent())
+  assert.equal(duplicate.duplicate, true, "message.updated must not abort a steering message already handled by chat.message")
+  assert.equal(aborts, 1)
+  assert.equal(clears, 1)
+
+  await runtime.handleEvent("/workspace", client, assistantEvent())
   assert.equal(runtime.shouldSuppressIdle("ses-steering"), false, "matching steering assistant turn should release idle suppression")
 }
 
@@ -75,7 +81,7 @@ function assistantEvent(sessionID = "ses-steering", parentID = "user-steering")
     isLoopOwnedUserMessage: () => false,
     now: () => 2000,
   })
-  const result = await runtime.handleEvent("/workspace", { session: { abort: async () => {} } }, userEvent("ses-idle", "user-idle"))
+  const result = await runtime.handleUserMessage("/workspace", { session: { abort: async () => {} } }, { sessionID: "ses-idle", messageID: "user-idle" })
   assert.equal(result.handled, true)
   assert.equal(result.preempted, false)
   assert.equal(aborts, 0, "an idle Goal should let the foreground user turn start normally")
@@ -95,7 +101,7 @@ function assistantEvent(sessionID = "ses-steering", parentID = "user-steering")
     isLoopOwnedUserMessage: () => false,
     now: () => 3000,
   })
-  const result = await runtime.handleEvent("/workspace", { session: { abort: async () => {} } }, userEvent("ses-ordinary", "user-ordinary"))
+  const result = await runtime.handleUserMessage("/workspace", { session: { abort: async () => {} } }, { sessionID: "ses-ordinary", messageID: "user-ordinary" })
   assert.equal(result.handled, true)
   assert.equal(result.preempted, false)
   assert.equal(aborts, 0)
@@ -110,7 +116,7 @@ function assistantEvent(sessionID = "ses-steering", parentID = "user-steering")
     appendLoopLog: async () => {},
     isLoopOwnedUserMessage: () => true,
   })
-  const result = await runtime.handleEvent("/workspace", { session: {} }, userEvent("ses-owned", "owned-message"))
+  const result = await runtime.handleUserMessage("/workspace", { session: {} }, { sessionID: "ses-owned", messageID: "owned-message" })
   assert.equal(result.loopOwned, true)
   assert.equal(reads, 0, "Loop-owned synthetic user messages must not be mistaken for human steering")
 }
@@ -128,10 +134,20 @@ function assistantEvent(sessionID = "ses-steering", parentID = "user-steering")
     now: () => clock,
     suppressionMs: 100,
   })
-  await runtime.handleEvent("/workspace", { session: { abort: async () => {} } }, userEvent("ses-expire", "user-expire"))
+  await runtime.handleUserMessage("/workspace", { session: { abort: async () => {} } }, { sessionID: "ses-expire", messageID: "user-expire" })
   assert.equal(runtime.shouldSuppressIdle("ses-expire"), true)
   clock += 101
   assert.equal(runtime.shouldSuppressIdle("ses-expire"), false, "lost steering must not suppress autonomous continuation forever")
 }
 
+{
+  const sessionID = "ses-loop-owned-two-stage"
+  guardLoopOwnedUserMessage(sessionID)
+  assert.equal(loopOwnedUserMessageGuardActive(sessionID), true, "chat.message should recognize a pending synthetic prompt before OpenCode assigns its ID")
+  assert.equal(loopOwnedUserMessageGuardActive(sessionID, "synthetic-user-1"), true, "message.updated should consume the pending guard and bind the real synthetic message ID")
+  assert.equal(loopOwnedUserMessageGuardActive(sessionID, "synthetic-user-1"), true, "the bound synthetic message ID should remain Loop-owned for later duplicate events")
+  clearLoopOwnedUserMessageGuard(sessionID)
+  assert.equal(loopOwnedUserMessageGuardActive(sessionID, "synthetic-user-1"), false)
+}
+
 console.log("Goal steering runtime tests passed")