fix(memory): heredoc commit form, per-segment milestone matching

This commit is contained in:
bchanot committed 2026-11-04 12:38:37 +01:00
1 parent 86fac26390
commit 01eac15367
2 files changed
+101 -15

No files matched your search

+68
View File
@@ -1122,3 +1122,71 @@ test('MTOFF: switched off, no milestone and no note', async ($, on) => {
expect(w.kv.size).toBe(0)
expect(seen[0]).toBeUndefined()
})
const HEREDOC = (subject: string) =>
`git commit -m "$(cat <<'EOF'\n${subject}\n\nbody\nEOF\n)"`
test('MS7: a heredoc commit message counts, a chore one does not', async (
$, on,
) => {
const w = await boot($, on)
await run($, w, HEREDOC('chore: nope'))
expect(w.kv.size).toBe(0)
await run($, w, HEREDOC('fix(memory): heredoc subject'))
expect(labels(w)).toEqual(['fix(memory): heredoc subject'])
expect(commitLabel('git commit -m "$(cat <<EOF\nfeat!: a\nEOF\n)"'))
.toBe('feat: a')
expect(commitLabel('git commit -m "$(cat <<"EOF"\nfix: b\nEOF\n)"'))
.toBe('fix: b')
})
test('a later git log -m does not make a chore commit a fix', () => {
expect(commitLabel('git commit -m "chore: a" && git log -m "fix: b"'))
.toBeUndefined()
})
test('finish is read per segment', () => {
expect(finishLabel('echo bash x/gitflow.sh finish')).toBeUndefined()
expect(finishLabel(
'bash ~/.claude/lib/gitflow.sh finish feature x && echo finish chore'))
.toBe('feature x')
expect(finishLabel('FOO=1 bash g/gitflow.sh finish')).toBe('finish')
})
test('rtk and subshell prefixes still read as a commit', () => {
expect(commitLabel('rtk git commit -m "fix: r"')).toBe('fix: r')
expect(commitLabel('(git commit -m "fix: s")')).toBe('fix: s')
})
test('a secret straddling the 80 cut does not escape the label', () => {
const secret = 'sk_live_' + 'a'.repeat(30)
const out = commitLabel(`git commit -m "fix: ${'w'.repeat(60)} ${secret}"`)
expect(out).toBe('fix: ' + 'w'.repeat(60) + ' <redacted:stri')
})
test('a finish label is stored redacted', async ($, on) => {
const w = await boot($, on)
await run($, w, 'bash ~/.claude/lib/gitflow.sh finish feature TOKEN=abc')
expect(labels(w)).toEqual(['feature TOKEN=<redacted>'])
})
test('the first of two -m is the subject', () => {
expect(commitLabel("git commit -m 'fix: a' -m 'body'")).toBe('fix: a')
})
test('an env-prefixed suite keeps its prefix in the green label', async (
$, on,
) => {
const w = await boot($, on)
await run($, w, 'X=1 make test suite=a', RED)
await run($, w, 'X=1 make test suite=a')
expect(kinds(w)).toEqual(['green'])
expect(labels(w)).toEqual(['X=1 make test suite=a'])
})
test('pending keeps the 20 latest milestones', async ($, on) => {
const { w, seen } = await bootNotes($, on)
for (let i = 0; i < 22; i++) await run($, w, `git commit -m "fix: n${i}"`)
await composer($)
expect(seen[0]?.[0]).toContain('memory: commit fix: n2 ')
})
+33 -15
View File
@@ -523,22 +523,29 @@ const recordFailure = ($: Api, at: Where, f: Failure) =>
// Milestones: a commit, a gitflow finish, a suite gone from red to green.
// Regexes read at most 64 KiB of one command and use bounded repeats.
const MAX_LABEL = 80
const MAX_PENDING = 20
const ENV_PREFIX = '(?:[A-Za-z_]\\w{0,60}=\\S{0,200}[ \\t]{1,5}){0,10}'
const SUITE_SEGMENT = new RegExp(
`^${ENV_PREFIX}make\\b[^;&|]{0,1000}\\btest\\b`,
)
const COMMIT_SEGMENT = new RegExp(
`^${ENV_PREFIX}git(?:[ \\t]{1,5}-C[ \\t]{1,5}\\S{1,200})?` +
'[ \\t]{1,5}commit\\b',
`^[(\\s]{0,5}(?:rtk[ \\t]{1,5})?${ENV_PREFIX}` +
'git(?:[ \\t]{1,5}-C[ \\t]{1,5}\\S{1,200})?[ \\t]{1,5}commit\\b',
)
const CONVENTIONAL = '(feat|fix)(\\([^)\\n]{0,80}\\))?!?:[ \\t]{0,5}'
const COMMIT_MESSAGE = new RegExp(
'-[a-z]{0,5}m[ \\t]{1,5}(["\']?)(feat|fix)(\\([^)\\n]{0,80}\\))?!?:' +
'[ \\t]{0,5}([^"\'\\n]{0,80})',
`-[a-z]{0,5}m[ \\t]{1,5}(["']?)${CONVENTIONAL}([^"'\\n]{0,300})`,
)
// -m "$(cat <<'EOF' newline subject: the subject is the first body line
const COMMIT_HEREDOC = new RegExp(
'-[a-z]{0,5}m[ \\t]{1,5}"\\$\\(cat[ \\t]{1,5}<<-?["\']?' +
'[A-Za-z_]{1,20}["\']?[ \\t]{0,5}\\n[ \\t]{0,20}' +
`${CONVENTIONAL}([^\\n]{0,300})`,
)
const FINISH = new RegExp(
'(?:^|[\\s;&|])(?:bash|sh)[ \\t]{1,5}\\S{0,200}gitflow\\.sh"?' +
`^${ENV_PREFIX}(?:bash|sh)[ \\t]{1,5}\\S{0,200}gitflow\\.sh"?` +
'[ \\t]{1,5}finish\\b(?:[ \\t]{1,5}([a-z]{1,20})[ \\t]{1,5}' +
'([\\w./-]{1,60}))?',
'([\\w.=/-]{1,60}))?',
)
const FINISH_CHORE = /\bfinish[ \t]{1,5}chore\b/
@@ -557,20 +564,30 @@ export function suiteKeyOf(command: string): string | undefined {
.slice(0, MAX_RED_LEN)
}
function conventional(type?: string, scope?: string, subject?: string) {
return label(`${type}${scope ?? ''}: ${(subject ?? '').trim()}`)
}
/** `<type><scope>: <subject>` of a feat/fix commit, else `undefined`. */
export function commitLabel(command: string): string | undefined {
if (!segments(command).some(s => COMMIT_SEGMENT.test(s))) return undefined
const m = COMMIT_MESSAGE.exec(cap(command, MAX_REGEX_INPUT))
if (m === null) return undefined
return label(`${m[2]}${m[3] ?? ''}: ${(m[4] ?? '').trim()}`)
const text = cap(command, MAX_REGEX_INPUT)
const seg = segments(command).find(s => COMMIT_SEGMENT.test(s))
if (seg === undefined) return undefined
const rest = text.slice(Math.max(0, text.indexOf(seg)))
const h = COMMIT_HEREDOC.exec(rest)
if (h !== null) return conventional(h[1], h[2], h[3])
const m = COMMIT_MESSAGE.exec(seg)
return m === null ? undefined : conventional(m[2], m[3], m[4])
}
/** `<type> <name>` after a gitflow finish, `finish` alone, or undefined. */
export function finishLabel(command: string): string | undefined {
const text = cap(command, MAX_REGEX_INPUT)
const m = FINISH.exec(text)
if (m === null || FINISH_CHORE.test(text)) return undefined
return m[1] === undefined ? 'finish' : label(`${m[1]} ${m[2]}`)
for (const seg of segments(command)) {
const m = FINISH.exec(seg)
if (m === null || FINISH_CHORE.test(seg)) continue
return m[1] === undefined ? 'finish' : label(`${m[1]} ${m[2]}`)
}
return undefined
}
function newState(): State {
@@ -758,7 +775,8 @@ function recordSuccess(
s.milestones = [...s.milestones, ...added]
if (green) s.red = s.red.filter(r => r !== key)
})
st.pending.push(...added.map(m => `${m.kind} ${m.label}`))
st.pending = [...st.pending, ...added.map(m => `${m.kind} ${m.label}`)]
.slice(-MAX_PENDING)
})
}