lechnerio-git-hooks 1.3.0 → 1.3.2

package/README.md

@@ -34,9 +34,13 @@ On install, the package automatically:
 | `commit-msg`  | Enforces conventional commits via commitlint                                                 |
 | `post-commit` | Interactive version bump (subtle/patch/minor/major), changelog generation with optional skip flag, push/merge prompt |
 
+## Changelog versioning model
+
+Commits belong to the version that was current while they were made. A Minor or Major bump closes the running version — all work since the previous bump stays under it, including the commit that triggered the bump — and opens the new version with a `Version Upgrade to <version>` marker entry. Future commits then accumulate under the new version.
+
 ## AI release summaries
 
-On Minor and Major version bumps, the `post-commit` hook sends the version's non-skipped commit messages to the Gemini API and stores the result as a `summary` field on the version entry in `data/changelog.json`. This requires `GITHOOKS_GEMINI_API_KEY` in the project's `.env` file or environment; without it the summary step is skipped silently.
+On Minor and Major version bumps, the `post-commit` hook sends the non-skipped commit messages of the version being closed to the Gemini API and stores the result as `summary_en` and `summary_ger` fields (English and German) on that version entry in `data/changelog.json`. This requires `GITHOOKS_GEMINI_API_KEY` in the project's `.env` file or environment; without it the summary step is skipped silently. Run `node scripts/generate-changelog.mjs --summarize-version <version>` to generate the summary for any version by hand (accepts the version with or without the `v` prefix, subtle suffixes are normalized). Summaries are only generated when `summary_en` or `summary_ger` is missing on the entry — to regenerate one, delete both fields from `data/changelog.json` first.
 
 ## Peer dependencies (auto-installed)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lechnerio-git-hooks",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Shared git hooks for lechnerio projects",
   "type": "module",
   "scripts": {

package/scripts/generate-changelog.mjs

@@ -36,7 +36,14 @@ if (existsSync("data/changelog.json")) {
   try {
     const existing = JSON.parse(readFileSync("data/changelog.json", "utf-8"))
     for (const entry of existing) {
-      if (typeof entry.summary === "string") summaries.set(entry.version, entry.summary)
+      const summaryEn = entry.summary_en ?? entry.summary
+      const summaryGer = entry.summary_ger
+      if (typeof summaryEn === "string" || typeof summaryGer === "string") {
+        const saved = {}
+        if (typeof summaryEn === "string") saved.summary_en = summaryEn
+        if (typeof summaryGer === "string") saved.summary_ger = summaryGer
+        summaries.set(entry.version, saved)
+      }
       for (const commit of entry.commits ?? []) {
         skipFlags.set(commit.message, commit.skip === true)
       }
@@ -51,23 +58,13 @@ if (process.argv.includes("--skip-last")) {
 
 const changelog = []
 
-const currentVersion = tags[0].replace(/^v/, "")
-const unreleasedRaw = run(`git log --format="%s" ${tags[0]}..HEAD`)
-if (unreleasedRaw) {
-  const commits = [...new Set(unreleasedRaw.split("\n").filter(Boolean))].map((message) => ({ message, skip: skipFlags.get(message) ?? false }))
-  if (commits.length > 0) {
-    const date = run(`git log --format=%ai HEAD -1`).split(" ")[0]
-    changelog.push({ version: currentVersion, tag: null, date, commits })
-  }
-}
-
 for (let i = 0; i < tags.length; i++) {
   const tag = tags[i]
+  const upper = i === 0 ? "HEAD" : tags[i - 1]
+  const eraRaw = run(`git log --format="%s" ${tag}..${upper}`)
+  const initialRaw = i === tags.length - 1 ? run(`git log --format="%s" ${tag}`) : ""
+  const raw = [eraRaw, initialRaw].filter(Boolean).join("\n")
   const date = run(`git log --format=%ai ${tag} -1`).split(" ")[0]
-  const prevTag = tags[i + 1]
-
-  const range = prevTag ? `${prevTag}..${tag}` : tag
-  const raw = run(`git log --format="%s" ${range}`)
 
   const commits = raw
     ? [...new Set(raw.split("\n").filter(Boolean))].map((message) => ({ message, skip: skipFlags.get(message) ?? false }))
@@ -86,10 +83,11 @@ const baseVersion = (v) => v.replace(/[a-z]+$/i, "")
 const grouped = []
 for (const entry of changelog) {
   const base = baseVersion(entry.version)
-  const existing = grouped.find((g) => g.version === base && g.tag !== null)
+  const existing = grouped.find((g) => g.version === base)
   if (existing) {
     existing.commits.push(...entry.commits)
     if (entry.date < existing.date) existing.date = entry.date
+    if (entry.tag && (!existing.tag || entry.tag.replace(/^v/, "") === base)) existing.tag = entry.tag
   } else {
     grouped.push({ ...entry, version: base })
   }
@@ -104,43 +102,70 @@ for (const entry of grouped) {
   })
 }
 
+for (let i = 0; i < grouped.length - 1; i++) {
+  const entry = grouped[i]
+  const marker = `Version Upgrade to ${entry.version}`
+  if (!entry.commits.some((c) => c.message === marker)) {
+    entry.commits.push({ message: marker, skip: skipFlags.get(marker) ?? false })
+  }
+}
+
 for (const entry of grouped) {
   const saved = summaries.get(entry.version)
-  if (saved && !entry.summary) entry.summary = saved
+  if (saved) {
+    if (saved.summary_en && !entry.summary_en) entry.summary_en = saved.summary_en
+    if (saved.summary_ger && !entry.summary_ger) entry.summary_ger = saved.summary_ger
+  }
 }
 
-if (process.argv.includes("--summarize")) {
+const svIndex = process.argv.indexOf("--summarize-version")
+const requestedVersion = svIndex === -1 ? null : process.argv[svIndex + 1] ?? null
+
+if (process.argv.includes("--summarize") || svIndex !== -1) {
   const apiKey = loadEnvKey("GITHOOKS_GEMINI_API_KEY")
-  if (!apiKey) {
+  if (svIndex !== -1 && !requestedVersion) {
+    console.warn("--summarize-version requires a version argument")
+  } else if (!apiKey) {
     console.warn("GITHOOKS_GEMINI_API_KEY not set, skipping AI summary")
   } else {
-    const target = grouped.find((e) => e.tag === tags[0])
-    if (target && !target.summary) {
+    const closedTag = tags.length > 1 ? tags[1] : tags[0]
+    const targetVersion = requestedVersion ? baseVersion(requestedVersion.replace(/^v/, "")) : baseVersion(closedTag.replace(/^v/, ""))
+    const target = grouped.find((e) => e.version === targetVersion)
+    if (!target) {
+      console.warn(`version ${targetVersion} not found in changelog`)
+    } else if (!(target.summary_en && target.summary_ger)) {
       const messages = target.commits.filter((c) => !c.skip).map((c) => c.message)
       if (messages.length === 0) {
         console.warn("no commits to summarize")
       } else {
-        try {
-          const model = loadEnvKey("GITHOOKS_GEMINI_MODEL") ?? "gemini-flash-latest"
-          const prompt = `Summarize these commit messages into a short user-facing release summary for version ${target.version}. Write 1-3 plain sentences, no markdown, no bullet points, no preamble.\n\n${messages.join("\n")}`
-          const res = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", "x-goog-api-key": apiKey },
-            body: JSON.stringify({
-              contents: [{ parts: [{ text: prompt }] }],
-              generationConfig: { thinkingConfig: { thinkingBudget: 0 } },
-            }),
-            signal: AbortSignal.timeout(60000),
-          })
-          if (!res.ok) throw new Error(`gemini api returned ${res.status}`)
-          const data = await res.json()
-          const text = data.candidates?.[0]?.content?.parts?.[0]?.text?.trim()
-          if (text) {
-            target.summary = text
+        const model = loadEnvKey("GITHOOKS_GEMINI_MODEL") ?? "gemini-flash-latest"
+        const prompt = `Summarize these commit messages into a short user-facing release summary for version ${target.version}. Write 1-3 plain sentences per language, no markdown, no bullet points, no preamble. Return a JSON object with exactly two string keys: "summary_en" (English) and "summary_ger" (German).\n\n${messages.join("\n")}`
+        for (let attempt = 1; attempt <= 2; attempt++) {
+          try {
+            const res = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", "x-goog-api-key": apiKey },
+              body: JSON.stringify({
+                contents: [{ parts: [{ text: prompt }] }],
+                generationConfig: { responseMimeType: "application/json", thinkingConfig: { thinkingBudget: 0 } },
+              }),
+              signal: AbortSignal.timeout(60000),
+            })
+            if (!res.ok) throw new Error(`gemini api returned ${res.status}`)
+            const data = await res.json()
+            const text = data.candidates?.[0]?.content?.parts?.[0]?.text?.trim()
+            if (!text) throw new Error("empty summary response")
+            const parsed = JSON.parse(text)
+            if (typeof parsed.summary_en !== "string" || typeof parsed.summary_ger !== "string") {
+              throw new Error("unexpected summary response shape")
+            }
+            target.summary_en = parsed.summary_en.trim()
+            target.summary_ger = parsed.summary_ger.trim()
             console.log(`ai summary generated for ${target.version}`)
+            break
+          } catch (err) {
+            if (attempt === 2) console.warn(`ai summary failed: ${err.message}`)
           }
-        } catch (err) {
-          console.warn(`ai summary failed: ${err.message}`)
         }
       }
     }