@bybrawe/opencode-loop 0.5.36 → 0.5.38

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 0.5.38
+
+Long-session provider-error, waiting-user, and OpenCode 2.0.11 compatibility release.
+
+- Route Loop-owned OpenCode `session.error` events into stable V1 run ownership instead of letting a terminal provider failure disappear into later idle/stale recovery.
+- Pause fail-closed on non-retryable provider/auth/policy/unknown session errors, persisting the error name/message/timestamp so an unlimited idle loop cannot keep dispatching after a terminal host failure.
+- Refund and exponentially back off retryable terminal `APIError` attempts without consuming logical `runCount`, `--max-runs`, or ordinary failure budget; keep `MessageAbortedError` on the existing user/session-abort path.
+- Deduplicate identical stale/completed-status recovery diagnostics per active run, preventing concurrent status probes from amplifying one recovery event into hundreds of `loop.log` records.
+- Keep ordinary `/loop devam et` intentionally unlimited, but pause after two consecutive current assistant replies explicitly say autonomous work is waiting for user approval, input, access, credentials, or another user action. A reply naming concrete autonomous next work clears the waiting-user streak.
+- Add exact regressions for the reported Loto Diyarı free-tier provider error, the Turkish `Onay bekleyenler: commit + push, canlı migration, cihaz testi` steady-state, retryable provider recovery, abort classification, recovery-log deduplication, waiting-user UX, and generated-bundle parity.
+- Harden Windows regression reliability with bounded temporary-directory cleanup retries and bounded waits for persisted stale-busy recovery, without changing production scheduler semantics.
+- Add a dual local-plugin server entry that preserves the OpenCode 1.x `server` contract while exposing the OpenCode 2.x `{ id, setup }` contract required by OpenCode 2.0.11.
+- Support the current OpenCode 2.0.11 command editor and session-command field shapes while retaining the older beta adapter path; normalize current native session execution/status events and select the official Promise event stream without relying on function arity or command-reload timing.
+- Prove OpenCode 2.0.11 compatibility with an exact real-host gate: the local plugin is active, Loop commands register, a two-turn autonomous Loop reaches the deterministic provider exactly twice, control lifecycle commands mutate persisted state correctly, and `--max-runs` stops further turns.
+- Verify the exact feature heads across Ubuntu/Windows CI, minimum/latest OpenCode plugin compatibility, real OpenCode Loop canaries, Dedicated Goal Coexistence, V2 Lifecycle Contract, OpenCode 2 Real Adapter, and the Single-file Bundle Gate.
+
+## 0.5.37
+
+Dedicated Goal tool-isolation release.
+
+- Detect a persisted dedicated @bybrawe/opencode-goal Goal before any experimental `opencode_loop_goal_*` lifecycle tool can mutate Loop Goal state.
+- Fail closed when a dedicated Goal owns the session and explicitly direct the model to `opencode_goal_progress`, `opencode_goal_wait_for_user`, `opencode_goal_blocked`, or `opencode_goal_complete` instead of returning a misleading experimental-Goal result.
+- Mark the Loop lifecycle tools as experimental `/loop-goal`-only in their model-visible descriptions, preventing the exact blocker-tool collision reproduced by the long Loto Diyarı session.
+- Keep modular source and the committed single-file stable bundle byte-for-byte synchronized with the Bun build output.
+- Add coexistence smoke coverage for blocked, progress, and completion collisions; exact feature-head CI, Dedicated Goal Coexistence, and Single-file Bundle Gate pass across the required host/platform lanes.
+
 ## 0.5.36
 
 Empty-turn fail-safe release.

package/README.md

@@ -4,7 +4,7 @@
 
 OpenCode Loop adds `/loop`, scheduled prompt/command/shell jobs, compact scheduling, verification/checkpoints, and the `opencode-loopd` background daemon.
 
-> **Current stable release: `0.5.36`.**
+> **Current stable release: `0.5.38`.**
 
 ## Install or update
 

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@bybrawe/opencode-loop",
-  "version": "0.5.36",
+  "version": "0.5.38",
   "description": "Claude Code/Codex style /loop and experimental goal mode for OpenCode: heartbeat scheduler, idle-safe loops, scheduled commands, compact scheduling, verification, checkpoints, and persistent coding goals.",
   "type": "module",
   "main": "src/index.js",
   "exports": {
-    ".": "./src/index.js"
+    ".": "./src/index.js",
+    "./server": "./src/server.js"
   },
   "files": [
     "src",
@@ -18,11 +19,11 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "build:plugin": "bun build src/source/v1.js --outfile=src/index.js --target=bun --format=esm --external=@opencode-ai/plugin/tool",
+    "build:plugin": "bun build src/source/v1.js --outfile=src/index.js --target=bun --format=esm --external=@opencode-ai/plugin/tool && bun build src/source/server.js --outfile=src/server.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/continuation.js && node --check src/source/core/schedule-syntax.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/schedule-policy.js && node --check src/source/runtime/scheduler-diagnostics.js && node --check src/source/runtime/companion-goal.js && node --check src/source/runtime/loop-diagnostics.js && node --check src/source/runtime/compaction.js && node --check src/source/runtime/action-dispatch.js && node --check src/source/runtime/network-recovery.js && node --check src/source/runtime/empty-turn.js && node --check src/source/runtime/terminal-guard.js && node --check src/source/runtime/run-finalization.js && node --check src/source/runtime/run-admission.js && node --check src/source/runtime/executor.js && node --check src/source/runtime/scheduler.js && node --check src/source/runtime/goal-prompt.js && node --check src/source/runtime/goal-report.js && node --check src/source/runtime/goal-evidence.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/opencode2/diagnostics.js && node --check src/source/opencode2/logging.js && node --check src/source/legacy-v1.js && node --check src/index.js && node --check scripts/install-node.mjs && node --check scripts/install-with-goals.mjs && node --check scripts/loopd.mjs && node --check scripts/install-test.mjs && node --check scripts/goal-companion-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/schedule-syntax-test.mjs && node --check scripts/schedule-policy-test.mjs && node --check scripts/session-activity-test.mjs && node --check scripts/session-status-test.mjs && node --check scripts/session-status-idle-recovery-test.mjs && node --check scripts/empty-turn-recovery-test.mjs && node --check scripts/network-recovery-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/v2-diagnostics-test.mjs && node --check scripts/v2-logging-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 && node --check scripts/publish-workflow-test.mjs",
-    "test": "node scripts/publish-workflow-test.mjs && 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/schedule-syntax-test.mjs && node scripts/schedule-policy-test.mjs && node scripts/session-activity-test.mjs && node scripts/session-status-test.mjs && node scripts/session-status-idle-recovery-test.mjs && node scripts/empty-turn-recovery-test.mjs && node scripts/network-recovery-test.mjs && node scripts/compaction-runtime-test.mjs && node scripts/action-dispatch-test.mjs && node scripts/run-finalization-test.mjs && node scripts/run-admission-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/v2-diagnostics-test.mjs && node scripts/v2-logging-test.mjs && node scripts/install-test.mjs && node scripts/goal-companion-test.mjs && node scripts/loopd-test.mjs && node scripts/smoke-test.mjs && node scripts/host-adapter-contract-test.mjs && node scripts/comprehensive-watchdog.mjs",
+    "prepack": "node --check src/index.js && node --check src/server.js",
+    "check": "node --check src/source/v1.js && node --check src/source/core/args.js && node --check src/source/core/continuation.js && node --check src/source/core/schedule-syntax.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/schedule-policy.js && node --check src/source/runtime/scheduler-diagnostics.js && node --check src/source/runtime/companion-goal.js && node --check src/source/runtime/loop-diagnostics.js && node --check src/source/runtime/compaction.js && node --check src/source/runtime/action-dispatch.js && node --check src/source/runtime/network-recovery.js && node --check src/source/runtime/empty-turn.js && node --check src/source/runtime/terminal-guard.js && node --check src/source/runtime/run-finalization.js && node --check src/source/runtime/run-admission.js && node --check src/source/runtime/executor.js && node --check src/source/runtime/scheduler.js && node --check src/source/runtime/goal-prompt.js && node --check src/source/runtime/goal-report.js && node --check src/source/runtime/goal-evidence.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/opencode2/diagnostics.js && node --check src/source/opencode2/logging.js && node --check src/source/server.js && node --check src/source/legacy-v1.js && node --check src/index.js && node --check src/server.js && node --check scripts/install-node.mjs && node --check scripts/install-with-goals.mjs && node --check scripts/loopd.mjs && node --check scripts/install-test.mjs && node --check scripts/goal-companion-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/server-entry-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/schedule-syntax-test.mjs && node --check scripts/schedule-policy-test.mjs && node --check scripts/session-activity-test.mjs && node --check scripts/session-status-test.mjs && node --check scripts/session-status-idle-recovery-test.mjs && node --check scripts/session-error-recovery-test.mjs && node --check scripts/empty-turn-recovery-test.mjs && node --check scripts/network-recovery-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/v2-diagnostics-test.mjs && node --check scripts/v2-logging-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 && node --check scripts/publish-workflow-test.mjs",
+    "test": "node scripts/publish-workflow-test.mjs && node scripts/server-entry-test.mjs && 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/schedule-syntax-test.mjs && node scripts/schedule-policy-test.mjs && node scripts/session-activity-test.mjs && node scripts/session-status-test.mjs && node scripts/session-status-idle-recovery-test.mjs && node scripts/session-error-recovery-test.mjs && node scripts/empty-turn-recovery-test.mjs && node scripts/network-recovery-test.mjs && node scripts/compaction-runtime-test.mjs && node scripts/action-dispatch-test.mjs && node scripts/run-finalization-test.mjs && node scripts/run-admission-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/v2-diagnostics-test.mjs && node scripts/v2-logging-test.mjs && node scripts/install-test.mjs && node scripts/goal-companion-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 && node scripts/host-goal-steering-canary.mjs",
     "install:global": "node scripts/install-with-goals.mjs",
     "pack:zip": "node scripts/make-zip.mjs"

package/scripts/comprehensive-test.mjs

@@ -165,7 +165,7 @@ async function createHarness(options = {}) {
     },
     async cleanup() {
       await hooks.dispose?.()
-      await fs.rm(directory, { recursive: true, force: true })
+      await fs.rm(directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })
     },
   }
 }
@@ -486,8 +486,11 @@ async function testStaleBusyUsesCompletedAssistantTail() {
     // and can reconcile the completed assistant tail instead of trusting cached busy.
     await delay(1_700)
     await h.command("loop-now", "stale-complete")
-    const state = await h.readState()
-    assert.ok(state.jobs[0].lastFinishedAt > 0, "a completed assistant tail must override a stale busy status")
+    const state = await waitForValue(async () => {
+      const candidate = await h.readState()
+      return candidate.jobs[0]?.lastFinishedAt > 0 ? candidate : undefined
+    }, 3_000)
+    assert.ok(state?.jobs[0]?.lastFinishedAt > 0, "a completed assistant tail must override a stale busy status")
     assert.ok(h.records.messageReads.length > 0, "busy recovery must cross-check message history")
   } finally {
     await h.cleanup()
@@ -643,7 +646,7 @@ async function testInitializationDoesNotWaitForLocalApi() {
     assert.equal(typeof hooks.event, "function")
     await hooks.dispose?.()
   } finally {
-    await fs.rm(directory, { recursive: true, force: true })
+    await fs.rm(directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })
   }
 }
 

package/scripts/fixtures/opencode2-real-adapter-probe.js

@@ -28,7 +28,12 @@ export default {
         const sessionID = String(created?.id || created?.data?.id || created?.sessionID || "")
         if (!sessionID) throw new Error("session.create returned no session id")
         try {
-          await ctx.session.command({ sessionID, command: COMMAND_SENTINEL })
+          await ctx.session.command({
+            sessionID,
+            name: COMMAND_SENTINEL,
+            command: COMMAND_SENTINEL,
+            text: "",
+          })
           commandFieldProbe = {
             matched: false,
             sessionID,

package/scripts/install-node.mjs

@@ -18,7 +18,7 @@ const installerArgs = process.argv.slice(2)
 const uninstallRequested = installerArgs.length === 1 && ["--uninstall", "uninstall", "--remove"].includes(installerArgs[0] || "")
 
 if (installerArgs.includes("--help") || installerArgs.includes("-h")) {
-  console.log(`OpenCode Loop installer/updater\n\nUsage:\n  opencode-loop\n  npx -y @bybrawe/opencode-loop@latest\n  npx -y @bybrawe/opencode-loop@latest --uninstall\n\nInstall/update copies the Loop command files and local command agent, and keeps an existing npm package entry pinned to the exact version.\nUninstall removes Loop package registrations plus known local plugin/command/agent files while preserving project Loop state.\n\nSet OPENCODE_CONFIG_DIR to target a non-default OpenCode config directory.`)
+  console.log(`OpenCode Loop installer/updater\n\nUsage:\n  opencode-loop\n  npx -y @bybrawe/opencode-loop@latest\n  npx -y @bybrawe/opencode-loop@latest --uninstall\n\nInstall/update copies the dual OpenCode 1/2 Loop plugin plus command files and local command agent, and keeps an existing npm package entry pinned to the exact version.\nUninstall removes Loop package registrations plus known local plugin/command/agent files while preserving project Loop state.\n\nSet OPENCODE_CONFIG_DIR to target a non-default OpenCode config directory.`)
   process.exit(0)
 }
 
@@ -311,7 +311,9 @@ async function installOrUpdate() {
     await rm(join(pluginDir, "opencode-loop.js"), { force: true })
   } else {
     await ensureDependency()
-    await copyFile(join(root, "src", "index.js"), join(pluginDir, "opencode-loop.ts"))
+    // Copy the dual contract bundle: OpenCode 1.x consumes default.server,
+    // while OpenCode 2.x consumes default.setup from the same local file.
+    await copyFile(join(root, "src", "server.js"), join(pluginDir, "opencode-loop.ts"))
     await rm(join(pluginDir, "opencode-loop.js"), { force: true })
   }
 

package/scripts/install-test.mjs

@@ -62,6 +62,11 @@ try {
   const localResult = await runInstaller(local)
   assert.equal(localResult.code, 0, localResult.stderr)
   assert.equal(await exists(path.join(local, "plugins", "opencode-loop.ts")), true)
+  assert.equal(
+    await fs.readFile(path.join(local, "plugins", "opencode-loop.ts"), "utf8"),
+    await fs.readFile(path.join(root, "src", "server.js"), "utf8"),
+    "local install must copy the dual OpenCode 1/2 server bundle",
+  )
   assert.equal(await commandCount(local), packagedCommandCount)
   assert.equal(await exists(path.join(local, "agents", "opencode-loop-local.md")), true)
   const localPackage = JSON.parse(await fs.readFile(path.join(local, "package.json"), "utf8"))

package/scripts/network-recovery-test.mjs

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict"
-import { isCompletionBoundedContinuation, isTerminalNoWorkReply } from "../src/source/core/continuation.js"
+import { isCompletionBoundedContinuation, isTerminalNoWorkReply, isWaitingUserReply } from "../src/source/core/continuation.js"
 import { isTransientNetworkError, networkRetryDelayMs, refundInfrastructureRun } from "../src/source/runtime/network-recovery.js"
 import { createSessionStatusRuntime } from "../src/source/runtime/session-status.js"
 import { applyTerminalContinuationGuard } from "../src/source/runtime/terminal-guard.js"
@@ -90,6 +90,10 @@ assert.equal(isCompletionBoundedContinuation("devam et"), false)
 assert.equal(isCompletionBoundedContinuation("devam et bitene kadar devam tamamen projeyi bitir"), true)
 assert.equal(isTerminalNoWorkReply("Proje tamamlandı — 28/28 test yeşil. Yapılacak iş yok. Sıfır bilinen hata."), true)
 assert.equal(isTerminalNoWorkReply("Proje tamamlandı ama sıradaki iş build doğrulaması."), false)
+assert.equal(isWaitingUserReply("Durum sabit.\n\nOnay bekleyenler: commit + push, canlı migration, cihaz testi."), true)
+assert.equal(isWaitingUserReply("Waiting for your approval before I can push the release."), true)
+assert.equal(isWaitingUserReply("Onay gerekmiyor; sıradaki iş build doğrulaması."), false)
+assert.equal(isWaitingUserReply("Deployment needs your approval, but next step is local verification."), false)
 
 {
   const terminalMessages = [{
@@ -122,6 +126,39 @@ assert.equal(isTerminalNoWorkReply("Proje tamamlandı ama sıradaki iş build do
   const untouched = await applyTerminalContinuationGuard("/repo", client, "s", infinite)
   assert.equal(untouched.terminal, false)
   assert.equal(untouched.job.paused, false, "plain /loop devam et must remain intentionally infinite")
+
+  const waitingMessages = [{
+    info: { role: "assistant", time: { created: 2_200, completed: 2_300 } },
+    parts: [{ type: "text", text: "Durum sabit.\n\nOnay bekleyenler: commit + push, canlı migration, cihaz testi." }],
+  }]
+  const waitingClient = { session: { messages: async () => ({ data: waitingMessages }) } }
+  const waiting = {
+    id: "waiting",
+    action: "devam et",
+    scheduleMode: "idle",
+    lastRunAt: 1_500,
+    paused: false,
+  }
+  let waitingResult = await applyTerminalContinuationGuard("/repo", waitingClient, "s", waiting)
+  assert.equal(waitingResult.waitingUser, true)
+  assert.equal(waitingResult.waitingUserPausedNow, false)
+  assert.equal(waitingResult.job.waitingUserCount, 1)
+  assert.equal(waitingResult.job.paused, false)
+  waitingResult = await applyTerminalContinuationGuard("/repo", waitingClient, "s", waitingResult.job)
+  assert.equal(waitingResult.waitingUserPausedNow, true, "two explicit user-dependency replies should pause plain continuation")
+  assert.equal(waitingResult.job.paused, true)
+  assert.equal(waitingResult.job.lastFailureReason, "waiting_user")
+
+  const productiveMessages = [{
+    info: { role: "assistant", time: { created: 2_400, completed: 2_500 } },
+    parts: [{ type: "text", text: "Deployment needs your approval, but next step is local verification." }],
+  }]
+  const productiveClient = { session: { messages: async () => ({ data: productiveMessages }) } }
+  const productive = { ...waitingResult.job, paused: false, waitingUserCount: 1 }
+  const productiveResult = await applyTerminalContinuationGuard("/repo", productiveClient, "s", productive)
+  assert.equal(productiveResult.waitingUser, false)
+  assert.equal(productiveResult.job.waitingUserCount, 0, "a reply with autonomous next work must clear waiting-user streak")
+  assert.equal(productiveResult.job.paused, false)
 }
 
 {

package/scripts/opencode2-loop-canary.mjs

@@ -2,7 +2,7 @@ import assert from "node:assert/strict"
 import { createServer } from "node:http"
 import net from "node:net"
 import { execFileSync, spawn } from "node:child_process"
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
+import { appendFile, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
 import process from "node:process"
@@ -14,6 +14,8 @@ const EXPECTED_TURNS = 2
 const EXPECTED_COMMANDS = ["loop", "loop-pause", "loop-resume", "loop-stop", "loop-remove", "loop-clear"]
 const SERVER_USERNAME = "opencode"
 const SERVER_PASSWORD = "opencode-loop-v2-canary"
+const OPENCODE_BINARY = process.env.OPENCODE2_BINARY || "opencode2"
+const CURRENT_COMMAND_FIELDS = process.env.OPENCODE2_CURRENT_COMMAND_FIELDS === "1"
 
 function appendLog(current, chunk, limit = 100_000) {
   return (current + String(chunk)).slice(-limit)
@@ -161,13 +163,36 @@ function startProvider() {
 }
 
 function bridgePluginSource() {
-  return `import { writeFile } from "node:fs/promises"
+  return `import { appendFile, writeFile } from "node:fs/promises"
 
 export default {
   id: "bybrawe.opencode-loop.v2.loop-canary-bridge",
   async setup(ctx) {
     const module = await import(process.env.OPENCODE_LOOP_V2_PLUGIN_URL)
-    const cleanup = await module.default.setup(ctx)
+    const traceFile = process.env.OPENCODE_LOOP_V2_EVENT_TRACE
+    const pluginTraceFile = process.env.OPENCODE_LOOP_V2_PLUGIN_EVENT_TRACE
+    const pluginContext = typeof ctx?.event?.subscribe === "function"
+      ? {
+          ...ctx,
+          event: {
+            ...ctx.event,
+            subscribe(options) {
+              const source = ctx.event.subscribe(options)
+              return {
+                async *[Symbol.asyncIterator]() {
+                  for await (const event of source) {
+                    const line = JSON.stringify(event) + "\\n"
+                    if (traceFile) await appendFile(traceFile, line, "utf8")
+                    if (pluginTraceFile) await appendFile(pluginTraceFile, line, "utf8")
+                    yield event
+                  }
+                },
+              }
+            },
+          },
+        }
+      : ctx
+    const cleanup = await module.default.setup(pluginContext)
     await writeFile(process.env.OPENCODE_LOOP_V2_MARKER, JSON.stringify({ activated: true }, null, 2), "utf8")
     return async () => {
       if (typeof cleanup === "function") await cleanup()
@@ -187,8 +212,10 @@ async function main() {
 
   const workspace = await mkdtemp(path.join(os.tmpdir(), "opencode-loop-v2-e2e-"))
   const home = path.join(workspace, ".home")
-  const pluginDir = path.join(workspace, ".opencode", "plugins")
+  const pluginDir = path.join(home, ".config", "opencode", "plugins")
   const marker = path.join(workspace, "v2-real-adapter-marker.json")
+  const eventTrace = path.join(workspace, "v2-native-events.jsonl")
+  const pluginEventTrace = path.join(workspace, "v2-plugin-events.jsonl")
   const provider = startProvider()
   const providerPort = await provider.listen()
   let server
@@ -241,6 +268,8 @@ async function main() {
     XDG_CACHE_HOME: path.join(home, ".cache"),
     OPENCODE_LOOP_V2_PLUGIN_URL: pathToFileURL(path.join(repoRoot, "src", "source", "opencode2", "experimental.js")).href,
     OPENCODE_LOOP_V2_MARKER: marker,
+    OPENCODE_LOOP_V2_EVENT_TRACE: eventTrace,
+    OPENCODE_LOOP_V2_PLUGIN_EVENT_TRACE: pluginEventTrace,
     OPENCODE_SERVER_USERNAME: SERVER_USERNAME,
     OPENCODE_SERVER_PASSWORD: SERVER_PASSWORD,
     OPENCODE_DISABLE_AUTOUPDATE: "true",
@@ -253,6 +282,10 @@ async function main() {
     if (sessionID) {
       try { state = await readFile(path.join(workspace, ".opencode", "opencode-loop", `${sessionID}.json`), "utf8") } catch {}
     }
+    let nativeEvents = "missing"
+    let pluginEvents = "missing"
+    try { nativeEvents = await readFile(eventTrace, "utf8") } catch {}
+    try { pluginEvents = await readFile(pluginEventTrace, "utf8") } catch {}
     return [
       `apiPrefix=${String(apiPrefix)}`,
       `commands=${JSON.stringify([...latestCommands])}`,
@@ -260,14 +293,18 @@ async function main() {
       `sessionID=${sessionID || "none"}`,
       `commandError=${String(commandError ?? "none")}`,
       `state=${state}`,
+      `binary=${OPENCODE_BINARY}`,
+      `currentCommandFields=${CURRENT_COMMAND_FIELDS}`,
       `serverExit=${server?.exitCode}`,
+      `nativeEvents=${nativeEvents.slice(-40_000)}`,
+      `pluginEvents=${pluginEvents.slice(-40_000)}`,
       `serverLog=${serverLog}`,
     ].join("\n")
   }
 
   try {
     const port = await reservePort()
-    server = spawn("opencode2", ["serve", "--hostname", "127.0.0.1", "--port", String(port)], {
+    server = spawn(OPENCODE_BINARY, ["serve", "--hostname", "127.0.0.1", "--port", String(port)], {
       cwd: workspace,
       env,
       windowsHide: true,
@@ -336,9 +373,13 @@ async function main() {
     sessionID = String(session?.id ?? "")
     assert.ok(sessionID, `OpenCode 2 did not create a session: ${createdResponse.text}\n${await diagnostics()}`)
 
+    const commandBody = (command, argumentsText = "") => CURRENT_COMMAND_FIELDS
+      ? { name: command, text: argumentsText }
+      : { command, arguments: argumentsText }
+
     const commandPromise = request(`${apiPrefix}/session/${encodeURIComponent(sessionID)}/command`, {
       method: "POST",
-      body: JSON.stringify({ command: "loop", arguments: `0s --max-runs ${EXPECTED_TURNS} ${LOOP_OBJECTIVE}` }),
+      body: JSON.stringify(commandBody("loop", `0s --max-runs ${EXPECTED_TURNS} ${LOOP_OBJECTIVE}`)),
     }, 120_000).catch((error) => {
       commandError = error
       return null
@@ -371,7 +412,7 @@ async function main() {
     const sendControl = async (command, argumentsText = "") => {
       const response = await request(`${apiPrefix}/session/${encodeURIComponent(sessionID)}/command`, {
         method: "POST",
-        body: JSON.stringify({ command, arguments: argumentsText }),
+        body: JSON.stringify(commandBody(command, argumentsText)),
       }, 120_000)
       if (!response.ok) throw new Error(`${command} failed: HTTP ${response.status} ${response.text}\n${await diagnostics()}`)
       return response

package/scripts/publish-workflow-test.mjs

@@ -14,6 +14,11 @@ assert.match(workflow, /COMMIT_SHA="\$GITHUB_SHA"/, "release tag must target the
 assert.match(workflow, /group:\s*npm-release/, "npm publication must be serialized")
 assert.match(workflow, /cancel-in-progress:\s*false/, "a newer release must not cancel an in-flight publication")
 
+assert.match(workflow, /Decide whether npm publish is needed/, "release reruns must detect an already-published immutable version")
+assert.match(workflow, /steps\.npm-state\.outputs\.publish == 'true'/, "npm publish must be idempotently gated")
+assert.match(workflow, /for attempt in \{1\.\.60\}/, "registry verification must allow bounded multi-minute propagation")
+assert.match(workflow, /--registry=https:\/\/registry\.npmjs\.org/, "registry checks must target the authoritative npm registry")
+
 const publishIndex = workflow.indexOf("npm publish --access public")
 const verifyIndex = workflow.indexOf("Verify published version is readable from npm")
 const tagIndex = workflow.indexOf("Create tag and GitHub release")

package/scripts/run-finalization-test.mjs

@@ -98,6 +98,39 @@ assert.equal(failedPostrun.failureCount, 1)
 assert.equal(failedPostrun.paused, true)
 assert.equal(notifications.at(-1)[2], "postrun_failed")
 
+const waitingNotifications = []
+const waitingLogs = []
+const waitingToasts = []
+const waitingRuntime = createRunFinalizationRuntime({
+  runGoalChecks: async (_directory, _sessionID, job) => job,
+  applyGoalNoProgressGuard: async (_directory, _client, _sessionID, job) => job,
+  createCheckpoint: async () => {},
+  scheduleDueWork: async () => {},
+  writeState: async () => {},
+  appendLoopLog: async (...args) => { waitingLogs.push(args) },
+  notifyJob: async (...args) => { waitingNotifications.push(args) },
+  toast: async (...args) => { waitingToasts.push(args) },
+  applyTerminalContinuationGuard: async (_directory, _client, _sessionID, job) => ({
+    job: {
+      ...job,
+      paused: true,
+      waitingUserCount: 2,
+      lastFailureReason: "waiting_user",
+    },
+    terminal: false,
+    pausedNow: false,
+    waitingUser: true,
+    waitingUserPausedNow: true,
+    text: "Onay bekleyenler: commit + push, canlı migration, cihaz testi.",
+  }),
+})
+const waitingJob = { id: "waiting-user", name: "default", enabled: true, paused: false }
+await waitingRuntime.finalizeJob("/repo", {}, "session-waiting", { jobs: [waitingJob] }, waitingJob, { id: "before-waiting" })
+assert.equal(waitingNotifications.at(-1)[2], "waiting_user")
+assert.equal(waitingLogs.at(-1)[1], "waiting-user")
+assert.match(waitingToasts.at(-1)[1], /waiting for explicit user approval/)
+assert.equal(waitingToasts.at(-1)[2], "warning")
+
 const goal = {
   id: "goal-job",
   kind: "goal",

package/scripts/server-entry-test.mjs

@@ -0,0 +1,15 @@
+import assert from "node:assert/strict"
+import plugin, {
+  OPENCODE_LOOP_PLUGIN_ID,
+  OpenCodeLoopPlugin,
+  OpenCodeLoopV2ExperimentalPlugin,
+} from "../src/source/server.js"
+
+assert.equal(plugin.id, OPENCODE_LOOP_PLUGIN_ID)
+assert.equal(plugin.id, "@bybrawe/opencode-loop")
+assert.equal(typeof plugin.server, "function", "OpenCode 1.x requires default.server()")
+assert.equal(typeof plugin.setup, "function", "OpenCode 2.x requires default.setup()")
+assert.strictEqual(plugin.server, OpenCodeLoopPlugin)
+assert.equal(typeof OpenCodeLoopV2ExperimentalPlugin.setup, "function")
+
+console.log("dual OpenCode 1/2 server entry contract passed")

package/scripts/session-error-recovery-test.mjs

@@ -0,0 +1,186 @@
+import assert from "node:assert/strict"
+import { createLoopExecutor } from "../src/source/runtime/executor.js"
+import { clearSessionActivity } from "../src/source/runtime/session-activity.js"
+
+function clone(value) {
+  return JSON.parse(JSON.stringify(value))
+}
+
+let clock = 1_000_000
+const directory = "/repo"
+const states = new Map()
+const logs = []
+const toasts = []
+const schedules = []
+const notifications = []
+
+function stateKey(sessionID) {
+  return `${directory}:${sessionID}`
+}
+
+function setJob(sessionID, overrides = {}) {
+  states.set(stateKey(sessionID), {
+    jobs: [{
+      id: `${sessionID}-job`,
+      name: `${sessionID}-job`,
+      action: "devam et",
+      enabled: true,
+      paused: false,
+      intervalMs: 0,
+      runCount: 0,
+      maxRuns: 0,
+      maxRuntimeMs: 0,
+      timeoutMs: 0,
+      noOverlap: true,
+      ...overrides,
+    }],
+  })
+}
+
+const executor = createLoopExecutor({
+  workspace: {
+    buildPrompt: async (_directory, job) => job.action,
+    ensureBranch: async (_directory, job) => job,
+    watchChanged: async () => false,
+    untilReached: async () => false,
+    createCheckpoint: async () => {},
+  },
+  goalPolicy: {
+    runGoalChecks: async (_directory, _sessionID, job) => job,
+    applyGoalNoProgressGuard: async (_directory, _client, _sessionID, job) => job,
+  },
+  scheduler: {
+    rememberSession: () => {},
+    scheduleDueWork: async (...args) => schedules.push(args),
+  },
+  now: () => clock,
+  readState: async (_directory, sessionID) => clone(states.get(stateKey(sessionID)) || { jobs: [] }),
+  writeState: async (_directory, sessionID, state) => states.set(stateKey(sessionID), clone(state)),
+  appendLoopLog: async (...args) => logs.push(args),
+  notifyJob: async (...args) => notifications.push(args),
+  toast: async (...args) => toasts.push(args),
+  runShellCommand: async () => ({ code: 0, stdout: "", stderr: "" }),
+  fireSdk: async () => ({ data: {} }),
+  sdkCall: async () => ({}),
+  normalizedModelRef: () => undefined,
+  compactTuiCommandName: () => undefined,
+  guardLoopOwnedUserMessage: () => {},
+  dangerousShell: () => false,
+  activeRunCompletionFromMessages: async () => "unknown",
+  busyRetryMs: 5_000,
+  networkRetryMaxMs: 60_000,
+})
+
+const client = {
+  session: {
+    status: async () => ({ data: {} }),
+    prompt: async () => ({ data: {} }),
+    abort: async () => ({ data: {} }),
+  },
+}
+
+{
+  const sessionID = "policy-error"
+  setJob(sessionID)
+  await executor.maybeRunDueJobs(directory, client, sessionID)
+  assert.ok(executor.getActiveRun(sessionID))
+  assert.equal(states.get(stateKey(sessionID)).jobs[0].runCount, 1)
+
+  const handled = await executor.handleSessionError(directory, client, {
+    type: "session.error",
+    properties: {
+      sessionID,
+      error: {
+        name: "APIError",
+        data: {
+          message: "OpenCode's free tier can only be used from within OpenCode",
+          statusCode: 403,
+          isRetryable: false,
+        },
+      },
+    },
+  })
+
+  assert.equal(handled, true)
+  assert.equal(executor.getActiveRun(sessionID), undefined)
+  const job = states.get(stateKey(sessionID)).jobs[0]
+  assert.equal(job.paused, true, "terminal provider policy error must pause an infinite idle loop")
+  assert.equal(job.failureCount, 1)
+  assert.equal(job.lastFailureReason, "session_error")
+  assert.equal(job.lastSessionErrorName, "APIError")
+  assert.equal(job.lastSessionError, "OpenCode's free tier can only be used from within OpenCode")
+  assert.equal(job.lastSessionErrorAt, clock)
+  assert.ok(notifications.some((call) => call[1]?.id === job.id && call[2] === "session_error"))
+  assert.ok(logs.some((call) => call[1] === "session-error" && call[2]?.sessionID === sessionID && call[2]?.paused === true))
+  assert.ok(toasts.some((call) => String(call[1]).includes("Loop paused after a terminal OpenCode session error")))
+
+  await executor.maybeRunDueJobs(directory, client, sessionID)
+  assert.equal(states.get(stateKey(sessionID)).jobs[0].runCount, 1, "paused terminal-error job must not immediately dispatch another run")
+}
+
+{
+  const sessionID = "retryable-provider-error"
+  setJob(sessionID, { maxRuns: 1 })
+  await executor.maybeRunDueJobs(directory, client, sessionID)
+  let job = states.get(stateKey(sessionID)).jobs[0]
+  assert.equal(job.runCount, 1)
+  assert.equal(job.enabled, false, "max-runs may disable while the provider turn is in flight")
+
+  clock += 10
+  const handled = await executor.handleSessionError(directory, client, {
+    type: "session.error",
+    properties: {
+      sessionID,
+      error: {
+        name: "APIError",
+        data: {
+          message: "provider temporarily unavailable",
+          statusCode: 503,
+          isRetryable: true,
+        },
+      },
+    },
+  })
+
+  assert.equal(handled, true)
+  assert.equal(executor.getActiveRun(sessionID), undefined)
+  job = states.get(stateKey(sessionID)).jobs[0]
+  assert.equal(job.runCount, 0, "retryable terminal provider error must refund the logical run")
+  assert.equal(job.enabled, true, "refunded max-runs disable must be rolled back")
+  assert.equal(job.paused, false)
+  assert.equal(job.failureCount || 0, 0, "retryable provider outage must not consume ordinary failure budget")
+  assert.equal(job.infrastructureFailureCount, 1)
+  assert.equal(job.lastInfrastructureFailure, "session_error_retryable")
+  assert.match(job.lastInfrastructureError, /provider temporarily unavailable/)
+  assert.ok(logs.some((call) => call[1] === "provider-session-error-retry" && call[2]?.sessionID === sessionID))
+  assert.ok(schedules.some((call) => call[2] === sessionID && call[3] >= 5_000))
+}
+
+{
+  const sessionID = "user-abort"
+  setJob(sessionID)
+  await executor.maybeRunDueJobs(directory, client, sessionID)
+  const active = executor.getActiveRun(sessionID)
+  assert.ok(active)
+
+  const handled = await executor.handleSessionError(directory, client, {
+    type: "session.error",
+    properties: {
+      sessionID,
+      error: {
+        name: "MessageAbortedError",
+        data: { message: "The operation was aborted." },
+      },
+    },
+  })
+
+  assert.equal(handled, false, "user/session abort must keep existing abort/finalization semantics")
+  assert.strictEqual(executor.getActiveRun(sessionID), active)
+}
+
+for (const sessionID of ["policy-error", "retryable-provider-error", "user-abort"]) {
+  executor.disposeSession(sessionID)
+  clearSessionActivity(sessionID)
+}
+
+console.log("session error recovery tests passed")