@zalom/plastic 1.14.0 → 2.0.0-alpha.1

package/scripts/lib/hook_registry.rb

@@ -10,9 +10,8 @@
 module HookRegistry
   module_function
 
-  # MCP tools that MUTATE files. Every write/lock/create gate must match them,
-  # or symbolic edits bypass the whole gate layer (the universal MCP-edit
-  # bypass found in 108's gate inventory).
+  # MCP tools that MUTATE files. The record hook must match them, or a symbolic
+  # edit never reaches the savepoint ledger or the day ledger.
   SERENA_EDIT_TOOLS = %w[
     mcp__serena__replace_content
     mcp__serena__replace_symbol_body
@@ -24,40 +23,6 @@ module HookRegistry
 
   WRITE_MATCHER = (%w[Write Edit NotebookEdit] + SERENA_EDIT_TOOLS).join("|")
 
-  # Per-gate tool applicability for the merged edit-path dispatcher (intent 244,
-  # spec D-d/D-l). Registration collapses to ONE PreToolUse hook on WRITE_MATCHER
-  # (a strict superset of the three former matcher groups), and this table is what
-  # keeps each gate's own coverage exactly what it was: scripts/hook-edit-gates
-  # reads tool_name off the payload and skips any gate whose list excludes it.
-  # Key order IS the evaluation order (spec D-a): savepoint-pre first because it
-  # never denies and its ledger append must stay unconditional; lock-gate leads
-  # the deniers because holding the delivery lock is the precondition the other
-  # rules assume. A test pins this table against today's three matcher groups, so
-  # no gate's coverage can widen or narrow silently.
-  GATE_TOOLS = {
-    "savepoint-pre" => %w[Write Edit].freeze,
-    "lock-gate"     => (%w[Write Edit NotebookEdit] + SERENA_EDIT_TOOLS).freeze,
-    "code-gate"     => (%w[Write Edit NotebookEdit] + SERENA_EDIT_TOOLS).freeze,
-    "links-gate"    => %w[Write Edit].freeze,
-    "create-gate"   => (%w[Write Edit] + SERENA_EDIT_TOOLS).freeze,
-  }.freeze
-
-  # Per-gate tool applicability for the merged CODEX edit-path dispatcher (intent
-  # 251, spec D1). Codex reports exactly one file-mutation tool name, apply_patch
-  # (intent 181 F4), so every value is the same single-entry list. The table is
-  # NOT decoration: EditGates.tool_applies? builds a regex from these values, and
-  # reusing GATE_TOOLS here would match none of them against "apply_patch" and
-  # silently skip all five gates. Key order IS the evaluation order and is the
-  # SAME order GATE_TOOLS uses (spec D5), so the two harnesses evaluate the five
-  # gates in one order, not two.
-  CODEX_GATE_TOOLS = {
-    "savepoint-pre" => %w[apply_patch].freeze,
-    "lock-gate"     => %w[apply_patch].freeze,
-    "code-gate"     => %w[apply_patch].freeze,
-    "links-gate"    => %w[apply_patch].freeze,
-    "create-gate"   => %w[apply_patch].freeze,
-  }.freeze
-
   # event => ordered list of { "matcher" =>, "hooks" => [{ "name" =>, "status" => }] }
   # The name is the hooks/<name> launcher; the flat install ships it as
   # ~/.claude/hooks/plastic-<name>.
@@ -74,75 +39,54 @@ module HookRegistry
           { "name" => "savepoint", "status" => "Saving Plastic intent state..." },
         ] },
       ],
-      "PreToolUse" => [
-        # ONE registered edit-path hook (intent 244, spec D-d). WRITE_MATCHER is a
-        # strict superset of the three matcher groups this replaces; per-gate tool
-        # applicability lives in GATE_TOOLS above and is read by
-        # scripts/hook-edit-gates, so no gate's coverage widened or narrowed.
+      "PostToolUse" => [
         { "matcher" => WRITE_MATCHER, "hooks" => [
-          { "name" => "edit-gates", "status" => "Checking Plastic gates..." },
-        ] },
-        { "matcher" => "Bash", "hooks" => [
-          { "name" => "bash-gate", "status" => "Checking lifecycle gate..." },
+          { "name" => "record", "status" => "Recording Plastic session state..." },
         ] },
       ],
-      "PostToolUse" => [
-        { "matcher" => "Write|Edit", "hooks" => [
-          { "name" => "gate-check", "status" => "Checking lifecycle gates..." },
+      "SessionEnd" => [
+        { "matcher" => "", "hooks" => [
+          { "name" => "close", "status" => "Closing the Plastic session..." },
         ] },
       ],
       "UserPromptSubmit" => [
         { "matcher" => "", "hooks" => [
-          { "name" => "continue", "status" => "Checking for continue..." },
-          { "name" => "future-intent-check", "status" => "Checking future intents..." },
-          { "name" => "auto-arm", "status" => "Checking auto mode..." },
-          { "name" => "power-tools", "status" => "Checking power tools..." },
+          { "name" => "capture", "status" => "Capturing prompt into the session ledger..." },
         ] },
       ],
     }
   end
 
   # Codex registration (~/.codex/hooks.json, intent 102). Derived from `events`:
-  # the file-mutation PreToolUse gate/savepoint hooks collapse from Claude's
-  # multi-tool matchers onto Codex's single apply_patch tool (181 F4: apply_patch
-  # is Codex's sole file-mutation tool; tool_name always reports apply_patch), plus
-  # the PostToolUse gate-check. Command invokes the codex-hook dispatcher with the
-  # gate name. Guide-settled shape [guide Part 3]: top-level {"hooks":{<Event>:
-  # [{"matcher","hooks":[{"type":"command","command","statusMessage"}]}]}},
-  # identical to Claude's shape, string command. Single source of truth (108 D7):
-  # any drift from `events` is a bug, pinned by test.
-  #
-  # Codex's apply_patch matcher carries ONE dispatcher command, edit-gates,
-  # which runs all five gates in-process through scripts/lib/codex_edit_gates.rb
-  # (intent 251), mirroring what intent 244 did for Claude. Five separately
-  # registered commands used to cost eight OS processes per edit (five
-  # top-level plus three nested run_core children); one dispatcher process
-  # reaches the same five gate decisions.
-  CODEX_PRE_HOOKS  = %w[edit-gates].freeze
-  CODEX_POST_HOOKS = %w[gate-check].freeze
-
-  # Codex's shell-tool gate hole (intent 203): bash-gate (denies a shell write to
-  # project code before How) belongs on the Bash matcher, and ONLY Bash: the
-  # official Codex hooks doc's PreToolUse event catalog enumerates exactly Bash,
-  # apply_patch, and MCP tool calls, and neither it nor the two prior Codex
-  # research passes (198's official-docs research, 181's deep research)
-  # documents a discrete Read, Grep, or Glob tool name (D3). Registering a tool
-  # name Codex never reports would be dead weight that looks alive, the exact
-  # defect this intent exists to fix.
-  CODEX_BASH_HOOKS = %w[bash-gate].freeze
-
-  # Live-state events registered WHOLE (intent 199), unlike CODEX_PRE_HOOKS/
-  # CODEX_POST_HOOKS above: Codex's SessionStart/UserPromptSubmit/PreCompact already
-  # match Claude's shape exactly, one matcher group each ("", no tool to collapse
-  # onto), so every hook `events` lists under these three events projects straight
-  # through with no allowlist to keep in sync. A hook added to any of them on the
-  # Claude side registers for Codex automatically.
+  # the PostToolUse record hook collapses from Claude's multi-tool matcher onto
+  # Codex's single apply_patch tool (181 F4: apply_patch is Codex's sole
+  # file-mutation tool; tool_name always reports apply_patch), and the live-state
+  # events project through whole. Since intent 302 there is no PreToolUse group at
+  # all: the edit-path gates are gone on both harnesses. Command invokes the
+  # codex-hook dispatcher with the hook name. Guide-settled shape [guide Part 3]:
+  # top-level {"hooks":{<Event>: [{"matcher","hooks":[{"type":"command","command",
+  # "statusMessage"}]}]}}, identical to Claude's shape, string command. Single
+  # source of truth (108 D7): any drift from `events` is a bug, pinned by test.
+  CODEX_POST_HOOKS = %w[record].freeze
+
+  # Live-state events registered WHOLE (intent 199): Codex's SessionStart/
+  # UserPromptSubmit/PreCompact already match Claude's shape exactly, one matcher
+  # group each ("", no tool to collapse onto), so every hook `events` lists under
+  # these three events projects straight through with no allowlist to keep in
+  # sync. A hook added to any of them on the Claude side registers for Codex
+  # automatically.
   CODEX_LIVE_STATE_EVENTS = %w[SessionStart UserPromptSubmit PreCompact].freeze
 
+  # SessionEnd on Codex (intent 309): projected from its own constant, never as a fourth
+  # live-state event, because the dispatch differs. Codex kills a SessionEnd hook after
+  # 3 seconds, so scripts/codex-hook hands `close` to its launcher detached and returns at
+  # once instead of the synchronous relay the live-state hooks get. Codex ships both Stop
+  # and SessionEnd (codex-rs/hooks at rust-v0.149.1); the design uses SessionEnd on both
+  # harnesses. Like STATE_HOOKS, the dispatcher's list is hand-kept and cross-checked by
+  # test/hook_registry_test.rb.
+  CODEX_SESSION_END_HOOKS = %w[close].freeze
+
   def codex_hooks_json(dispatcher_path:)
-    # Every Codex hook name is now a name `events` itself carries (intent 251,
-    # spec D9): edit-gates is Claude's own PreToolUse hook name, so there is
-    # nothing left to merge in from a separate status table.
     status_by_name = events.values.flatten.flat_map { |g| g["hooks"] }
                            .each_with_object({}) { |h, m| m[h["name"]] = h["status"] }
     cmd = ->(name) {
@@ -150,27 +94,19 @@ module HookRegistry
         "command" => "\"#{dispatcher_path}\" #{name}",
         "statusMessage" => status_by_name[name].to_s }
     }
-    # Preserve the order these hook names appear across the PreToolUse groups in `events`.
-    pre_order = events["PreToolUse"].flat_map { |g| g["hooks"].map { |h| h["name"] } }
-    # The Codex apply_patch matcher carries the same edit-gates name Claude's own
-    # PreToolUse group carries (intent 251, spec D9), so the intersection with
-    # pre_order validates the Codex gate name against the single source of truth,
-    # `events`, rather than against a table of Claude tool applicability.
-    pre = (CODEX_PRE_HOOKS & pre_order).map { |n| cmd.call(n) }
-    bash = (pre_order & CODEX_BASH_HOOKS).map { |n| cmd.call(n) }
-    post = CODEX_POST_HOOKS.map { |n| cmd.call(n) }
+    # Validate the Codex name against the single source of truth, `events`.
+    post_order = events["PostToolUse"].flat_map { |g| g["hooks"].map { |h| h["name"] } }
+    post = (CODEX_POST_HOOKS & post_order).map { |n| cmd.call(n) }
 
     result = {
-      "PreToolUse"  => [
-        { "matcher" => "apply_patch", "hooks" => pre },
-        { "matcher" => "Bash", "hooks" => bash },
-      ],
       "PostToolUse" => [{ "matcher" => "apply_patch", "hooks" => post }],
     }
     CODEX_LIVE_STATE_EVENTS.each do |event|
       names = events[event].flat_map { |g| g["hooks"].map { |h| h["name"] } }
       result[event] = [{ "matcher" => "", "hooks" => names.map { |n| cmd.call(n) } }]
     end
+    end_order = events["SessionEnd"].flat_map { |g| g["hooks"].map { |h| h["name"] } }
+    result["SessionEnd"] = [{ "matcher" => "", "hooks" => (CODEX_SESSION_END_HOOKS & end_order).map { |n| cmd.call(n) } }]
     result
   end
 
@@ -179,8 +115,7 @@ module HookRegistry
   # installed as ~/.claude/hooks/plastic-<name>. The single derivation doctor's
   # hooks_exist/hooks_executable/hooks_no_orphans checks read from, so a
   # hand-kept list of launchers can never drift out of step with `events`
-  # again (the gap that let 8 of 15 launchers, all the enforcement gates, go
-  # unchecked).
+  # again (the gap that once let 8 of 15 launchers go unchecked).
   def claude_launcher_names
     events.values.flatten.flat_map { |g| g["hooks"].map { |h| h["name"] } }
           .uniq.sort.map { |name| "plastic-#{name}" }
@@ -204,8 +139,10 @@ module HookRegistry
   # hooks_exist demands be present on disk, so a retired name there makes a correct
   # install report missing launchers.
   RETIRED_HOOK_NAMES = %w[
-    code-gate create-gate links-gate lock-gate savepoint-pre
+    edit-gates bash-gate code-gate create-gate links-gate lock-gate savepoint-pre
     qmd-search retrieval-gate model-instructions opus-manual
+    continue future-intent-check auto-arm gate-check
+    power-tools
   ].freeze
 
   RETIRED_CLAUDE_LAUNCHERS = RETIRED_HOOK_NAMES.map { |n| "plastic-#{n}" }.freeze
@@ -226,7 +163,7 @@ module HookRegistry
     live = CODEX_LIVE_STATE_EVENTS.flat_map do |event|
       events[event].flat_map { |g| g["hooks"].map { |h| h["name"] } }
     end
-    (CODEX_PRE_HOOKS + CODEX_POST_HOOKS + CODEX_BASH_HOOKS + live).uniq.sort
+    (CODEX_POST_HOOKS + live + CODEX_SESSION_END_HOOKS).uniq.sort
   end
 
   def codex_purgeable_hook_names

package/scripts/lib/insights.rb

@@ -7,14 +7,13 @@
 #
 # Every entry leads with a fixed, machine-parseable prefix
 # `{utc-iso8601} · {stage} · {author}` where the timestamp is `now.utc.iso8601`,
-# the SAME convention `Bridge.append_savepoint_line` uses, so the store has one
+# the SAME convention `Savepoint.append_savepoint_line` uses, so the store has one
 # timestamp convention across both ledgers. Entries are append-only, newest at
 # the BOTTOM (the [[34]] ordering law): the per-entry prefix is not prepending
 # the entry, and existing entries are never reordered.
 
 require "time"
-require_relative "bridge"
-
+require_relative "savepoint"
 module Insights
   HEADING = "## Insights"
   # The middle dot (U+00B7) with a single space on each side separates the
@@ -35,7 +34,7 @@ module Insights
     end
 
     entry = "#{prefix} — #{text}"
-    path = Bridge.intent_file(intent_dir)
+    path = Savepoint.intent_file(intent_dir)
     File.write(path, with_entry(File.exist?(path) ? File.read(path) : "", entry))
     entry
   end

package/scripts/lib/installer_core.rb

@@ -174,13 +174,6 @@ class InstallerCore
     keys.uniq
   end
 
-  def channel_from(argv, default: "latest")
-    return "alpha" if argv.include?("--alpha")
-    return "beta" if argv.include?("--beta")
-    return "latest" if argv.include?("--latest")
-    default
-  end
-
   def prompt_agents(input: $stdin)
     return ["claude"] unless input.tty?
 
@@ -329,22 +322,17 @@ class InstallerCore
       "scripts/write-config" => "scripts/write-config",
       "scripts/select-update-target" => "scripts/select-update-target",
       "scripts/hook-session-start" => "scripts/hook-session-start",
-      "scripts/hook-continue" => "scripts/hook-continue",
-      "scripts/hook-future-intent-check" => "scripts/hook-future-intent-check",
-      "scripts/hook-gate-check" => "scripts/hook-gate-check",
-      "scripts/hook-savepoint-pre" => "scripts/hook-savepoint-pre",
-      "scripts/hook-power-tools" => "scripts/hook-power-tools",
-      "scripts/lib/qmd_hook.rb" => "scripts/lib/qmd_hook.rb",
+      "scripts/hook-capture" => "scripts/hook-capture",
+      "scripts/hook-record" => "scripts/hook-record",
+      "scripts/hook-close" => "scripts/hook-close",
       "scripts/lib/power_tools.rb" => "scripts/lib/power_tools.rb",
       "scripts/lib/ruby_probe.rb" => "scripts/lib/ruby_probe.rb",
       "scripts/lib/agent_models.rb" => "scripts/lib/agent_models.rb",
       "scripts/lib/config_asks.rb" => "scripts/lib/config_asks.rb",
       "scripts/lib/release_guard.rb" => "scripts/lib/release_guard.rb",
-      "scripts/hook-code-gate" => "scripts/hook-code-gate",
-      "scripts/hook-lock-gate" => "scripts/hook-lock-gate",
-      "scripts/hook-bash-gate" => "scripts/hook-bash-gate",
-      "scripts/hook-auto-arm" => "scripts/hook-auto-arm",
       "scripts/lib/bridge.rb" => "scripts/lib/bridge.rb",
+      "scripts/lib/savepoint.rb" => "scripts/lib/savepoint.rb",
+      "scripts/lib/arm.rb" => "scripts/lib/arm.rb",
       "scripts/lib/lock.rb" => "scripts/lib/lock.rb",
       "scripts/plastic-lock" => "scripts/plastic-lock",
       "scripts/lib/hook_registry.rb" => "scripts/lib/hook_registry.rb",
@@ -380,13 +368,7 @@ class InstallerCore
       "scripts/validate-intent" => "scripts/validate-intent",
       "scripts/new-intent" => "scripts/new-intent",
       "scripts/end-intent" => "scripts/end-intent",
-      "scripts/hook-create-gate" => "scripts/hook-create-gate",
-      "scripts/hook-links-gate" => "scripts/hook-links-gate",
-      "scripts/lib/links_gate.rb" => "scripts/lib/links_gate.rb",
-      "scripts/lib/edit_gates.rb" => "scripts/lib/edit_gates.rb",
-      "scripts/hook-edit-gates" => "scripts/hook-edit-gates",
       "scripts/lib/apply_patch_envelope.rb" => "scripts/lib/apply_patch_envelope.rb",
-      "scripts/lib/codex_edit_gates.rb" => "scripts/lib/codex_edit_gates.rb",
       "scripts/lib/harness_text.rb" => "scripts/lib/harness_text.rb",
       "scripts/codex-hook" => "scripts/codex-hook",
       "scripts/spawn-preamble" => "scripts/spawn-preamble",
@@ -401,24 +383,31 @@ class InstallerCore
       "scripts/uninstall.rb" => "scripts/uninstall.rb",
       "scripts/rollback.rb" => "scripts/rollback.rb",
       "scripts/lib/outcome_guard.rb" => "scripts/lib/outcome_guard.rb",
-      "scripts/lib/spec_header.rb" => "scripts/lib/spec_header.rb",
       "scripts/lib/scaffold_intent.rb" => "scripts/lib/scaffold_intent.rb",
+      "scripts/lib/backfill_intent.rb" => "scripts/lib/backfill_intent.rb",
       "scripts/scaffold-intent" => "scripts/scaffold-intent",
       "scripts/lib/verify_intent.rb" => "scripts/lib/verify_intent.rb",
       "scripts/verify-intent" => "scripts/verify-intent",
-      "scripts/lib/start_intent.rb" => "scripts/lib/start_intent.rb",
-      "scripts/start-intent" => "scripts/start-intent",
       "scripts/lib/exec_worktree.rb" => "scripts/lib/exec_worktree.rb",
       "scripts/exec-worktree" => "scripts/exec-worktree",
       "scripts/doctor.rb" => "scripts/doctor.rb",
       "scripts/lib/doctor_core.rb" => "scripts/lib/doctor_core.rb",
       "scripts/lib/rule_catalog.rb" => "scripts/lib/rule_catalog.rb",
       "scripts/lib/doctor_exclusions.rb" => "scripts/lib/doctor_exclusions.rb",
+      "scripts/lib/doctor_session_ledger.rb" => "scripts/lib/doctor_session_ledger.rb",
       "scripts/dashboard.rb" => "scripts/dashboard.rb",
       "scripts/skill-lint" => "scripts/skill-lint",
       "scripts/lib/skill_lint.rb" => "scripts/lib/skill_lint.rb",
       "scripts/feedback-report" => "scripts/feedback-report",
       "scripts/lib/feedback_report.rb" => "scripts/lib/feedback_report.rb",
+      "scripts/append-ledger" => "scripts/append-ledger",
+      "scripts/lib/session_ledger.rb" => "scripts/lib/session_ledger.rb",
+      "scripts/session-commit" => "scripts/session-commit",
+      "scripts/file-session-intent" => "scripts/file-session-intent",
+      "scripts/promote-session-item" => "scripts/promote-session-item",
+      "scripts/lib/session_backfill.rb" => "scripts/lib/session_backfill.rb",
+      "scripts/lib/session_close.rb" => "scripts/lib/session_close.rb",
+      "scripts/lib/session_git.rb" => "scripts/lib/session_git.rb",
     }
   end
 
@@ -718,7 +707,7 @@ class InstallerCore
   end
 
   # `install_skills_flat` relocates any top-level underscore-prefixed markdown
-  # fragment (today: `_active-intent-gate.md`, `_decision-tables.md`) out of the
+  # fragment (today: `_decision-tables.md`) out of the
   # per-agent skills tree and into `plastic_home` directly, then lists them in
   # `installed`, so they are manifest-tracked and eligible for prune. But
   # `install_for_agent`'s prune roots are `[config[:dir], config[:home_dir]]`,
@@ -1012,7 +1001,7 @@ class InstallerCore
 
   # Copy each skills/<name>/ to <skills_root>/plastic-<name>/ (flat, namespaced by
   # directory name -- the only personal-skill namespacing Claude Code supports).
-  # Any top-level underscore-prefixed markdown fragment (e.g. `_active-intent-gate.md`,
+  # Any top-level underscore-prefixed markdown fragment (e.g. `_decision-tables.md`,
   # `_decision-tables.md`) is a shared non-skill fragment and relocates to ~/.plastic/
   # instead, so every skill can read it from one shared location. `exclude` skips
   # named top-level skill directories entirely (intent 185: the agent-advisor skill
@@ -1273,8 +1262,8 @@ class InstallerCore
     plastic_hooks.each do |event, group|
       hooks[event] ||= []
 
-      # An event may map to a LIST of plastic groups (PreToolUse carries the
-      # code-gate AND the create-gate). The purge pass above already removed all
+      # An event may map to a LIST of plastic groups (none does since the edit-path
+      # gates left in 2.0, intent 302; the shape stays). The purge pass above already removed all
       # prior plastic groups, so appending each desired group fresh is idempotent
       # across re-runs and never collapses two matchers into one group.
       groups = group.is_a?(Array) ? group : [group]

package/scripts/lib/lock.rb

@@ -49,11 +49,11 @@ module Lock
   DELEGATE_ACTIVITY_LIMIT = 20
   DELEGATE_STATUSES = %w[active finished failed].freeze
 
-  # Lease TTL. Heartbeats fire from the write-path hooks (PostToolUse
-  # gate-check and the lock-gate allow path), so a delivering session
-  # refreshes constantly; 30 minutes tolerates long read-only stretches
-  # without opening a takeover window mid-delivery. Reclaim is explicit
-  # either way (takeover), so the TTL only bounds WHEN takeover is allowed.
+  # Lease TTL. Heartbeats fire from the PostToolUse record hook on every write
+  # inside the intent dir (intent 302), so a delivering session refreshes
+  # constantly; 30 minutes tolerates long read-only stretches without opening
+  # a takeover window mid-delivery. Reclaim is explicit either way (takeover),
+  # so the TTL only bounds WHEN takeover is allowed.
   TTL_SECONDS = 1800
 
   # The write guard is a mutex, not a lock in the Plastic sense: it carries no
@@ -122,7 +122,7 @@ module Lock
     Array(data["delegates"]).map(&:to_s).include?(session.to_s)
   end
 
-  # The one question gates ask: does session hold this intent's lock?
+  # The one question the write path asks: does session hold this intent's lock?
   # Owner/delegate on an EXISTING lock counts even when stale (a stale lock is
   # still theirs until an explicit takeover replaces it); freshness only
   # guards AGAINST other sessions.
@@ -676,24 +676,4 @@ module Claim
     end
   end
 
-  # Second, independent write gate at the artifact grain (intent 111 D7). Returns a
-  # deny reason String to BLOCK, or nil to ALLOW. Composes UNDER the delivery-lock
-  # gate: only reached after the session already holds the intent's delivery lock.
-  # ENGAGES only when a claim file exists (dormant otherwise, so single-owner flows
-  # and the existing suite stay green, AC7). Fails open on stale/corrupt via
-  # fail_open?, the named contract.
-  def claim_gate_reason(intent_dir, artifact, session:, ttl: Lock::TTL_SECONDS, now: Time.now,
-                        harness: :claude)
-    return nil if Lock.blank?(artifact)
-    return nil unless File.exist?(path(intent_dir, artifact))   # dormant: no claim
-    return nil if holds_claim?(intent_dir, artifact, session: session)  # you hold it
-    return nil if fail_open?(intent_dir, artifact, ttl: ttl, now: now)  # stale/corrupt: yield
-    data = read(intent_dir, artifact)
-    holder = data && data["owner_session"]
-    since = data && data["acquired_at"]
-    "artifact #{artifact} is claimed by #{holder} since #{since}; another writer holds " \
-      "it. Back off or run #{Lock.skill_ref('plastic-doctor', harness: harness)} check the " \
-      "lock status. If you are a distinct delegate, the owner must register you: " \
-      "plastic-lock delegate --intent-dir #{intent_dir} --session <your-session-id>"
-  end
 end

package/scripts/lib/outcome_guard.rb

@@ -1,14 +1,16 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 
-require_relative "bridge"
+require_relative "savepoint"
 require_relative "intent_validator"
 
 # OutcomeGuard - the single definition of "is outcome.md real and disposition-matched for
 # THIS close" (intent 222). Extracted verbatim from scripts/end-intent's own
-# outcome_guard_reason (intent 161/188) so end-intent's existing exit-2 path and doctor's new
-# per-intent check (intent_lifecycle_artifacts) can never independently drift on what counts
-# as a valid outcome.md. Pure, read-only: authors nothing regardless of outcome.
+# outcome_guard_reason (intent 161/188) so its two callers, doctor's per-intent check
+# (intent_lifecycle_artifacts) and end-intent's post-backfill self-check, can never drift on
+# what counts as a valid outcome.md. Since intent 308 nothing blocks on it: end-intent
+# backfills a missing or placeholder outcome.md first, prints a non-nil reason, and proceeds.
+# Pure, read-only: authors nothing regardless of outcome.
 module OutcomeGuard
   module_function
 
@@ -23,7 +25,7 @@ module OutcomeGuard
 
     content = File.read(path)
     first_line = content.each_line.first.to_s.chomp
-    if first_line == Bridge::PLACEHOLDER_SENTINEL
+    if first_line == Savepoint::PLACEHOLDER_SENTINEL
       return "outcome.md is still the scaffold placeholder (first line is the sentinel)"
     end
 

package/scripts/lib/project_validator.rb

@@ -24,6 +24,15 @@ require "yaml"
 module ProjectValidator
   module_function
 
+  # The two enumerated flow: knobs (intent 300, spec D2). Kept as a plain
+  # literal here rather than a require on SessionGit: this validator only
+  # reports a bad value in `errors` (project.yml is still "accepted", spec
+  # D2's matrix row), it never blocks spawn completeness, since a bad value
+  # degrades gracefully at commit time (SessionGit falls back with a Note)
+  # rather than blocking the spawn.
+  FLOW_MODES = %w[direct pull_request].freeze
+  FLOW_WORKSPACES = %w[checkout worktree].freeze
+
   def validate(slug, plastic_home: File.join(Dir.home, ".plastic"))
     missing = []
     errors = []
@@ -53,7 +62,9 @@ module ProjectValidator
       rescue StandardError
         nil
       end
-      unless parsed.is_a?(Hash)
+      if parsed.is_a?(Hash)
+        validate_flow_block(parsed, errors)
+      else
         missing << "project.yml (valid YAML)"
         errors << "project.yml exists at #{project_yml_path} but does not parse as YAML"
       end
@@ -88,6 +99,24 @@ module ProjectValidator
     { ok: missing.empty?, missing: missing, errors: errors }
   end
 
+  # Non-blocking: an unknown `mode` or `workspace` value in project.yml's
+  # `flow:` block, if present, is reported in `errors` but never added to
+  # `missing`, so it never flips `ok`.
+  def validate_flow_block(parsed, errors)
+    flow = parsed["flow"]
+    return unless flow.is_a?(Hash)
+
+    validate_flow_knob(flow, "mode", FLOW_MODES, errors)
+    validate_flow_knob(flow, "workspace", FLOW_WORKSPACES, errors)
+  end
+
+  def validate_flow_knob(flow, key, allowed, errors)
+    value = flow[key]
+    return if value.nil? || allowed.include?(value.to_s)
+
+    errors << "project.yml flow.#{key} is #{value.inspect}, must be one of #{allowed.join(", ")}"
+  end
+
   # Invariant 1: registered in projects.yml with a 'path'. Returns the
   # project's entry Hash, or nil when unregistered or the entry has no path.
   def registration_for(slug, plastic_home)

package/scripts/lib/roadmap_queue.rb

@@ -20,10 +20,10 @@ class FileOrderRanker
   end
 end
 
-# RoadmapQueue - the one deterministic reader the auto loop and plastic-roadmap-continuing
+# RoadmapQueue - the one deterministic reader the auto loop and plastic-intent-continuing
 # both call (intent 148). Constructor-DI, hermetic: clock and paths injected, no eval, no ENV
 # or global config seam. It does two things: liveness-ranks a tier's roadmaps/*.md files
-# (porting plastic-roadmap-continuing's read-time algorithm), and, within the winning
+# (porting plastic-intent-continuing's read-time algorithm), and, within the winning
 # roadmap, selects the frontier wave plus its dispatchable set (D-b), value-ordered by the
 # injected ranker (default FileOrderRanker, the intent-173 swap seam). Every frontier token is
 # reconciled against INDEX.md first, INDEX wins. Reads through the 134 ledger via the public
@@ -181,7 +181,7 @@ class RoadmapQueue
     File.join(File.dirname(@roadmaps_dir), "INDEX.md")
   end
 
-  # --- liveness ranking (ports plastic-roadmap-continuing's read-time algorithm) -
+  # --- liveness ranking (ports plastic-intent-continuing's read-time algorithm) -
 
   def rank_candidates(parsed_list)
     parsed_list.map do |c|

package/scripts/lib/roadmap_savepoint.rb

@@ -102,7 +102,7 @@ module RoadmapSavepoint
   # entry has a `merged` line. Every timestamp comes from an on-disk source (the Log, or INDEX
   # `## Completed`); an entry with no recoverable timestamp is not emitted (D4, never invented).
   # Overwrites the ledger (the one operation allowed to rewrite it, matching
-  # `Bridge.rebuild_savepoint`). Returns the number of lines written.
+  # `Savepoint.rebuild_savepoint`). Returns the number of lines written.
   def rebuild(roadmap_path)
     text = File.read(roadmap_path)
     log_lines = classify_log(section_body(text, "Log"))

package/scripts/lib/rule_catalog.rb

@@ -5,9 +5,9 @@
 # different axes so there is exactly one place to look up or register a rule name:
 #
 #   EXCLUDABLE_CHECKS - a doctor check `name` a per-store doctor-exclusions file may name. A
-#   check name says WHICH DIAGNOSTIC FIRED. v1 carries exactly one key, savepoint_operational
-#   (see spec D3): most doctor checks have no exclusion mechanism at all, and this is the only
-#   one the owner asked to make skippable.
+#   check name says WHICH DIAGNOSTIC FIRED. Two keys: savepoint_operational (274, spec D3) and
+#   backfilled_complete (308). Most doctor checks have no exclusion mechanism at all; these two
+#   are the ones whose gap can be a known, accepted fact on an old or migrated intent.
 #
 #   REVISION_RULES - the `[rule: <tag>]` vocabulary every revisions.md entry must carry
 #   (scripts/lib/revisions_writer.rb). A tag says WHY an intent's files were structurally
@@ -33,6 +33,9 @@ module RuleCatalog
                                "delivered|abandoned echo, on a terminal intent. Usually " \
                                "repairable via maintenance-run --tool rebuild-savepoint; " \
                                "excludable for the gaps 219 D6 forbids ever repairing.",
+    "backfilled_complete" => "spec.md or plan.md missing or still the placeholder, or no real " \
+                             "action file, on a terminal intent. Repairable via scaffold-intent " \
+                             "backfill; excludable for an old intent whose record was never kept.",
   }.freeze
 
   # Measured from live store data across all eight stores, 2026-08-24 (spec D1).