@bybrawe/opencode-loop 0.5.32 → 0.5.34

package/src/source/runtime/executor.js

@@ -1,16 +1,15 @@
-import path from "node:path"
-import { now as defaultNow, splitFirst } from "../core/args.js"
-import { actionKind, isGoalJob } from "../core/jobs.js"
-import { pathExists as defaultPathExists, readState as defaultReadState, writeState as defaultWriteState } from "../core/state.js"
+import { now as defaultNow } from "../core/args.js"
+import { isGoalJob } from "../core/jobs.js"
+import { readState as defaultReadState, writeState as defaultWriteState } from "../core/state.js"
 import { appendLoopLog as defaultAppendLoopLog, runShellCommand as defaultRunShellCommand, notifyJob as defaultNotifyJob } from "../core/process.js"
-import { sdkErrorMessage as defaultErrorMessage, sdkCall as defaultSdkCall } from "../opencode/sdk.js"
-import { normalizedModelRef as defaultNormalizedModelRef } from "../opencode/session-context.js"
-import { fireSdk as defaultFireSdk, compactTuiCommandName as defaultCompactTuiCommandName, log as defaultLog, toast as defaultToast } from "../opencode/host.js"
-import { guardLoopOwnedUserMessage as defaultGuardLoopOwnedUserMessage } from "../opencode/messages.js"
-import { writeGoalReport as defaultWriteGoalReport } from "./goal-runtime.js"
+import { sdkErrorMessage as defaultErrorMessage } from "../opencode/sdk.js"
+import { fireSdk as defaultFireSdk, log as defaultLog, toast as defaultToast } from "../opencode/host.js"
 import { dangerousShell as defaultDangerousShell } from "./job-workspace.js"
 import { createSessionStatusRuntime } from "./session-status.js"
 import { createCompactionRuntime } from "./compaction.js"
+import { createActionDispatcher } from "./action-dispatch.js"
+import { createRunFinalizationRuntime } from "./run-finalization.js"
+import { createRunAdmissionRuntime } from "./run-admission.js"
 
 const DEFAULT_ACTIVE_GUARD_MS = 45_000
 const DEFAULT_BUSY_RETRY_MS = 5_000
@@ -38,21 +37,13 @@ export function createLoopExecutor(options = {}) {
   const now = typeof options.now === "function" ? options.now : defaultNow
   const readState = typeof options.readState === "function" ? options.readState : defaultReadState
   const writeState = typeof options.writeState === "function" ? options.writeState : defaultWriteState
-  const pathExists = typeof options.pathExists === "function" ? options.pathExists : defaultPathExists
   const appendLoopLog = typeof options.appendLoopLog === "function" ? options.appendLoopLog : defaultAppendLoopLog
   const runShellCommand = typeof options.runShellCommand === "function" ? options.runShellCommand : defaultRunShellCommand
   const notifyJob = typeof options.notifyJob === "function" ? options.notifyJob : defaultNotifyJob
   const errorMessage = typeof options.errorMessage === "function" ? options.errorMessage : defaultErrorMessage
-  const sdkCall = typeof options.sdkCall === "function" ? options.sdkCall : defaultSdkCall
-  const normalizedModelRef = typeof options.normalizedModelRef === "function" ? options.normalizedModelRef : defaultNormalizedModelRef
   const fireSdk = typeof options.fireSdk === "function" ? options.fireSdk : defaultFireSdk
-  const compactTuiCommandName = typeof options.compactTuiCommandName === "function" ? options.compactTuiCommandName : defaultCompactTuiCommandName
   const log = typeof options.log === "function" ? options.log : defaultLog
   const toast = typeof options.toast === "function" ? options.toast : defaultToast
-  const guardLoopOwnedUserMessage = typeof options.guardLoopOwnedUserMessage === "function"
-    ? options.guardLoopOwnedUserMessage
-    : defaultGuardLoopOwnedUserMessage
-  const writeGoalReport = typeof options.writeGoalReport === "function" ? options.writeGoalReport : defaultWriteGoalReport
   const dangerousShell = typeof options.dangerousShell === "function" ? options.dangerousShell : defaultDangerousShell
   const activeGuardMs = Number.isFinite(Number(options.activeGuardMs)) && Number(options.activeGuardMs) > 0
     ? Number(options.activeGuardMs)
@@ -91,20 +82,47 @@ export function createLoopExecutor(options = {}) {
     now,
   })
 
-  function dueJobs(state, force = false) {
-    const current = now()
-    const due = (state.jobs || []).filter((job) => {
-      if (isGoalJob(job) && ["completed", "blocked", "cleared"].includes(job.goalStatus)) return false
-      if (!job.enabled || job.paused) return false
-      if (job.maxRuns > 0 && (job.runCount || 0) >= job.maxRuns) return false
-      if (job.maxRuntimeMs > 0 && current - Date.parse(job.createdAt || new Date().toISOString()) >= job.maxRuntimeMs) return true
-      if (Number(job.runNowRequestedAt || 0) > 0) return true
-      if (force) return true
-      if (job.watchPaths?.length) return job.watchTriggered === true
-      return job.intervalMs === 0 || !job.lastRunAt || current - job.lastRunAt >= job.intervalMs
-    })
-    return due.sort((a, b) => Number(Number(b.runNowRequestedAt || 0) > 0) - Number(Number(a.runNowRequestedAt || 0) > 0))
-  }
+  const actionDispatcher = createActionDispatcher({
+    buildPrompt,
+    compactionRuntime,
+    appendLoopLog,
+    sdkCall: options.sdkCall,
+    normalizedModelRef: options.normalizedModelRef,
+    fireSdk: options.fireSdk,
+    compactTuiCommandName: options.compactTuiCommandName,
+    toast,
+    guardLoopOwnedUserMessage: options.guardLoopOwnedUserMessage,
+    dangerousShell,
+  })
+
+  const finalizationRuntime = createRunFinalizationRuntime({
+    runGoalChecks,
+    applyGoalNoProgressGuard,
+    createCheckpoint,
+    scheduleDueWork,
+    now,
+    writeState,
+    appendLoopLog,
+    runShellCommand,
+    notifyJob,
+    toast,
+    writeGoalReport: options.writeGoalReport,
+    dangerousShell,
+  })
+
+  const admissionRuntime = createRunAdmissionRuntime({
+    untilReached,
+    scheduleDueWork,
+    now,
+    pathExists: options.pathExists,
+    writeState,
+    appendLoopLog,
+    runShellCommand,
+    notifyJob,
+    toast,
+    dangerousShell,
+  })
+  const dueJobs = admissionRuntime.dueJobs
 
   function clearActiveRun(sessionID) {
     const active = activeRuns.get(sessionID)
@@ -181,149 +199,11 @@ export function createLoopExecutor(options = {}) {
       })
     }
 
-    if (job.verifyCommand) {
-      const verify = await runShellCommand(job.verifyCommand, directory, job.timeoutMs || 300_000)
-      job.lastVerifyAt = now()
-      job.lastVerifyCode = verify.code
-      if (verify.code === 0) {
-        job.failureCount = 0
-        job.lastVerifyFailure = ""
-        await toast(client, "Loop verify passed: " + job.verifyCommand, "success")
-      } else {
-        job.failureCount = (job.failureCount || 0) + 1
-        job.lastVerifyFailure = (job.verifyCommand + "\nexit=" + verify.code + "\n" + verify.stdout + "\n" + verify.stderr).slice(0, 4000)
-        await toast(client, "Loop verify failed: " + job.verifyCommand, "warning")
-        if (job.pauseOnVerifyFail || (job.maxFailures > 0 && job.failureCount >= job.maxFailures)) {
-          job.paused = true
-          await notifyJob(directory, job, "verify_failed")
-        }
-      }
-      await appendLoopLog(directory, "verify", {
-        sessionID,
-        job: job.name || job.id,
-        command: job.verifyCommand,
-        code: verify.code,
-        failures: job.failureCount || 0,
-      })
-    }
-
-    if (job.postrunCommand) {
-      if (job.safe && dangerousShell(job.postrunCommand)) {
-        await appendLoopLog(directory, "postrun-blocked", {
-          sessionID,
-          job: job.name || job.id,
-          command: job.postrunCommand,
-        })
-      } else {
-        const postrun = await runShellCommand(job.postrunCommand, directory, job.timeoutMs || 300_000)
-        job.lastPostrunCode = postrun.code
-        job.lastPostrunAt = now()
-        if (postrun.code !== 0) {
-          job.failureCount = (job.failureCount || 0) + 1
-          job.lastPostrunFailure = (job.postrunCommand + "\nexit=" + postrun.code + "\n" + postrun.stdout + "\n" + postrun.stderr).slice(0, 4000)
-          if (job.maxFailures > 0 && job.failureCount >= job.maxFailures) {
-            job.paused = true
-            await notifyJob(directory, job, "postrun_failed")
-          }
-        }
-        await appendLoopLog(directory, "postrun", {
-          sessionID,
-          job: job.name || job.id,
-          command: job.postrunCommand,
-          code: postrun.code,
-        })
-      }
-    }
-
-    if (isGoalJob(job)) {
-      job = await runGoalChecks(directory, sessionID, job, client)
-      job = await applyGoalNoProgressGuard(directory, client, sessionID, job, active.job)
-    }
-    state.jobs = (state.jobs || [])
-      .map((candidate) => candidate.id === job.id ? job : candidate)
-      .filter((candidate) => candidate.enabled !== false || isGoalJob(candidate))
-    await writeState(directory, sessionID, state)
-    if (isGoalJob(job)) await writeGoalReport(directory, sessionID, job)
-    await createCheckpoint(directory, sessionID, job, client)
-    await scheduleDueWork(directory, client, sessionID)
+    await finalizationRuntime.finalizeJob(directory, client, sessionID, state, job, active.job)
     return true
   }
 
-  async function fireAction(directory, client, sessionID, job) {
-    const action = String(job.action || "").trim()
-    const kind = actionKind(action, job)
-    const agent = job.agent || "build"
-    const model = normalizedModelRef(job.model)
-
-    if (kind === "compact") {
-      const ok = await compactionRuntime.start(directory, client, sessionID, job.id, model, false)
-      return { startsAssistantTurn: ok, pause: !ok, reason: "compact_failed", compaction: ok }
-    }
-
-    if (kind === "command") {
-      const normalized = action.startsWith("/") ? action.slice(1) : action
-      const [command, argumentsText] = splitFirst(normalized)
-      if (!command) {
-        await toast(client, "Loop command action is empty. Example: /loop-command 200m /compact", "warning")
-        return { startsAssistantTurn: false, pause: true, reason: "empty_command" }
-      }
-      const tuiCommand = compactTuiCommandName(command)
-      if (tuiCommand) {
-        guardLoopOwnedUserMessage(sessionID)
-        const ok = await compactionRuntime.start(directory, client, sessionID, job.id, model, false)
-        return { startsAssistantTurn: ok, pause: !ok, reason: "compact_failed", compaction: ok }
-      }
-      guardLoopOwnedUserMessage(sessionID)
-      const commandBody = { command, arguments: argumentsText, agent }
-      if (model) commandBody.model = `${model.providerID}/${model.modelID}`
-      await sdkCall(
-        client.session.command.bind(client.session),
-        { path: { id: sessionID }, body: commandBody },
-        { path: { sessionID }, body: commandBody },
-        { sessionID, ...commandBody },
-      )
-      return { startsAssistantTurn: true }
-    }
-
-    if (kind === "shell") {
-      const command = action.replace(/^[!$]\s*/, "").trim()
-      if (job.safe && dangerousShell(command)) {
-        await toast(client, `Blocked dangerous shell command in safe mode: ${command}`, "error")
-        await appendLoopLog(directory, "blocked", { sessionID, job: job.name || job.id, command })
-        return { startsAssistantTurn: false, pause: true, reason: "safe_shell_blocked" }
-      }
-      guardLoopOwnedUserMessage(sessionID)
-      const shellBody = { command, agent }
-      if (model) shellBody.model = model
-      const dispatch = fireSdk(
-        client,
-        "session.shell",
-        client.session.shell.bind(client.session),
-        { path: { id: sessionID }, body: shellBody },
-        { path: { sessionID }, body: shellBody },
-        { sessionID, ...shellBody },
-      )
-      return { startsAssistantTurn: true, dispatch }
-    }
-
-    const prompt = await buildPrompt(directory, job)
-    const prefix = kind === "goal"
-      ? "EXPERIMENTAL GOAL MODE CONTINUATION. Continue pursuing the active goal. Do not explain the /loop-goal command. Use the goal tools only when progress/completion/block state is real."
-      : "AUTONOMOUS OPENCODE LOOP ITERATION. Continue the configured task now. Do not explain the /loop command. Do not search for documentation about this plugin. Do not create scheduler files. Do not ask questions. Make reasonable assumptions and work directly."
-    const promptText = `${prefix}\n\n${prompt}`
-    guardLoopOwnedUserMessage(sessionID)
-    const promptBody = { agent, parts: [{ type: "text", text: promptText }] }
-    if (model) promptBody.model = model
-    const dispatch = fireSdk(
-      client,
-      "session.prompt",
-      client.session.prompt.bind(client.session),
-      { path: { id: sessionID }, body: promptBody },
-      { path: { sessionID }, body: promptBody },
-      { sessionID, ...promptBody },
-    )
-    return { startsAssistantTurn: true, dispatch }
-  }
+  const fireAction = actionDispatcher.fireAction
 
   async function maybeRunDueJobs(directory, client, sessionID, runOptions = {}) {
     rememberSession(directory, client, sessionID)
@@ -367,64 +247,11 @@ export function createLoopExecutor(options = {}) {
         return
       }
       job = due[0]
-      const runNowRequested = Number(job.runNowRequestedAt || 0) > 0
-
-      if (job.maxRuntimeMs > 0 && now() - Date.parse(job.createdAt || new Date().toISOString()) >= job.maxRuntimeMs) {
-        state.jobs = (state.jobs || []).filter((candidate) => candidate.id !== job.id)
-        await writeState(directory, sessionID, state)
-        await notifyJob(directory, job, "max_runtime_reached")
-        await toast(client, `Loop stopped by --max-runtime: ${job.name || job.id}`, "success")
-        await appendLoopLog(directory, "max-runtime", { sessionID, job: job.name || job.id })
-        await reschedule()
-        return
-      }
-      if (job.stopFile && await pathExists(path.resolve(directory, job.stopFile))) {
-        state.jobs = (state.jobs || []).filter((candidate) => candidate.id !== job.id)
-        await writeState(directory, sessionID, state)
-        await notifyJob(directory, job, "stop_file")
-        await toast(client, "Loop stopped by --stop-file: " + job.stopFile, "success")
-        await reschedule()
-        return
-      }
-      if (await untilReached(directory, job)) {
-        state.jobs = (state.jobs || []).filter((candidate) => candidate.id !== job.id)
-        await writeState(directory, sessionID, state)
-        await notifyJob(directory, job, "until_reached")
-        await toast(client, `Loop stopped by --until: ${job.until}`, "success")
-        await reschedule()
-        return
-      }
 
-      if (job.preflightCommand) {
-        if (job.safe && dangerousShell(job.preflightCommand)) {
-          if (runNowRequested) delete job.runNowRequestedAt
-          job.paused = true
-          await writeState(directory, sessionID, state)
-          await notifyJob(directory, job, "preflight_blocked")
-          await toast(client, "Preflight blocked in safe mode and loop paused: " + job.preflightCommand, "error")
-          await reschedule()
-          return
-        }
-        const preflight = await runShellCommand(job.preflightCommand, directory, job.timeoutMs || 300_000)
-        await appendLoopLog(directory, "preflight", {
-          sessionID,
-          job: job.name || job.id,
-          command: job.preflightCommand,
-          code: preflight.code,
-        })
-        if (preflight.code !== 0) {
-          if (runNowRequested) delete job.runNowRequestedAt
-          job.paused = true
-          job.failureCount = (job.failureCount || 0) + 1
-          job.lastPreflightFailure = (job.preflightCommand + "\nexit=" + preflight.code + "\n" + preflight.stdout + "\n" + preflight.stderr).slice(0, 4000)
-          state.jobs = (state.jobs || []).map((candidate) => candidate.id === job.id ? job : candidate)
-          await writeState(directory, sessionID, state)
-          await notifyJob(directory, job, "preflight_failed")
-          await toast(client, "Preflight failed and loop paused: " + job.preflightCommand, "warning")
-          await reschedule()
-          return
-        }
-      }
+      const admission = await admissionRuntime.admitJob(directory, client, sessionID, state, job)
+      if (!admission.admitted) return
+      job = admission.job
+      const runNowRequested = admission.runNowRequested
 
       job = await ensureBranch(directory, job, client, sessionID)
       const compactResult = await compactionRuntime.maybeCompact(directory, client, sessionID, job)

package/src/source/runtime/goal-evidence.js

@@ -0,0 +1,39 @@
+export function hasConcreteGoalEvidence(value) {
+  const text = String(value || "").trim()
+  if (text.length < 24) return false
+  const normalized = text.toLowerCase().replace(/\s+/g, " ")
+  const weak = new Set(["done", "complete", "completed", "ok", "looks good", "n/a", "none", "no evidence", "no evidence provided", "goal completed", "marked complete"])
+  if (weak.has(normalized) || normalized.startsWith("marked complete by /loop-goal-done")) return false
+  return /(\b(npm|pnpm|yarn|bun|node|pytest|cargo|dotnet|go test|tsc|typecheck|test|tests|lint|build|check|checks|exit\s*\d|passed|verified|changed|updated|created|fixed|file|files|diff|commit)\b|[`\\/][\w./:-]+)/i.test(text) || text.length >= 80
+}
+
+export function goalChecksPassed(job) {
+  return Array.isArray(job?.lastGoalChecks) && job.lastGoalChecks.length > 0 && job.lastGoalChecks.every((item) => Number(item?.code) === 0)
+}
+
+export function goalRequiresPassingChecks(job) {
+  return job?.goalRequireChecksPass !== false && Array.isArray(job?.goalChecks) && job.goalChecks.length > 0
+}
+
+export function goalProgressSnapshot(job) {
+  return {
+    status: job?.goalStatus || "",
+    progressCount: Array.isArray(job?.goalProgress) ? job.goalProgress.length : 0,
+    evidence: String(job?.goalEvidence || ""),
+    checksPassedAt: Number(job?.goalChecksPassedAt || 0),
+    lastGoalCheckAt: Number(job?.lastGoalCheckAt || 0),
+    lastVerifyAt: Number(job?.lastVerifyAt || 0),
+    lastVerifyCode: Number.isFinite(Number(job?.lastVerifyCode)) ? Number(job.lastVerifyCode) : undefined,
+  }
+}
+
+export function goalMadeMeaningfulProgress(beforeJob, afterJob) {
+  const before = goalProgressSnapshot(beforeJob || {})
+  const after = goalProgressSnapshot(afterJob || {})
+  if (["completed", "blocked"].includes(after.status) && after.status !== before.status) return true
+  if (after.progressCount > before.progressCount) return true
+  if (after.evidence !== before.evidence && hasConcreteGoalEvidence(after.evidence)) return true
+  if (after.checksPassedAt > before.checksPassedAt || goalChecksPassed(afterJob) && after.lastGoalCheckAt > before.lastGoalCheckAt) return true
+  if (after.lastVerifyAt > before.lastVerifyAt && after.lastVerifyCode === 0) return true
+  return false
+}

package/src/source/runtime/goal-policy.js

@@ -1,7 +1,7 @@
 import { DEFAULT_GOAL_MAX_NO_PROGRESS, now as defaultNow } from "../core/args.js"
 import { isGoalJob } from "../core/jobs.js"
 import { appendLoopLog as defaultAppendLoopLog } from "../core/process.js"
-import { goalMadeMeaningfulProgress } from "./goal-runtime.js"
+import { goalMadeMeaningfulProgress } from "./goal-evidence.js"
 
 function requireFunction(value, name) {
   if (typeof value !== "function") throw new TypeError(`createGoalExecutionPolicy requires ${name}`)

package/src/source/runtime/goal-prompt.js

@@ -0,0 +1,53 @@
+import path from "node:path"
+import { DEFAULT_GOAL_MAX_NO_PROGRESS } from "../core/args.js"
+import { readSmallTextFile } from "../core/process.js"
+
+const GOAL_PROMPT_PREFIX = "EXPERIMENTAL OPENCODE GOAL MODE ITERATION"
+
+export async function buildGoalPrompt(directory, job) {
+  const sections = []
+  sections.push(`Working directory:\n${path.resolve(directory)}\nKeep every file operation inside this directory. Prefer workspace-relative paths such as \"src/index.js\"; never turn a relative path into a root path such as \"/src/index.js\".`)
+  const objective = String(job.action || "").trim()
+  if (objective) sections.push(`Goal objective:\n${objective}`)
+  if (job.goalFile) {
+    const text = await readSmallTextFile(path.resolve(directory, job.goalFile), 120_000)
+    if (text.trim()) sections.push(`Goal file ${job.goalFile}:\n${text.trim()}`)
+    else sections.push(`Goal file ${job.goalFile} was requested but could not be read. Continue from the inline goal objective.`)
+  }
+  if (job.promptFile) {
+    const text = await readSmallTextFile(path.resolve(directory, job.promptFile), 120_000)
+    if (text.trim()) sections.push(`Extra goal instructions from ${job.promptFile}:\n${text.trim()}`)
+  }
+  if (job.goalAcceptance?.length) sections.push("Acceptance criteria:\n" + job.goalAcceptance.map((item, index) => `${index + 1}. ${item}`).join("\n"))
+  if (job.goalChecks?.length) sections.push("Verification commands that define useful evidence:\n" + job.goalChecks.map((item, index) => `${index + 1}. ${item}`).join("\n"))
+  if (job.verifyCommand) sections.push(`Post-turn verify command configured by the loop: ${job.verifyCommand}`)
+  if (job.lastGoalChecks?.length) sections.push("Latest goal check results:\n" + job.lastGoalChecks.map((item) => `- ${item.command}: exit ${item.code}`).join("\n"))
+  if (job.lastVerifyFailure) sections.push("Previous verify/check failure summary:\n" + String(job.lastVerifyFailure).slice(0, 1600))
+  if (job.goalCompletionRejectedReason) sections.push(`Previous completion attempt was rejected:\n${job.goalCompletionRejectedReason}`)
+  if ((job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS) > 0) sections.push(`No-progress guard:\n${job.noProgressCount || 0}/${job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS} recent turn(s) without recorded meaningful progress.`)
+  if (job.goalProgress?.length) sections.push("Recent goal progress:\n" + job.goalProgress.slice(-5).map((item) => `- ${item.time}: ${item.summary}`).join("\n"))
+  for (const file of job.includeFiles || []) {
+    const text = await readSmallTextFile(path.resolve(directory, file), 80_000)
+    if (text.trim()) sections.push(`Context from ${file}:\n${text.trim().slice(0, 20_000)}`)
+  }
+
+  return `${GOAL_PROMPT_PREFIX}.
+
+You are pursuing an experimental persistent goal for this OpenCode session. This is not a timer loop and not a one-shot prompt. Keep working toward the goal until it is completed, blocked, paused, cleared, or stopped by safety limits.
+
+Rules:
+- Work on the next smallest useful step toward the goal.
+- Prefer direct code changes, tests, typechecks, builds, and evidence over discussion.
+- Do not claim the goal is complete unless the acceptance criteria are satisfied and verification evidence supports it.
+- If verification commands are configured, do not call opencode_loop_goal_complete until the latest relevant checks have passed unless the user explicitly overrides the goal.
+- Completion evidence must be concrete: mention commands, files, checks, results, or code inspection details.
+- When the goal is complete, call the tool opencode_loop_goal_complete with a summary and evidence.
+- If you are truly blocked and need user input, call the tool opencode_loop_goal_blocked with the reason and what is needed.
+- If you made meaningful progress but the goal is not complete, call the tool opencode_loop_goal_progress with the summary and next step.
+- If you cannot make meaningful progress for this turn, call opencode_loop_goal_blocked instead of repeating the same attempt.
+- Do not call completion tools just to be polite; only call them when the state is real.
+- Do not ask the user questions unless blocked; make reasonable assumptions and continue.
+- Follow safety rules: no destructive commands, force pushes, production deploys, production database resets, or deleting user data.
+
+${sections.join("\n\n---\n\n")}`
+}

package/src/source/runtime/goal-report.js

@@ -0,0 +1,52 @@
+import { promises as fs } from "node:fs"
+import path from "node:path"
+import { DEFAULT_GOAL_MAX_NO_PROGRESS, safeID } from "../core/args.js"
+import { isGoalJob, goalStatusText } from "../core/jobs.js"
+import { stateDir, ensureDir } from "../core/state.js"
+
+const GOAL_REPORT_DIR = "goals"
+
+export function goalReportPath(directory, sessionID, job) {
+  return path.join(stateDir(directory), GOAL_REPORT_DIR, `${safeID(sessionID)}-${safeID(job.name || job.id)}.md`)
+}
+
+export function goalReportText(job) {
+  const lines = []
+  lines.push(`# OpenCode Loop Goal Report`)
+  lines.push("")
+  lines.push(`Status: ${goalStatusText(job) || "unknown"}`)
+  lines.push(`Goal: ${job.action || job.goalFile || ""}`)
+  lines.push(`Created: ${job.createdAt || ""}`)
+  if (job.goalCompletedAt) lines.push(`Completed: ${new Date(job.goalCompletedAt).toISOString()}`)
+  if (job.goalBlockedAt) lines.push(`Blocked: ${new Date(job.goalBlockedAt).toISOString()}`)
+  if (job.lastUserInterruptAt) lines.push(`Paused by user message: ${new Date(job.lastUserInterruptAt).toISOString()}`)
+  if (job.goalNoProgressPausedAt) lines.push(`Paused by no-progress guard: ${new Date(job.goalNoProgressPausedAt).toISOString()}`)
+  if (job.runCount) lines.push(`Turns: ${job.runCount}`)
+  if ((job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS) > 0) lines.push(`No-progress: ${job.noProgressCount || 0}/${job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS}`)
+  lines.push("")
+  if (job.goalSummary) lines.push("## Summary", "", String(job.goalSummary), "")
+  if (job.goalEvidence) lines.push("## Evidence", "", String(job.goalEvidence), "")
+  if (job.goalBlockedReason) lines.push("## Blocked reason", "", String(job.goalBlockedReason), "")
+  if (job.goalCompletionRejectedReason) lines.push("## Last completion rejection", "", String(job.goalCompletionRejectedReason), "")
+  if (job.goalInterruptedReason) lines.push("## Interrupt", "", String(job.goalInterruptedReason), "")
+  if (job.goalNoProgressReason) lines.push("## No-progress guard", "", String(job.goalNoProgressReason), "")
+  if (job.goalAcceptance?.length) lines.push("## Acceptance criteria", "", ...job.goalAcceptance.map((item) => `- ${item}`), "")
+  if (job.lastGoalChecks?.length) {
+    lines.push("## Latest checks", "")
+    for (const item of job.lastGoalChecks) lines.push(`- ${item.command}: exit ${item.code}`)
+    lines.push("")
+  }
+  if (job.goalProgress?.length) {
+    lines.push("## Progress", "")
+    for (const item of job.goalProgress) lines.push(`- ${item.time}: ${item.summary}${item.next ? ` Next: ${item.next}` : ""}`)
+    lines.push("")
+  }
+  return lines.join("\n")
+}
+
+export async function writeGoalReport(directory, sessionID, job) {
+  if (!isGoalJob(job)) return
+  const target = job.goalEvidenceFile ? path.resolve(directory, job.goalEvidenceFile) : goalReportPath(directory, sessionID, job)
+  await ensureDir(path.dirname(target))
+  await fs.writeFile(target, goalReportText(job), "utf8")
+}

package/src/source/runtime/goal-runtime.js

@@ -1,105 +1,13 @@
-import { promises as fs } from "node:fs"
-import path from "node:path"
-import { DEFAULT_GOAL_MAX_NO_PROGRESS, now, safeID } from "../core/args.js"
-import { matchJob, isGoalJob, goalStatusText } from "../core/jobs.js"
-import { stateDir, ensureDir, readState, writeState } from "../core/state.js"
-import { appendLoopLog, readSmallTextFile } from "../core/process.js"
+import { now } from "../core/args.js"
+import { matchJob, isGoalJob } from "../core/jobs.js"
+import { readState, writeState } from "../core/state.js"
+import { appendLoopLog } from "../core/process.js"
+import { writeGoalReport } from "./goal-report.js"
+import { hasConcreteGoalEvidence, goalChecksPassed, goalRequiresPassingChecks } from "./goal-evidence.js"
 
-const GOAL_REPORT_DIR = "goals"
-const GOAL_PROMPT_PREFIX = "EXPERIMENTAL OPENCODE GOAL MODE ITERATION"
-
-export async function buildGoalPrompt(directory, job) {
-  const sections = []
-  sections.push(`Working directory:\n${path.resolve(directory)}\nKeep every file operation inside this directory. Prefer workspace-relative paths such as \"src/index.js\"; never turn a relative path into a root path such as \"/src/index.js\".`)
-  const objective = String(job.action || "").trim()
-  if (objective) sections.push(`Goal objective:\n${objective}`)
-  if (job.goalFile) {
-    const text = await readSmallTextFile(path.resolve(directory, job.goalFile), 120_000)
-    if (text.trim()) sections.push(`Goal file ${job.goalFile}:\n${text.trim()}`)
-    else sections.push(`Goal file ${job.goalFile} was requested but could not be read. Continue from the inline goal objective.`)
-  }
-  if (job.promptFile) {
-    const text = await readSmallTextFile(path.resolve(directory, job.promptFile), 120_000)
-    if (text.trim()) sections.push(`Extra goal instructions from ${job.promptFile}:\n${text.trim()}`)
-  }
-  if (job.goalAcceptance?.length) sections.push("Acceptance criteria:\n" + job.goalAcceptance.map((item, index) => `${index + 1}. ${item}`).join("\n"))
-  if (job.goalChecks?.length) sections.push("Verification commands that define useful evidence:\n" + job.goalChecks.map((item, index) => `${index + 1}. ${item}`).join("\n"))
-  if (job.verifyCommand) sections.push(`Post-turn verify command configured by the loop: ${job.verifyCommand}`)
-  if (job.lastGoalChecks?.length) sections.push("Latest goal check results:\n" + job.lastGoalChecks.map((item) => `- ${item.command}: exit ${item.code}`).join("\n"))
-  if (job.lastVerifyFailure) sections.push("Previous verify/check failure summary:\n" + String(job.lastVerifyFailure).slice(0, 1600))
-  if (job.goalCompletionRejectedReason) sections.push(`Previous completion attempt was rejected:\n${job.goalCompletionRejectedReason}`)
-  if ((job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS) > 0) sections.push(`No-progress guard:\n${job.noProgressCount || 0}/${job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS} recent turn(s) without recorded meaningful progress.`)
-  if (job.goalProgress?.length) sections.push("Recent goal progress:\n" + job.goalProgress.slice(-5).map((item) => `- ${item.time}: ${item.summary}`).join("\n"))
-  for (const file of job.includeFiles || []) {
-    const text = await readSmallTextFile(path.resolve(directory, file), 80_000)
-    if (text.trim()) sections.push(`Context from ${file}:\n${text.trim().slice(0, 20_000)}`)
-  }
-
-  return `${GOAL_PROMPT_PREFIX}.
-
-You are pursuing an experimental persistent goal for this OpenCode session. This is not a timer loop and not a one-shot prompt. Keep working toward the goal until it is completed, blocked, paused, cleared, or stopped by safety limits.
-
-Rules:
-- Work on the next smallest useful step toward the goal.
-- Prefer direct code changes, tests, typechecks, builds, and evidence over discussion.
-- Do not claim the goal is complete unless the acceptance criteria are satisfied and verification evidence supports it.
-- If verification commands are configured, do not call opencode_loop_goal_complete until the latest relevant checks have passed unless the user explicitly overrides the goal.
-- Completion evidence must be concrete: mention commands, files, checks, results, or code inspection details.
-- When the goal is complete, call the tool opencode_loop_goal_complete with a summary and evidence.
-- If you are truly blocked and need user input, call the tool opencode_loop_goal_blocked with the reason and what is needed.
-- If you made meaningful progress but the goal is not complete, call the tool opencode_loop_goal_progress with the summary and next step.
-- If you cannot make meaningful progress for this turn, call opencode_loop_goal_blocked instead of repeating the same attempt.
-- Do not call completion tools just to be polite; only call them when the state is real.
-- Do not ask the user questions unless blocked; make reasonable assumptions and continue.
-- Follow safety rules: no destructive commands, force pushes, production deploys, production database resets, or deleting user data.
-
-${sections.join("\n\n---\n\n")}`
-}
-
-export function goalReportPath(directory, sessionID, job) {
-  return path.join(stateDir(directory), GOAL_REPORT_DIR, `${safeID(sessionID)}-${safeID(job.name || job.id)}.md`)
-}
-
-export function goalReportText(job) {
-  const lines = []
-  lines.push(`# OpenCode Loop Goal Report`)
-  lines.push("")
-  lines.push(`Status: ${goalStatusText(job) || "unknown"}`)
-  lines.push(`Goal: ${job.action || job.goalFile || ""}`)
-  lines.push(`Created: ${job.createdAt || ""}`)
-  if (job.goalCompletedAt) lines.push(`Completed: ${new Date(job.goalCompletedAt).toISOString()}`)
-  if (job.goalBlockedAt) lines.push(`Blocked: ${new Date(job.goalBlockedAt).toISOString()}`)
-  if (job.lastUserInterruptAt) lines.push(`Paused by user message: ${new Date(job.lastUserInterruptAt).toISOString()}`)
-  if (job.goalNoProgressPausedAt) lines.push(`Paused by no-progress guard: ${new Date(job.goalNoProgressPausedAt).toISOString()}`)
-  if (job.runCount) lines.push(`Turns: ${job.runCount}`)
-  if ((job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS) > 0) lines.push(`No-progress: ${job.noProgressCount || 0}/${job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS}`)
-  lines.push("")
-  if (job.goalSummary) lines.push("## Summary", "", String(job.goalSummary), "")
-  if (job.goalEvidence) lines.push("## Evidence", "", String(job.goalEvidence), "")
-  if (job.goalBlockedReason) lines.push("## Blocked reason", "", String(job.goalBlockedReason), "")
-  if (job.goalCompletionRejectedReason) lines.push("## Last completion rejection", "", String(job.goalCompletionRejectedReason), "")
-  if (job.goalInterruptedReason) lines.push("## Interrupt", "", String(job.goalInterruptedReason), "")
-  if (job.goalNoProgressReason) lines.push("## No-progress guard", "", String(job.goalNoProgressReason), "")
-  if (job.goalAcceptance?.length) lines.push("## Acceptance criteria", "", ...job.goalAcceptance.map((item) => `- ${item}`), "")
-  if (job.lastGoalChecks?.length) {
-    lines.push("## Latest checks", "")
-    for (const item of job.lastGoalChecks) lines.push(`- ${item.command}: exit ${item.code}`)
-    lines.push("")
-  }
-  if (job.goalProgress?.length) {
-    lines.push("## Progress", "")
-    for (const item of job.goalProgress) lines.push(`- ${item.time}: ${item.summary}${item.next ? ` Next: ${item.next}` : ""}`)
-    lines.push("")
-  }
-  return lines.join("\n")
-}
-
-export async function writeGoalReport(directory, sessionID, job) {
-  if (!isGoalJob(job)) return
-  const target = job.goalEvidenceFile ? path.resolve(directory, job.goalEvidenceFile) : goalReportPath(directory, sessionID, job)
-  await ensureDir(path.dirname(target))
-  await fs.writeFile(target, goalReportText(job), "utf8")
-}
+export { buildGoalPrompt } from "./goal-prompt.js"
+export { goalReportPath, goalReportText, writeGoalReport } from "./goal-report.js"
+export { hasConcreteGoalEvidence, goalChecksPassed, goalRequiresPassingChecks, goalProgressSnapshot, goalMadeMeaningfulProgress } from "./goal-evidence.js"
 
 export function pickGoalJob(state, target = "") {
   const goals = (state.jobs || []).filter(isGoalJob)
@@ -115,46 +23,6 @@ export function parseGoalToolText(args, fields) {
   return result
 }
 
-export function hasConcreteGoalEvidence(value) {
-  const text = String(value || "").trim()
-  if (text.length < 24) return false
-  const normalized = text.toLowerCase().replace(/\s+/g, " ")
-  const weak = new Set(["done", "complete", "completed", "ok", "looks good", "n/a", "none", "no evidence", "no evidence provided", "goal completed", "marked complete"])
-  if (weak.has(normalized) || normalized.startsWith("marked complete by /loop-goal-done")) return false
-  return /(\b(npm|pnpm|yarn|bun|node|pytest|cargo|dotnet|go test|tsc|typecheck|test|tests|lint|build|check|checks|exit\s*\d|passed|verified|changed|updated|created|fixed|file|files|diff|commit)\b|[`\\/][\w./:-]+)/i.test(text) || text.length >= 80
-}
-
-export function goalChecksPassed(job) {
-  return Array.isArray(job?.lastGoalChecks) && job.lastGoalChecks.length > 0 && job.lastGoalChecks.every((item) => Number(item?.code) === 0)
-}
-
-export function goalRequiresPassingChecks(job) {
-  return job?.goalRequireChecksPass !== false && Array.isArray(job?.goalChecks) && job.goalChecks.length > 0
-}
-
-export function goalProgressSnapshot(job) {
-  return {
-    status: job?.goalStatus || "",
-    progressCount: Array.isArray(job?.goalProgress) ? job.goalProgress.length : 0,
-    evidence: String(job?.goalEvidence || ""),
-    checksPassedAt: Number(job?.goalChecksPassedAt || 0),
-    lastGoalCheckAt: Number(job?.lastGoalCheckAt || 0),
-    lastVerifyAt: Number(job?.lastVerifyAt || 0),
-    lastVerifyCode: Number.isFinite(Number(job?.lastVerifyCode)) ? Number(job.lastVerifyCode) : undefined,
-  }
-}
-
-export function goalMadeMeaningfulProgress(beforeJob, afterJob) {
-  const before = goalProgressSnapshot(beforeJob || {})
-  const after = goalProgressSnapshot(afterJob || {})
-  if (["completed", "blocked"].includes(after.status) && after.status !== before.status) return true
-  if (after.progressCount > before.progressCount) return true
-  if (after.evidence !== before.evidence && hasConcreteGoalEvidence(after.evidence)) return true
-  if (after.checksPassedAt > before.checksPassedAt || goalChecksPassed(afterJob) && after.lastGoalCheckAt > before.lastGoalCheckAt) return true
-  if (after.lastVerifyAt > before.lastVerifyAt && after.lastVerifyCode === 0) return true
-  return false
-}
-
 export async function rejectGoalCompletion(directory, sessionID, state, job, reason) {
   job.goalCompletionRejectedAt = now()
   job.goalCompletionRejectedReason = reason