maiass 5.15.6 → 5.15.8

package/lib/commit.js

@@ -329,6 +329,77 @@ async function createAnonymousSubscriptionIfNeeded() {
   }
 }
 
+/**
+ * Normalize a bullet-style AI commit suggestion into a deterministic on-disk
+ * format. Pure function — no side effects. The normalizer is deliberately
+ * conservative and content-preserving: it reformats whitespace/markers but
+ * never fabricates a subject and never drops body content.
+ *
+ * Contract:
+ *   - Input is coerced via String(text); non-string input cannot throw.
+ *   - CRLF (`\r\n`) and CR line endings are tolerated (trailing \r stripped).
+ *   - Early return (input returned trimmed, unchanged) when the input has zero
+ *     or one non-empty line — a bare title with no bullets, or empty input.
+ *   - No-title passthrough: if the first non-empty line already starts with a
+ *     bullet marker (`-` or `*`), the model produced bullets with no summary
+ *     line. A deterministic normalizer must not invent a subject, so the input
+ *     is returned trimmed and otherwise unchanged.
+ *   - Otherwise the first non-empty line becomes the title (trailing whitespace
+ *     stripped; no marker stripping — it is not a marker line by definition).
+ *   - Each subsequent non-empty line that starts with a bullet marker becomes
+ *     "  - <content>" (exactly two-space indent, single dash; the original
+ *     marker and leading indentation are stripped).
+ *   - Each subsequent non-empty line that does NOT start with a marker is a
+ *     soft-wrapped continuation of the previous line: it is appended to the
+ *     previous bullet (joined with a single space). If no bullet exists yet,
+ *     it is appended to the title line instead.
+ *   - Blank lines between the title and bullets (and trailing blanks) are
+ *     dropped.
+ * @param {string} text - raw AI suggestion (already trimmed/quote-stripped)
+ * @returns {string} normalized bullet-style message
+ */
+function normalizeBulletMessage(text) {
+  const source = String(text);
+  // Normalize line endings so \r\n / \r inputs behave identically to \n.
+  const lines = source.split(/\r\n|\r|\n/);
+
+  // Guard: zero or one non-empty line (empty input or a bare title) is left
+  // untouched apart from outer trimming.
+  if (lines.filter(l => l.trim() !== '').length <= 1) {
+    return source.trim();
+  }
+
+  // No-title passthrough: the model emitted bullets with no summary line. Do
+  // not promote a bullet to a title — return the input trimmed, unchanged.
+  const firstNonEmpty = lines.find(l => l.trim() !== '');
+  if (/^\s*[-*]\s+/.test(firstNonEmpty)) {
+    return source.trim();
+  }
+
+  const isMarker = (line) => /^\s*[-*]\s+/.test(line);
+  const stripMarker = (line) => line.replace(/^\s*[-*]\s+/, '').trim();
+
+  const out = [];
+  let titleSet = false;
+  for (const raw of lines) {
+    const line = raw.replace(/\s+$/, '');
+    if (line.trim() === '') continue;
+    if (!titleSet) {
+      // First non-empty line is the title (guaranteed non-marker above).
+      out.push(line.trim());
+      titleSet = true;
+      continue;
+    }
+    if (isMarker(line)) {
+      out.push('  - ' + stripMarker(line));
+    } else {
+      // Soft-wrapped continuation: append to the previous line.
+      out[out.length - 1] = out[out.length - 1] + ' ' + line.trim();
+    }
+  }
+  return out.join('\n');
+}
+
 /**
  * Get AI commit message suggestion
  * @param {Object} gitInfo - Git information object
@@ -466,20 +537,31 @@ async function getAICommitSuggestion(gitInfo) {
     }
 
     // Create AI prompt based on commit message style
+    //
+    // ⚠️ MAI-108 PROMPT CHANGE / ROLLBACK POINT: the bullet prompt below was
+    // rewritten (placeholders + anti-leak/anti-invent guard) because small/local
+    // models echoed the old few-shot example bullets verbatim. The PREVIOUS,
+    // long-standing prompt is production-proven against the 1min.ai chat path.
+    // If hosted-model commit-message QUALITY regresses, revert this block to its
+    // pre-change form: see git history of this file before commit dca4519 (PR #28).
     let prompt;
     if (commitMessageStyle === 'bullet') {
-      prompt = `Analyze the following git diff and create a commit message with bullet points. Format as:
-Brief summary title
-  - feat: add user authentication
-  - fix(api): resolve syntax error
-  - docs: update README
-
-Use past tense verbs. No blank line between title and bullets. Keep concise. Do not wrap the response in quotes.
+      prompt = `Write a git commit message for the diff below.
+Format exactly like this template:
+<one-line summary>
+  - <type>: <description>
+  - <type>: <description>
+Rules:
+- First line: a brief past-tense summary with no leading dash.
+- Then one or more bullet lines, each indented by exactly two spaces, starting with "- ", then a conventional-commit type (feat, fix, docs, refactor, chore) and a colon.
+- No blank line between the summary line and the bullets.
+- Describe ONLY the actual changes in the diff. Do not output the literal words type or description or any angle brackets, and do not invent changes that are not in the diff.
+- Do not wrap the response in quotes.
 
 Git diff:
 ${gitDiff}`;
     } else {
-      prompt = `Analyze the following git diff and create a concise, descriptive commit message. Use conventional commit format when appropriate (feat:, fix:, docs:, etc.). Keep it under 72 characters for the first line.
+      prompt = `Analyze the following git diff and create a concise, descriptive commit message. Use conventional commit format when appropriate (feat:, fix:, docs:, etc.). Keep it under 72 characters for the first line. Describe only the actual changes in the diff; do not invent changes.
 
 Git diff:
 ${gitDiff}`;
@@ -577,11 +659,16 @@ ${gitDiff}`;
         }
         
         // Clean up any quotes that might wrap the entire response
-        if ((suggestion.startsWith("'") && suggestion.endsWith("'")) || 
+        if ((suggestion.startsWith("'") && suggestion.endsWith("'")) ||
             (suggestion.startsWith('"') && suggestion.endsWith('"'))) {
           suggestion = suggestion.slice(1, -1).trim();
         }
-        
+
+        // Deterministically normalize bullet format so it's model-independent.
+        if (commitMessageStyle === 'bullet') {
+          suggestion = normalizeBulletMessage(suggestion);
+        }
+
         // Extract credit information from billing data
         let creditsUsed, creditsRemaining;
         if (data.billing) {
@@ -1157,6 +1244,7 @@ export {
   getCommitMessage,
   handleStagedCommit,
   getAICommitSuggestion,
+  normalizeBulletMessage,
   executeGitCommand,
   remoteExists
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maiass",
   "type": "module",
-  "version": "5.15.6",
+  "version": "5.15.8",
   "description": "AI commit messages, version bumps, and changelogs from one command. Stages, commits, merges, tags. Anonymous on first run — no email, no card.",
   "main": "maiass.mjs",
   "bin": {