diff --git a/README.md b/README.md
index f5f27d5c..15ca2576 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,18 @@ Create a starter progress file first if needed:
 /loop-init
 ```
 
+### Stop when a Markdown checklist is complete (unreleased)
+
+The native V2 source on this branch supports an **opt-in, host-checked** completion guard. It is **not part of the published 0.6.8 npm package** until a verified release ships:
+
+```text
+/loop --progress-file TASK.md --until-checklist-complete --verify "npm test" finish the tasks in TASK.md
+```
+
+On a safe idle/scheduling boundary, Loop reads `TASK.md` as a regular project file. If it has at least one Markdown checkbox and all actionable boxes are checked, Loop stops scheduling further turns. If `--verify` is configured, Loop also requires a previously observed successful host verification. Empty/missing/oversized/unsafe/symlink/control-plane files pause for review rather than being called finished; code-fenced and quoted checkbox examples do not count.
+
+**Without `--until-checklist-complete`, `--progress-file` only supplies context** and normal unlimited loops stay unlimited. The host/user controls `/loop-stop` and `/loop-clear` directly; having a model print those names is not an actual command invocation. Follow [#174](https://github.com/ByBrawe/opencode-loop/issues/174) and [#175](https://github.com/ByBrawe/opencode-loop/issues/175).
+
 ### Repeat every 5 minutes
 
 ```text
diff --git a/docs/SCHEDULING.md b/docs/SCHEDULING.md
index e694497f..3a9d648d 100644
--- a/docs/SCHEDULING.md
+++ b/docs/SCHEDULING.md
@@ -330,6 +330,20 @@ If the desired contract is to stop when the project is demonstrably complete, ma
 /loop --safe --ask-never --progress-file progress.md devam et bitene kadar; projeyi bitir
 ```
 
+## Opt-in checklist completion guard (unreleased on main)
+
+The native V2 code under development adds `--until-checklist-complete` when `--progress-file` names the user-owned project Markdown checklist:
+
+```text
+/loop --progress-file TASK.md --until-checklist-complete --verify "npm test" finish remaining tasks
+```
+
+`--progress-file` **alone** is not a completion condition, and ordinary idle loops remain intentionally unlimited. With the opt-in flag, the host checks real Markdown task boxes on safe idle/admission boundaries, ignoring quoted and code-fenced examples. At least one task must exist, and every task must be `[x]`/`[X]`. If `--verify` is configured, a successful host-observed verification must also exist. Missing, unsafe, unreadable, control-plane or oversized files pause instead of claiming success. See [#174](https://github.com/ByBrawe/opencode-loop/issues/174).
+
+Users can stop any job directly with `/loop-stop` or `/loop-clear`. An assistant simply printing those strings in chat does **not** execute the host-native slash command; see [#175](https://github.com/ByBrawe/opencode-loop/issues/175).
+
+This feature is **not shipped in npm 0.6.8**; verify the release notes of a later version before relying on it.
+
 ## Stopping and limits
 
 Idle loops are intentionally unlimited by default. Bound them when needed:
diff --git a/package.json b/package.json
index 9113a667..cfb2d27d 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
     "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 && bun build src/source/native.js --outfile=src/native.js --target=bun --format=esm",
     "build:plugin:npm": "npm run build:plugin",
     "prepack": "node --check src/plugin.js && node --check src/v2.js && node --check src/index.js && node --check src/server.js && node --check src/native.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/pulse-check.mjs && node --check scripts/state-process-test.mjs && node --check scripts/state-exfat-lock-test.mjs && node --check scripts/state-integrity-test.mjs && node --check scripts/install-test.mjs && node --check scripts/desktop-command-diagnostics.mjs && node --check scripts/desktop-command-diagnostics-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-goal-bootstrap.mjs && node --check scripts/host-goal-bootstrap-test.mjs && node --check scripts/host-loop-canary.mjs && node --check scripts/host-goal-steering-canary.mjs && node --check scripts/publish-workflow-test.mjs && node --check scripts/goal-compaction-safety-test.mjs && node --check src/source/native.js && node --check src/source/opencode2/native-plugin.js && node --check src/source/opencode2/native-runtime.js && node --check src/source/opencode2/native-policy.js && node --check src/native.js && node --check scripts/native-entry-test.mjs && node --check scripts/package-native-smoke.mjs && node --check src/v1.js && node --check scripts/native-cli-io-test.mjs && node --check scripts/native-lifecycle-test.mjs && node --check scripts/native-plugin-lifetime-test.mjs && node --check src/source/core/progress.js && node --check scripts/native-presets-test.mjs && node --check scripts/control-plane-until-test.mjs && node --check src/source/opencode2/session-location.js && node --check scripts/native-session-location-test.mjs && node --check src/plugin.js && node --check src/v2.js",
-    "test": "node --test scripts/native-session-location-test.mjs && node --test scripts/control-plane-until-test.mjs && node --test scripts/native-presets-test.mjs && node --test scripts/native-plugin-lifetime-test.mjs && node --test scripts/native-cli-io-test.mjs scripts/native-lifecycle-test.mjs && node scripts/native-entry-test.mjs && node scripts/native-coexistence-test.mjs && node scripts/native-shell-test.mjs && node scripts/native-install-test.mjs && node scripts/native-v2-test.mjs && node scripts/goal-compaction-safety-test.mjs && 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/state-process-test.mjs && node scripts/state-exfat-lock-test.mjs && node scripts/state-integrity-test.mjs && node scripts/install-test.mjs && node --test scripts/desktop-command-diagnostics-test.mjs && node scripts/goal-companion-test.mjs && node scripts/loopd-test.mjs && node scripts/smoke-test.mjs && node --test scripts/host-goal-bootstrap-test.mjs && node scripts/host-adapter-contract-test.mjs && node scripts/comprehensive-watchdog.mjs",
+    "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/pulse-check.mjs && node --check scripts/state-process-test.mjs && node --check scripts/state-exfat-lock-test.mjs && node --check scripts/state-integrity-test.mjs && node --check scripts/install-test.mjs && node --check scripts/desktop-command-diagnostics.mjs && node --check scripts/desktop-command-diagnostics-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-goal-bootstrap.mjs && node --check scripts/host-goal-bootstrap-test.mjs && node --check scripts/host-loop-canary.mjs && node --check scripts/host-goal-steering-canary.mjs && node --check scripts/publish-workflow-test.mjs && node --check scripts/goal-compaction-safety-test.mjs && node --check src/source/native.js && node --check src/source/opencode2/native-plugin.js && node --check src/source/opencode2/native-runtime.js && node --check src/source/opencode2/native-policy.js && node --check src/source/runtime/checklist-completion.js && node --check scripts/checklist-completion-test.mjs && node --check src/native.js && node --check scripts/native-entry-test.mjs && node --check scripts/package-native-smoke.mjs && node --check src/v1.js && node --check scripts/native-cli-io-test.mjs && node --check scripts/native-lifecycle-test.mjs && node --check scripts/native-plugin-lifetime-test.mjs && node --check src/source/core/progress.js && node --check scripts/native-presets-test.mjs && node --check scripts/control-plane-until-test.mjs && node --check src/source/opencode2/session-location.js && node --check scripts/native-session-location-test.mjs && node --check src/plugin.js && node --check src/v2.js",
+    "test": "node --test scripts/native-session-location-test.mjs && node --test scripts/control-plane-until-test.mjs && node --test scripts/native-presets-test.mjs && node --test scripts/native-plugin-lifetime-test.mjs && node --test scripts/native-cli-io-test.mjs scripts/native-lifecycle-test.mjs && node scripts/native-entry-test.mjs && node scripts/native-coexistence-test.mjs && node scripts/native-shell-test.mjs && node scripts/native-install-test.mjs && node scripts/checklist-completion-test.mjs && node scripts/native-v2-test.mjs && node scripts/goal-compaction-safety-test.mjs && 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/state-process-test.mjs && node scripts/state-exfat-lock-test.mjs && node scripts/state-integrity-test.mjs && node scripts/install-test.mjs && node --test scripts/desktop-command-diagnostics-test.mjs && node scripts/goal-companion-test.mjs && node scripts/loopd-test.mjs && node scripts/smoke-test.mjs && node --test scripts/host-goal-bootstrap-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",
diff --git a/scripts/checklist-completion-test.mjs b/scripts/checklist-completion-test.mjs
new file mode 100644
index 00000000..0993645c
--- /dev/null
+++ b/scripts/checklist-completion-test.mjs
@@ -0,0 +1,104 @@
+import assert from "node:assert/strict"
+import { mkdtemp, mkdir, writeFile, symlink, rm } from "node:fs/promises"
+import os from "node:os"
+import path from "node:path"
+import { parseLoopArgs } from "../src/source/core/args.js"
+import { summarizeTaskChecklist, inspectTaskChecklist } from "../src/source/runtime/checklist-completion.js"
+import { formatOpenCode2LoopStatus } from "../src/source/opencode2/status.js"
+import { createNativeJobPolicy } from "../src/source/opencode2/native-policy.js"
+
+let checks = 0
+function expectSummary(input, status, total, pending) {
+  const got = summarizeTaskChecklist(input)
+  assert.deepEqual([got.status, got.total, got.pending], [status, total, pending])
+  checks++
+}
+const ticks = String.fromCharCode(96).repeat(3)
+expectSummary("- [ ] first\n- [x] second", "pending", 2, 1)
+expectSummary("- [X] first\r\n  * [x] second\r\n    + [x] third", "complete", 3, 0)
+expectSummary("\uFEFF- [x] already finished\n", "complete", 1, 0)
+expectSummary("- [ ]", "pending", 1, 1)
+expectSummary("- [x]\n- [ ] TODO", "pending", 2, 1)
+expectSummary(ticks + "md\n- [ ] fake\n" + ticks + "\n- [x] real", "complete", 1, 0)
+expectSummary("~~~~\n- [ ] fake\n~~~~\n- [x] real", "complete", 1, 0)
+expectSummary("> - [ ] fake\n- [x] real", "complete", 1, 0)
+expectSummary("<!--\n- [ ] fake\n-->\n- [x] real", "complete", 1, 0)
+expectSummary("<!-- - [ ] fake -->\n- [x] real", "complete", 1, 0)
+expectSummary("No Markdown task boxes here.", "unavailable", 0, 0)
+expectSummary(ticks + "\n- [x] fake\n" + ticks, "unavailable", 0, 0)
+expectSummary("## [x] Not a task\n- [other] Nope", "unavailable", 0, 0)
+
+const args = parseLoopArgs("0s --progress-file TASK.md --until-checklist-complete task")
+assert.equal(args.ok, true)
+assert.equal(args.job.untilChecklistComplete, true)
+assert.equal(args.job.progressFile, "TASK.md")
+assert.equal(parseLoopArgs("0s --until-checklist-complete task").ok, false)
+assert.equal(parseLoopArgs("0s --progress-file TASK.md task").job.untilChecklistComplete, false)
+checks += 5
+assert.equal(formatOpenCode2LoopStatus({ jobs: [] }).text, "OpenCode loop status:\nNo active loop jobs.")
+checks++
+
+const root = await mkdtemp(path.join(os.tmpdir(), "loop-checklist-"))
+try {
+  await writeFile(path.join(root, "TASK.md"), "- [ ] one\n- [x] two\n")
+  let state = await inspectTaskChecklist(root, "TASK.md")
+  assert.deepEqual([state.status, state.total, state.pending], ["pending", 2, 1])
+  checks++
+  await writeFile(path.join(root, "TASK.md"), "- [X] one\n- [x] two\n")
+  state = await inspectTaskChecklist(root, "TASK.md")
+  assert.equal(state.status, "complete")
+  assert.match(state.digest, /^[0-9a-f]{64}$/)
+  checks++
+  const verifiedHash = state.digest
+  const policy = createNativeJobPolicy()
+  const job = { id: "verify", untilChecklistComplete: true, progressFile: "TASK.md",
+    verifyCommand: "npm test", lastVerifyCode: 0, lastVerifyAt: 10, lastVerifyChecklistDigest: verifiedHash }
+  await writeFile(path.join(root, "TASK.md"), "- [X] one\n- [x] two\n- [x] three\n")
+  assert.equal(await policy.checkStop({ directory: root }, job), true,
+    "stale digest must not complete a modified checklist")
+  assert.equal(job.enabled, undefined)
+  assert.equal(job.paused, undefined)
+  checks++
+  job.lastVerifyChecklistDigest = (await inspectTaskChecklist(root, "TASK.md")).digest
+  assert.equal(await policy.checkStop({ directory: root }, job), false)
+  assert.equal(job.paused, true)
+  assert.equal(job.pauseReason, "checklist-complete")
+  checks++
+  await mkdir(path.join(root, "plans"))
+  await writeFile(path.join(root, "plans", "tasks.md"), " - [x] done\n")
+  assert.equal((await inspectTaskChecklist(root, "plans/tasks.md")).status, "complete")
+  checks++
+
+  const bad = [
+    ["missing.md", "file-missing"],
+    ["../escape.md", "outside-project"],
+    ["/tmp/not-a-project-task.md", "absolute-path"],
+    [".opencode/goals/goal.md", "control-plane-path"],
+    [".git/TASK.md", "control-plane-path"],
+    ["node_modules/TASK.md", "control-plane-path"],
+    ["plans", "not-regular-file"],
+  ]
+  for (const [file, reason] of bad) {
+    const result = await inspectTaskChecklist(root, file)
+    assert.equal(result.status, "unavailable", file)
+    assert.equal(result.reason, reason, file)
+    checks++
+  }
+  await writeFile(path.join(root, "empty.md"), "Just prose\n")
+  assert.equal((await inspectTaskChecklist(root, "empty.md")).reason, "no-task-checkboxes")
+  checks++
+  await writeFile(path.join(root, "huge.md"), "x".repeat(256_001))
+  assert.equal((await inspectTaskChecklist(root, "huge.md")).reason, "file-too-large")
+  checks++
+  try {
+    await symlink(path.join(root, "TASK.md"), path.join(root, "linked.md"))
+    assert.equal((await inspectTaskChecklist(root, "linked.md")).reason, "symlink-path")
+    checks++
+  } catch (error) {
+    if (!["EPERM", "EACCES", "ENOTSUP", "EOPNOTSUPP"].includes(error?.code)) throw error
+  }
+} finally {
+  await rm(root, { force: true, recursive: true })
+}
+
+console.log("checklist completion regression tests passed: " + checks)
diff --git a/scripts/native-v2-test.mjs b/scripts/native-v2-test.mjs
index 1a78d383..a880691b 100644
--- a/scripts/native-v2-test.mjs
+++ b/scripts/native-v2-test.mjs
@@ -47,6 +47,67 @@ async function test(name, run, extra) {
   finally { await f.close() }
 }
 
+await test("explicit checklist stop prevents the next V2 model turn", async (f) => {
+  await writeFile(path.join(f.directory, "TASK.md"), "- [ ] implement\n- [x] setup\n")
+  const added = await f.add("0s --progress-file TASK.md --until-checklist-complete implement --max-runs 3")
+  assert.equal(added.accepted, true)
+  await f.wake()
+  assert.equal(f.prompts.length, 1)
+  await writeFile(path.join(f.directory, "TASK.md"), "- [x] implement\n- [x] setup\n")
+  await f.complete()
+  const job = (await f.state()).jobs[0]
+  assert.equal(f.prompts.length, 1, "no redundant model prompt after host checks TASK.md")
+  assert.equal(job.enabled, false)
+  assert.equal(job.paused, true)
+  assert.equal(job.pauseReason, "checklist-complete")
+  assert.deepEqual(job.checklistStatus, { status: "complete", total: 2, pending: 0 })
+})
+
+await test("explicit checklist refuses missing project file instead of spending tokens", async (f) => {
+  assert.equal((await f.add("0s --progress-file MISSING.md --until-checklist-complete implement")).accepted, true)
+  await f.wake()
+  const job = (await f.state()).jobs[0]
+  assert.equal(f.prompts.length, 0)
+  assert.equal(job.paused, true)
+  assert.equal(job.pauseReason, "checklist-unavailable")
+  assert.equal(job.lastChecklistError, "file-missing")
+})
+
+await test("an already-complete checklist still requires host verification when requested", async (f) => {
+  await writeFile(path.join(f.directory, "TASK.md"), "- [x] done\n")
+  await f.add('0s --progress-file TASK.md --until-checklist-complete --verify "npm test" check work --max-runs 2')
+  await f.wake()
+  assert.equal(f.prompts.length, 1, "unobserved verify must not pass by default")
+  await f.complete()
+  const job = (await f.state()).jobs[0]
+  assert.equal(f.hooks.length, 1)
+  assert.equal(f.hooks[0], "npm test")
+  assert.equal(f.prompts.length, 1, "observed verify pass stops before another turn")
+  assert.equal(job.enabled, false)
+  assert.equal(job.pauseReason, "checklist-complete")
+  assert.equal(job.lastVerifyCode, 0)
+})
+
+await test("progress-file without opt-in still follows existing finite or infinite semantics", async (f) => {
+  await writeFile(path.join(f.directory, "TASK.md"), "- [x] all done\n")
+  await f.add("0s --progress-file TASK.md task --max-runs 1")
+  await f.wake()
+  assert.equal(f.prompts.length, 1)
+  assert.equal((await f.state()).jobs[0].untilChecklistComplete, false)
+})
+
+await test("native checklist flag requires explicit progress file and status reveals stop controls", async (f) => {
+  const rejected = await f.add("0s --until-checklist-complete implement")
+  assert.equal(rejected.accepted, false)
+  assert.match(rejected.error, /--progress-file/)
+  await writeFile(path.join(f.directory, "TASK.md"), "- [ ] todo\n")
+  await f.add("0s --progress-file TASK.md --until-checklist-complete implement --max-runs 3")
+  const status = await f.control("loop-status")
+  assert.match(status.status.text, /checklist-stop:TASK\.md/)
+  assert.match(status.status.text, /\/loop-stop/)
+  assert.match(status.status.text, /\/loop-clear/)
+})
+
 await test("one durable prompt under concurrent idle notifications", async (f) => {
   assert.equal((await f.add("0s keep working --max-runs 2")).accepted, true)
   await Promise.all(Array.from({ length: 12 }, () => f.wake()))
diff --git a/scripts/run-admission-test.mjs b/scripts/run-admission-test.mjs
index f525179f..fdfa2ec9 100644
--- a/scripts/run-admission-test.mjs
+++ b/scripts/run-admission-test.mjs
@@ -1,6 +1,9 @@
 import assert from "node:assert/strict"
 import path from "node:path"
+import os from "node:os"
+import { mkdtemp, writeFile, rm } from "node:fs/promises"
 import { createRunAdmissionRuntime } from "../src/source/runtime/run-admission.js"
+import { inspectTaskChecklist } from "../src/source/runtime/checklist-completion.js"
 
 assert.throws(() => createRunAdmissionRuntime({}), /untilReached/)
 assert.throws(() => createRunAdmissionRuntime({ untilReached: async () => false }), /scheduleDueWork/)
@@ -130,4 +133,48 @@ assert.equal(admitted.paused, undefined)
 assert.equal(admitted.runNowRequestedAt, clock)
 assert.equal(logs.findLast((entry) => entry[1] === "preflight")?.[2].code, 0)
 
+const project = await mkdtemp(path.join(os.tmpdir(), "loop-admission-checklist-"))
+try {
+  await writeFile(path.join(project, "TASK.md"), "- [ ] code\n- [x] plan\n")
+  const checklistJob = { id: "checklist-job", enabled: true, progressFile: "TASK.md", untilChecklistComplete: true }
+  const checklistState = { jobs: [checklistJob] }
+  assert.equal((await runtime.admitJob(project, {}, "session-checklist", checklistState, checklistJob)).admitted, true)
+  assert.deepEqual(checklistJob.checklistStatus, { status: "pending", total: 2, pending: 1 })
+
+  await writeFile(path.join(project, "TASK.md"), "- [x] code\n- [x] plan\n")
+  assert.deepEqual(await runtime.admitJob(project, {}, "session-checklist", checklistState, checklistJob),
+    { admitted: false, reason: "checklist_complete" })
+  assert.equal(checklistState.jobs.length, 0)
+  assert.equal(notifications.at(-1)[2], "checklist_complete")
+
+  const verifyJob = { id: "verify-checklist", enabled: true, progressFile: "TASK.md",
+    untilChecklistComplete: true, verifyCommand: "npm test" }
+  const verifyState = { jobs: [verifyJob] }
+  assert.equal((await runtime.admitJob(project, {}, "session-verify", verifyState, verifyJob)).admitted, true,
+    "unchecked host verification cannot imply completion")
+  verifyJob.lastVerifyCode = 1
+  verifyJob.lastVerifyAt = clock
+  assert.equal((await runtime.admitJob(project, {}, "session-verify", verifyState, verifyJob)).admitted, true,
+    "failed host verification cannot imply completion")
+  verifyJob.lastVerifyCode = 0
+  assert.equal((await runtime.admitJob(project, {}, "session-verify", verifyState, verifyJob)).admitted, true,
+    "successful verify without recorded checklist fingerprint is not authoritative")
+  verifyJob.lastVerifyChecklistDigest = (await inspectTaskChecklist(project, "TASK.md")).digest
+  await writeFile(path.join(project, "TASK.md"), "- [x] code\n- [x] plan\n- [x] later task\n")
+  assert.equal((await runtime.admitJob(project, {}, "session-verify", verifyState, verifyJob)).admitted, true,
+    "verification for older checklist bytes cannot certify newly changed work")
+  verifyJob.lastVerifyChecklistDigest = (await inspectTaskChecklist(project, "TASK.md")).digest
+  assert.equal((await runtime.admitJob(project, {}, "session-verify", verifyState, verifyJob)).reason, "checklist_complete")
+
+  const missingJob = { id: "missing-checklist", enabled: true, progressFile: "MISSING.md", untilChecklistComplete: true }
+  const missingState = { jobs: [missingJob] }
+  const missing = await runtime.admitJob(project, {}, "session-missing", missingState, missingJob)
+  assert.deepEqual(missing, { admitted: false, reason: "checklist_unavailable" })
+  assert.equal(missingJob.paused, true)
+  assert.equal(missingJob.lastChecklistError, "file-missing")
+  assert.equal(missingState.jobs.length, 1, "preserve job for explicit recovery")
+} finally {
+  await rm(project, { force: true, recursive: true })
+}
+
 console.log("run admission runtime tests passed")
diff --git a/src/index.js b/src/index.js
index cf0b399b..be10b9e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -141,6 +141,7 @@ function parseLoopArgs(raw, defaults = {}) {
     until: defaults.until,
     stopFile: defaults.stopFile,
     progressFile: defaults.progressFile,
+    untilChecklistComplete: defaults.untilChecklistComplete ?? false,
     promptFile: defaults.promptFile,
     includeFiles: Array.isArray(defaults.includeFiles) ? [...defaults.includeFiles] : [],
     watchPaths: Array.isArray(defaults.watchPaths) ? [...defaults.watchPaths] : [],
@@ -221,6 +222,9 @@ function parseLoopArgs(raw, defaults = {}) {
   [found, rest] = takeFlag(rest, "--pause-on-verify-fail");
   if (found)
     job.pauseOnVerifyFail = true;
+  [found, rest] = takeFlag(rest, "--until-checklist-complete");
+  if (found)
+    job.untilChecklistComplete = true;
   [found, rest] = takeFlag(rest, "--dry-run");
   if (found)
     job.dryRun = true;
@@ -369,6 +373,8 @@ function parseLoopArgs(raw, defaults = {}) {
     job.maxNoProgress = job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS;
   }
   job.lastRunAt = job.immediate ? 0 : now();
+  if (job.untilChecklistComplete && !job.progressFile)
+    return { ok: false, error: "--until-checklist-complete requires --progress-file <project.md>" };
   if (!job.action && !job.promptFile && !job.goalFile)
     return { ok: false, error: "Missing action. Example: /loop 0s continue from progress.md, /loop-goal ship the feature, or /loop 0s --prompt-file loop-prompt.md" };
   return { ok: true, job };
@@ -1445,6 +1451,8 @@ function decoratePrompt(job) {
     additions.push(continuation);
   if (job.progressFile)
     additions.push(`Use ${job.progressFile} as the main progress/TODO state file. Read it before choosing the next task and update it after work.`);
+  if (job.untilChecklistComplete)
+    additions.push("When all actual Markdown tasks in the configured progress file are checked, stop creating new work and report results. Loop will make the stopping decision itself from the project file at a safe host boundary; do not attempt to invoke /loop-clear as assistant text.");
   if (job.lastVerifyFailure)
     additions.push("Previous verify command failed. Fix this before moving on. Failure summary: " + String(job.lastVerifyFailure).slice(0, 1200));
   if (job.askNever)
@@ -3625,6 +3633,125 @@ async function applyTerminalContinuationGuard(directory, client, sessionID, job,
   return { job, terminal: true, pausedNow, waitingUser: false, waitingUserPausedNow: false, text };
 }
 
+// src/source/runtime/checklist-completion.js
+import { promises as fs8, constants } from "fs";
+import path9 from "path";
+import { createHash } from "crypto";
+var MAX_CHECKLIST_BYTES = 256000;
+var EXCLUDED_PROJECT_DIRS = new Set([".opencode", ".git", "node_modules"]);
+function unavailable(reason) {
+  return { status: "unavailable", reason, total: 0, pending: 0 };
+}
+function summarizeTaskChecklist(markdown) {
+  let total = 0;
+  let pending = 0;
+  let fence = null;
+  let comment = false;
+  for (const original of String(markdown || "").replace(/^\uFEFF/, "").split(/\r?\n/)) {
+    let line = "";
+    let offset = 0;
+    while (offset < original.length) {
+      if (comment) {
+        const end = original.indexOf("-->", offset);
+        if (end < 0)
+          break;
+        comment = false;
+        offset = end + 3;
+      } else {
+        const start = original.indexOf("<!--", offset);
+        if (start < 0) {
+          line += original.slice(offset);
+          break;
+        }
+        line += original.slice(offset, start);
+        comment = true;
+        offset = start + 4;
+      }
+    }
+    const trimmed = line.trimStart();
+    const indentation = line.length - trimmed.length;
+    const marker = trimmed.charAt(0);
+    let markerSize = 0;
+    if (marker === "~" || marker.charCodeAt(0) === 96) {
+      while (trimmed.charAt(markerSize) === marker)
+        markerSize++;
+    }
+    if (fence) {
+      if (indentation <= 3 && markerSize >= fence.length && marker === fence.marker && !trimmed.slice(markerSize).trim())
+        fence = null;
+      continue;
+    }
+    if (indentation <= 3 && markerSize >= 3) {
+      fence = { marker, length: markerSize };
+      continue;
+    }
+    if (/^\s*>/.test(line))
+      continue;
+    const match = line.match(/^\s{0,24}[-+*]\s+\[([ xX])\](?:\s|$)/);
+    if (!match)
+      continue;
+    total++;
+    if (match[1] === " ")
+      pending++;
+  }
+  return {
+    status: total === 0 ? "unavailable" : pending === 0 ? "complete" : "pending",
+    reason: total === 0 ? "no-task-checkboxes" : "",
+    total,
+    pending
+  };
+}
+async function inspectTaskChecklist(directory, progressFile) {
+  const name = String(progressFile || "").trim();
+  if (!name || name.includes("\x00"))
+    return unavailable("missing-progress-file");
+  if (path9.isAbsolute(name) || path9.win32.isAbsolute(name))
+    return unavailable("absolute-path");
+  const root = path9.resolve(directory);
+  const target = path9.resolve(root, name);
+  const relative = path9.relative(root, target);
+  if (!relative || relative === ".." || relative.startsWith(".." + path9.sep) || path9.isAbsolute(relative)) {
+    return unavailable("outside-project");
+  }
+  const parts = relative.split(path9.sep);
+  if (parts.some((part) => EXCLUDED_PROJECT_DIRS.has(part.toLowerCase())))
+    return unavailable("control-plane-path");
+  try {
+    const rootInfo = await fs8.lstat(root);
+    if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink())
+      return unavailable("unsafe-project-root");
+    let current = root;
+    for (let index = 0;index < parts.length; index++) {
+      current = path9.join(current, parts[index]);
+      const info = await fs8.lstat(current);
+      if (info.isSymbolicLink())
+        return unavailable("symlink-path");
+      if (index < parts.length - 1 && !info.isDirectory())
+        return unavailable("invalid-parent");
+      if (index === parts.length - 1 && (!info.isFile() || info.size > MAX_CHECKLIST_BYTES)) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+    }
+    const handle = await fs8.open(target, constants.O_RDONLY | (constants.O_NOFOLLOW || 0));
+    try {
+      const info = await handle.stat();
+      if (!info.isFile() || info.size > MAX_CHECKLIST_BYTES) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+      const content = await handle.readFile({ encoding: "utf8" });
+      const after = await fs8.lstat(target);
+      if (!after.isFile() || after.isSymbolicLink() || after.dev !== info.dev || after.ino !== info.ino) {
+        return unavailable("file-changed-during-read");
+      }
+      return { ...summarizeTaskChecklist(content), digest: createHash("sha256").update(content).digest("hex") };
+    } finally {
+      await handle.close();
+    }
+  } catch (error) {
+    return unavailable(error?.code === "ENOENT" ? "file-missing" : error?.code === "ELOOP" ? "symlink-path" : "file-unreadable");
+  }
+}
+
 // src/source/runtime/run-finalization.js
 function requireFunction8(value, label) {
   if (typeof value !== "function")
@@ -3659,8 +3786,16 @@ function createRunFinalizationRuntime(options = {}) {
       if (verify.code === 0) {
         job.failureCount = 0;
         job.lastVerifyFailure = "";
+        if (job.untilChecklistComplete) {
+          const inspected = await inspectTaskChecklist(directory, job.progressFile);
+          if (inspected.status !== "unavailable")
+            job.lastVerifyChecklistDigest = inspected.digest;
+          else
+            delete job.lastVerifyChecklistDigest;
+        }
         await toast2(client, "Loop verify passed: " + job.verifyCommand, "success");
       } else {
+        delete job.lastVerifyChecklistDigest;
         job.failureCount = (job.failureCount || 0) + 1;
         job.lastVerifyFailure = (job.verifyCommand + `
 exit=` + verify.code + `
@@ -3748,7 +3883,7 @@ exit=` + postrun.code + `
 }
 
 // src/source/runtime/run-admission.js
-import path9 from "path";
+import path10 from "path";
 function requireFunction9(value, label) {
   if (typeof value !== "function")
     throw new TypeError(`createRunAdmissionRuntime requires ${label}`);
@@ -3786,12 +3921,30 @@ function createRunAdmissionRuntime(options = {}) {
     if (job.maxRuntimeMs > 0 && now2() - Date.parse(job.createdAt || new Date().toISOString()) >= job.maxRuntimeMs) {
       return await stopAndRemove(directory, client, sessionID, state, job, "max_runtime_reached", `Loop stopped by --max-runtime: ${job.name || job.id}`, "max-runtime");
     }
-    if (job.stopFile && await pathExists2(path9.resolve(directory, job.stopFile))) {
+    if (job.stopFile && await pathExists2(path10.resolve(directory, job.stopFile))) {
       return await stopAndRemove(directory, client, sessionID, state, job, "stop_file", "Loop stopped by --stop-file: " + job.stopFile);
     }
     if (await untilReached(directory, job)) {
       return await stopAndRemove(directory, client, sessionID, state, job, "until_reached", `Loop stopped by --until: ${job.until}`);
     }
+    if (job.untilChecklistComplete) {
+      const checklist = await inspectTaskChecklist(directory, job.progressFile);
+      job.checklistStatus = { status: checklist.status, total: checklist.total, pending: checklist.pending };
+      if (checklist.status === "unavailable") {
+        job.paused = true;
+        job.pauseReason = "checklist-unavailable";
+        job.lastChecklistError = checklist.reason;
+        await writeState2(directory, sessionID, state);
+        await notifyJob2(directory, job, "checklist_unavailable");
+        await toast2(client, "Loop paused: checklist " + job.progressFile + " could not be validated (" + checklist.reason + ").", "warning");
+        await reschedule(directory, client, sessionID);
+        return { admitted: false, reason: "checklist_unavailable" };
+      }
+      delete job.lastChecklistError;
+      if (checklist.status === "complete" && (!job.verifyCommand || job.lastVerifyAt > 0 && job.lastVerifyCode === 0 && job.lastVerifyChecklistDigest === checklist.digest)) {
+        return await stopAndRemove(directory, client, sessionID, state, job, "checklist_complete", "Loop stopped: " + job.progressFile + " checklist completed.", "checklist-complete");
+      }
+    }
     if (job.preflightCommand) {
       if (job.safe && dangerousShell2(job.preflightCommand)) {
         if (runNowRequested)
diff --git a/src/native.js b/src/native.js
index f02a06da..6d7ebdf0 100644
--- a/src/native.js
+++ b/src/native.js
@@ -149,6 +149,7 @@ function parseLoopArgs(raw, defaults = {}) {
     until: defaults.until,
     stopFile: defaults.stopFile,
     progressFile: defaults.progressFile,
+    untilChecklistComplete: defaults.untilChecklistComplete ?? false,
     promptFile: defaults.promptFile,
     includeFiles: Array.isArray(defaults.includeFiles) ? [...defaults.includeFiles] : [],
     watchPaths: Array.isArray(defaults.watchPaths) ? [...defaults.watchPaths] : [],
@@ -229,6 +230,9 @@ function parseLoopArgs(raw, defaults = {}) {
   [found, rest] = takeFlag(rest, "--pause-on-verify-fail");
   if (found)
     job.pauseOnVerifyFail = true;
+  [found, rest] = takeFlag(rest, "--until-checklist-complete");
+  if (found)
+    job.untilChecklistComplete = true;
   [found, rest] = takeFlag(rest, "--dry-run");
   if (found)
     job.dryRun = true;
@@ -377,6 +381,8 @@ function parseLoopArgs(raw, defaults = {}) {
     job.maxNoProgress = job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS;
   }
   job.lastRunAt = job.immediate ? 0 : now();
+  if (job.untilChecklistComplete && !job.progressFile)
+    return { ok: false, error: "--until-checklist-complete requires --progress-file <project.md>" };
   if (!job.action && !job.promptFile && !job.goalFile)
     return { ok: false, error: "Missing action. Example: /loop 0s continue from progress.md, /loop-goal ship the feature, or /loop 0s --prompt-file loop-prompt.md" };
   return { ok: true, job };
@@ -490,6 +496,8 @@ function decoratePrompt(job) {
     additions.push(continuation);
   if (job.progressFile)
     additions.push(`Use ${job.progressFile} as the main progress/TODO state file. Read it before choosing the next task and update it after work.`);
+  if (job.untilChecklistComplete)
+    additions.push("When all actual Markdown tasks in the configured progress file are checked, stop creating new work and report results. Loop will make the stopping decision itself from the project file at a safe host boundary; do not attempt to invoke /loop-clear as assistant text.");
   if (job.lastVerifyFailure)
     additions.push("Previous verify command failed. Fix this before moving on. Failure summary: " + String(job.lastVerifyFailure).slice(0, 1200));
   if (job.askNever)
@@ -1357,7 +1365,7 @@ var init_job_workspace = __esm(() => {
 });
 
 // src/source/opencode2/native-plugin.js
-import path9 from "path";
+import path10 from "path";
 
 // src/source/opencode2/session-location.js
 import path from "path";
@@ -1774,7 +1782,11 @@ function formatOpenCode2LoopStatus(state, current = Date.now()) {
       job.askNever ? "ask-never" : undefined,
       job.noOverlap ? "no-overlap" : undefined,
       job.checkpointOnly ? "checkpoint-only" : undefined,
-      job.gitCheckpoint ? "git-checkpoint" : undefined
+      job.gitCheckpoint ? "git-checkpoint" : undefined,
+      job.untilChecklistComplete ? "checklist-stop:" + (job.progressFile || "missing-file") : undefined,
+      job.pauseReason ? "reason:" + job.pauseReason : undefined,
+      job.lastChecklistError ? "checklist-error:" + job.lastChecklistError : undefined,
+      !job.maxRuns && !job.maxRuntimeMs && !job.until && !job.stopFile && !job.untilChecklistComplete ? "unlimited" : undefined
     ].filter(Boolean).join(",");
     return `${index + 1}. ${job.id}${job.name ? ` (${job.name})` : ""}: ${jobLabel(job)} | runs=${job.runCount || 0} | failures=${job.failureCount || 0} | due in ${durationToText(dueIn)} | ${flags}`;
   }) : ["No active loop jobs."];
@@ -1782,7 +1794,8 @@ function formatOpenCode2LoopStatus(state, current = Date.now()) {
     jobs,
     text: `OpenCode loop status:
 ${lines.join(`
-`)}`
+`)}${jobs.length ? `
+Host controls: run /loop-stop <name-or-id> or /loop-clear to stop jobs; asking the model to print those commands does not execute them.` : ""}`
   });
 }
 
@@ -1790,7 +1803,128 @@ ${lines.join(`
 init_process();
 init_job_workspace();
 import { stat } from "fs/promises";
+import path8 from "path";
+
+// src/source/runtime/checklist-completion.js
+import { promises as fs4, constants } from "fs";
 import path7 from "path";
+import { createHash as createHash2 } from "crypto";
+var MAX_CHECKLIST_BYTES = 256000;
+var EXCLUDED_PROJECT_DIRS = new Set([".opencode", ".git", "node_modules"]);
+function unavailable(reason) {
+  return { status: "unavailable", reason, total: 0, pending: 0 };
+}
+function summarizeTaskChecklist(markdown) {
+  let total = 0;
+  let pending = 0;
+  let fence = null;
+  let comment = false;
+  for (const original of String(markdown || "").replace(/^\uFEFF/, "").split(/\r?\n/)) {
+    let line = "";
+    let offset = 0;
+    while (offset < original.length) {
+      if (comment) {
+        const end = original.indexOf("-->", offset);
+        if (end < 0)
+          break;
+        comment = false;
+        offset = end + 3;
+      } else {
+        const start = original.indexOf("<!--", offset);
+        if (start < 0) {
+          line += original.slice(offset);
+          break;
+        }
+        line += original.slice(offset, start);
+        comment = true;
+        offset = start + 4;
+      }
+    }
+    const trimmed = line.trimStart();
+    const indentation = line.length - trimmed.length;
+    const marker = trimmed.charAt(0);
+    let markerSize = 0;
+    if (marker === "~" || marker.charCodeAt(0) === 96) {
+      while (trimmed.charAt(markerSize) === marker)
+        markerSize++;
+    }
+    if (fence) {
+      if (indentation <= 3 && markerSize >= fence.length && marker === fence.marker && !trimmed.slice(markerSize).trim())
+        fence = null;
+      continue;
+    }
+    if (indentation <= 3 && markerSize >= 3) {
+      fence = { marker, length: markerSize };
+      continue;
+    }
+    if (/^\s*>/.test(line))
+      continue;
+    const match = line.match(/^\s{0,24}[-+*]\s+\[([ xX])\](?:\s|$)/);
+    if (!match)
+      continue;
+    total++;
+    if (match[1] === " ")
+      pending++;
+  }
+  return {
+    status: total === 0 ? "unavailable" : pending === 0 ? "complete" : "pending",
+    reason: total === 0 ? "no-task-checkboxes" : "",
+    total,
+    pending
+  };
+}
+async function inspectTaskChecklist(directory, progressFile) {
+  const name = String(progressFile || "").trim();
+  if (!name || name.includes("\x00"))
+    return unavailable("missing-progress-file");
+  if (path7.isAbsolute(name) || path7.win32.isAbsolute(name))
+    return unavailable("absolute-path");
+  const root = path7.resolve(directory);
+  const target = path7.resolve(root, name);
+  const relative = path7.relative(root, target);
+  if (!relative || relative === ".." || relative.startsWith(".." + path7.sep) || path7.isAbsolute(relative)) {
+    return unavailable("outside-project");
+  }
+  const parts = relative.split(path7.sep);
+  if (parts.some((part) => EXCLUDED_PROJECT_DIRS.has(part.toLowerCase())))
+    return unavailable("control-plane-path");
+  try {
+    const rootInfo = await fs4.lstat(root);
+    if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink())
+      return unavailable("unsafe-project-root");
+    let current = root;
+    for (let index = 0;index < parts.length; index++) {
+      current = path7.join(current, parts[index]);
+      const info = await fs4.lstat(current);
+      if (info.isSymbolicLink())
+        return unavailable("symlink-path");
+      if (index < parts.length - 1 && !info.isDirectory())
+        return unavailable("invalid-parent");
+      if (index === parts.length - 1 && (!info.isFile() || info.size > MAX_CHECKLIST_BYTES)) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+    }
+    const handle = await fs4.open(target, constants.O_RDONLY | (constants.O_NOFOLLOW || 0));
+    try {
+      const info = await handle.stat();
+      if (!info.isFile() || info.size > MAX_CHECKLIST_BYTES) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+      const content = await handle.readFile({ encoding: "utf8" });
+      const after = await fs4.lstat(target);
+      if (!after.isFile() || after.isSymbolicLink() || after.dev !== info.dev || after.ino !== info.ino) {
+        return unavailable("file-changed-during-read");
+      }
+      return { ...summarizeTaskChecklist(content), digest: createHash2("sha256").update(content).digest("hex") };
+    } finally {
+      await handle.close();
+    }
+  } catch (error) {
+    return unavailable(error?.code === "ENOENT" ? "file-missing" : error?.code === "ELOOP" ? "symlink-path" : "file-unreadable");
+  }
+}
+
+// src/source/opencode2/native-policy.js
 function createNativeJobPolicy(options = {}) {
   const now = options.now || Date.now;
   const run = options.runShellCommand || runShellCommand;
@@ -1824,7 +1958,7 @@ function createNativeJobPolicy(options = {}) {
     }
     if (job.stopFile) {
       try {
-        await stat(path7.resolve(scope.directory, job.stopFile));
+        await stat(path8.resolve(scope.directory, job.stopFile));
         job.enabled = false;
         return pause(job, "stop-file");
       } catch (error) {
@@ -1836,6 +1970,20 @@ function createNativeJobPolicy(options = {}) {
       job.enabled = false;
       return pause(job, "until-reached");
     }
+    if (job.untilChecklistComplete) {
+      const checklist = await inspectTaskChecklist(scope.directory, job.progressFile);
+      job.checklistStatus = { status: checklist.status, total: checklist.total, pending: checklist.pending };
+      if (checklist.status === "unavailable") {
+        job.lastChecklistError = checklist.reason;
+        return pause(job, "checklist-unavailable");
+      }
+      delete job.lastChecklistError;
+      if (checklist.status === "complete" && (!job.verifyCommand || job.lastVerifyAt > 0 && job.lastVerifyCode === 0 && job.lastVerifyChecklistDigest === checklist.digest)) {
+        job.enabled = false;
+        job.checklistCompletedAt = now();
+        return pause(job, "checklist-complete");
+      }
+    }
     return true;
   }
   async function prepare(scope, job, isCurrent = () => true) {
@@ -1868,12 +2016,20 @@ function createNativeJobPolicy(options = {}) {
       job.lastVerifyOutput = `${result.stdout || ""}
 ${result.stderr || ""}`.trim().slice(-8000);
       if (result.code !== 0) {
+        delete job.lastVerifyChecklistDigest;
         job.failureCount = (job.failureCount || 0) + 1;
         if (result.blocked || job.pauseOnVerifyFail || job.maxFailures > 0 && job.failureCount >= job.maxFailures)
           pause(job, "verification-failed");
         return;
       }
       job.failureCount = 0;
+      if (job.untilChecklistComplete) {
+        const verified = await inspectTaskChecklist(scope.directory, job.progressFile);
+        if (verified.status !== "unavailable")
+          job.lastVerifyChecklistDigest = verified.digest;
+        else
+          delete job.lastVerifyChecklistDigest;
+      }
     }
     if (!isCurrent())
       return;
@@ -2001,6 +2157,8 @@ function createNativeLoopRuntime(options = {}) {
         continue;
       if (job.watchPaths?.length || job.stopFile || job.until)
         delay = Math.min(delay, 1000);
+      if (job.untilChecklistComplete)
+        delay = Math.min(delay, 5000);
       const due = dueAt(job);
       if (due > now())
         delay = Math.min(delay, due - now());
@@ -3144,8 +3302,8 @@ init_process();
 init_state();
 
 // src/source/core/progress.js
-import { promises as fs4 } from "fs";
-import path8 from "path";
+import { promises as fs5 } from "fs";
+import path9 from "path";
 var DEFAULT_PROGRESS_MD = `# Progress
 
 ## Current Goal
@@ -3173,24 +3331,24 @@ Describe the current project goal here.
 - None.
 `;
 function inside(root, candidate) {
-  const relative = path8.relative(root, candidate);
-  return relative !== ".." && !relative.startsWith(`..${path8.sep}`) && !path8.isAbsolute(relative);
+  const relative = path9.relative(root, candidate);
+  return relative !== ".." && !relative.startsWith(`..${path9.sep}`) && !path9.isAbsolute(relative);
 }
 async function initializeProgressFile(directory, argumentsText = "") {
-  const root = await fs4.realpath(directory);
+  const root = await fs5.realpath(directory);
   const target = String(argumentsText || "").trim() || "progress.md";
-  const file = path8.resolve(root, target);
-  const relative = path8.relative(root, file);
+  const file = path9.resolve(root, target);
+  const relative = path9.relative(root, file);
   if (!relative || !inside(root, file))
     throw new Error("Progress file must be inside the project");
-  if ([".git", ".opencode"].includes(relative.split(path8.sep)[0].toLowerCase())) {
+  if ([".git", ".opencode"].includes(relative.split(path9.sep)[0].toLowerCase())) {
     throw new Error("Progress file cannot replace a control-plane path");
   }
-  const parent = await fs4.realpath(path8.dirname(file));
+  const parent = await fs5.realpath(path9.dirname(file));
   if (!inside(root, parent))
     throw new Error("Progress file must remain inside the project; symlink escape refused");
   try {
-    await fs4.writeFile(file, DEFAULT_PROGRESS_MD, { encoding: "utf8", flag: "wx" });
+    await fs5.writeFile(file, DEFAULT_PROGRESS_MD, { encoding: "utf8", flag: "wx" });
     return { created: true, file: relative };
   } catch (error) {
     if (error?.code === "EEXIST")
@@ -3205,6 +3363,7 @@ var HELP = `OpenCode Loop: native OpenCode 2 runtime
 /loop 5m <task> --verify "npm test" --pause-on-verify-fail
 /loop --watch progress.md <task>
 /loop 0s <task> --prompt-file instructions.md --include-file progress.md
+/loop 0s <task> --progress-file TASK.md --until-checklist-complete --verify "npm test"
 /loop 0s <task> --compact-every 3
 /loop 5m --shell npm test
 /loop 15m --compact /compact
@@ -3212,6 +3371,8 @@ Presets: /loop-dev, /loop-testfix, /loop-progress, /loop-safe-dev, /loop-ask, /l
 /loop-init [progress.md] creates a missing project-local progress file without overwriting existing data.
 Controls: /loop-now, /loop-pause, /loop-resume, /loop-stop, /loop-remove, /loop-clear, /loop-status, /loop-export.
 Preflight, postrun, notifications, stop files, completion markers, runtime/failure/run limits, branches and checkpoints are supported.
+--progress-file alone is context, not a stop condition. --until-checklist-complete is an explicit host-verified stop condition; missing/unsafe/no-task files pause for review, and --verify must have passed before stopping.
+Invoke /loop-stop or /loop-clear as native USER commands. Having an assistant print the slash command does not execute it.
 Scheduled shell commands run as bounded local child processes managed by Loop; OpenCode 2's ctx.shell surface is a hook API, not a shell-execution method.
 Manual /loop-compact, --compact and --compact-every use public session.compact when the V2 host exposes it. Loop matches the admitted manual compaction inputID and waits for host completion; older hosts without this capability reject the job before creation. Automatic compaction stays host-owned.
 An unfinished dedicated Goal reserves its session; Loop will not override it.
@@ -3318,7 +3479,7 @@ var OpenCodeLoopNativePlugin = Object.freeze({
         return { handled: true, accepted: true, ...output };
       }
       if (["loop-help", "loop-doctor", "loop-logs"].includes(name)) {
-        const text = name === "loop-logs" ? (await readSmallTextFile(path9.join(stateDir(directory), "loop.log"), 2000000)).split(`
+        const text = name === "loop-logs" ? (await readSmallTextFile(path10.join(stateDir(directory), "loop.log"), 2000000)).split(`
 `).slice(-60).join(`
 `) || "No Loop log entries." : name === "loop-doctor" ? `Native OpenCode Loop
 Host: ${ctx.app?.version || "unknown"}
diff --git a/src/server.js b/src/server.js
index 5f2e2ec5..49173d27 100644
--- a/src/server.js
+++ b/src/server.js
@@ -149,6 +149,7 @@ function parseLoopArgs(raw, defaults = {}) {
     until: defaults.until,
     stopFile: defaults.stopFile,
     progressFile: defaults.progressFile,
+    untilChecklistComplete: defaults.untilChecklistComplete ?? false,
     promptFile: defaults.promptFile,
     includeFiles: Array.isArray(defaults.includeFiles) ? [...defaults.includeFiles] : [],
     watchPaths: Array.isArray(defaults.watchPaths) ? [...defaults.watchPaths] : [],
@@ -229,6 +230,9 @@ function parseLoopArgs(raw, defaults = {}) {
   [found, rest] = takeFlag(rest, "--pause-on-verify-fail");
   if (found)
     job.pauseOnVerifyFail = true;
+  [found, rest] = takeFlag(rest, "--until-checklist-complete");
+  if (found)
+    job.untilChecklistComplete = true;
   [found, rest] = takeFlag(rest, "--dry-run");
   if (found)
     job.dryRun = true;
@@ -377,6 +381,8 @@ function parseLoopArgs(raw, defaults = {}) {
     job.maxNoProgress = job.maxNoProgress ?? DEFAULT_GOAL_MAX_NO_PROGRESS;
   }
   job.lastRunAt = job.immediate ? 0 : now();
+  if (job.untilChecklistComplete && !job.progressFile)
+    return { ok: false, error: "--until-checklist-complete requires --progress-file <project.md>" };
   if (!job.action && !job.promptFile && !job.goalFile)
     return { ok: false, error: "Missing action. Example: /loop 0s continue from progress.md, /loop-goal ship the feature, or /loop 0s --prompt-file loop-prompt.md" };
   return { ok: true, job };
@@ -490,6 +496,8 @@ function decoratePrompt(job) {
     additions.push(continuation);
   if (job.progressFile)
     additions.push(`Use ${job.progressFile} as the main progress/TODO state file. Read it before choosing the next task and update it after work.`);
+  if (job.untilChecklistComplete)
+    additions.push("When all actual Markdown tasks in the configured progress file are checked, stop creating new work and report results. Loop will make the stopping decision itself from the project file at a safe host boundary; do not attempt to invoke /loop-clear as assistant text.");
   if (job.lastVerifyFailure)
     additions.push("Previous verify command failed. Fix this before moving on. Failure summary: " + String(job.lastVerifyFailure).slice(0, 1200));
   if (job.askNever)
@@ -1357,7 +1365,7 @@ var init_job_workspace = __esm(() => {
 });
 
 // src/source/opencode2/native-plugin.js
-import path9 from "path";
+import path10 from "path";
 
 // src/source/opencode2/session-location.js
 import path from "path";
@@ -1774,7 +1782,11 @@ function formatOpenCode2LoopStatus(state, current = Date.now()) {
       job.askNever ? "ask-never" : undefined,
       job.noOverlap ? "no-overlap" : undefined,
       job.checkpointOnly ? "checkpoint-only" : undefined,
-      job.gitCheckpoint ? "git-checkpoint" : undefined
+      job.gitCheckpoint ? "git-checkpoint" : undefined,
+      job.untilChecklistComplete ? "checklist-stop:" + (job.progressFile || "missing-file") : undefined,
+      job.pauseReason ? "reason:" + job.pauseReason : undefined,
+      job.lastChecklistError ? "checklist-error:" + job.lastChecklistError : undefined,
+      !job.maxRuns && !job.maxRuntimeMs && !job.until && !job.stopFile && !job.untilChecklistComplete ? "unlimited" : undefined
     ].filter(Boolean).join(",");
     return `${index + 1}. ${job.id}${job.name ? ` (${job.name})` : ""}: ${jobLabel(job)} | runs=${job.runCount || 0} | failures=${job.failureCount || 0} | due in ${durationToText(dueIn)} | ${flags}`;
   }) : ["No active loop jobs."];
@@ -1782,7 +1794,8 @@ function formatOpenCode2LoopStatus(state, current = Date.now()) {
     jobs,
     text: `OpenCode loop status:
 ${lines.join(`
-`)}`
+`)}${jobs.length ? `
+Host controls: run /loop-stop <name-or-id> or /loop-clear to stop jobs; asking the model to print those commands does not execute them.` : ""}`
   });
 }
 
@@ -1790,7 +1803,128 @@ ${lines.join(`
 init_process();
 init_job_workspace();
 import { stat } from "fs/promises";
+import path8 from "path";
+
+// src/source/runtime/checklist-completion.js
+import { promises as fs4, constants } from "fs";
 import path7 from "path";
+import { createHash as createHash2 } from "crypto";
+var MAX_CHECKLIST_BYTES = 256000;
+var EXCLUDED_PROJECT_DIRS = new Set([".opencode", ".git", "node_modules"]);
+function unavailable(reason) {
+  return { status: "unavailable", reason, total: 0, pending: 0 };
+}
+function summarizeTaskChecklist(markdown) {
+  let total = 0;
+  let pending = 0;
+  let fence = null;
+  let comment = false;
+  for (const original of String(markdown || "").replace(/^\uFEFF/, "").split(/\r?\n/)) {
+    let line = "";
+    let offset = 0;
+    while (offset < original.length) {
+      if (comment) {
+        const end = original.indexOf("-->", offset);
+        if (end < 0)
+          break;
+        comment = false;
+        offset = end + 3;
+      } else {
+        const start = original.indexOf("<!--", offset);
+        if (start < 0) {
+          line += original.slice(offset);
+          break;
+        }
+        line += original.slice(offset, start);
+        comment = true;
+        offset = start + 4;
+      }
+    }
+    const trimmed = line.trimStart();
+    const indentation = line.length - trimmed.length;
+    const marker = trimmed.charAt(0);
+    let markerSize = 0;
+    if (marker === "~" || marker.charCodeAt(0) === 96) {
+      while (trimmed.charAt(markerSize) === marker)
+        markerSize++;
+    }
+    if (fence) {
+      if (indentation <= 3 && markerSize >= fence.length && marker === fence.marker && !trimmed.slice(markerSize).trim())
+        fence = null;
+      continue;
+    }
+    if (indentation <= 3 && markerSize >= 3) {
+      fence = { marker, length: markerSize };
+      continue;
+    }
+    if (/^\s*>/.test(line))
+      continue;
+    const match = line.match(/^\s{0,24}[-+*]\s+\[([ xX])\](?:\s|$)/);
+    if (!match)
+      continue;
+    total++;
+    if (match[1] === " ")
+      pending++;
+  }
+  return {
+    status: total === 0 ? "unavailable" : pending === 0 ? "complete" : "pending",
+    reason: total === 0 ? "no-task-checkboxes" : "",
+    total,
+    pending
+  };
+}
+async function inspectTaskChecklist(directory, progressFile) {
+  const name = String(progressFile || "").trim();
+  if (!name || name.includes("\x00"))
+    return unavailable("missing-progress-file");
+  if (path7.isAbsolute(name) || path7.win32.isAbsolute(name))
+    return unavailable("absolute-path");
+  const root = path7.resolve(directory);
+  const target = path7.resolve(root, name);
+  const relative = path7.relative(root, target);
+  if (!relative || relative === ".." || relative.startsWith(".." + path7.sep) || path7.isAbsolute(relative)) {
+    return unavailable("outside-project");
+  }
+  const parts = relative.split(path7.sep);
+  if (parts.some((part) => EXCLUDED_PROJECT_DIRS.has(part.toLowerCase())))
+    return unavailable("control-plane-path");
+  try {
+    const rootInfo = await fs4.lstat(root);
+    if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink())
+      return unavailable("unsafe-project-root");
+    let current = root;
+    for (let index = 0;index < parts.length; index++) {
+      current = path7.join(current, parts[index]);
+      const info = await fs4.lstat(current);
+      if (info.isSymbolicLink())
+        return unavailable("symlink-path");
+      if (index < parts.length - 1 && !info.isDirectory())
+        return unavailable("invalid-parent");
+      if (index === parts.length - 1 && (!info.isFile() || info.size > MAX_CHECKLIST_BYTES)) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+    }
+    const handle = await fs4.open(target, constants.O_RDONLY | (constants.O_NOFOLLOW || 0));
+    try {
+      const info = await handle.stat();
+      if (!info.isFile() || info.size > MAX_CHECKLIST_BYTES) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large");
+      }
+      const content = await handle.readFile({ encoding: "utf8" });
+      const after = await fs4.lstat(target);
+      if (!after.isFile() || after.isSymbolicLink() || after.dev !== info.dev || after.ino !== info.ino) {
+        return unavailable("file-changed-during-read");
+      }
+      return { ...summarizeTaskChecklist(content), digest: createHash2("sha256").update(content).digest("hex") };
+    } finally {
+      await handle.close();
+    }
+  } catch (error) {
+    return unavailable(error?.code === "ENOENT" ? "file-missing" : error?.code === "ELOOP" ? "symlink-path" : "file-unreadable");
+  }
+}
+
+// src/source/opencode2/native-policy.js
 function createNativeJobPolicy(options = {}) {
   const now = options.now || Date.now;
   const run = options.runShellCommand || runShellCommand;
@@ -1824,7 +1958,7 @@ function createNativeJobPolicy(options = {}) {
     }
     if (job.stopFile) {
       try {
-        await stat(path7.resolve(scope.directory, job.stopFile));
+        await stat(path8.resolve(scope.directory, job.stopFile));
         job.enabled = false;
         return pause(job, "stop-file");
       } catch (error) {
@@ -1836,6 +1970,20 @@ function createNativeJobPolicy(options = {}) {
       job.enabled = false;
       return pause(job, "until-reached");
     }
+    if (job.untilChecklistComplete) {
+      const checklist = await inspectTaskChecklist(scope.directory, job.progressFile);
+      job.checklistStatus = { status: checklist.status, total: checklist.total, pending: checklist.pending };
+      if (checklist.status === "unavailable") {
+        job.lastChecklistError = checklist.reason;
+        return pause(job, "checklist-unavailable");
+      }
+      delete job.lastChecklistError;
+      if (checklist.status === "complete" && (!job.verifyCommand || job.lastVerifyAt > 0 && job.lastVerifyCode === 0 && job.lastVerifyChecklistDigest === checklist.digest)) {
+        job.enabled = false;
+        job.checklistCompletedAt = now();
+        return pause(job, "checklist-complete");
+      }
+    }
     return true;
   }
   async function prepare(scope, job, isCurrent = () => true) {
@@ -1868,12 +2016,20 @@ function createNativeJobPolicy(options = {}) {
       job.lastVerifyOutput = `${result.stdout || ""}
 ${result.stderr || ""}`.trim().slice(-8000);
       if (result.code !== 0) {
+        delete job.lastVerifyChecklistDigest;
         job.failureCount = (job.failureCount || 0) + 1;
         if (result.blocked || job.pauseOnVerifyFail || job.maxFailures > 0 && job.failureCount >= job.maxFailures)
           pause(job, "verification-failed");
         return;
       }
       job.failureCount = 0;
+      if (job.untilChecklistComplete) {
+        const verified = await inspectTaskChecklist(scope.directory, job.progressFile);
+        if (verified.status !== "unavailable")
+          job.lastVerifyChecklistDigest = verified.digest;
+        else
+          delete job.lastVerifyChecklistDigest;
+      }
     }
     if (!isCurrent())
       return;
@@ -2001,6 +2157,8 @@ function createNativeLoopRuntime(options = {}) {
         continue;
       if (job.watchPaths?.length || job.stopFile || job.until)
         delay = Math.min(delay, 1000);
+      if (job.untilChecklistComplete)
+        delay = Math.min(delay, 5000);
       const due = dueAt(job);
       if (due > now())
         delay = Math.min(delay, due - now());
@@ -3144,8 +3302,8 @@ init_process();
 init_state();
 
 // src/source/core/progress.js
-import { promises as fs4 } from "fs";
-import path8 from "path";
+import { promises as fs5 } from "fs";
+import path9 from "path";
 var DEFAULT_PROGRESS_MD = `# Progress
 
 ## Current Goal
@@ -3173,24 +3331,24 @@ Describe the current project goal here.
 - None.
 `;
 function inside(root, candidate) {
-  const relative = path8.relative(root, candidate);
-  return relative !== ".." && !relative.startsWith(`..${path8.sep}`) && !path8.isAbsolute(relative);
+  const relative = path9.relative(root, candidate);
+  return relative !== ".." && !relative.startsWith(`..${path9.sep}`) && !path9.isAbsolute(relative);
 }
 async function initializeProgressFile(directory, argumentsText = "") {
-  const root = await fs4.realpath(directory);
+  const root = await fs5.realpath(directory);
   const target = String(argumentsText || "").trim() || "progress.md";
-  const file = path8.resolve(root, target);
-  const relative = path8.relative(root, file);
+  const file = path9.resolve(root, target);
+  const relative = path9.relative(root, file);
   if (!relative || !inside(root, file))
     throw new Error("Progress file must be inside the project");
-  if ([".git", ".opencode"].includes(relative.split(path8.sep)[0].toLowerCase())) {
+  if ([".git", ".opencode"].includes(relative.split(path9.sep)[0].toLowerCase())) {
     throw new Error("Progress file cannot replace a control-plane path");
   }
-  const parent = await fs4.realpath(path8.dirname(file));
+  const parent = await fs5.realpath(path9.dirname(file));
   if (!inside(root, parent))
     throw new Error("Progress file must remain inside the project; symlink escape refused");
   try {
-    await fs4.writeFile(file, DEFAULT_PROGRESS_MD, { encoding: "utf8", flag: "wx" });
+    await fs5.writeFile(file, DEFAULT_PROGRESS_MD, { encoding: "utf8", flag: "wx" });
     return { created: true, file: relative };
   } catch (error) {
     if (error?.code === "EEXIST")
@@ -3205,6 +3363,7 @@ var HELP = `OpenCode Loop: native OpenCode 2 runtime
 /loop 5m <task> --verify "npm test" --pause-on-verify-fail
 /loop --watch progress.md <task>
 /loop 0s <task> --prompt-file instructions.md --include-file progress.md
+/loop 0s <task> --progress-file TASK.md --until-checklist-complete --verify "npm test"
 /loop 0s <task> --compact-every 3
 /loop 5m --shell npm test
 /loop 15m --compact /compact
@@ -3212,6 +3371,8 @@ Presets: /loop-dev, /loop-testfix, /loop-progress, /loop-safe-dev, /loop-ask, /l
 /loop-init [progress.md] creates a missing project-local progress file without overwriting existing data.
 Controls: /loop-now, /loop-pause, /loop-resume, /loop-stop, /loop-remove, /loop-clear, /loop-status, /loop-export.
 Preflight, postrun, notifications, stop files, completion markers, runtime/failure/run limits, branches and checkpoints are supported.
+--progress-file alone is context, not a stop condition. --until-checklist-complete is an explicit host-verified stop condition; missing/unsafe/no-task files pause for review, and --verify must have passed before stopping.
+Invoke /loop-stop or /loop-clear as native USER commands. Having an assistant print the slash command does not execute it.
 Scheduled shell commands run as bounded local child processes managed by Loop; OpenCode 2's ctx.shell surface is a hook API, not a shell-execution method.
 Manual /loop-compact, --compact and --compact-every use public session.compact when the V2 host exposes it. Loop matches the admitted manual compaction inputID and waits for host completion; older hosts without this capability reject the job before creation. Automatic compaction stays host-owned.
 An unfinished dedicated Goal reserves its session; Loop will not override it.
@@ -3318,7 +3479,7 @@ var OpenCodeLoopNativePlugin = Object.freeze({
         return { handled: true, accepted: true, ...output };
       }
       if (["loop-help", "loop-doctor", "loop-logs"].includes(name)) {
-        const text = name === "loop-logs" ? (await readSmallTextFile(path9.join(stateDir(directory), "loop.log"), 2000000)).split(`
+        const text = name === "loop-logs" ? (await readSmallTextFile(path10.join(stateDir(directory), "loop.log"), 2000000)).split(`
 `).slice(-60).join(`
 `) || "No Loop log entries." : name === "loop-doctor" ? `Native OpenCode Loop
 Host: ${ctx.app?.version || "unknown"}
@@ -3410,8 +3571,8 @@ function inspectOpenCode2Context(ctx) {
 
 // src/source/opencode2/diagnostics.js
 init_state();
-import { promises as fs5 } from "fs";
-import path10 from "path";
+import { promises as fs6 } from "fs";
+import path11 from "path";
 var OPENCODE_LOOP_V2_HELP_TEXT = [
   "OpenCode Loop V2 experimental help:",
   "/loop 0s --max-runs 2 <prompt>                  autonomous prompt loop",
@@ -3440,7 +3601,7 @@ function createOpenCode2DiagnosticsRuntime(options = {}) {
   if (typeof options.prompt !== "function")
     throw new TypeError("V2 diagnostics runtime requires prompt()");
   const readState2 = typeof options.readState === "function" ? options.readState : readState;
-  const readFile = typeof options.readFile === "function" ? options.readFile : (...args) => fs5.readFile(...args);
+  const readFile = typeof options.readFile === "function" ? options.readFile : (...args) => fs6.readFile(...args);
   const runtimeVersion = options.runtimeVersion || process.version;
   const runtimePlatform = options.runtimePlatform || process.platform;
   async function exportState(event) {
@@ -3491,7 +3652,7 @@ ${JSON.stringify(state, null, 2)}
       return { handled: false, reason: "missing-scope" };
     let text = "No OpenCode 2 Loop log found.";
     try {
-      const raw = await readFile(path10.join(stateDir(scope.directory), "loop.log"), "utf8");
+      const raw = await readFile(path11.join(stateDir(scope.directory), "loop.log"), "utf8");
       const lines = String(raw || "").trim().split(/\r?\n/).filter((line) => line.includes('"v2":true')).slice(-80);
       if (lines.length)
         text = lines.join(`
diff --git a/src/source/core/args.js b/src/source/core/args.js
index 2733a719..ef863465 100644
--- a/src/source/core/args.js
+++ b/src/source/core/args.js
@@ -135,6 +135,7 @@ export function parseLoopArgs(raw, defaults = {}) {
     until: defaults.until,
     stopFile: defaults.stopFile,
     progressFile: defaults.progressFile,
+    untilChecklistComplete: defaults.untilChecklistComplete ?? false,
     promptFile: defaults.promptFile,
     includeFiles: Array.isArray(defaults.includeFiles) ? [...defaults.includeFiles] : [],
     watchPaths: Array.isArray(defaults.watchPaths) ? [...defaults.watchPaths] : [],
@@ -197,6 +198,7 @@ export function parseLoopArgs(raw, defaults = {}) {
   ;[found, rest] = takeFlag(rest, "--git-checkpoint"); if (found) job.gitCheckpoint = true
   ;[found, rest] = takeFlag(rest, "--checkpoint-only"); if (found) job.checkpointOnly = true
   ;[found, rest] = takeFlag(rest, "--pause-on-verify-fail"); if (found) job.pauseOnVerifyFail = true
+  ;[found, rest] = takeFlag(rest, "--until-checklist-complete"); if (found) job.untilChecklistComplete = true
   ;[found, rest] = takeFlag(rest, "--dry-run"); if (found) job.dryRun = true
   ;[found, rest] = takeFlag(rest, "--multi"); if (found) job.multi = true
   ;[found, rest] = takeFlag(rest, "--replace"); if (found) job.multi = false
@@ -276,6 +278,7 @@ export function parseLoopArgs(raw, defaults = {}) {
   }
   job.lastRunAt = job.immediate ? 0 : now()
 
+  if (job.untilChecklistComplete && !job.progressFile) return { ok: false, error: "--until-checklist-complete requires --progress-file <project.md>" }
   if (!job.action && !job.promptFile && !job.goalFile) return { ok: false, error: "Missing action. Example: /loop 0s continue from progress.md, /loop-goal ship the feature, or /loop 0s --prompt-file loop-prompt.md" }
   return { ok: true, job }
 }
diff --git a/src/source/core/jobs.js b/src/source/core/jobs.js
index 3ea3e519..4e5aca4b 100644
--- a/src/source/core/jobs.js
+++ b/src/source/core/jobs.js
@@ -58,6 +58,7 @@ export function decoratePrompt(job) {
   const continuation = continuationProjectInstruction(job.action)
   if (continuation) additions.push(continuation)
   if (job.progressFile) additions.push(`Use ${job.progressFile} as the main progress/TODO state file. Read it before choosing the next task and update it after work.`)
+  if (job.untilChecklistComplete) additions.push("When all actual Markdown tasks in the configured progress file are checked, stop creating new work and report results. Loop will make the stopping decision itself from the project file at a safe host boundary; do not attempt to invoke /loop-clear as assistant text.")
   if (job.lastVerifyFailure) additions.push("Previous verify command failed. Fix this before moving on. Failure summary: " + String(job.lastVerifyFailure).slice(0, 1200))
   if (job.askNever) additions.push("Do not ask the user questions. Make reasonable assumptions and continue. Only write a short BLOCKED note if truly blocked.")
   if (job.safe) additions.push("Safety rules: do not run destructive commands such as git reset, git clean, rm -rf, del /s, rmdir /s, force push, production deploys, production migrations, terraform destroy, or deleting user data. If such an action seems needed, write a BLOCKED note instead.")
diff --git a/src/source/opencode2/native-plugin.js b/src/source/opencode2/native-plugin.js
index af97088b..f00b4c0f 100644
--- a/src/source/opencode2/native-plugin.js
+++ b/src/source/opencode2/native-plugin.js
@@ -13,6 +13,7 @@ const HELP = `OpenCode Loop: native OpenCode 2 runtime
 /loop 5m <task> --verify "npm test" --pause-on-verify-fail
 /loop --watch progress.md <task>
 /loop 0s <task> --prompt-file instructions.md --include-file progress.md
+/loop 0s <task> --progress-file TASK.md --until-checklist-complete --verify "npm test"
 /loop 0s <task> --compact-every 3
 /loop 5m --shell npm test
 /loop 15m --compact /compact
@@ -20,6 +21,8 @@ Presets: /loop-dev, /loop-testfix, /loop-progress, /loop-safe-dev, /loop-ask, /l
 /loop-init [progress.md] creates a missing project-local progress file without overwriting existing data.
 Controls: /loop-now, /loop-pause, /loop-resume, /loop-stop, /loop-remove, /loop-clear, /loop-status, /loop-export.
 Preflight, postrun, notifications, stop files, completion markers, runtime/failure/run limits, branches and checkpoints are supported.
+--progress-file alone is context, not a stop condition. --until-checklist-complete is an explicit host-verified stop condition; missing/unsafe/no-task files pause for review, and --verify must have passed before stopping.
+Invoke /loop-stop or /loop-clear as native USER commands. Having an assistant print the slash command does not execute it.
 Scheduled shell commands run as bounded local child processes managed by Loop; OpenCode 2's ctx.shell surface is a hook API, not a shell-execution method.
 Manual /loop-compact, --compact and --compact-every use public session.compact when the V2 host exposes it. Loop matches the admitted manual compaction inputID and waits for host completion; older hosts without this capability reject the job before creation. Automatic compaction stays host-owned.
 An unfinished dedicated Goal reserves its session; Loop will not override it.
diff --git a/src/source/opencode2/native-policy.js b/src/source/opencode2/native-policy.js
index 7e17d9ca..75133092 100644
--- a/src/source/opencode2/native-policy.js
+++ b/src/source/opencode2/native-policy.js
@@ -2,6 +2,7 @@ import { stat } from "node:fs/promises"
 import path from "node:path"
 import { runShellCommand, appendLoopLog } from "../core/process.js"
 import { createJobWorkspaceRuntime, dangerousShell } from "../runtime/job-workspace.js"
+import { inspectTaskChecklist } from "../runtime/checklist-completion.js"
 
 export function createNativeJobPolicy(options = {}) {
   const now = options.now || Date.now
@@ -44,6 +45,20 @@ export function createNativeJobPolicy(options = {}) {
       job.enabled = false
       return pause(job, "until-reached")
     }
+    if (job.untilChecklistComplete) {
+      const checklist = await inspectTaskChecklist(scope.directory, job.progressFile)
+      job.checklistStatus = { status: checklist.status, total: checklist.total, pending: checklist.pending }
+      if (checklist.status === "unavailable") {
+        job.lastChecklistError = checklist.reason
+        return pause(job, "checklist-unavailable")
+      }
+      delete job.lastChecklistError
+      if (checklist.status === "complete" && (!job.verifyCommand || (job.lastVerifyAt > 0 && job.lastVerifyCode === 0 && job.lastVerifyChecklistDigest === checklist.digest))) {
+        job.enabled = false
+        job.checklistCompletedAt = now()
+        return pause(job, "checklist-complete")
+      }
+    }
     return true
   }
 
@@ -71,11 +86,17 @@ export function createNativeJobPolicy(options = {}) {
       job.lastVerifyAt = now()
       job.lastVerifyOutput = `${result.stdout || ""}\n${result.stderr || ""}`.trim().slice(-8000)
       if (result.code !== 0) {
+        delete job.lastVerifyChecklistDigest
         job.failureCount = (job.failureCount || 0) + 1
         if (result.blocked || job.pauseOnVerifyFail || (job.maxFailures > 0 && job.failureCount >= job.maxFailures)) pause(job, "verification-failed")
         return
       }
       job.failureCount = 0
+      if (job.untilChecklistComplete) {
+        const verified = await inspectTaskChecklist(scope.directory, job.progressFile)
+        if (verified.status !== "unavailable") job.lastVerifyChecklistDigest = verified.digest
+        else delete job.lastVerifyChecklistDigest
+      }
     }
     if (!isCurrent()) return
     if (job.postrunCommand) {
diff --git a/src/source/opencode2/native-runtime.js b/src/source/opencode2/native-runtime.js
index f4097657..d443d699 100644
--- a/src/source/opencode2/native-runtime.js
+++ b/src/source/opencode2/native-runtime.js
@@ -81,6 +81,7 @@ export function createNativeLoopRuntime(options = {}) {
     for (const job of state.jobs || []) {
       if (!eligible(job) || job.v2Run || blocked(job).length) continue
       if (job.watchPaths?.length || job.stopFile || job.until) delay = Math.min(delay, 1000)
+      if (job.untilChecklistComplete) delay = Math.min(delay, 5000)
       const due = dueAt(job)
       if (due > now()) delay = Math.min(delay, due - now())
       // A zero-delay deferred preset still needs a first idle-safe wake after
diff --git a/src/source/opencode2/status.js b/src/source/opencode2/status.js
index b7993902..5466119d 100644
--- a/src/source/opencode2/status.js
+++ b/src/source/opencode2/status.js
@@ -28,6 +28,10 @@ export function formatOpenCode2LoopStatus(state, current = Date.now()) {
           job.noOverlap ? "no-overlap" : undefined,
           job.checkpointOnly ? "checkpoint-only" : undefined,
           job.gitCheckpoint ? "git-checkpoint" : undefined,
+          job.untilChecklistComplete ? "checklist-stop:" + (job.progressFile || "missing-file") : undefined,
+          job.pauseReason ? "reason:" + job.pauseReason : undefined,
+          job.lastChecklistError ? "checklist-error:" + job.lastChecklistError : undefined,
+          !job.maxRuns && !job.maxRuntimeMs && !job.until && !job.stopFile && !job.untilChecklistComplete ? "unlimited" : undefined,
         ].filter(Boolean).join(",")
         return `${index + 1}. ${job.id}${job.name ? ` (${job.name})` : ""}: ${jobLabel(job)} | runs=${job.runCount || 0} | failures=${job.failureCount || 0} | due in ${durationToText(dueIn)} | ${flags}`
       })
@@ -35,6 +39,6 @@ export function formatOpenCode2LoopStatus(state, current = Date.now()) {
 
   return Object.freeze({
     jobs,
-    text: `OpenCode loop status:\n${lines.join("\n")}`,
+    text: `OpenCode loop status:\n${lines.join("\n")}${jobs.length ? "\nHost controls: run /loop-stop <name-or-id> or /loop-clear to stop jobs; asking the model to print those commands does not execute them." : ""}`,
   })
 }
diff --git a/src/source/runtime/checklist-completion.js b/src/source/runtime/checklist-completion.js
new file mode 100644
index 00000000..2a83a397
--- /dev/null
+++ b/src/source/runtime/checklist-completion.js
@@ -0,0 +1,113 @@
+import { promises as fs, constants } from "node:fs"
+import path from "node:path"
+import { createHash } from "node:crypto"
+
+const MAX_CHECKLIST_BYTES = 256_000
+const EXCLUDED_PROJECT_DIRS = new Set([".opencode", ".git", "node_modules"])
+
+function unavailable(reason) {
+  return { status: "unavailable", reason, total: 0, pending: 0 }
+}
+
+export function summarizeTaskChecklist(markdown) {
+  let total = 0
+  let pending = 0
+  let fence = null
+  let comment = false
+
+  for (const original of String(markdown || "").replace(/^\uFEFF/, "").split(/\r?\n/)) {
+    // Only project tasks count, never examples in HTML comments or fenced code.
+    let line = ""
+    let offset = 0
+    while (offset < original.length) {
+      if (comment) {
+        const end = original.indexOf("-->", offset)
+        if (end < 0) break
+        comment = false
+        offset = end + 3
+      } else {
+        const start = original.indexOf("<!--", offset)
+        if (start < 0) {
+          line += original.slice(offset)
+          break
+        }
+        line += original.slice(offset, start)
+        comment = true
+        offset = start + 4
+      }
+    }
+
+    const trimmed = line.trimStart()
+    const indentation = line.length - trimmed.length
+    const marker = trimmed.charAt(0)
+    let markerSize = 0
+    if (marker === "~" || marker.charCodeAt(0) === 96) {
+      while (trimmed.charAt(markerSize) === marker) markerSize++
+    }
+    if (fence) {
+      if (indentation <= 3 && markerSize >= fence.length && marker === fence.marker && !trimmed.slice(markerSize).trim()) fence = null
+      continue
+    }
+    if (indentation <= 3 && markerSize >= 3) {
+      fence = { marker, length: markerSize }
+      continue
+    }
+    // A quoted example must not be mistaken for an actionable checkbox.
+    if (/^\s*>/.test(line)) continue
+    const match = line.match(/^\s{0,24}[-+*]\s+\[([ xX])\](?:\s|$)/)
+    if (!match) continue
+    total++
+    if (match[1] === " ") pending++
+  }
+
+  return { status: total === 0 ? "unavailable" : pending === 0 ? "complete" : "pending",
+    reason: total === 0 ? "no-task-checkboxes" : "",
+    total, pending }
+}
+
+export async function inspectTaskChecklist(directory, progressFile) {
+  const name = String(progressFile || "").trim()
+  if (!name || name.includes("\u0000")) return unavailable("missing-progress-file")
+  if (path.isAbsolute(name) || path.win32.isAbsolute(name)) return unavailable("absolute-path")
+  const root = path.resolve(directory)
+  const target = path.resolve(root, name)
+  const relative = path.relative(root, target)
+  if (!relative || relative === ".." || relative.startsWith(".." + path.sep) || path.isAbsolute(relative)) {
+    return unavailable("outside-project")
+  }
+  const parts = relative.split(path.sep)
+  if (parts.some((part) => EXCLUDED_PROJECT_DIRS.has(part.toLowerCase()))) return unavailable("control-plane-path")
+
+  try {
+    const rootInfo = await fs.lstat(root)
+    if (!rootInfo.isDirectory() || rootInfo.isSymbolicLink()) return unavailable("unsafe-project-root")
+    let current = root
+    for (let index = 0; index < parts.length; index++) {
+      current = path.join(current, parts[index])
+      const info = await fs.lstat(current)
+      if (info.isSymbolicLink()) return unavailable("symlink-path")
+      if (index < parts.length - 1 && !info.isDirectory()) return unavailable("invalid-parent")
+      if (index === parts.length - 1 && (!info.isFile() || info.size > MAX_CHECKLIST_BYTES)) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large")
+      }
+    }
+    // Do not follow a last-component symlink introduced between lstat and open.
+    const handle = await fs.open(target, constants.O_RDONLY | (constants.O_NOFOLLOW || 0))
+    try {
+      const info = await handle.stat()
+      if (!info.isFile() || info.size > MAX_CHECKLIST_BYTES) {
+        return unavailable(!info.isFile() ? "not-regular-file" : "file-too-large")
+      }
+      const content = await handle.readFile({ encoding: "utf8" })
+      const after = await fs.lstat(target)
+      if (!after.isFile() || after.isSymbolicLink() || after.dev !== info.dev || after.ino !== info.ino) {
+        return unavailable("file-changed-during-read")
+      }
+      return { ...summarizeTaskChecklist(content), digest: createHash("sha256").update(content).digest("hex") }
+    } finally {
+      await handle.close()
+    }
+  } catch (error) {
+    return unavailable(error?.code === "ENOENT" ? "file-missing" : error?.code === "ELOOP" ? "symlink-path" : "file-unreadable")
+  }
+}
diff --git a/src/source/runtime/run-admission.js b/src/source/runtime/run-admission.js
index 89786653..5fe23f54 100644
--- a/src/source/runtime/run-admission.js
+++ b/src/source/runtime/run-admission.js
@@ -4,6 +4,7 @@ import { pathExists as defaultPathExists, writeState as defaultWriteState } from
 import { appendLoopLog as defaultAppendLoopLog, runShellCommand as defaultRunShellCommand, notifyJob as defaultNotifyJob } from "../core/process.js"
 import { toast as defaultToast } from "../opencode/host.js"
 import { dangerousShell as defaultDangerousShell } from "./job-workspace.js"
+import { inspectTaskChecklist } from "./checklist-completion.js"
 import { dueJobs as sharedDueJobs } from "./schedule-policy.js"
 
 function requireFunction(value, label) {
@@ -82,6 +83,30 @@ export function createRunAdmissionRuntime(options = {}) {
       )
     }
 
+    if (job.untilChecklistComplete) {
+      const checklist = await inspectTaskChecklist(directory, job.progressFile)
+      job.checklistStatus = { status: checklist.status, total: checklist.total, pending: checklist.pending }
+      if (checklist.status === "unavailable") {
+        job.paused = true
+        job.pauseReason = "checklist-unavailable"
+        job.lastChecklistError = checklist.reason
+        await writeState(directory, sessionID, state)
+        await notifyJob(directory, job, "checklist_unavailable")
+        await toast(client, "Loop paused: checklist " + job.progressFile + " could not be validated (" + checklist.reason + ").", "warning")
+        await reschedule(directory, client, sessionID)
+        return { admitted: false, reason: "checklist_unavailable" }
+      }
+      delete job.lastChecklistError
+      if (checklist.status === "complete" && (!job.verifyCommand || (job.lastVerifyAt > 0 && job.lastVerifyCode === 0 && job.lastVerifyChecklistDigest === checklist.digest))) {
+        return await stopAndRemove(
+          directory, client, sessionID, state, job,
+          "checklist_complete",
+          "Loop stopped: " + job.progressFile + " checklist completed.",
+          "checklist-complete",
+        )
+      }
+    }
+
     if (job.preflightCommand) {
       if (job.safe && dangerousShell(job.preflightCommand)) {
         if (runNowRequested) delete job.runNowRequestedAt
diff --git a/src/source/runtime/run-finalization.js b/src/source/runtime/run-finalization.js
index 24be5fb6..c4d2bf32 100644
--- a/src/source/runtime/run-finalization.js
+++ b/src/source/runtime/run-finalization.js
@@ -6,6 +6,7 @@ import { toast as defaultToast } from "../opencode/host.js"
 import { writeGoalReport as defaultWriteGoalReport } from "./goal-runtime.js"
 import { dangerousShell as defaultDangerousShell } from "./job-workspace.js"
 import { applyTerminalContinuationGuard as defaultApplyTerminalContinuationGuard } from "./terminal-guard.js"
+import { inspectTaskChecklist } from "./checklist-completion.js"
 
 function requireFunction(value, label) {
   if (typeof value !== "function") throw new TypeError(`createRunFinalizationRuntime requires ${label}`)
@@ -49,8 +50,14 @@ export function createRunFinalizationRuntime(options = {}) {
       if (verify.code === 0) {
         job.failureCount = 0
         job.lastVerifyFailure = ""
+        if (job.untilChecklistComplete) {
+          const inspected = await inspectTaskChecklist(directory, job.progressFile)
+          if (inspected.status !== "unavailable") job.lastVerifyChecklistDigest = inspected.digest
+          else delete job.lastVerifyChecklistDigest
+        }
         await toast(client, "Loop verify passed: " + job.verifyCommand, "success")
       } else {
+        delete job.lastVerifyChecklistDigest
         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")