@zalom/plastic 1.4.1 → 1.6.0

package/scripts/restore-intent-v1

@@ -45,6 +45,7 @@ require_relative "lib/store_discovery"
 require_relative "lib/intent_validator"
 require_relative "lib/graph_rebuild"
 require_relative "lib/frontmatter_writer"
+require_relative "lib/links_projection"
 require_relative "lib/restore_intent_v1"
 
 class RestoreIntentV1CLI
@@ -116,8 +117,18 @@ class RestoreIntentV1CLI
 
     other_files = prose_siblings_to_restore(dir)
 
+    # `## Links` is a purely derived section: apply_graph always re-derives new_md's body
+    # from v1_md's ORIGINAL (pre-reprojection) content, so its Links ENTRY LINES differ
+    # from the current, already-reprojected file on every single invocation, even when
+    # nothing else changed. Comparing raw new_md != current_md would treat that churn as a
+    # real change forever (write, reproject, write, reproject...), which is both pointless
+    # IO and, per D14, a false "something changed" signal. md_changed ignores only the
+    # entry lines themselves; any other difference (frontmatter graph, real prose) is
+    # still a real, detected change.
+    md_changed = differs_outside_links_entries?(new_md, current_md)
+
     prose_changes = other_files.keys.dup
-    prose_changes.unshift("#{base}.md") if new_md != current_md
+    prose_changes.unshift("#{base}.md") if md_changed
 
     puts RestoreIntentV1.render_report(
       base: base, at: at, prose_changes: prose_changes,
@@ -128,7 +139,7 @@ class RestoreIntentV1CLI
 
     return unless apply
 
-    File.write(md_path, new_md) if new_md != current_md
+    File.write(md_path, new_md) if md_changed
     other_files.each { |f, content| File.write(File.join(dir, f), content) }
 
     puts "Reminder: restore-to-v1 runs under the maintenance lock (PLASTIC.md > Terminal " \
@@ -136,7 +147,8 @@ class RestoreIntentV1CLI
 
     handle_links_reprojection(base)
     append_revision(dir, base, graph, files: prose_changes,
-                    before_sources: current_fm["sources"], before_chain: current_fm["chain"])
+                    before_sources: current_fm["sources"], before_chain: current_fm["chain"]) \
+      if md_changed || other_files.any?
   end
 
   private
@@ -261,6 +273,28 @@ class RestoreIntentV1CLI
          "Rerun: ruby #{project_links} --plastic-home #{plastic_home}"
   end
 
+  # True iff `md_a`/`md_b` differ OUTSIDE their ## Links ENTRY LINES (the ones
+  # LinksProjection renders/parses, plus its empty-state comment). Line-level, not
+  # section-level: a section-boundary replace (LinksSection.rewrite) would discard
+  # everything from the heading to EOF, which is unsafe here because a stray prose
+  # edit sitting after ## Links would be discarded too, not only the Links entries
+  # themselves. Frontmatter and every non-entry body line are compared verbatim, so a
+  # genuine graph or prose change is always still detected.
+  def differs_outside_links_entries?(md_a, md_b)
+    neutralize_links_entries(md_a) != neutralize_links_entries(md_b)
+  end
+
+  def neutralize_links_entries(text)
+    text.to_s.lines.map do |line|
+      stripped = line.chomp
+      if stripped.match?(LinksProjection::ENTRY_LINE_RE) || stripped == LinksProjection::EMPTY_COMMENT
+        "\n"
+      else
+        line
+      end
+    end.join
+  end
+
   def append_revision(dir, base, graph, files:, before_sources:, before_chain:)
     path = File.join(dir, "revisions.md")
     existing = File.exist?(path) ? File.read(path) : "# revisions.md\n\n"

package/scripts/sweep-store-worktrees

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+# frozen_string_literal: true
+
+# sweep-store-worktrees (intent 178, D2) -- ONE-TIME cleanup of the store
+# worktrees Plastic used to provision under `~/.plastic/.worktrees/` before
+# intent 178 retired the mechanism. Dry-run by default; nothing is ever
+# removed without an explicit --apply, run only after reviewing the dry-run
+# report (D2: "present a dry-run for owner review before applying").
+#
+# Usage:
+#   scripts/sweep-store-worktrees              # dry run (default, safe)
+#   scripts/sweep-store-worktrees --apply       # actually remove REMOVE candidates
+#   scripts/sweep-store-worktrees --home <dir>  # override plastic_home (tests/CI only)
+
+require_relative "lib/worktree_sweep"
+
+def parse_args(argv)
+  opts = { apply: false, home: Dir.home }
+  i = 0
+  while i < argv.length
+    case argv[i]
+    when "--apply" then opts[:apply] = true
+    when "--home"  then opts[:home] = argv[i += 1]
+    else
+      warn "sweep-store-worktrees: unknown argument #{argv[i].inspect}"
+      exit 1
+    end
+    i += 1
+  end
+  opts
+end
+
+def main(argv)
+  opts = parse_args(argv)
+  plastic_home = File.expand_path(File.join(opts[:home], ".plastic"))
+  unless Dir.exist?(File.join(plastic_home, ".worktrees"))
+    puts "No #{File.join(plastic_home, '.worktrees')} directory; nothing to sweep."
+    exit 0
+  end
+
+  candidates = WorktreeSweep.candidates(plastic_home: plastic_home)
+  puts WorktreeSweep.dry_run_report(candidates)
+
+  if opts[:apply]
+    removed = WorktreeSweep.apply!(candidates, plastic_home: plastic_home)
+    puts ""
+    puts "Removed #{removed.length} worktree(s):"
+    removed.each { |c| puts "  #{c.name}" }
+  end
+end
+
+main(ARGV) if $PROGRAM_NAME == __FILE__

package/skills/auto/references/end-tail.md

@@ -44,12 +44,14 @@ deliberately); and the durable lock file is checked again after disarm, never me
 trusted (exit 3 if it is somehow still present).
 
 **Worktree cleanup (mandatory, intent 73c3).** `end-intent`'s step 5 calls
-`Bridge.disarm_auto` by default, which calls `Worktree.release`, which removes both
-per-intent worktrees (the code worktree under `<repo>/.claude/worktrees/{id}--{slug}` and
-the paired store worktree under `<plastic_home>/.worktrees/{id}--{slug}`), prunes both
-repos, and clears the worktree block from the bridge. This is the plain remove path: the
-disarm route does NOT merge, so use it only when no release merges the branch (the branch
-survives and can be reclaimed).
+`Bridge.disarm_auto` by default, which calls `Worktree.release`, which removes the
+intent's code worktree under `<repo>/.claude/worktrees/{id}--{slug}`, prunes the repo, and
+clears the worktree block from the bridge. (Plastic used to also provision a paired store
+worktree under `<plastic_home>/.worktrees/{id}--{slug}`; intent 178 retired it, since
+lifecycle-doc writes go straight to the main store checkout, and intent 197's
+branch-from-main plus scoped commit already gives them their own write safety.) This is the
+plain remove path: the disarm route does NOT merge, so use it only when no release merges
+the branch (the branch survives and can be reclaimed).
 
 When the work is being shipped through a release, do NOT rely on this plain remove.
 `skills/releasing/SKILL.md` reorders its own two steps for exactly this reason (intent 188,

package/skills/doctor/SKILL.md

@@ -106,6 +106,11 @@ If any checks have `fixable: true` AND status is not `pass`:
 
 If no fixable issues exist, skip this step.
 
+This "Fix all / Select individually / Skip" prompt IS the router the spec calls
+`doctor --fix-all` (intent 197): doctor itself never mutates anything (see Step 5's table and
+"Important Notes" below); "Fix all" means "dispatch every fixable finding to the maintenance
+tool or skill that owns that class of repair," one row per fix_hint pattern.
+
 ### Step 5: Apply fixes
 
 Use the `fix_hint` value to determine the correct action:
@@ -121,6 +126,7 @@ Use the `fix_hint` value to determine the correct action:
 | "Run: provision-project-store {slug}" | Run `provision-project-store <slug>` (or invoke the `plastic-store-provisioning` skill) to create the missing store |
 | "Re-run installer" | Run `npx -y @zalom/plastic@<channel> install --agent <agent>` (channel: -alpha->@alpha, -beta->@beta, else @latest) |
 | "Dispatch plastic-store-curating ... revisions.md ..." | Invoke the `plastic-store-curating` (or the agent) to relocate the flagged section or ref into the intent's `revisions.md` via move-and-record (one dated, `[rule: <tag>]`-tagged entry per item), per PLASTIC.md > Structural maintenance and revisions.md. For a missing required section, restore or reproject it instead. |
+| "Run scripts/project-links ... PRESERVES ... --drop-unbacked-links" | Run `ruby ~/.plastic/scripts/maintenance-run --tool project-links --intent <id> --apply` for the one flagged id (never run bare `project-links` against a real store outside the rare owner-approved batch exception, D2) |
 
 For fixes the agent cannot handle automatically, explain what the user needs
 to do manually. The `revisions.md` remedy is curator-applied (a move-and-record

package/skills/releasing/SKILL.md

@@ -247,11 +247,11 @@ lock correctly (G5): before intent 188 this path left the lock stranded, exactly
 of bug closed by the End-tail enforcement work.
 
 This is the release branch of `plastic-intent-ending`'s Step 5 disarm (`merge: true`), not a
-separate concern: a release is the merge-then-remove path for the intent's worktrees (intent
+separate concern: a release is the merge-then-remove path for the intent's worktree (intent
 73c3), so the intent's code branch is merged back into the default branch BEFORE the worktree
 is removed. Drive it through `Worktree.finish` with `merge: true`, which merges the code
-branch, then removes both worktrees (code + paired store), prunes both repos, and clears the
-worktree block from the bridge:
+branch, then removes the worktree, prunes the repo, and clears the worktree block from the
+bridge:
 
 ```bash
 ruby -r ~/.plastic/scripts/lib/worktree -r ~/.plastic/scripts/lib/bridge -e \

package/skills/store-curating/SKILL.md

@@ -45,3 +45,12 @@ When an intent reaches a terminal state, moved to Completed OR Abandoned, do the
 2. Call `plastic-intent-ending` for the terminal-transition close (INDEX move, savepoint `Done` bookend, store commit, disarm, and the QMD reindex last): `ruby ~/.plastic/scripts/end-intent --store <store> --id <id> --disposition delivered|abandoned`, then follow that skill's own disarm and reindex steps. Never restate those one-liners here.
 
 After the agent completes, report what changed.
+
+## Maintenance dispatch (intent 197)
+
+When invoked to fix a structural finding on an intent OTHER than one currently being delivered
+(for example, from `/plastic-doctor`'s fix-all routing), the `plastic-intent-curator` agent
+follows its own step 7: it detects (never acquires) the target's delivery lock, requires a
+clean working tree, and performs the fix on a fresh branch merged back to main as one closed
+operation, with an append-only `revisions.md` receipt in the same pass as the edit. See
+`agents/plastic-intent-curator.md` for the exact mechanics.

package/skills/store-curating/evals/evals.json

@@ -17,6 +17,22 @@
           "result": "pass"
         }
       ]
+    },
+    {
+      "id": 2,
+      "scope": "behavior",
+      "set": "validation",
+      "prompt": "The user says: intent 26 (Completed) has a stale ## Links comment that contradicts its own real chain edge; fix it. Intent 26 is NOT the intent currently being delivered by this session.",
+      "expected_output": "Before editing intent 26, checks its delivery lock freshness (plastic-lock status --intent-dir, reading lock_fresh) and defers if fresh; requires a clean store working tree; creates a fresh maintenance branch off main; makes the scoped edit AND appends a revisions.md receipt in the same pass, refusing the edit if the receipt cannot be written; stages only the changed paths (never git add -A); merges the branch back to main and deletes it before reporting done.",
+      "files": [],
+      "assertions": [
+        {
+          "type": "human",
+          "check": "agent file states detect-only lock check, clean-tree precheck, branch-and-merge-back, and refuse-without-receipt as an unconditional sequence for maintenance on a non-current intent",
+          "observed": "agents/plastic-intent-curator.md step 7 covers all five sub-steps (a-f) exactly as asked",
+          "result": "pass"
+        }
+      ]
     }
   ]
 }