@zalom/plastic 1.0.2 → 1.1.0

package/skills/{brainstorming → intent-brainstorming}/SKILL.md

@@ -1,18 +1,19 @@
 ---
-name: plastic-brainstorming
-description: "Explore intent requirements and design before implementation. Produces spec.md in the active intent directory."
+name: plastic-intent-brainstorming
+description: "Explore intent requirements and design before implementation, through conversational prose questions asked one at a time (no multiple-choice chips), persisting each owner ruling immediately as an insight. Produces the enriched Why (Context and Decisions) in the active intent directory; hands off to /plastic-intent-speccing for spec.md."
+user-invocable: true
 ---
 
 # Brainstorming Ideas Into Designs
 
-Help turn ideas into fully formed designs and specs through natural collaborative dialogue.
+Help turn ideas into fully formed designs through natural collaborative dialogue.
 
-Announce: "I'm using the brainstorming skill to explore the design for intent {id} — {name}."
+Announce: "I'm using the brainstorming skill to explore the design for intent {id}: {name}."
 
-Start by understanding the current project context, then ask questions one at a time to refine the idea. Once you understand what you're building, present the design and get user approval.
+Start by understanding the current project context, then ask questions one at a time, in prose, to refine the idea. Once you understand what you're building, present the design and collect the owner's rulings on it. This skill's product is the enriched Why, not spec.md.
 
 <HARD-GATE>
-Do NOT invoke any implementation skill, write any code, scaffold any project, or take any implementation action until you have presented a design and the user has approved it. This applies to EVERY project regardless of perceived simplicity.
+Do NOT invoke any implementation skill, write any code, scaffold any project, or take any implementation action until you have presented a design and the user has ruled on it. This applies to EVERY project regardless of perceived simplicity.
 </HARD-GATE>
 
 ## Active Intent Gate
@@ -20,34 +21,32 @@ Do NOT invoke any implementation skill, write any code, scaffold any project, or
 Before proceeding, resolve the active intent:
 
 1. **Detect store:** Read `~/.plastic/projects.yml`, match CWD against registered project paths. If match → project store at `~/.plastic/projects/{slug}/store/`. If no match → global store at `~/.plastic/store/`.
-2. **Find active intent:** Read `INDEX.md` from the detected store. Look under `## Active`. If exactly one → use it. If multiple → ask which. If none → refuse: "No active intent. Create one first with /plastic-creating-intent"
+2. **Find active intent:** Read `INDEX.md` from the detected store. Look under `## Active`. If exactly one → use it. If multiple → ask which. If none → refuse: "No active intent. Create one first with /plastic-intent-creating"
 3. **Resolve intent directory:** `{store}/store/{id}--{slug}/`
 
 All artifacts go to the intent directory. Never write to external paths.
 
 ## Anti-Pattern: "This Is Too Simple To Need A Design"
 
-Every project goes through this process. A todo list, a single-function utility, a config change — all of them. "Simple" projects are where unexamined assumptions cause the most wasted work. The design can be short (a few sentences for truly simple projects), but you MUST present it and get approval.
+Every project goes through this process. A todo list, a single-function utility, a config change: all of them. "Simple" projects are where unexamined assumptions cause the most wasted work. The design can be short (a few sentences for truly simple projects), but you MUST present it and get a ruling.
 
 ## Checklist
 
 You MUST create a task for each of these items and complete them in order:
 
-1. **Explore project context** — check files, docs, recent commits, read active intent
-2. **Ask clarifying questions** — one at a time, understand purpose/constraints/success criteria
-3. **Propose 2-3 approaches** — with trade-offs and your recommendation
-4. **Present design** — in sections scaled to their complexity, get user approval after each section
-5. **Write spec** — save to `{intent_dir}/spec.md` and commit to store repo
-6. **Spec self-review** — placeholder scan, consistency, scope, ambiguity
-7. **User reviews written spec** — ask user to review before proceeding
-8. **Transition to planning** — invoke `plastic-writing-plans`
+1. **Explore project context**: check files, docs, recent commits, read active intent
+2. **Grill in prose**: ask conversational prose questions, one at a time, no multiple-choice chips; understand purpose/constraints/success criteria
+3. **Propose 2-3 approaches**: with trade-offs and your recommendation
+4. **Present design**: in sections scaled to their complexity, get a ruling after each section
+5. **Collect rulings**: for each owner ruling, immediately persist it (see Collect rulings below); never batch
+6. **Hand off to /plastic-intent-speccing**: the enriched Why is done; do not author spec.md here
 
 ## Process Flow
 
-The Checklist above states the ordered flow (steps 1-8). For the same flow as a
+The Checklist above states the ordered flow (steps 1-6). For the same flow as a
 diagram, read `references/design-principles.md`.
 
-**The terminal state is invoking `plastic-writing-plans`.** Do NOT invoke any other implementation skill. The ONLY skill you invoke after brainstorming is `plastic-writing-plans`.
+**The terminal state is the handoff below.** Do NOT invoke any implementation skill and do NOT write spec.md. Brainstorming's product is the enriched Why.
 
 ## The Process
 
@@ -55,9 +54,9 @@ diagram, read `references/design-principles.md`.
 - QMD-first (when available): before scanning the store with grep/Read for prior decisions, specs, or outcomes, run `ruby ~/.plastic/scripts/qmd-sync search "<terms>"` to surface candidate, prior, or related intents, then open the authoritative intent file for any hit you act on. The command is a no-op when QMD is absent, so fall back to the existing INDEX.md / file scan.
 - Check out the current project state first (files, docs, recent commits)
 - Before asking detailed questions, assess scope: if the request describes multiple independent subsystems (e.g., "build a platform with chat, file storage, billing, and analytics"), flag this immediately. Don't spend questions refining details of a project that needs to be decomposed first.
-- If the project is too large for a single spec, help the user decompose into sub-projects: what are the independent pieces, how do they relate, what order should they be built? Then brainstorm the first sub-project through the normal design flow. Each sub-project gets its own spec → plan → implementation cycle.
-- For appropriately-scoped projects, ask questions one at a time to refine the idea
-- Prefer multiple choice questions when possible, but open-ended is fine too
+- If the project is too large for a single spec, help the user decompose into sub-projects: what are the independent pieces, how do they relate, what order should they be built? Then brainstorm the first sub-project through the normal design flow. Each sub-project gets its own Why → spec → plan → implementation cycle.
+- For appropriately-scoped projects, ask questions one at a time, in prose, to refine the idea
+- Ask conversational prose questions, not multiple-choice chips. A short menu of named options is fine when the choice is genuinely enumerable, but phrase it as a sentence, not a bulleted picker.
 - Only one question per message - if a topic needs more exploration, break it into multiple questions
 - Focus on understanding: purpose, constraints, success criteria
 
@@ -79,39 +78,39 @@ guidance (what makes a good interface, when a file has grown too large) and
 existing-codebase guidance (follow established patterns, fold in targeted
 improvements without unrelated refactoring).
 
-## After the Design
-**Documentation:**
-- Write the validated design (spec) to `{intent_dir}/spec.md` using the `${CLAUDE_PLUGIN_ROOT}/templates/spec.md` form
-- Use elements-of-style:writing-clearly-and-concisely skill if available
-- Commit to the store repo:
-  ```
-  cd {store_root} && git add . && git commit -m "docs: spec for intent {id} — {name}"
-  ```
+## Collect rulings
 
-**Spec Self-Review:**
-After writing the spec document, look at it with fresh eyes:
-1. **Placeholder scan:** Any "TBD", "TODO", incomplete sections, or vague requirements? Fix them.
-2. **Internal consistency:** Do any sections contradict each other? Does the architecture match the feature descriptions?
-3. **Scope check:** Is this focused enough for a single implementation plan, or does it need decomposition?
-4. **Ambiguity check:** Could any requirement be interpreted two different ways? If so, pick one and make it explicit.
+Each owner ruling triggers one immediate persist call, never a batch. The moment the
+owner rules on a question or a design section, before moving to the next one, run:
 
-Fix any issues inline. No need to re-review — just fix and move on.
+```
+ruby ~/.plastic/scripts/insight-append {intent_dir} "<ruling text>" --stage Why --author human
+```
 
-**User Review Gate:**
-After the spec review loop passes, ask the user to review the written spec before proceeding:
-> "Spec written and committed to `{intent_dir}/spec.md`. Please review it and let me know if you want to make any changes before we start writing out the implementation plan."
+When a later ruling conflicts with an earlier one already on record, append a new
+insight that names the superseded ruling and states plainly that this one supersedes
+it. Both insights stay on record; the later one wins.
 
-Wait for the user's response. If they request changes, make them and re-run the spec review loop. Only proceed once the user approves.
+When presenting a batch of design options or rulings for the owner to choose, read
+`~/.plastic/_decision-tables.md` and follow the numbered-table procedure.
 
-**Implementation:**
-- Invoke `plastic-writing-plans` to create the implementation plan
-- Do NOT invoke any other skill. `plastic-writing-plans` is the next step.
+## Handoff
+
+Why exploration complete. The enriched Why is captured (Context, Decisions, one
+insight per ruling). Invoke /plastic-intent-speccing to consolidate it into spec.md.
+Do not author spec.md here.
+
+## Gate position
+
+- **Before:** an active intent exists with the lock armed.
+- **Produces:** the enriched Why (`## Context`, `### Decisions`, one `## Insights` entry per ruling).
+- **Next:** /plastic-intent-speccing consolidates the enriched Why into spec.md.
 
 ## Key Principles
 
 - **One question at a time** - Don't overwhelm with multiple questions
-- **Multiple choice preferred** - Easier to answer than open-ended when possible
+- **Prose, not chips** - Ask conversational prose questions; skip multiple-choice menus
 - **YAGNI ruthlessly** - Remove unnecessary features from all designs
 - **Explore alternatives** - Always propose 2-3 approaches before settling
-- **Incremental validation** - Present design, get approval before moving on
+- **Incremental validation** - Present design, collect a ruling before moving on
 - **Be flexible** - Go back and clarify when something doesn't make sense

package/skills/intent-brainstorming/evals/evals.json

@@ -0,0 +1,67 @@
+{
+  "skill_name": "plastic-intent-brainstorming",
+  "notes": "Intent 66a. Spec for the QMD-first step in the Why/explore-context phase (surface prior decisions/specs/outcomes before grep/Read). Runner is intent 76; spec only. Intent 164 extended this file with the prose-grilling, conflict-supersession, and handoff-to-speccing scenarios; evals 2-4 are pending a real observed run per the plastic-evaluating-skills convention.",
+  "evals": [
+    {
+      "id": 1,
+      "scope": "behavior",
+      "set": "validation",
+      "prompt": "QMD is present. Brainstorming the active intent during the Why phase, the agent needs prior decisions and specs on caching.",
+      "expected_output": "In the explore-project-context (Why) step, before scanning the store with grep/Read, runs `ruby ~/.plastic/scripts/qmd-sync search \"caching decisions\"` to surface prior decisions, specs, or outcomes, then opens the authoritative intent file for any hit it acts on. No-op fallback to INDEX.md / file scan when QMD is absent.",
+      "files": [],
+      "assertions": [
+        {
+          "type": "human",
+          "check": "qmd-sync search is run during Why before grep/Read; authoritative file opened for any hit",
+          "observed": "SKILL.md (or agent file) carries the QMD-first step: run qmd-sync search before grep/Read, then open the authoritative file; no-op fallback when QMD is absent",
+          "result": "pass"
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "scope": "behavior",
+      "set": "validation",
+      "prompt": "During Why exploration for intent X, the owner first rules that a setting ships as a CLI flag. Later in the same session, after more discussion, the owner rules that it should ship as a config-file setting instead, explicitly reversing the earlier call.",
+      "expected_output": "The skill persists BOTH rulings as separate insight-append calls with --stage Why: one for the CLI-flag ruling when it was made, and a second for the config-file ruling that names the CLI-flag ruling as superseded and states that this ruling supersedes it. Neither call is skipped, merged, or batched.",
+      "files": [],
+      "assertions": [
+        {
+          "type": "human",
+          "check": "two separate `ruby ~/.plastic/scripts/insight-append {intent_dir} \"<ruling text>\" --stage Why --author human` calls are made, one per ruling, immediately as each ruling lands; the second insight names the superseded CLI-flag ruling and states supersession",
+          "result": "expect-pass"
+        }
+      ]
+    },
+    {
+      "id": 3,
+      "scope": "behavior",
+      "set": "train",
+      "prompt": "Brainstorming a new intent about notification delivery, the agent needs to learn the owner's preferred channel (email, push, or SMS).",
+      "expected_output": "The agent asks a single conversational prose question about the preferred channel, one at a time, phrased as a sentence rather than a bulleted or lettered multiple-choice menu.",
+      "files": [],
+      "assertions": [
+        {
+          "type": "human",
+          "check": "the question is prose, not a chip/lettered multiple-choice menu; only one question is asked per message",
+          "result": "expect-pass"
+        }
+      ]
+    },
+    {
+      "id": 4,
+      "scope": "behavior",
+      "set": "train",
+      "prompt": "Design for intent Y is presented and the owner has ruled on every open section.",
+      "expected_output": "The skill states the enriched Why is captured (Context, Decisions, one insight per ruling) and invokes /plastic-intent-speccing as the handoff. It does not write spec.md itself.",
+      "files": [],
+      "assertions": [
+        {
+          "type": "code",
+          "check": "no spec.md write action is taken by this skill; the terminal message names /plastic-intent-speccing and states spec.md is not authored here",
+          "result": "expect-pass"
+        }
+      ]
+    }
+  ]
+}

package/skills/{brainstorming → intent-brainstorming}/references/design-principles.md

@@ -20,30 +20,25 @@ steps).
 
 ## Process Flow (diagram)
 
-The Checklist above already states this ordered flow as numbered steps 1-8; this
+The Checklist above already states this ordered flow as numbered steps 1-6; this
 diagram is the same flow in a visual form.
 
 ```dot
 digraph brainstorming {
     "Explore project context" [shape=box];
-    "Ask clarifying questions" [shape=box];
+    "Grill in prose" [shape=box];
     "Propose 2-3 approaches" [shape=box];
     "Present design sections" [shape=box];
-    "User approves design?" [shape=diamond];
-    "Write spec" [shape=box];
-    "Spec self-review\n(fix inline)" [shape=box];
-    "User reviews spec?" [shape=diamond];
-    "Invoke plastic-writing-plans" [shape=doublecircle];
-
-    "Explore project context" -> "Ask clarifying questions";
-    "Ask clarifying questions" -> "Propose 2-3 approaches";
+    "Owner rules?" [shape=diamond];
+    "Collect rulings\n(persist each immediately)" [shape=box];
+    "Invoke /plastic-intent-speccing" [shape=doublecircle];
+
+    "Explore project context" -> "Grill in prose";
+    "Grill in prose" -> "Propose 2-3 approaches";
     "Propose 2-3 approaches" -> "Present design sections";
-    "Present design sections" -> "User approves design?";
-    "User approves design?" -> "Present design sections" [label="no, revise"];
-    "User approves design?" -> "Write spec" [label="yes"];
-    "Write spec" -> "Spec self-review\n(fix inline)";
-    "Spec self-review\n(fix inline)" -> "User reviews spec?";
-    "User reviews spec?" -> "Write spec" [label="changes requested"];
-    "User reviews spec?" -> "Invoke plastic-writing-plans" [label="approved"];
+    "Present design sections" -> "Owner rules?";
+    "Owner rules?" -> "Present design sections" [label="no, revise"];
+    "Owner rules?" -> "Collect rulings\n(persist each immediately)" [label="yes"];
+    "Collect rulings\n(persist each immediately)" -> "Invoke /plastic-intent-speccing";
 }
 ```

package/skills/{continuing → intent-continuing}/SKILL.md

@@ -1,11 +1,12 @@
 ---
-name: plastic-continuing
-description: Use when the user says "continue", "resume", or "pick up where we left off", or when starting a new session. Continues work with the latest project context: lands on the right dashboard, then presents choices. Boot (health check, core context, version, statusline) is owned by the SessionStart hook, not this skill. Does not drive work autonomously (that is plastic-auto).
+name: plastic-intent-continuing
+description: 'Use when the user says "continue", "resume", or "pick up where we left off", or when starting a new session. Continues work with the latest project context: lands on the right dashboard, then presents choices. Boot (health check, core context, version, statusline) is owned by the SessionStart hook, not this skill. Does not drive work autonomously (that is plastic-auto).'
+user-invocable: true
 ---
 
 # Continuing
 
-`plastic-continuing` continues work. It presents the latest state via the dashboard and offers
+`plastic-intent-continuing` continues work. It presents the latest state via the dashboard and offers
 choices, then stops. It does NOT execute work autonomously (that is `plastic-auto`) and does
 NOT render the dashboard itself (it only invokes it).
 

package/skills/{continuing → intent-continuing}/evals/evals.json

@@ -1,51 +1,51 @@
 {
-  "skill_name": "plastic-continuing",
+  "skill_name": "plastic-intent-continuing",
   "notes": "Intent 36, updated for 36a (boot moved into hook-session-start; the skill is now work-continuation only). Scopes: description triggering (1-8) and behavior/convention compliance of the work-continuation skill (9-14). Triggering assertions follow the plastic-auto eval style (one subagent router per case). Behavior assertions are convention checks against the SKILL.md.",
   "results": {
     "triggering": { "cases": 8, "passed": 8, "run": "2026-06-16, one subagent per case" },
-    "behavior": { "cases": 6, "passed": 6, "evidence": "convention checks against skills/continuing/SKILL.md after the intent-36 rewrite; doctor --core verified at 0.07s with 9 liveness checks and full doctor unchanged at 30 checks" }
+    "behavior": { "cases": 6, "passed": 6, "evidence": "convention checks against skills/intent-continuing/SKILL.md after the intent-36 rewrite; doctor --core verified at 0.07s with 9 liveness checks and full doctor unchanged at 30 checks" }
   },
   "evals": [
     {
       "id": 1, "scope": "triggering", "set": "train",
       "prompt": "continue",
-      "expected_output": "Activates plastic-continuing (the bare 'continue' keyword is the documented trigger).",
+      "expected_output": "Activates plastic-intent-continuing (the bare 'continue' keyword is the documented trigger).",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic-continuing", "observed": "plastic-continuing", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-intent-continuing", "observed": "plastic-intent-continuing", "result": "pass" }
       ]
     },
     {
       "id": 2, "scope": "triggering", "set": "train",
       "prompt": "resume where we left off",
-      "expected_output": "Activates plastic-continuing.",
+      "expected_output": "Activates plastic-intent-continuing.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic-continuing", "observed": "plastic-continuing", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-intent-continuing", "observed": "plastic-intent-continuing", "result": "pass" }
       ]
     },
     {
       "id": 3, "scope": "triggering", "set": "validation",
       "prompt": "pick up where we left off in this project",
-      "expected_output": "Activates plastic-continuing.",
+      "expected_output": "Activates plastic-intent-continuing.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic-continuing", "observed": "plastic-continuing", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-intent-continuing", "observed": "plastic-intent-continuing", "result": "pass" }
       ]
     },
     {
       "id": 4, "scope": "triggering", "set": "train",
       "prompt": "boot plastic and show me where things stand",
-      "expected_output": "Activates plastic-continuing (continuing work + presenting state is the skill's purpose; boot itself is hook-owned).",
+      "expected_output": "Activates plastic-intent-continuing (continuing work + presenting state is the skill's purpose; boot itself is hook-owned).",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic-continuing", "observed": "plastic-continuing", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-intent-continuing", "observed": "plastic-intent-continuing", "result": "pass" }
       ]
     },
     {
       "id": 5, "scope": "triggering", "set": "train",
       "prompt": "continue delivering this intent autonomously, don't ask me",
-      "expected_output": "Does NOT settle on plastic-continuing for execution. Shares 'continue' but the autonomous-delivery intent routes to plastic-auto.",
+      "expected_output": "Does NOT settle on plastic-intent-continuing for execution. Shares 'continue' but the autonomous-delivery intent routes to plastic-auto.",
       "files": [],
       "assertions": [
         { "type": "code", "check": "router CHOICE == plastic-auto", "observed": "plastic-auto", "result": "pass" }
@@ -54,35 +54,35 @@
     {
       "id": 6, "scope": "triggering", "set": "validation",
       "prompt": "continue the for-loop to the next iteration in this function",
-      "expected_output": "Does NOT activate plastic-continuing. Near-miss: shares 'continue' but is a code-editing task.",
+      "expected_output": "Does NOT activate plastic-intent-continuing. Near-miss: shares 'continue' but is a code-editing task.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic-continuing", "observed": "none", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-intent-continuing", "observed": "none", "result": "pass" }
       ]
     },
     {
       "id": 7, "scope": "triggering", "set": "train",
       "prompt": "resume the paused background download",
-      "expected_output": "Does NOT activate plastic-continuing. Near-miss: shares 'resume' but is unrelated to Plastic sessions.",
+      "expected_output": "Does NOT activate plastic-intent-continuing. Near-miss: shares 'resume' but is unrelated to Plastic sessions.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic-continuing", "observed": "none", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-intent-continuing", "observed": "none", "result": "pass" }
       ]
     },
     {
       "id": 8, "scope": "triggering", "set": "validation",
       "prompt": "what's the dashboard look like right now",
-      "expected_output": "May activate plastic-dashboard rather than plastic-continuing; an overview request without 'continue/resume' is a dashboard task.",
+      "expected_output": "May activate plastic-dashboard rather than plastic-intent-continuing; an overview request without 'continue/resume' is a dashboard task.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic-continuing", "observed": "plastic-dashboard", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-intent-continuing", "observed": "plastic-dashboard", "result": "pass" }
       ]
     },
     {
       "id": 9, "scope": "behavior", "set": "train",
       "prompt": "Does the skill defer boot to the SessionStart hook rather than running it itself?",
       "expected_output": "SKILL.md states boot (health check, core context, version banner, statusline) is owned by hook-session-start / plastic-statusline, not this skill.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "SKILL.md says boot is owned by the SessionStart hook and the skill does not run it", "observed": "'Boot is not this skill's job.' paragraph naming hook-session-start and plastic-statusline", "result": "pass" }
       ]
@@ -91,7 +91,7 @@
       "id": 10, "scope": "behavior", "set": "train",
       "prompt": "Does the skill avoid running doctor / setting the statusline itself?",
       "expected_output": "SKILL.md does NOT instruct running doctor.rb --core or setting the statusline; it attributes those to the hooks.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "no in-skill boot step invokes doctor.rb --core or sets the statusline; both are attributed to hooks", "observed": "doctor --core and statusline mentioned only as hook-owned in the 'Boot is not this skill's job' note", "result": "pass" }
       ]
@@ -100,7 +100,7 @@
       "id": 11, "scope": "behavior", "set": "train",
       "prompt": "Is dashboard selection project-aware?",
       "expected_output": "Project loaded -> `dashboard.rb project <slug>`; otherwise -> `dashboard.rb continue`. Skill only invokes, does not render.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "both dashboard invocations present and gated on project detection", "observed": "'dashboard.rb project <slug>' and 'dashboard.rb continue' in the 'Continue (present the dashboard)' section", "result": "pass" }
       ]
@@ -109,7 +109,7 @@
       "id": 12, "scope": "behavior", "set": "validation",
       "prompt": "Is ledger-resume conditional and ledger-driven?",
       "expected_output": "Resume fires only when a specific intent is named; reads savepoint.md last line as stage, verifies the stage file, rebuilds on drift, derives next step from first unchecked checklist item.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "Conditional Ledger-Resume section reads last ledger line, verifies stage file, calls rebuild_savepoint on drift, uses first unchecked checklist item", "observed": "all four present in 'Conditional Ledger-Resume'", "result": "pass" }
       ]
@@ -118,7 +118,7 @@
       "id": 13, "scope": "behavior", "set": "validation",
       "prompt": "Are the stale prose-savepoint fields gone?",
       "expected_output": "No 'In progress' / 'Blockers' fields read from a prose savepoint remain; the ledger model is used instead.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "no prose-savepoint announce template (In progress / Blockers from prose)", "observed": "absent; announce uses Stage/Next step/Context/Drift derived from ledger + checklist", "result": "pass" }
       ]
@@ -127,7 +127,7 @@
       "id": 14, "scope": "behavior", "set": "validation",
       "prompt": "Is the 'Determine Store' local-store gap filled?",
       "expected_output": "Step 2 of Determine Store describes local/project-store detection (no empty step).",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "convention", "check": "Determine Store step 2 documents local/project store detection via projects.yml + CWD match", "observed": "filled", "result": "pass" }
       ]
@@ -136,7 +136,7 @@
       "id": 15, "scope": "behavior", "set": "validation",
       "prompt": "QMD is present. The user says: continue the work on the statusline coloring (names the intent by description, not id).",
       "expected_output": "Before scanning the store with grep/Read to locate the named intent, runs `ruby ~/.plastic/scripts/qmd-sync search \"statusline coloring\"` to surface the candidate intent, then opens the authoritative intent file for the hit it resumes. No-op fallback to INDEX.md / file scan when QMD is absent.",
-      "files": ["skills/continuing/SKILL.md"],
+      "files": ["skills/intent-continuing/SKILL.md"],
       "assertions": [
         { "type": "human", "check": "qmd-sync search is run before grep/Read when the intent is named by description; authoritative file opened for the hit", "observed": "Conditional Ledger-Resume carries the QMD-first step: run qmd-sync search before grep/Read, then open the authoritative file; no-op fallback when QMD is absent", "result": "pass" }
       ]

package/skills/{creating-intent → intent-creating}/SKILL.md

@@ -1,6 +1,7 @@
 ---
-name: plastic-creating-intent
+name: plastic-intent-creating
 description: Use when new work begins, the user expresses a new goal, says "new intent", or no active intent exists for the current task. Creates intents in the global store (~/.plastic/store/) or in a project's store (~/.plastic/projects/{slug}/store/) depending on context.
+user-invocable: true
 ---
 
 # Creating an Intent
@@ -72,7 +73,7 @@ Having a "parent" in mind does NOT automatically mean branch. Choose by meaning:
 frontmatter edge and reproject. Links are decided by context influence (a `chain` edge has a high
 bar: the candidate's context must materially help deliver this intent), not by shared files or a
 similarity score. To gather candidates with their context and record an edge, use the
-`plastic-linking-intents` skill and `scripts/link-suggest`.
+`plastic-intent-linking` skill and `scripts/link-suggest`.
 
 ### 3. Determine Intent Properties
 
@@ -125,7 +126,7 @@ cleanly, and do not work around the failure by hand-writing the files.
 ### 6. If Implementation Intent Spawns a Project
 
 When the user says "start building" or the plan calls for a new project, invoke the
-`plastic-creating-project` skill; it owns project directory creation, AGENTS.md
+`plastic-project-creating` skill; it owns project directory creation, AGENTS.md
 population, projects.yml registration, store provisioning, and the auto-commit of
 both stores. Add `project-<slug>` to this intent's `tags` array either before
 invoking it or as part of that skill's handoff.

package/skills/{creating-intent → intent-creating}/evals/evals.json

@@ -1,5 +1,5 @@
 {
-  "skill_name": "plastic-creating-intent",
+  "skill_name": "plastic-intent-creating",
   "notes": "Intent 68. Scope: output-quality for the sources-vs-chain construction rules (D1/D2). Asserts the related-but-not-spawned case produces NO sources plus a predecessor chain link and a ## Links mirror, contrasted with the created-from case (true ascendant -> --sources set, reciprocal chain). The machine-checkable half lives in test/new_intent_test.rb (test_sources_path_gets_child_in_chain_frontmatter); this file documents the agent-facing scenario for skill evaluation and is NOT run by bin/test.",
   "evals": [
     {

package/skills/{intent-discovery → intent-discovering}/SKILL.md

@@ -1,11 +1,12 @@
 ---
-name: plastic-intent-discovery
+name: plastic-intent-discovering
 description: >-
   What-stage context deposit at intent activation: run QMD discovery over the
   intent's chain/sources and related parked intents, and write findings to
   resources/discovery--<slug>.md for the Why stage to consume. Use when an intent
   is activated (moved from Future to Active), after the lock is armed, under it,
   and before Why begins. Never writes the intent file itself.
+user-invocable: false
 ---
 
 # Intent Discovery — What-stage context deposit
@@ -33,6 +34,7 @@ lock. Dispatched as the `plastic-intent-discovery` background agent.
    the intent file, spec.md, or any lifecycle deliverable. The lock-owner-only
    write rule stays intact; the Why-stage `plastic-brainstorming` agent reads the
    deposit and enriches `## Context`.
+   Shape the deposit tabular-first per `PLASTIC.md` (## Tabular-First Reporting, intent 160).
 
 ## Stage coverage
 This is the What-stage agent in the one-agent-per-stage table (What: