@skitterbyte/skitterspec-jira 1.2.2 → 2.1.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.
- package/MIGRATION.md +170 -1
- package/README.md +3 -1
- package/assets/core/SETUP.md +1 -1
- package/assets/core/env.config.md +1 -1
- package/assets/core/jira.config.json.example +1 -0
- package/assets/core/jira.config.md +34 -6
- package/assets/rules/spec-planning.md +35 -12
- package/assets/rules/spec-reports.md +28 -2
- package/assets/skills/no-spec/SKILL.md +2 -2
- package/assets/skills/spec/SKILL.md +31 -8
- package/assets/skills/spec-bug/SKILL.md +2 -2
- package/assets/skills/spec-jira-setup/SKILL.md +2 -1
- package/assets/skills/spec-next/SKILL.md +2 -2
- package/assets/skills/spec-status/SKILL.md +27 -25
- package/assets/skills/spec-sync/SKILL.md +6 -4
- package/package.json +1 -1
- package/src/cli.js +108 -3
- package/src/env/resolve.js +11 -4
- package/src/env/review.js +79 -0
- package/src/vendor/jira/cli-sync.js +21 -12
- package/src/vendor/jira/config.js +21 -17
- package/src/vendor/provider-kit/src/config.js +101 -48
- package/src/vendor/provider-kit/src/list-assignee.js +71 -0
- package/src/vendor/provider-kit/src/list-rows.js +35 -0
- package/src/vendor/provider-kit/src/released.js +27 -77
- package/src/vendor/provider-kit/src/specs.js +89 -7
- package/src/vendor/sync-core/index.js +3 -4
- package/src/vendor/sync-core/src/compare.js +6 -6
- package/src/vendor/sync-core/src/normalize.js +60 -59
- package/src/vendor/provider-kit/src/releases.js +0 -595
|
@@ -44,7 +44,7 @@ In a project that installs the Jira superset the binary is
|
|
|
44
44
|
| "link this spec to PROJ-1 by hand" | `stamp <spec> --issue PROJ-1` |
|
|
45
45
|
| "mirror the whole backlog / every complete spec" | `apply --all <bucket>` — **confirm first** |
|
|
46
46
|
| "what ticket am I on?", writing a commit | `ref` |
|
|
47
|
-
| "what shipped in this release?" | `released` |
|
|
47
|
+
| "what shipped in this release?", "which tickets does CI mark deployed?" | `released` — `--json` for a script; recording deploys is the project's own |
|
|
48
48
|
| "is any of this wired up?", "why isn't sync working?" | `doctor` — scaffold, isolation, tracker and credentials in one |
|
|
49
49
|
| "set my Jira credentials", "am I authenticated?" | `credentials <status\|set\|unset>` |
|
|
50
50
|
| push one spec, or "what would push?" | **defer** — see below |
|
|
@@ -66,7 +66,7 @@ Two front doors to one write path is worse than none:
|
|
|
66
66
|
|
|
67
67
|
- **Push one spec** → `/spec-push`. It owns the transport choice, the
|
|
68
68
|
status-name gate, the plan, the apply, the stamping and the snapshot.
|
|
69
|
-
- **Per-spec
|
|
69
|
+
- **Per-spec status** ("is this spec in sync?", "what would push?") →
|
|
70
70
|
`/spec-status`.
|
|
71
71
|
|
|
72
72
|
Say which skill you're handing to and stop; don't reimplement either.
|
|
@@ -170,8 +170,10 @@ and never write `Refs: none`.
|
|
|
170
170
|
|
|
171
171
|
`released` reports the tickets in a commit range — by default since the most
|
|
172
172
|
recent tag, and it always prints the range it chose so a wrong default is
|
|
173
|
-
visible. It is **read-only**: it does not move anything in Jira.
|
|
174
|
-
|
|
173
|
+
visible. It is **read-only**: it does not move anything in Jira. Each ticket
|
|
174
|
+
row names the `spec` and `url` behind it (`null` when no spec linked the ref),
|
|
175
|
+
so `--json` is what a project's CI pipes into its own tooling to record a
|
|
176
|
+
release or a deploy. Recording those is the project's job, not skitterspec's.
|
|
175
177
|
|
|
176
178
|
Relay the **unreferenced count** even when it is zero. A chore commit
|
|
177
179
|
legitimately carries no ticket and a *missed* trailer looks identical, so
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skitterbyte/skitterspec-jira",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Spec-driven development for Claude Code, with one-way Jira Cloud sync — a superset of @skitterbyte/skitterspec: the base filesystem workflow plus /spec-status · /spec-push and the spec-sync CLI. The repo is canonical; Jira is a generated mirror. Install this OR the base OR the Linear superset — exactly one.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"claude",
|
package/src/cli.js
CHANGED
|
@@ -119,6 +119,9 @@ const {
|
|
|
119
119
|
passesSince,
|
|
120
120
|
waitForPass,
|
|
121
121
|
WAIT_HEARTBEAT_MS,
|
|
122
|
+
WAIT_RESHOW_EVERY,
|
|
123
|
+
recordWaitStart,
|
|
124
|
+
reshowDue,
|
|
122
125
|
waitingPasses,
|
|
123
126
|
describePending,
|
|
124
127
|
pendingAge,
|
|
@@ -903,7 +906,7 @@ function specEnvUp(dir, config, specArg, flags = {}) {
|
|
|
903
906
|
try {
|
|
904
907
|
spec = resolveSpecWithWorktree(dir, config, specArg)
|
|
905
908
|
} catch (err) {
|
|
906
|
-
const specShaped = typeof specArg === 'string' && /^(feat|bug|hotfix)-./.test(specArg)
|
|
909
|
+
const specShaped = typeof specArg === 'string' && /^(feat|bug|hotfix|chore)-./.test(specArg)
|
|
907
910
|
if (err.code !== 'SPEC_NOT_FOUND' || !docs || !specShaped || config.mode === 'checkout') {
|
|
908
911
|
throw err
|
|
909
912
|
}
|
|
@@ -2761,6 +2764,74 @@ function resolveHeartbeatMs(flags) {
|
|
|
2761
2764
|
return seconds * 1000
|
|
2762
2765
|
}
|
|
2763
2766
|
|
|
2767
|
+
/**
|
|
2768
|
+
* Every this-many re-arms the stack is printed again. Default 5, `0` disables.
|
|
2769
|
+
* A value that is not a whole number takes the DEFAULT rather than disabling
|
|
2770
|
+
* (`.claude/rules/negative-checks.md` rule 4), the same as `--heartbeat`.
|
|
2771
|
+
*/
|
|
2772
|
+
function resolveReshowEvery(flags) {
|
|
2773
|
+
if (flags.reshowEvery === undefined || flags.reshowEvery === null) return WAIT_RESHOW_EVERY
|
|
2774
|
+
const n = Number(flags.reshowEvery)
|
|
2775
|
+
if (!Number.isInteger(n) || n < 0) return WAIT_RESHOW_EVERY
|
|
2776
|
+
return n
|
|
2777
|
+
}
|
|
2778
|
+
|
|
2779
|
+
/**
|
|
2780
|
+
* The review server that is running, read and never touched — or null.
|
|
2781
|
+
*
|
|
2782
|
+
* NOT `ensureReviewServer`. That one adopts, and where a server is stale it
|
|
2783
|
+
* replaces it, and a re-show that restarted the server would kill the link
|
|
2784
|
+
* open on the reader's phone in order to remind them of it. This reads the
|
|
2785
|
+
* pidfile and the settings and stops there.
|
|
2786
|
+
*
|
|
2787
|
+
* WHAT WOULD FOOL THIS: a pidfile left by a crash names a pid the OS may have
|
|
2788
|
+
* reused for something else. `isAlive` cannot tell those apart, so the URL it
|
|
2789
|
+
* offers could point at nothing — the same blind spot every adopt has, and the
|
|
2790
|
+
* cost is a dead link in a reminder, never a lost pass.
|
|
2791
|
+
*/
|
|
2792
|
+
function readRunningReviewServer(dir, config) {
|
|
2793
|
+
const abs = (rel) => path.resolve(dir, rel)
|
|
2794
|
+
const settingsFile = `${stateDirLabel(config)}/review-serve.json`
|
|
2795
|
+
const proc = serveProcFor(config, abs(settingsFile), { root: dir })
|
|
2796
|
+
const pid = readPid(abs(proc.pidFile))
|
|
2797
|
+
if (!pid || !isAlive(pid)) return null
|
|
2798
|
+
let settings = null
|
|
2799
|
+
try {
|
|
2800
|
+
settings = JSON.parse(fs.readFileSync(abs(settingsFile), 'utf-8'))
|
|
2801
|
+
} catch {
|
|
2802
|
+
return null
|
|
2803
|
+
}
|
|
2804
|
+
if (!settings || !settings.port) return null
|
|
2805
|
+
return {
|
|
2806
|
+
port: settings.port,
|
|
2807
|
+
token: settings.token || null,
|
|
2808
|
+
loopback: settings.host === '127.0.0.1' || settings.host === 'localhost',
|
|
2809
|
+
}
|
|
2810
|
+
}
|
|
2811
|
+
|
|
2812
|
+
/**
|
|
2813
|
+
* The stack a re-show prints: the same tiers and `live` a render reports, from
|
|
2814
|
+
* the same functions, with nothing rendered and nothing started.
|
|
2815
|
+
*/
|
|
2816
|
+
function reshowStack(dir, config, spec, out) {
|
|
2817
|
+
const cfg = withSpecRemote(config, out)
|
|
2818
|
+
const up = readRunningReviewServer(dir, cfg)
|
|
2819
|
+
const served = up ? reviewServedUrls(up, offerableLanAddresses(), spec.folder) : null
|
|
2820
|
+
const tiers = reviewTierStack({ served, fileUrl: reviewFileUrl(out), publishedUrl: readReviewUrl(out), config: cfg })
|
|
2821
|
+
let live = null
|
|
2822
|
+
try {
|
|
2823
|
+
const primaryState = assertPrimaryOnMain(cfg, gitReader(dir))
|
|
2824
|
+
live = liveStateFor(
|
|
2825
|
+
spec,
|
|
2826
|
+
liveContext(dir, cfg, spec, { onBase: primaryState.onBase, primaryBranch: primaryState.branch }),
|
|
2827
|
+
)
|
|
2828
|
+
} catch {
|
|
2829
|
+
// Cannot tell whether it is live — print no line rather than a wrong one.
|
|
2830
|
+
live = null
|
|
2831
|
+
}
|
|
2832
|
+
return { tiers, live }
|
|
2833
|
+
}
|
|
2834
|
+
|
|
2764
2835
|
async function specEnvReviewWait(dir, config, specArg, flags) {
|
|
2765
2836
|
let spec
|
|
2766
2837
|
try {
|
|
@@ -2794,10 +2865,28 @@ async function specEnvReviewWait(dir, config, specArg, flags) {
|
|
|
2794
2865
|
// SAID BEFORE THE FIRST POLL, not after it. The whole point is that a caller
|
|
2795
2866
|
// knows the wait is running; a line printed on the way out would arrive only
|
|
2796
2867
|
// for the waits that already worked.
|
|
2868
|
+
//
|
|
2869
|
+
// WHICH START THIS IS, counted per window. A wait that dies is re-armed on the
|
|
2870
|
+
// same `--since`, and every re-arm leaves a trace in the conversation, so
|
|
2871
|
+
// after enough of them the banner and its links have scrolled out of sight.
|
|
2872
|
+
// Every `reshowEvery`th re-arm prints the stack again, read-only, for the
|
|
2873
|
+
// skill to relay as the banner.
|
|
2874
|
+
const reshowEvery = resolveReshowEvery(flags)
|
|
2875
|
+
const started = recordWaitStart(out, spec.folder, flags.since)
|
|
2876
|
+
const rearm = started ? started.rearm : null
|
|
2877
|
+
const reshow = reshowDue(rearm, reshowEvery)
|
|
2878
|
+
const stack = reshow ? reshowStack(dir, config, spec, out) : null
|
|
2879
|
+
|
|
2797
2880
|
if (!flags.json) {
|
|
2798
2881
|
process.stdout.write(
|
|
2799
2882
|
`spec-env review wait: ${spec.folder} — waiting for a verdict sent since ${flags.since}` +
|
|
2800
|
-
`${timeoutMs === null ? '' : ` (up to ${flags.timeout}s)`}
|
|
2883
|
+
`${timeoutMs === null ? '' : ` (up to ${flags.timeout}s)`}` +
|
|
2884
|
+
`${rearm ? ` (re-arm ${rearm})` : ''}\n` +
|
|
2885
|
+
(stack
|
|
2886
|
+
? ` re-show: banner (re-arm ${rearm})\n` +
|
|
2887
|
+
stack.tiers.map((t) => reviewTierLine(t) + '\n').join('') +
|
|
2888
|
+
(liveStateLine(stack.live) ? `${liveStateLine(stack.live)}\n` : '')
|
|
2889
|
+
: ''),
|
|
2801
2890
|
)
|
|
2802
2891
|
}
|
|
2803
2892
|
|
|
@@ -2827,7 +2916,20 @@ async function specEnvReviewWait(dir, config, specArg, flags) {
|
|
|
2827
2916
|
})
|
|
2828
2917
|
|
|
2829
2918
|
if (flags.json) {
|
|
2830
|
-
process.stdout.write(
|
|
2919
|
+
process.stdout.write(
|
|
2920
|
+
`${JSON.stringify(
|
|
2921
|
+
{
|
|
2922
|
+
spec: spec.folder,
|
|
2923
|
+
since: flags.since,
|
|
2924
|
+
rearm,
|
|
2925
|
+
reshow,
|
|
2926
|
+
...(stack ? { tiers: stack.tiers, live: stack.live } : {}),
|
|
2927
|
+
...result,
|
|
2928
|
+
},
|
|
2929
|
+
null,
|
|
2930
|
+
2,
|
|
2931
|
+
)}\n`,
|
|
2932
|
+
)
|
|
2831
2933
|
}
|
|
2832
2934
|
|
|
2833
2935
|
if (result.state === 'arrived') {
|
|
@@ -5617,6 +5719,7 @@ async function specEnv(rest) {
|
|
|
5617
5719
|
claim: null,
|
|
5618
5720
|
offered: false,
|
|
5619
5721
|
heartbeat: null,
|
|
5722
|
+
reshowEvery: null,
|
|
5620
5723
|
drop: null,
|
|
5621
5724
|
buttons: null,
|
|
5622
5725
|
json: false,
|
|
@@ -5652,6 +5755,7 @@ async function specEnv(rest) {
|
|
|
5652
5755
|
else if (args[i] === '--claim') flags.claim = args[++i]
|
|
5653
5756
|
else if (args[i] === '--claim-since') flags.claimSince = args[++i]
|
|
5654
5757
|
else if (args[i] === '--heartbeat') flags.heartbeat = args[++i]
|
|
5758
|
+
else if (args[i] === '--reshow-every') flags.reshowEvery = args[++i]
|
|
5655
5759
|
else if (args[i] === '--since') flags.since = args[++i]
|
|
5656
5760
|
else if (args[i] === '--timeout') flags.timeout = args[++i]
|
|
5657
5761
|
else if (args[i] === '--drop') flags.drop = args[++i]
|
|
@@ -5831,6 +5935,7 @@ async function specEnv(rest) {
|
|
|
5831
5935
|
' review skip [spec] "<reason>" move on without one, on the record\n' +
|
|
5832
5936
|
' review gate [spec] --offered record that the bypass was offered (spends it)\n' +
|
|
5833
5937
|
' review wait [spec] --heartbeat <secs> proof-of-life cadence on stderr; 0 disables\n' +
|
|
5938
|
+
' review wait [spec] --reshow-every <n> print the stack again every nth re-arm (5); 0 disables\n' +
|
|
5834
5939
|
' review wait [spec] --since <iso> block until a verdict arrives ([--timeout <s>])\n' +
|
|
5835
5940
|
' review waiting [--json] every pass waiting, across every spec\n' +
|
|
5836
5941
|
' review [spec] --claim-since <iso> claim the one pass that arrived since <iso>\n' +
|
package/src/env/resolve.js
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* Pure spec/branch resolution for per-spec isolation.
|
|
5
5
|
*
|
|
6
6
|
* Given a spec argument (a folder name or path) it locates the spec folder under
|
|
7
|
-
* `specs/**`, splits the `feat-`/`bug-` prefix into
|
|
7
|
+
* `specs/**`, splits the `feat-`/`bug-`/`hotfix-`/`chore-` prefix into
|
|
8
|
+
* `{ type, slug }`, derives the
|
|
8
9
|
* git branch from the config's `branch.pattern` (provider-neutral; `{identifier}`
|
|
9
10
|
* is filled from a tracker id when one is configured, else it falls back to
|
|
10
11
|
* `{type}/{slug}`), and expands the config's path/name tokens (`{repo}`,
|
|
@@ -294,10 +295,10 @@ function phaseIsDone(text) {
|
|
|
294
295
|
return /^#\s.*✅\s*$/m.test(text)
|
|
295
296
|
}
|
|
296
297
|
|
|
297
|
-
// Split a `feat-`/`bug-`/`hotfix-` prefix. Unknown prefix → type
|
|
298
|
-
// `feat` and the whole folder name is the slug.
|
|
298
|
+
// Split a `feat-`/`bug-`/`hotfix-`/`chore-` prefix. Unknown prefix → type
|
|
299
|
+
// defaults to `feat` and the whole folder name is the slug.
|
|
299
300
|
function splitPrefix(folder) {
|
|
300
|
-
const m = /^(feat|bug|hotfix)-(.+)$/.exec(folder)
|
|
301
|
+
const m = /^(feat|bug|hotfix|chore)-(.+)$/.exec(folder)
|
|
301
302
|
if (m) return { type: m[1], slug: m[2] }
|
|
302
303
|
return { type: 'feat', slug: folder }
|
|
303
304
|
}
|
|
@@ -498,6 +499,12 @@ function assertPrimaryOnMain(config, git) {
|
|
|
498
499
|
* was actually created against, and re-deriving it would go wrong the moment a
|
|
499
500
|
* project changed its pattern under a standing branch.
|
|
500
501
|
*
|
|
502
|
+
* A `chore-foo` SPEC derives the same `chore/foo` branch as `/no-spec foo`
|
|
503
|
+
* does, deliberately left colliding: both cannot exist at once, and git
|
|
504
|
+
* refuses the second `worktree add -b` loudly rather than either lane
|
|
505
|
+
* silently adopting the other's branch (spec feat-chore-kind-bug-bodies,
|
|
506
|
+
* decision 9).
|
|
507
|
+
*
|
|
501
508
|
* Pure but for `repoInfo`, like `resolveSpec`.
|
|
502
509
|
*/
|
|
503
510
|
function resolveSpecless(name, dir, config, entry = {}) {
|
package/src/env/review.js
CHANGED
|
@@ -1282,6 +1282,81 @@ const WAIT_POLL_MS = 400
|
|
|
1282
1282
|
// whatever is supervising the process.
|
|
1283
1283
|
const WAIT_HEARTBEAT_MS = 5 * 60 * 1000
|
|
1284
1284
|
|
|
1285
|
+
// Every this-many re-arms on one window, the wait prints the stack again. A
|
|
1286
|
+
// COUNT, not an interval, and deliberately: what buries the banner is how many
|
|
1287
|
+
// re-arms have scrolled past it, and a death every five minutes and one every
|
|
1288
|
+
// forty-five push it up the same distance each. This is not the count
|
|
1289
|
+
// `spec-reports.md` rejects — that one bounded how long to keep waiting, and
|
|
1290
|
+
// the 12-hour age bound below still does.
|
|
1291
|
+
const WAIT_RESHOW_EVERY = 5
|
|
1292
|
+
|
|
1293
|
+
// How old a window may be before its start count is pruned. The same 12 hours
|
|
1294
|
+
// the skills stop re-arming at: past it nobody is counting, so nothing is kept.
|
|
1295
|
+
const WAIT_WINDOW_MAX_MS = 12 * 60 * 60 * 1000
|
|
1296
|
+
|
|
1297
|
+
// Beside the pending store, under gitignored `.spec-env/`.
|
|
1298
|
+
const WAITS_SUFFIX = '.waits.json'
|
|
1299
|
+
|
|
1300
|
+
function reviewWaitsPath(outPath) {
|
|
1301
|
+
return outPath.replace(/\.html$/, '') + WAITS_SUFFIX
|
|
1302
|
+
}
|
|
1303
|
+
|
|
1304
|
+
/**
|
|
1305
|
+
* Record that a wait started on `since`, and say which start this is.
|
|
1306
|
+
* Returns `{ starts, rearm }` — `rearm` is 0 for the first wait on a window —
|
|
1307
|
+
* or `null` when it cannot tell.
|
|
1308
|
+
*
|
|
1309
|
+
* CANNOT-TELL IS NULL, and null means no re-show (`.claude/rules/negative-checks.md`
|
|
1310
|
+
* rule 4). A store that will not parse, a window that is not a timestamp, a
|
|
1311
|
+
* write that failed: each costs the reader one reminder, never a verdict, so
|
|
1312
|
+
* none of them is worth more than silence. An unreadable store is also never
|
|
1313
|
+
* written over — it may be someone's history.
|
|
1314
|
+
*
|
|
1315
|
+
* WHAT WOULD FOOL THIS: it counts STARTS, so anything that runs `review wait`
|
|
1316
|
+
* on the same window counts too — a second session waiting on one spec, or a
|
|
1317
|
+
* person running it by hand. That over-counts, and the cost is a banner shown
|
|
1318
|
+
* a little early, which is the harmless direction.
|
|
1319
|
+
*/
|
|
1320
|
+
function recordWaitStart(outPath, specFolder, since, { now = Date.now() } = {}) {
|
|
1321
|
+
if (!Number.isFinite(Date.parse(since))) return null
|
|
1322
|
+
const file = reviewWaitsPath(outPath)
|
|
1323
|
+
let store = { version: 1, spec: specFolder, windows: {} }
|
|
1324
|
+
let raw = null
|
|
1325
|
+
try {
|
|
1326
|
+
raw = fs.readFileSync(file, 'utf8')
|
|
1327
|
+
} catch {}
|
|
1328
|
+
if (raw !== null) {
|
|
1329
|
+
try {
|
|
1330
|
+
const parsed = JSON.parse(raw)
|
|
1331
|
+
if (!parsed || typeof parsed.windows !== 'object' || parsed.windows === null) return null
|
|
1332
|
+
store = { version: parsed.version || 1, spec: parsed.spec || specFolder, windows: parsed.windows }
|
|
1333
|
+
} catch {
|
|
1334
|
+
return null
|
|
1335
|
+
}
|
|
1336
|
+
}
|
|
1337
|
+
const windows = {}
|
|
1338
|
+
for (const [key, count] of Object.entries(store.windows)) {
|
|
1339
|
+
const at = Date.parse(key)
|
|
1340
|
+
if (Number.isFinite(at) && now - at <= WAIT_WINDOW_MAX_MS) windows[key] = count
|
|
1341
|
+
}
|
|
1342
|
+
const prior = Number.isInteger(windows[since]) && windows[since] > 0 ? windows[since] : 0
|
|
1343
|
+
const starts = prior + 1
|
|
1344
|
+
windows[since] = starts
|
|
1345
|
+
try {
|
|
1346
|
+
fs.mkdirSync(path.dirname(file), { recursive: true })
|
|
1347
|
+
fs.writeFileSync(file, JSON.stringify({ ...store, windows }, null, 2) + '\n')
|
|
1348
|
+
} catch {
|
|
1349
|
+
return null
|
|
1350
|
+
}
|
|
1351
|
+
return { starts, rearm: starts - 1 }
|
|
1352
|
+
}
|
|
1353
|
+
|
|
1354
|
+
// Is this re-arm one that re-shows the stack? Pure. The first wait never does —
|
|
1355
|
+
// the banner is right above it — and `every` of 0 turns it off.
|
|
1356
|
+
function reshowDue(rearm, every = WAIT_RESHOW_EVERY) {
|
|
1357
|
+
return Number.isInteger(every) && every > 0 && Number.isInteger(rearm) && rearm > 0 && rearm % every === 0
|
|
1358
|
+
}
|
|
1359
|
+
|
|
1285
1360
|
/**
|
|
1286
1361
|
* Block until exactly one pass arrives inside a window. Impure only in that it
|
|
1287
1362
|
* reads the store and sleeps; it writes nothing and claims nothing.
|
|
@@ -2555,6 +2630,10 @@ module.exports = {
|
|
|
2555
2630
|
waitingPasses,
|
|
2556
2631
|
waitForPass,
|
|
2557
2632
|
WAIT_HEARTBEAT_MS,
|
|
2633
|
+
WAIT_RESHOW_EVERY,
|
|
2634
|
+
recordWaitStart,
|
|
2635
|
+
reshowDue,
|
|
2636
|
+
reviewWaitsPath,
|
|
2558
2637
|
WAIT_POLL_MS,
|
|
2559
2638
|
passState,
|
|
2560
2639
|
describePending,
|
|
@@ -26,7 +26,6 @@ const {
|
|
|
26
26
|
isEmptyPlan,
|
|
27
27
|
validateStates,
|
|
28
28
|
stateSuggestions,
|
|
29
|
-
remoteWorkflowState,
|
|
30
29
|
remoteDescriptionEdited,
|
|
31
30
|
writeFrontmatter,
|
|
32
31
|
stampSubIssueId,
|
|
@@ -91,7 +90,20 @@ function stateCheckFailure(config, flags) {
|
|
|
91
90
|
// Apply ops: the kit orchestration with Jira's tracker calls. Status is moved
|
|
92
91
|
// by TRANSITION after the create/update — Jira has no "set status" field — and
|
|
93
92
|
// `transitionTo` is idempotent when the issue already sits on the target.
|
|
94
|
-
|
|
93
|
+
// A spec's KIND, read off its folder prefix — the same convention the
|
|
94
|
+
// lifecycle skills stamp into `> **Type:**`, but greppable with no file read.
|
|
95
|
+
function specKindOf(snapshotDir) {
|
|
96
|
+
const name = path.basename(String(snapshotDir || ''))
|
|
97
|
+
if (name.startsWith('bug-')) return 'bug'
|
|
98
|
+
if (name.startsWith('hotfix-')) return 'hotfix'
|
|
99
|
+
if (name.startsWith('chore-')) return 'chore'
|
|
100
|
+
return 'feature'
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
function applyOps({ adapter, config, kind = 'feature' }) {
|
|
104
|
+
// The mint type for THIS spec's kind (jira.issueTypeByKind), falling back to
|
|
105
|
+
// the one configured type — unmapped kinds mint exactly as before.
|
|
106
|
+
const mintType = (config.jira.issueTypeByKind && config.jira.issueTypeByKind[kind]) || config.jira.issueType
|
|
95
107
|
const statusFor = (bucket) => {
|
|
96
108
|
const name = config.states && config.states[bucket]
|
|
97
109
|
if (!name) {
|
|
@@ -121,7 +133,7 @@ function applyOps({ adapter, config }) {
|
|
|
121
133
|
description: issue && issue.description != null ? issue.description : undefined,
|
|
122
134
|
assigneeId: issue && issue.assignee ? issue.assignee : undefined,
|
|
123
135
|
projectKey: config.jira.projectKey,
|
|
124
|
-
issueTypeName:
|
|
136
|
+
issueTypeName: mintType,
|
|
125
137
|
})
|
|
126
138
|
await settle(created.identifier, issue && issue.state)
|
|
127
139
|
return created
|
|
@@ -242,7 +254,7 @@ async function specSyncApply(dir, config, specArg, flags, out, err) {
|
|
|
242
254
|
snapshotDir,
|
|
243
255
|
plan,
|
|
244
256
|
adapter: cred.adapter,
|
|
245
|
-
ops: applyOps({ adapter: cred.adapter, config }),
|
|
257
|
+
ops: applyOps({ adapter: cred.adapter, config, kind: specKindOf(snapshotDir) }),
|
|
246
258
|
forceNew: !!flags.forceNew,
|
|
247
259
|
program: PROGRAM,
|
|
248
260
|
})
|
|
@@ -410,13 +422,9 @@ function specSyncStatus(dir, config, specArg, flags, out, err) {
|
|
|
410
422
|
out.write(`${PROGRAM} status: cannot read --remote: ${error.message}\n`)
|
|
411
423
|
return 1
|
|
412
424
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
lines.push(` drift: Jira says "${bucket}", the repo says "${local}" (repo wins on next push)`)
|
|
417
|
-
} else if (bucket) {
|
|
418
|
-
lines.push(' drift: none — Jira agrees with the repo')
|
|
419
|
-
}
|
|
425
|
+
// NO STATE LINE, deliberately: skitterspec tells the tracker about its own
|
|
426
|
+
// transitions and never reads a status back. A ticket someone moved there
|
|
427
|
+
// is theirs to have moved, and push resends State only when the spec does.
|
|
420
428
|
// SILENT ON EVERYTHING EXCEPT A POSITIVE ANSWER: `remoteDescriptionEdited`
|
|
421
429
|
// returns null for every cannot-tell, and none of those is evidence.
|
|
422
430
|
if (remoteDescriptionEdited(readBase(dir, identifier, config), remote, config) === true) {
|
|
@@ -675,12 +683,13 @@ function specSyncReleased(dir, config, rangeArg, flags, out) {
|
|
|
675
683
|
const report = kit.ticketsInRange(read.commits, {
|
|
676
684
|
ignorePaths: (config.release && config.release.ignorePaths) || [],
|
|
677
685
|
})
|
|
686
|
+
report.tickets = kit.nameTickets(report.tickets, listSpecs(dir, config, { urls: true }))
|
|
678
687
|
if (flags.json) {
|
|
679
688
|
out.write(JSON.stringify(report, null, 2) + '\n')
|
|
680
689
|
return 0
|
|
681
690
|
}
|
|
682
691
|
const lines = [`${PROGRAM} released: ${range} — ${report.total} commit(s)`]
|
|
683
|
-
for (const t of report.tickets) lines.push(` ${t.ref} (${t.commits} commit(s))`)
|
|
692
|
+
for (const t of report.tickets) lines.push(` ${t.ref} (${t.commits} commit(s))${t.spec ? ` ${t.spec}` : ''}`)
|
|
684
693
|
if (!report.tickets.length) lines.push(' no referenced tickets')
|
|
685
694
|
if (report.unreferenced) lines.push(` ${report.unreferenced} commit(s) carry no Refs: trailer`)
|
|
686
695
|
if (report.ignored) lines.push(` ${report.ignored} bookkeeping commit(s) ignored`)
|
|
@@ -35,7 +35,11 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
35
35
|
// here, once. `issueType`/`subtaskType` name the types this site uses for a
|
|
36
36
|
// spec and its phases; workflows and type names vary per site, which is why
|
|
37
37
|
// both are config rather than constants.
|
|
38
|
-
|
|
38
|
+
// `issueTypeByKind` picks the mint type per SPEC KIND
|
|
39
|
+
// (`feature`/`bug`/`hotfix`/`chore`, from the spec folder's prefix), falling
|
|
40
|
+
// back to `issueType` — `{ "bug": "Bug" }` files bug specs as Jira Bugs.
|
|
41
|
+
// Empty means one type for everything, as before.
|
|
42
|
+
jira: Object.freeze({ siteUrl: '', projectKey: '', issueType: 'Task', subtaskType: 'Subtask', issueTypeByKind: Object.freeze({}) }),
|
|
39
43
|
// A spec is a Jira ISSUE; each phase a SUBTASK of it. `tasks` selects how the
|
|
40
44
|
// phase's checkboxes reach that subtask's description (as an ADF task list —
|
|
41
45
|
// live checkboxes, still a read-only mirror).
|
|
@@ -63,7 +67,7 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
63
67
|
assigneeId: 'jira_assignee_id',
|
|
64
68
|
assigneeName: 'jira_assignee_name',
|
|
65
69
|
}),
|
|
66
|
-
release: Object.freeze({
|
|
70
|
+
release: Object.freeze({ ignorePaths: Object.freeze(['specs/', 'CHANGELOG.md', 'RELEASES.md']) }),
|
|
67
71
|
branch: Object.freeze({ pattern: '{type}/{slug}' }),
|
|
68
72
|
// Env-var NAMES, not values: Jira Cloud authenticates with an email + API
|
|
69
73
|
// token pair (basic auth), so there are two of them.
|
|
@@ -99,13 +103,13 @@ const LIFECYCLE_BUCKETS = Object.freeze(Object.keys(DEFAULT_CONFIG.states))
|
|
|
99
103
|
// A fresh, deeply-mutable copy of the defaults to merge onto.
|
|
100
104
|
function defaults() {
|
|
101
105
|
return {
|
|
102
|
-
jira: { ...DEFAULT_CONFIG.jira },
|
|
106
|
+
jira: { ...DEFAULT_CONFIG.jira, issueTypeByKind: { ...DEFAULT_CONFIG.jira.issueTypeByKind } },
|
|
103
107
|
mapping: { ...DEFAULT_CONFIG.mapping },
|
|
104
108
|
states: { ...DEFAULT_CONFIG.states },
|
|
109
|
+
stateAliases: {},
|
|
105
110
|
snapshot: { ...DEFAULT_CONFIG.snapshot },
|
|
106
111
|
fields: { ...DEFAULT_CONFIG.fields },
|
|
107
112
|
release: {
|
|
108
|
-
stages: DEFAULT_CONFIG.release.stages.map((s) => ({ ...s })),
|
|
109
113
|
ignorePaths: [...DEFAULT_CONFIG.release.ignorePaths],
|
|
110
114
|
},
|
|
111
115
|
branch: { ...DEFAULT_CONFIG.branch },
|
|
@@ -122,7 +126,7 @@ function defaults() {
|
|
|
122
126
|
}
|
|
123
127
|
|
|
124
128
|
const { isObject, stringList, assign } = kitConfig
|
|
125
|
-
const { mergeFieldOwnership, mergePhaseMapping,
|
|
129
|
+
const { mergeStates, mergeFieldOwnership, mergePhaseMapping, mergeReleaseIgnorePaths, mergeKeyedFields } =
|
|
126
130
|
kitConfig.makeMergeHelpers({
|
|
127
131
|
configFile: CONFIG_FILE,
|
|
128
132
|
ownership: OWNERSHIP,
|
|
@@ -142,6 +146,16 @@ function mergeConfig(base, parsed) {
|
|
|
142
146
|
assign(base.jira, parsed.jira, 'projectKey', 'string?')
|
|
143
147
|
assign(base.jira, parsed.jira, 'issueType', 'string')
|
|
144
148
|
assign(base.jira, parsed.jira, 'subtaskType', 'string')
|
|
149
|
+
if (isObject(parsed.jira.issueTypeByKind)) {
|
|
150
|
+
// Only the kinds a spec folder can actually be — an unknown key is
|
|
151
|
+
// dropped, matching the other providers' by-kind validation.
|
|
152
|
+
const byKind = {}
|
|
153
|
+
for (const kind of ['feature', 'bug', 'hotfix', 'chore']) {
|
|
154
|
+
const value = parsed.jira.issueTypeByKind[kind]
|
|
155
|
+
if (typeof value === 'string' && value.trim()) byKind[kind] = value.trim()
|
|
156
|
+
}
|
|
157
|
+
base.jira.issueTypeByKind = byKind
|
|
158
|
+
}
|
|
145
159
|
// A trailing slash on the site would double up in every composed URL.
|
|
146
160
|
if (base.jira.siteUrl) base.jira.siteUrl = base.jira.siteUrl.replace(/\/+$/, '')
|
|
147
161
|
}
|
|
@@ -158,18 +172,13 @@ function mergeConfig(base, parsed) {
|
|
|
158
172
|
mergePhaseMapping(base.mapping, parsed.mapping)
|
|
159
173
|
}
|
|
160
174
|
|
|
161
|
-
|
|
162
|
-
for (const key of Object.keys(base.states)) {
|
|
163
|
-
assign(base.states, parsed.states, key, 'string')
|
|
164
|
-
}
|
|
165
|
-
}
|
|
175
|
+
mergeStates(base, parsed)
|
|
166
176
|
|
|
167
177
|
if (isObject(parsed.snapshot)) {
|
|
168
178
|
assign(base.snapshot, parsed.snapshot, 'overviewFile', 'string')
|
|
169
179
|
}
|
|
170
180
|
|
|
171
181
|
if (isObject(parsed.release)) {
|
|
172
|
-
mergeReleaseStages(base.release, parsed.release)
|
|
173
182
|
mergeReleaseIgnorePaths(base.release, parsed.release)
|
|
174
183
|
}
|
|
175
184
|
|
|
@@ -269,18 +278,13 @@ function loadJiraConfig(dir = process.cwd()) {
|
|
|
269
278
|
return { config: withRuntime(mergeConfig(base, parsed)), present: true }
|
|
270
279
|
}
|
|
271
280
|
|
|
272
|
-
// The
|
|
273
|
-
// accessors the Linear provider exposes, reading this provider's config.
|
|
274
|
-
const releaseStages = (config) => (config.release && config.release.stages) || []
|
|
275
|
-
const stageFor = (config, key) => releaseStages(config).find((s) => s.key === key) || null
|
|
281
|
+
// The bookkeeping path prefixes `released` ignores.
|
|
276
282
|
const releaseIgnorePaths = (config) => (config.release && config.release.ignorePaths) || []
|
|
277
283
|
|
|
278
284
|
module.exports = {
|
|
279
285
|
loadJiraConfig,
|
|
280
286
|
mergeConfig,
|
|
281
287
|
defaults,
|
|
282
|
-
releaseStages,
|
|
283
|
-
stageFor,
|
|
284
288
|
releaseIgnorePaths,
|
|
285
289
|
DEFAULT_CONFIG,
|
|
286
290
|
CONFIG_FILE,
|