@skitterbyte/skitterspec-jira 2.2.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/assets/claude-md-section.md +20 -1
  2. package/assets/core/env.config.json.example +1 -0
  3. package/assets/core/env.config.md +90 -6
  4. package/assets/core/jira.config.md +4 -2
  5. package/assets/hooks/main-guard.cjs +18 -2
  6. package/assets/hooks/review-gate.cjs +19 -2
  7. package/assets/rules/commit-trailers.md +24 -1
  8. package/assets/rules/spec-planning.md +131 -18
  9. package/assets/rules/spec-reports.md +1 -1
  10. package/assets/skills/spec/SKILL.md +95 -6
  11. package/assets/skills/spec-bug/SKILL.md +57 -1
  12. package/assets/skills/spec-cancel/SKILL.md +35 -0
  13. package/assets/skills/spec-complete/SKILL.md +113 -0
  14. package/assets/skills/spec-hotfix/SKILL.md +61 -2
  15. package/assets/skills/spec-incident/SKILL.md +44 -0
  16. package/assets/skills/spec-jira-setup/SKILL.md +23 -1
  17. package/assets/skills/spec-next/SKILL.md +9 -4
  18. package/assets/skills/spec-push/SKILL.md +22 -0
  19. package/assets/skills/spec-review/SKILL.md +32 -0
  20. package/assets/skills/spec-start/SKILL.md +39 -1
  21. package/assets/skills/spec-status/SKILL.md +18 -3
  22. package/assets/skills/spec-sync/SKILL.md +1 -0
  23. package/assets/skills/spec-to-main/SKILL.md +47 -1
  24. package/package.json +1 -1
  25. package/src/cli.js +1091 -39
  26. package/src/env/base.js +104 -0
  27. package/src/env/config.js +75 -3
  28. package/src/env/disposition.js +62 -0
  29. package/src/env/handoff.js +80 -0
  30. package/src/env/host.js +262 -0
  31. package/src/env/hotfix.js +225 -0
  32. package/src/env/hotfixland.js +103 -9
  33. package/src/env/inflight.js +95 -0
  34. package/src/env/integrate.js +130 -4
  35. package/src/env/mainguard.js +6 -0
  36. package/src/env/phases.js +28 -0
  37. package/src/env/provision.js +18 -6
  38. package/src/env/resolve.js +108 -9
  39. package/src/env/serve.js +6 -1
  40. package/src/env/specstate.js +101 -0
  41. package/src/env/teardown.js +42 -0
  42. package/src/vendor/jira/cli-sync.js +45 -3
  43. package/src/vendor/jira/config.js +17 -5
  44. package/src/vendor/provider-kit/index.js +4 -0
  45. package/src/vendor/provider-kit/src/apply.js +49 -4
  46. package/src/vendor/provider-kit/src/assignment.js +78 -1
  47. package/src/vendor/provider-kit/src/config.js +34 -1
  48. package/src/vendor/provider-kit/src/list-rows.js +35 -11
  49. package/src/vendor/provider-kit/src/released.js +14 -1
  50. package/src/vendor/provider-kit/src/specs.js +4 -2
  51. package/src/vendor/provider-kit/src/splice.js +64 -0
  52. package/src/vendor/provider-kit/src/status.js +137 -0
  53. package/src/vendor/sync-core/index.js +14 -1
  54. package/src/vendor/sync-core/src/compare.js +17 -5
  55. package/src/vendor/sync-core/src/normalize.js +50 -7
  56. package/src/vendor/sync-core/src/push.js +26 -2
  57. package/src/vendor/sync-core/src/summary.js +257 -0
@@ -157,7 +157,9 @@ not write the spec until this is resolved.
157
157
  asking. Verify endpoints/models/files actually exist before relying on them.
158
158
  - Cover, at minimum, the areas that apply:
159
159
  1. **Problem & why** — what's broken/missing, who feels it, why now.
160
- 2. **Scope & non-goals** — explicit out-of-scope items.
160
+ 2. **Scope & non-goals** — explicit out-of-scope items, and the
161
+ **acceptance criteria**: what someone checks, without reading the code,
162
+ to call the work done (they become `## Acceptance criteria`).
161
163
  3. **Affected areas** — concrete files/modules/packages this touches.
162
164
  4. **Proposed solution shape** — the chosen approach and the alternatives
163
165
  rejected, with the reason (this becomes "Decisions").
@@ -188,6 +190,39 @@ not write the spec until this is resolved.
188
190
  Stop grilling when there are no unresolved branches that would change the spec.
189
191
  Briefly play back the agreed understanding before writing.
190
192
 
193
+ ### Watch for the other doors — bug, hotfix, incident
194
+
195
+ `/spec` is the default door, so work that belongs to another skill arrives here
196
+ described in the user's own words — no issue, no labels for Phase 0 to route
197
+ on. While grilling, watch for the signals that mark the other kinds and raise
198
+ the hand-off **the moment one appears**, not at the end of the grill: for a
199
+ live outage especially, finishing a feature grill first is actively harmful,
200
+ because `/spec-incident` exists to be written *during* the outage.
201
+
202
+ - **Defect** — behaviour differing from intended ("it's broken", a failing
203
+ flow, a stack trace of a failure) → propose **`/spec-bug`**.
204
+ - **Defect on a released version** — the defect is on what is deployed ("in
205
+ prod", "since v2.1") → propose **`/spec-hotfix`**.
206
+ - **Live outage** — a service down or degraded **right now**, users affected
207
+ as we speak → propose **`/spec-incident`**.
208
+
209
+ **Always confirm; never silently switch.** Name the signal in the user's own
210
+ words, propose the destination with a one-line reason, and let them decide. A
211
+ decline carries the grill on where it was, and the same signal is not raised
212
+ again. A signal is a question, never a verdict: a pasted stack trace in
213
+ "handle this error nicely" is a feature request. When one description carries
214
+ several signals, propose the most specific destination —
215
+ **incident > hotfix > bug**.
216
+
217
+ **On a confirmed switch, hand off in-session and carry the context.** Invoke
218
+ the destination skill directly and seed it with everything the grilling has
219
+ already established — symptom, version, impact, repro material, decisions so
220
+ far — so it grills only what it still needs ("seed, don't skip, the grill",
221
+ exactly as issue adoption does). Do not stop and tell the user to retype: that
222
+ shape belongs to Phase 0's label routing, which fires before any grilling has
223
+ happened and so has nothing to lose. The full routing matrix lives in
224
+ `.claude/rules/spec-planning.md`.
225
+
191
226
  ### Propose the kind — feature, chore or issue
192
227
 
193
228
  This skill writes three kinds of spec, and
@@ -215,10 +250,13 @@ the point.
215
250
 
216
251
  There is no `/spec-chore` or `/spec-issue` and none should be added: one entry
217
252
  point, one grill, and the kind is an output of understanding the work rather
218
- than a door the user must pick before describing it. The one kind with its own
219
- door is the **incident** — an outage or degradation of a live service, which
220
- needs a different grill and starts mid-flight — so when the grilling uncovers
221
- one, hand off to **`/spec-incident`** rather than writing it here.
253
+ than a door the user must pick before describing it. The kinds with their own
254
+ doors — bug, hotfix, and the **incident**, an outage or degradation of a live
255
+ service that needs a different grill and starts mid-flight — are the watch's
256
+ business above: when the grilling uncovers one, hand off to **`/spec-bug`**,
257
+ **`/spec-hotfix`** or **`/spec-incident`** rather than writing it here, and it
258
+ is never too late to propose that — reaching this proposal with the signal
259
+ unraised is a missed watch, not a reason to write the wrong kind.
222
260
 
223
261
  ## Phase B — write the spec
224
262
 
@@ -294,6 +332,28 @@ move to, **warn, don't refuse**, and say the trailer for that commit wants
294
332
  a feature, `chore-` for a chore, `issue-` for an issue (the bug counterpart
295
333
  uses `bug-`, the incident one `incident-`).
296
334
 
335
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
336
+ Run `skitterspec spec-sync ownership --json` once and read both values:
337
+
338
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
339
+ this skill **writes no `> **Status:**` header and appends no State log row**,
340
+ wherever its steps below say to. A spec this skill creates gets neither: its
341
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
342
+ has stamped the url, and its body has no `## State log` section. Readiness is
343
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
344
+ empty — so nothing is lost with the header.
345
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
346
+ **writes no `> **Developer:**` line** either.
347
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
348
+ — is cannot-tell, and the steps below run exactly as written.
349
+
350
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
351
+ the code, not a planning status), the phase files and index, and the Changelog.
352
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
353
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
354
+ any of these lines keeps them untouched: they are history, and nothing rewrites
355
+ them.
356
+
297
357
  Use this template (keep it **as concise as possible** — no filler, no restating
298
358
  the codebase, link rather than duplicate):
299
359
 
@@ -318,10 +378,20 @@ the codebase, link rather than duplicate):
318
378
  > "none: not user-facing". An empty value or a bare
319
379
  > "none" is not a valid outcome — see Phase A item 10>
320
380
 
381
+ ## Summary
382
+
383
+ <1–3 sentences: what the work delivers, for someone who will never open the
384
+ spec — no phase breakdown, no implementation detail. With a ticketing provider
385
+ in summary mode this is what the ticket leads with.>
386
+
321
387
  ## Problem
322
388
 
323
389
  <2–6 sentences: what's wrong/missing and why it matters. No fluff.>
324
390
 
391
+ ## Acceptance criteria
392
+
393
+ - <an observable check, from Phase A item 2 — one per line>
394
+
325
395
  ## Decisions
326
396
 
327
397
  <Numbered, confirmed decisions from Phase A. Each: the choice + one-line why,
@@ -431,6 +501,11 @@ Rules for the spec body:
431
501
  - **Changelog** is mandatory and lives in the spec. Every later decision or
432
502
  course-correction gets a dated one-line entry. Convert relative dates to
433
503
  absolute.
504
+ - **`## Summary` and `## Acceptance criteria` are the ticket-facing pair.**
505
+ Write them for a reader on the board, not the one building it: the summary
506
+ says what the work delivers, each criterion is something a person can check.
507
+ A ticketing provider in summary mode projects exactly these (plus the
508
+ Impact table's surfaces, Gating and progress) and nothing else.
434
509
  - Keep it tight. If a section adds no information, delete it.
435
510
 
436
511
  ## Phase C — finish up
@@ -514,6 +589,18 @@ on the branch you are standing on — so a spec left on its own branch would be
514
589
  invisible to everyone, including the next `/spec` run. The commit goes on the
515
590
  branch and then the branch goes onto the base:
516
591
 
592
+ **Unless the project set `land.specDocs: "branch"`** — the lane for a base
593
+ branch nobody may push, where the spec document rides the feature branch and
594
+ lands with the work's PR. There both verdicts commit on the branch and
595
+ **skip the integrate below entirely**; `commit-start` carries into
596
+ `/spec-start` over the same worktree exactly as ever, and plain `commit` keeps
597
+ the branch AND the worktree, because they are now the only copy of the
598
+ document. Say the trade out loud in the report's `Notes`: the backlog is found
599
+ through the tracker listing (or `git branch`), not `ls specs/backlog/` on base
600
+ — and a later `/spec-cancel` of a never-started branch-mode spec deletes the
601
+ branch and worktree with the spec document dying with them, no PR ever having
602
+ existed. Under the default `"trunk"` everything below applies unchanged.
603
+
517
604
  ```
518
605
  skitterspec spec-env integrate <name>
519
606
  ```
@@ -635,7 +722,9 @@ If it's absent, skip this entirely — the spec stays local-only and the skill
635
722
  behaves exactly as above. When present, link the spec you just wrote so status
636
723
  and discussion live in Jira while the repo stays the source of truth. A spec is
637
724
  a Jira **issue**; each phase is a **subtask**, carrying that phase's tasks in
638
- its description as a read-only checklist.
725
+ its description as a read-only checklist. That is the `spec` description mode;
726
+ under `summary` (a new config's default) the issue and each sub-issue carry
727
+ a short block instead, and the phase's tasks stay in git.
639
728
 
640
729
  **Linking is just the first push**, so it runs the same engine path `/spec-push`
641
730
  does — you never create the issue by hand:
@@ -150,6 +150,38 @@ Bugs are concrete — confirm, don't over-grill. Establish:
150
150
  against the broken one (the bug usually lives in the differential). Do NOT
151
151
  patch a symptom before you understand the cause.
152
152
 
153
+ ### Watch for the other doors — hotfix, incident, or not a bug at all
154
+
155
+ The investigation above is where mis-entry shows, so watch it for the signals
156
+ that mark the other kinds and raise the hand-off the moment one appears —
157
+ before the failing test is written, while nothing is on disk
158
+ (`.claude/rules/spec-planning.md` carries the full routing matrix):
159
+
160
+ - **On a released version** — the defect is on what is deployed ("in prod",
161
+ "since v2.1") → propose **`/spec-hotfix`**. This is the escalation that must
162
+ not be missed: a fix built here lands on `main` and never reaches the
163
+ running version.
164
+ - **Live outage** — a service down or degraded **right now** → propose
165
+ **`/spec-incident`**; the record comes first, and the fix returns as a
166
+ linked spec.
167
+ - **Not a defect** — the ask is new or changed behaviour, not restoring
168
+ intended behaviour → propose **`/spec`**, whose kind proposal picks feature,
169
+ chore or issue from there.
170
+
171
+ **Always confirm; never silently switch** — name the signal in the user's own
172
+ words with a one-line reason, and a decline carries this skill on where it
173
+ was, the same signal not raised again. When several signals appear at once,
174
+ propose the most specific destination — incident over hotfix.
175
+ **On a confirmed switch, hand off in-session and carry the context**: invoke
176
+ the destination skill directly and seed it with what §1 established — symptom,
177
+ repro, root-cause notes, any version named — so it grills only what it still
178
+ needs.
179
+
180
+ **Once the failing test exists, the repro is evidence, not a question to re-litigate**
181
+ — but evidence can still escalate: a red test that also fails at
182
+ the released tag is the hotfix signal with proof attached, and the hand-off
183
+ carries the failing test across.
184
+
153
185
  ## 2. Isolate the fix in a worktree — when isolation is enabled
154
186
 
155
187
  **Only when per-spec isolation is enabled** (`specs/.core/env.config.json`
@@ -259,6 +291,28 @@ split it into phase files (`01-<slug>.md`, `02-…`) with a phase index in
259
291
  `00-overview.md`, exactly like a feature spec. It starts in `in-progress`
260
292
  because work is already underway. Keep it lean:
261
293
 
294
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
295
+ Run `skitterspec spec-sync ownership --json` once and read both values:
296
+
297
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
298
+ this skill **writes no `> **Status:**` header and appends no State log row**,
299
+ wherever its steps below say to. A spec this skill creates gets neither: its
300
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
301
+ has stamped the url, and its body has no `## State log` section. Readiness is
302
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
303
+ empty — so nothing is lost with the header.
304
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
305
+ **writes no `> **Developer:**` line** either.
306
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
307
+ — is cannot-tell, and the steps below run exactly as written.
308
+
309
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
310
+ the code, not a planning status), the phase files and index, and the Changelog.
311
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
312
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
313
+ any of these lines keeps them untouched: they are history, and nothing rewrites
314
+ them.
315
+
262
316
  ```markdown
263
317
  # Bug: <short title>
264
318
 
@@ -337,7 +391,9 @@ If it's absent, skip this entirely — the spec stays local-only and the skill
337
391
  behaves exactly as above. When present, link the spec you just wrote so status
338
392
  and discussion live in Jira while the repo stays the source of truth. A spec is
339
393
  a Jira **issue**; each phase is a **subtask**, carrying that phase's tasks in
340
- its description as a read-only checklist.
394
+ its description as a read-only checklist. That is the `spec` description mode;
395
+ under `summary` (a new config's default) the issue and each sub-issue carry
396
+ a short block instead, and the phase's tasks stay in git.
341
397
 
342
398
  **Linking is just the first push**, so it runs the same engine path `/spec-push`
343
399
  does — you never create the issue by hand:
@@ -37,6 +37,28 @@ it verbatim/condensed for the header.
37
37
 
38
38
  ## 4. Stamp the spec
39
39
 
40
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
41
+ Run `skitterspec spec-sync ownership --json` once and read both values:
42
+
43
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
44
+ this skill **writes no `> **Status:**` header and appends no State log row**,
45
+ wherever its steps below say to. A spec this skill creates gets neither: its
46
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
47
+ has stamped the url, and its body has no `## State log` section. Readiness is
48
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
49
+ empty — so nothing is lost with the header.
50
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
51
+ **writes no `> **Developer:**` line** either.
52
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
53
+ — is cannot-tell, and the steps below run exactly as written.
54
+
55
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
56
+ the code, not a planning status), the phase files and index, and the Changelog.
57
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
58
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
59
+ any of these lines keeps them untouched: they are history, and nothing rewrites
60
+ them.
61
+
40
62
  Update the **Status** header in the entry point so the reason is visible at the
41
63
  top:
42
64
 
@@ -75,6 +97,10 @@ Jira credentials are set (see `apply.transport` in `jira.config.md`).
75
97
  complete/cancelled/reviewed in the repo regardless; the mirror is disposable
76
98
  and the next push repairs it. Do not roll anything back, and do not stop to
77
99
  ask.
100
+ - **In `/spec-complete`'s PR mode this push belongs to run 2.** Run 1 readies
101
+ a PR, and a ready PR is not a merged one — so skip it on run 1, even where
102
+ the `branch` lane committed the move to ride the PR, and run it on run 2 once
103
+ the host has merged. The tracker's Done lands when the work does.
78
104
  - **Say what happened** in the skill's report: mirror updated, skipped as
79
105
  unlinked, or failed with the reason.
80
106
  - **There is no assignment to release here.** Assignment sync is not yet
@@ -252,6 +278,15 @@ only ordering that survives.
252
278
  copy of abandoned work. Seeing no such section here is the expected case, not
253
279
  a fault — and if the user wants the remote branch gone anyway, that is their
254
280
  call to make explicitly, not something to tidy away on their behalf.
281
+
282
+ **In PR mode the same confirm-first section may carry the PR abandon**
283
+ (`gh pr close` / `az repos pr update --status abandoned`): a cancelled spec
284
+ must not leave a live PR behind — it is noise with a merge button on it.
285
+ The teardown of an open-PR spec is refused unforced (the PR is named), so
286
+ this line appears on the forced run the refusal led to; ask before running
287
+ it like the delete above, and run the abandon **before** any remote branch
288
+ delete — closing the PR first is what stops the host complaining about a
289
+ deleted source branch.
255
290
  4. `skitterspec spec-env prune` — reap orphaned test-DB volumes that belong to no
256
291
  live spec (leftovers from declined/aborted teardowns or manual worktree
257
292
  removal). Show the orphan list and, **only on the user's confirmation**, run
@@ -102,6 +102,29 @@ feature was designed not to disturb.
102
102
 
103
103
  - Tick all completed tasks in the phase files; flip every finished phase-file
104
104
  heading **and** every row in the `00-overview.md` phase index to `✅`.
105
+
106
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
107
+ Run `skitterspec spec-sync ownership --json` once and read both values:
108
+
109
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
110
+ this skill **writes no `> **Status:**` header and appends no State log row**,
111
+ wherever its steps below say to. A spec this skill creates gets neither: its
112
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
113
+ has stamped the url, and its body has no `## State log` section. Readiness is
114
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
115
+ empty — so nothing is lost with the header.
116
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
117
+ **writes no `> **Developer:**` line** either.
118
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
119
+ — is cannot-tell, and the steps below run exactly as written.
120
+
121
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
122
+ the code, not a planning status), the phase files and index, and the Changelog.
123
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
124
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
125
+ any of these lines keeps them untouched: they are history, and nothing rewrites
126
+ them.
127
+
105
128
  - Set the **Status** header in the entry point:
106
129
  `> **Status:** Complete (<YYYY-MM-DD>)`.
107
130
  - Append a **State log** row:
@@ -136,6 +159,10 @@ Jira credentials are set (see `apply.transport` in `jira.config.md`).
136
159
  complete/cancelled/reviewed in the repo regardless; the mirror is disposable
137
160
  and the next push repairs it. Do not roll anything back, and do not stop to
138
161
  ask.
162
+ - **In `/spec-complete`'s PR mode this push belongs to run 2.** Run 1 readies
163
+ a PR, and a ready PR is not a merged one — so skip it on run 1, even where
164
+ the `branch` lane committed the move to ride the PR, and run it on run 2 once
165
+ the host has merged. The tracker's Done lands when the work does.
139
166
  - **Say what happened** in the skill's report: mirror updated, skipped as
140
167
  unlinked, or failed with the reason.
141
168
  - **There is no assignment to release here.** Assignment sync is not yet
@@ -288,6 +315,27 @@ in that order, and stops at the first step that fails:
288
315
  **Then stop: the worktree is kept** (step 7). The branch is what the next
289
316
  `-hotfix.N` is cut from if this deploy fails, so it waits for the deploy.
290
317
 
318
+ **A branch-based hotfix** (`> **Base version:** <branch>@<sha>`, from
319
+ `hotfix.releaseBranch`) runs the same command and the same consent ask — the
320
+ engine picks the path from the header. What differs is what it does:
321
+
322
+ - it **rebases** onto `<remote>/<branch>` and **lands on the release branch** by
323
+ `land.strategy`: under `ff` the push of the hotfix onto that branch *is* the
324
+ land (so the consent ask names the release branch, not only a tag); under `pr`
325
+ it pushes the hotfix branch and opens a **ready** PR, then holds with
326
+ `the PR into <branch> is open` — re-run the same command once it merges;
327
+ - the **tag** is optional (`hotfix.tag`): cut and pushed after the land, or not
328
+ at all;
329
+ - the **carry** goes to the resolved base — the current rc under
330
+ `baseBranchPattern` — directly under `ff`, through a `carry/<slug>` branch and
331
+ its own ready PR under `pr`.
332
+
333
+ `Landed` then names the release branch, how it landed (fast-forward, or the PR
334
+ and whether it merged), the tag if one was cut, and the carry. A PR still
335
+ waiting on its merge is a `⚠️` — the land is not done until the host says so.
336
+ `spec-env hotfix finish` tears it down once both the land and the carry are
337
+ confirmed, naming every check that is not.
338
+
291
339
  ### 6-feature/bug. `Type: Feature` / `Type: Bug` — rebase + fast-forward
292
340
 
293
341
  Land the finished branch on the base branch so the work reaches `main` (or your
@@ -323,6 +371,19 @@ is finished — e.g. to run a later phase in CI or a shared test env? Use
323
371
  `git -C <worktree> rebase --abort`, relay the conflict, and **stop** — leave it
324
372
  to the user; do not tear anything down.
325
373
  On a **no-op** ("already landed"), just say so and continue.
374
+
375
+ **Under a rolling base** (`baseBranchPattern` in `env.config.json`) the plan
376
+ can carry two more things, and both are the engine's to say:
377
+ - a `git -C <mainRepoPath> switch <base>` (or `switch -c … --track`) **first**,
378
+ when the primary checkout still has an older release candidate out — run it
379
+ in order with the rest;
380
+ - a `retarget: forked from <old> · landing onto <new>` line, when the rc
381
+ rolled while this spec was in flight. It is the land working, not a fault:
382
+ relay it verbatim in the `Landed` row so the reader sees where the work went.
383
+
384
+ A refusal naming `no branch matches <pattern>` means no release candidate is
385
+ visible — usually not fetched. Relay it, stop with `⏸`, and name
386
+ `skitterspec spec-env base` (it fetches and lists) as the next step.
326
387
  3. **Run the after-land commands.** Where the plan ends with a
327
388
  `then, in the primary checkout (<path>), run:` section — the project's
328
389
  `afterLand`, such as a data migration — run those commands in that
@@ -342,6 +403,58 @@ is finished — e.g. to run a later phase in CI or a shared test env? Use
342
403
  5. **Report** the landing (base branch, fast-forward result). It **never pushes** —
343
404
  mention the user can `git push` the base branch themselves.
344
405
 
406
+ ### 6-pr. PR mode (`land.strategy: "pr"`) — dispose, push, ready; finish after the merge
407
+
408
+ Completion is **two runs** here, the `hotfix land`/`finish` shape: the merge is
409
+ the host's act and may be days away, so the run that readies the PR cannot also
410
+ finalise. Which run this is, the engine says: `spec-env integrate <name>`
411
+ printing a `(pr)` plan is run 1; printing
412
+ `already landed … — finish what the merge deferred` is run 2.
413
+
414
+ **Run 1 — the last control point.** Once the PR is ready, anyone can merge from
415
+ the host UI and the tracker's automations act — so everything that needs a
416
+ person happens before the ready, in this order:
417
+
418
+ 1. **Disposition pass — mandatory, before anything is pushed.** Run
419
+ `skitterspec spec-env disposition <name> --json`. For every unticked task,
420
+ non-✅ phase and surfaced follow-up it lists, the user disposes it:
421
+ **tick** (it was done — tick it, naming the evidence) · **spin off** (a
422
+ follow-on ticket minted now, linked to this one — offer `/spec` or the
423
+ provider's mint) · **drop** (a dated Changelog line with the reason, the
424
+ `none: <reason>` grammar). Batch the asking; never decide for them, and
425
+ never auto-create. **Refuse to ready the PR while anything is undisposed**
426
+ — you asked the enumeration, so it cannot also be fine. `clean` proceeds
427
+ with nothing asked.
428
+ 2. **Consent, naming the target.** Ask once, plainly:
429
+ *"push `<branch>` and open the PR into `<base>` on `<remote>`, ready for
430
+ merge?"* — the base branch is named so a spec that outlived a release roll
431
+ is caught by the person reading a stale rc name. On a no, stop with the
432
+ held commands relayed.
433
+ 3. **Run the plan.** `skitterspec spec-env integrate <name> --push` and run
434
+ what it prints: fetch, rebase onto `<remote>/<base>`, the push, and the PR
435
+ create — or, where a draft already exists, the flip-to-ready. A rebase
436
+ conflict aborts and stops exactly as 6-feature/bug step 2.
437
+ 4. **Defer the finalise.** §4's bucket move follows the spec documents'
438
+ `land.specDocs` lane: under `trunk` leave the spec in `specs/in-progress/`
439
+ — run 2 moves it on base after the merge; under `branch` commit the move on
440
+ the branch *before* step 3 so it rides the PR. Either way
441
+ **the tracker's Done waits for run 2**: a ready PR is not a merged one.
442
+ 5. **Stop, keeping the worktree.** Report
443
+ `Landed: PR #N opened — finish after merge` (or `ready`), spec
444
+ `In Progress`, worktree standing. No afterLand runs — the plan deferred it
445
+ — and no teardown. The merge is what un-blocks run 2; nothing here waits on
446
+ it.
447
+
448
+ **Run 2 — after the host merges.** `integrate` recognises the landed branch
449
+ (ancestry or the host's answer) and prints the finish: catch local base up and
450
+ the deferred `afterLand` with the land's own range. Run those, then do what run
451
+ 1 deferred — the §4 move (trunk lane) with its State log row and commit, the
452
+ §5 report — then **§7 teardown runs as normal**:
453
+ a host-merged branch counts as landed (squash and rebase
454
+ merges included), and a host that auto-deleted the branch makes the remote
455
+ delete an already-gone no-op, never a failure. Re-test on base before calling
456
+ it done, exactly as 6-feature/bug step 4.
457
+
345
458
  ## 7. Tear down the environment (opt-in, only if configured)
346
459
 
347
460
  **A hotfix is torn down later, by `hotfix finish`.**
@@ -148,6 +148,16 @@ it happens differs (`/spec` writes the spec in Phase B, `/spec-bug` in its step
148
148
 
149
149
  ## 1. Establish the base version (the tag)
150
150
 
151
+ **A release BRANCH instead of a tag.** Where `env.config.json` sets
152
+ `hotfix.releaseBranch` (e.g. `"master"` — a team whose prod is whatever that
153
+ branch holds), there is **no tag to ask for**: skip the questions below and run
154
+ §3's `up` **without `--from`**. The engine fetches, forks from the remote's head
155
+ of that branch, and prints two lines — `fork:` naming the commit, and
156
+ `record: > **Base version:** <branch>@<sha>` — and §5 copies that `record:`
157
+ value into the header **verbatim**. Say which commit it forked from in one line;
158
+ that is the version the fix is built on. The rest of this section is the tag
159
+ flow, unchanged.
160
+
151
161
  - **Read the arguments.** `/spec-hotfix <tag> <name>` (e.g.
152
162
  `/spec-hotfix v33.16.4 login-crash`). An argument shaped like an issue
153
163
  reference — letters, a hyphen, digits (`SKI-123`) —
@@ -177,6 +187,27 @@ Hotfixes are concrete — confirm, don't over-grill. Establish:
177
187
  - **Root cause:** read the code **at the base tag** and trace it to `file:line`.
178
188
  The fix belongs on the tag's line, so reason about that code, not `main`'s.
179
189
 
190
+ ### Watch for the other doors — incident, bug, or not a defect
191
+
192
+ This is the most specific defect door, so most mis-entries route *down*
193
+ (`.claude/rules/spec-planning.md` carries the full routing matrix):
194
+
195
+ - **Live outage** — the released version is not just wrong but down or
196
+ degraded **right now** → propose **`/spec-incident`**; the record comes
197
+ first, and the fix returns here as a linked hotfix spec.
198
+ - **Not on a released version** — §1 cannot name a deployed tag the defect is
199
+ on (it exists only on `main`, or prod runs something newer that is fine) →
200
+ propose **`/spec-bug`**; a hotfix branch for something `main` can carry is
201
+ waste, not safety.
202
+ - **Not a defect** — the ask is new or changed behaviour, not restoring
203
+ intended behaviour → propose **`/spec`**.
204
+
205
+ **Always confirm; never silently switch** — name the signal in the user's own
206
+ words with a one-line reason; a decline carries this skill on where it was.
207
+ **On a confirmed switch, hand off in-session and carry the context**
208
+ established so far — the symptom, the repro, any version discussion — so the
209
+ destination grills only what it still needs.
210
+
180
211
  ## 3. Provision the worktree from the tag, then write in it
181
212
 
182
213
  **Provision before you write, not after.** §1 settled the tag and the name and
@@ -244,6 +275,10 @@ installs `.claude/hooks/main-guard.cjs` that first write is refused outright,
244
275
  and a step whose documented opening the repo will not perform is not a step. The
245
276
  spec is written in the worktree at §5, on the branch it belongs to.
246
277
 
278
+ **Branch-based (`hotfix.releaseBranch`):** run the same command **without**
279
+ `--from` — the engine picks the release branch's head and prints the
280
+ `record:` line §5 copies. An explicit `--from` still wins over it.
281
+
247
282
  **§5 records the same tag you passed to `--from`**, on the spec's
248
283
  `> **Base version:**` header. That is not bookkeeping: `/spec-complete` cuts the
249
284
  release and carries the fix off the header, so a worktree forked from one ref and
@@ -282,6 +317,28 @@ you there, so create the folder and write it here. A hotfix
282
317
  is usually a single-pass fix, so the `## Fix` block can live directly in
283
318
  `00-overview.md`. Keep it lean:
284
319
 
320
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
321
+ Run `skitterspec spec-sync ownership --json` once and read both values:
322
+
323
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
324
+ this skill **writes no `> **Status:**` header and appends no State log row**,
325
+ wherever its steps below say to. A spec this skill creates gets neither: its
326
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
327
+ has stamped the url, and its body has no `## State log` section. Readiness is
328
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
329
+ empty — so nothing is lost with the header.
330
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
331
+ **writes no `> **Developer:**` line** either.
332
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
333
+ — is cannot-tell, and the steps below run exactly as written.
334
+
335
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
336
+ the code, not a planning status), the phase files and index, and the Changelog.
337
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
338
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
339
+ any of these lines keeps them untouched: they are history, and nothing rewrites
340
+ them.
341
+
285
342
  ```markdown
286
343
  # Hotfix: <short title>
287
344
 
@@ -290,7 +347,7 @@ is usually a single-pass fix, so the `## Fix` block can live directly in
290
347
  > **Status:** In Progress — fixing (red test added)
291
348
  > **Author:** <git user.name — who reported/captured it>
292
349
  > **Developer:** <git user.name — you, since you're fixing it now>
293
- > **Base version:** <tag prod is running, e.g. v33.16.4>
350
+ > **Base version:** <tag prod is running, e.g. v33.16.4 — or, branch-based, the `record:` value `up` printed, e.g. master@1a2b3c4d5e6f>
294
351
  > **Raised:** <YYYY-MM-DD (today)>
295
352
  > **Area:** <files/modules>
296
353
  > **Severity:** <Azure's literal values, "1 - Critical" … "4 - Low" — optional;
@@ -369,7 +426,9 @@ If it's absent, skip this entirely — the spec stays local-only and the skill
369
426
  behaves exactly as above. When present, link the spec you just wrote so status
370
427
  and discussion live in Jira while the repo stays the source of truth. A spec is
371
428
  a Jira **issue**; each phase is a **subtask**, carrying that phase's tasks in
372
- its description as a read-only checklist.
429
+ its description as a read-only checklist. That is the `spec` description mode;
430
+ under `summary` (a new config's default) the issue and each sub-issue carry
431
+ a short block instead, and the phase's tasks stay in git.
373
432
 
374
433
  **Linking is just the first push**, so it runs the same engine path `/spec-push`
375
434
  does — you never create the issue by hand:
@@ -37,6 +37,28 @@ Ask for exactly these, batched, with nothing speculative:
37
37
  A root cause is **not** grilled: nobody has it yet, and the Timeline is where
38
38
  the investigation lands as it happens.
39
39
 
40
+ ### No live outage to record — route to the right door
41
+
42
+ This is the costliest door to enter wrongly — no backlog stop, no review page,
43
+ straight into `specs/in-progress/` — so the grill's own answers are also its
44
+ exit. When items 1 and 2 establish there is **no outage to record** — nothing
45
+ is down or degraded, it never was live, or it is a risk rather than an event —
46
+ propose the right door instead of writing an incident
47
+ (`.claude/rules/spec-planning.md` carries the full routing matrix):
48
+
49
+ - a **defect** → **`/spec-bug`**, or **`/spec-hotfix`** when it is on a
50
+ released version;
51
+ - anything else → **`/spec`**, whose kind proposal picks feature, chore or
52
+ issue from there.
53
+
54
+ **A past outage someone wants a record of stays an incident**: "it is over" is
55
+ not "it never happened" — the signal is *no outage to record*, not *no outage
56
+ now*. This check is the grill's existing questions read honestly, never an
57
+ extra round trip, and the hand-off contract is the same as everywhere else:
58
+ confirm first, naming the signal in the user's own words; a decline carries
59
+ this skill on; on a confirmed switch invoke the destination skill in-session,
60
+ seeded with everything already established.
61
+
40
62
  ## 2. Write it, in flight
41
63
 
42
64
  Pick a short kebab name prefixed `incident-` (e.g. `incident-api-outage`).
@@ -50,6 +72,28 @@ this spec. Without isolation, write where you stand.
50
72
  The spec is a folder in **`specs/in-progress/`** — never backlog — with
51
73
  `00-overview.md` and one phase file:
52
74
 
75
+ **Who owns this spec's status.** Only when `specs/.core/jira.config.json` exists.
76
+ Run `skitterspec spec-sync ownership --json` once and read both values:
77
+
78
+ - **`workflowState: "pull"`** — Jira is the record of this spec's status, so
79
+ this skill **writes no `> **Status:**` header and appends no State log row**,
80
+ wherever its steps below say to. A spec this skill creates gets neither: its
81
+ header carries `> **Tracker:** <issue url>` instead, filled in once linking
82
+ has stamped the url, and its body has no `## State log` section. Readiness is
83
+ the spec's own content — a `Draft` is a spec whose **Open questions** is not
84
+ empty — so nothing is lost with the header.
85
+ - **`assignee: "pull"`** — Jira holds who is building it, so this skill
86
+ **writes no `> **Developer:**` line** either.
87
+ - **Anything else** — `push`, `none`, sync reported off, or the command failing
88
+ — is cannot-tell, and the steps below run exactly as written.
89
+
90
+ What `pull` leaves alone: the folder move (a bucket records what the repo did to
91
+ the code, not a planning status), the phase files and index, and the Changelog.
92
+ A reason a `Status:` header would have carried — a cancellation's, a knock-back
93
+ to Draft — goes in a dated Changelog line instead. A spec that already carries
94
+ any of these lines keeps them untouched: they are history, and nothing rewrites
95
+ them.
96
+
53
97
  ```markdown
54
98
  # Incident: <short title>
55
99
 
@@ -119,13 +119,35 @@ Then settle the four bucket→status names against that list:
119
119
  Each answer that differs from the defaults becomes a `--state <bucket>=<name>`
120
120
  flag in step 6.
121
121
 
122
+ ## 5b. What does a ticket carry?
123
+
124
+ Ask once, with the recommendation first — this decides what the team sees on
125
+ every ticket, so it is theirs to choose rather than a default to inherit:
126
+
127
+ - **`summary`** *(recommended — what `init-config` writes)* — the ticket holds a
128
+ short delimited block: the spec's summary, its acceptance criteria, the
129
+ surfaces it touches, its gating and its progress. Push splices that block in
130
+ beside whatever the team writes, which no push ever touches. The spec itself
131
+ stays in git.
132
+ - **`spec`** — the whole overview is the ticket body, replaced on every push.
133
+ Pass `--description spec` to `init-config`.
134
+
135
+ Jira's block is marked with a heading for now (`summary.delimiter`), provisional
136
+ until a measured run settles which delimiter Jira's editor keeps.
137
+
138
+ Then name the phase mode, without asking unless they raise it:
139
+ `mapping.phases` stays `subissue` — one assignable sub-issue per phase, which
140
+ is what lets phases run in parallel. `deferred` (minted at `/spec-start`),
141
+ `inline` and `none` (no sub-issues at all) are one edit to the file away.
142
+
122
143
  ## 6. Write it
123
144
 
124
145
  ```
125
146
  skitterspec spec-sync init-config \
126
147
  --site-url https://<site>.atlassian.net --project-key PROJ \
127
148
  [--issue-type Task] [--subtask-type Subtask] \
128
- [--state <bucket>=<name> …] [--force] [--json]
149
+ [--state <bucket>=<name> …] [--force] [--json] \
150
+ [--description summary|spec]
129
151
  ```
130
152
 
131
153
  The engine writes **only the keys that differ from the defaults**, so the file