climaybe 2.3.0 → 2.4.0

package/README.md

@@ -7,7 +7,7 @@ Built by [Electric Maybe](https://electricmaybe.com) — a Shopify-focused produ
 **Commit linting and Cursor bundle (optional in both flows):**
 
 - **Conventional commit linting:** During `climaybe theme init` or `climaybe app init`, you can install [commitlint](https://commitlint.js.org/) and [Husky](https://typicode.github.io/husky) for [Conventional Commits](https://www.conventionalcommits.org/).
-- **Cursor rules + skills:** Opt in to Electric Maybe’s bundled [Cursor](https://cursor.com/) rules and skills under `.cursor/rules/` and `.cursor/skills/` (themes, JS, a11y, commits, changelog, Linear, etc.).
+- **Cursor bundle (rules + skills + subagents):** Opt in to Electric Maybe’s bundled [Cursor](https://cursor.com/) files under `.cursor/rules/`, `.cursor/skills/`, and `.cursor/agents/` (themes, JS, a11y, commits, changelog, Linear, **theme-translator** for locale sync, etc.).
 
 ## Command layout (Shopify CLI–style)
 
@@ -48,7 +48,7 @@ npm install -D climaybe
 npx climaybe app init
 ```
 
-Installs optional commitlint/Husky and Cursor rules/skills only. Use [Shopify CLI](https://shopify.dev/docs/api/shopify-cli) for app development and deployment.
+Installs optional commitlint/Husky and the Cursor bundle (rules, skills, agents). Use [Shopify CLI](https://shopify.dev/docs/api/shopify-cli) for app development and deployment.
 
 ## Commands
 
@@ -62,12 +62,12 @@ Interactive setup that configures your repo for CI/CD.
 4. Asks whether to enable optional **preview + cleanup** workflows (default: yes)
 5. Asks whether to enable optional **build + Lighthouse** workflows (default: yes)
 6. Asks whether to enable **commitlint + Husky** (enforce [conventional commits](https://www.conventionalcommits.org/) on `git commit`)
-7. Asks whether to install **Cursor rules + skills** (`.cursor/rules/`, `.cursor/skills/`) — Electric Maybe conventions for themes and AI workflows
+7. Asks whether to install the **Cursor bundle** (`.cursor/rules/`, `.cursor/skills/`, `.cursor/agents/`) — Electric Maybe conventions for themes and AI workflows
 8. Based on store count, sets up **single-store** or **multi-store** mode
 9. Writes `package.json` config
 10. Scaffolds GitHub Actions workflows
 11. Creates git branches and store directories (multi-store)
-12. Optionally installs commitlint, Husky, and the Cursor bundle (rules + skills)
+12. Optionally installs commitlint, Husky, and the Cursor bundle (rules, skills, agents)
 
 ### `climaybe app init`
 
@@ -135,13 +135,13 @@ npx climaybe setup-commitlint
 
 ### `climaybe add-cursor`
 
-Install Electric Maybe **Cursor rules and skills** into `.cursor/rules/` and `.cursor/skills/`. Use this if you skipped the bundle at init or want to refresh from the version of climaybe you have installed.
+Install Electric Maybe **Cursor rules, skills, and subagents** into `.cursor/rules/`, `.cursor/skills/`, and `.cursor/agents/` (including **theme-translator** for `theme/locales/`). Use this if you skipped the bundle at init or want to refresh from the version of climaybe you have installed.
 
 ```bash
 npx climaybe add-cursor
 ```
 
-The previous command name `add-cursor-skill` still works as an alias. Re-running replaces the bundled rule and skill files with the copies shipped by your installed climaybe version (same idea as `update-workflows`).
+The previous command name `add-cursor-skill` still works as an alias. Re-running replaces the bundled rules, skills, and subagent files with the copies shipped by your installed climaybe version (same idea as `update-workflows`).
 
 ## Configuration
 
@@ -241,7 +241,6 @@ When enabled, `init` validates required theme files and exits with an error if a
 
 `init` auto-creates:
 - `assets/`
-- `release-notes.md` (starter template)
 
 `climaybe` auto-installs the shared build script at `.climaybe/build-scripts.js` during workflow scaffolding.
 
@@ -249,7 +248,7 @@ When enabled, `init` validates required theme files and exits with an error if a
 |----------|---------|-------------|
 | `build-pipeline.yml` | Push to any branch | Runs reusable build and Lighthouse checks (when required secrets exist) |
 | `reusable-build.yml` | workflow_call | Runs Node build + Tailwind compile, then commits compiled assets when changed |
-| `create-release.yml` | Push tag `v*` | Builds release archive and creates GitHub Release using `release-notes.md` |
+| `create-release.yml` | Push tag `v*`, or **workflow_run** after Post-Merge Tag / Nightly Hotfix Tag succeed on `main` | Builds release archive and creates GitHub Release notes from commits since the previous tag. If commit subjects are low-signal and `GEMINI_API_KEY` exists, it uses Gemini to generate cleaner merchant-facing notes. Also covers tags created by workflows with `GITHUB_TOKEN`, which may not trigger tag-push workflows. |
 
 ### Optional theme dev kit package
 

package/bin/version.txt

@@ -1 +1 @@
-2.3.0
+2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
   "type": "module",
   "bin": {

package/src/commands/add-cursor-skill.js

@@ -3,17 +3,19 @@ import { writeConfig } from '../lib/config.js';
 import { scaffoldCursorBundle } from '../lib/cursor-bundle.js';
 
 /**
- * Install Electric Maybe Cursor rules and skills (.cursor/rules, .cursor/skills).
+ * Install Electric Maybe Cursor bundle (.cursor/rules, .cursor/skills, .cursor/agents).
  * Can be run standalone or after init if Cursor bundle was skipped.
  */
 export async function addCursorSkillCommand() {
-  console.log(pc.bold('\n  climaybe — Add Cursor rules + skills\n'));
+  console.log(pc.bold('\n  climaybe — Add Cursor bundle\n'));
 
   writeConfig({ cursor_skills: true });
 
   const ok = scaffoldCursorBundle();
   if (ok) {
-    console.log(pc.green('  Installed .cursor/rules and .cursor/skills from climaybe bundle.'));
+    console.log(
+      pc.green('  Installed .cursor/rules, .cursor/skills, and .cursor/agents from climaybe bundle.'),
+    );
     console.log(pc.dim('  See .cursor/rules/00-rule-index.mdc for which rules apply when.\n'));
   } else {
     console.log(pc.red('  Cursor bundle not found in this climaybe install.'));

package/src/commands/app-init.js

@@ -42,7 +42,9 @@ async function runAppInitFlow() {
   if (enableCursorSkills) {
     const cursorOk = scaffoldCursorBundle();
     if (cursorOk) {
-      console.log(pc.green('  Electric Maybe Cursor rules + skills → .cursor/rules, .cursor/skills'));
+      console.log(
+        pc.green('  Electric Maybe Cursor bundle → .cursor/rules, .cursor/skills, .cursor/agents'),
+      );
     } else {
       console.log(pc.yellow('  Cursor bundle not found in package (skipped).'));
     }
@@ -50,7 +52,7 @@ async function runAppInitFlow() {
 
   console.log(pc.bold(pc.green('\n  App setup complete!\n')));
   console.log(pc.dim('  commitlint + Husky: ' + (enableCommitlint ? 'enabled' : 'disabled')));
-  console.log(pc.dim('  Cursor rules + skills: ' + (enableCursorSkills ? 'installed' : 'skipped')));
+  console.log(pc.dim('  Cursor bundle: ' + (enableCursorSkills ? 'installed' : 'skipped')));
   console.log(pc.dim('\n  Next steps:'));
   console.log(pc.dim('    Use Shopify CLI (`shopify app dev`, etc.) for app development.'));
   console.log(pc.dim('    Theme CI/CD workflows are not installed; add your own deployment as needed.\n'));

package/src/commands/init.js

@@ -112,7 +112,7 @@ async function runInitFlow() {
     includeBuild: enableBuildWorkflows,
   });
 
-  // 7. Optional commitlint + Husky and Cursor rules + skills bundle
+  // 7. Optional commitlint + Husky and Cursor bundle (rules, skills, agents)
   if (enableCommitlint) {
     console.log(pc.dim('  Setting up commitlint + Husky...'));
     if (scaffoldCommitlint()) {
@@ -124,7 +124,9 @@ async function runInitFlow() {
   if (enableCursorSkills) {
     const cursorOk = scaffoldCursorBundle();
     if (cursorOk) {
-      console.log(pc.green('  Electric Maybe Cursor rules + skills → .cursor/rules, .cursor/skills'));
+      console.log(
+        pc.green('  Electric Maybe Cursor bundle → .cursor/rules, .cursor/skills, .cursor/agents'),
+      );
     } else {
       console.log(pc.yellow('  Cursor bundle not found in package (skipped).'));
     }
@@ -163,7 +165,7 @@ async function runInitFlow() {
     console.log(pc.dim(`  VS Code tasks: ${enableVSCodeTasks ? 'enabled' : 'disabled'}`));
   }
   console.log(pc.dim(`  commitlint + Husky: ${enableCommitlint ? 'enabled' : 'disabled'}`));
-  console.log(pc.dim(`  Cursor rules + skills: ${enableCursorSkills ? 'installed' : 'skipped'}`));
+  console.log(pc.dim(`  Cursor bundle: ${enableCursorSkills ? 'installed' : 'skipped'}`));
 
   const suggestedTag = getSuggestedTagForRelease();
   const tagLabel = suggestedTag === 'v1.0.0' ? 'Tag your first release' : 'Tag your next release';

package/src/cursor/agents/theme-translator.md

@@ -0,0 +1,53 @@
+---
+name: theme-translator
+description: >-
+  Use when changes are detected in theme/locales/en.default.schema.json or
+  theme/locales/en.default.json. Generates translations for other locale files
+  from new, modified, or removed English entries—including both
+  [country-code].json and [country-code].schema.json. Use proactively after
+  English locale edits or when reviewing locale diffs.
+model: claude-4-sonnet
+---
+
+You are an expert multilingual translator specializing in e-commerce and Shopify theme localization. Your primary responsibility is to maintain translation consistency across all locale files in a Shopify theme project.
+
+## Core tasks
+
+1. **Monitor changes** — Analyze modifications in `theme/locales/en.default.schema.json` and `theme/locales/en.default.json`: new keys, changed values, and deleted entries.
+
+2. **Generate accurate translations** for every other locale file. You must:
+   - Preserve the exact JSON structure and key hierarchy
+   - Keep terminology consistent within each language
+   - Prefer e-commerce and online-shopping context for ambiguous terms
+   - Reuse phrasing from existing strings in the same locale when it matches the same concept
+   - Follow language-specific capitalization, punctuation, and formatting norms
+
+3. **Schema files** — For `.schema.json` files, translate UI labels, descriptions, and info text. Preserve technical identifiers and settings structure; do not translate keys meant to stay stable for Shopify or internal references.
+
+4. **Quality assurance**
+   - Cross-check similar keys in the same locale for consistent wording
+   - Match appropriate brand tone per market
+   - Preserve placeholder syntax exactly (e.g. `{{ variable }}`, Liquid-style tokens) as in the English source unless the locale requires a different order—never drop or corrupt placeholders
+   - Prefer concise UI-friendly phrasing (avoid unnecessarily long strings)
+
+5. **Best practices**
+   - Use market-appropriate shopping terms (e.g. cart vs basket)
+   - Align register (formal/informal) with typical e-commerce expectations for that locale
+   - Keep widely recognized English UI terms when locals expect them (e.g. checkout, sale), unless the locale file already established a different convention—then stay consistent with that file
+
+## Workflow
+
+1. List all locale files under `theme/locales/`.
+2. Diff English defaults (`en.default.json`, `en.default.schema.json`) against each other locale’s matching files.
+3. For **additions/updates**: add or update translated values; mirror structure exactly.
+4. For **deletions** in English: remove the same keys from other locales (or align with team policy if documented—default is remove to avoid stale keys).
+5. Ensure output is **valid JSON** (no trailing commas, correct quoting, stable key order optional but structure must match English).
+6. End with a **short summary** grouped by locale: added / modified / deleted.
+
+## Invocation examples (for the parent agent)
+
+- User added new keys in English → run theme-translator to propagate to all locales.
+- User changed English copy → update the same keys across locales.
+- During review, English locale diffs are present → proactively sync other languages.
+
+Never break JSON syntax. When unsure of a term, prefer consistency with existing strings in that locale file over literal word-for-word translation.

package/src/cursor/skills/locale-translation-prep/SKILL.md

@@ -13,7 +13,7 @@ For context on how the project uses locales (e.g. in sections/snippets), the rul
 
 1. `.cursor/rules/00-rule-index.mdc` — rule index (schemas.mdc prefers translation keys over schema text; locales live in `locales/`)
 
-No single "locale rules" file is required; this skill focuses on file comparison and reporting.
+No single "locale rules" file is required; this skill focuses on file comparison and reporting. To **generate** translations across locales after English changes, use the **theme-translator** subagent (`/theme-translator`), installed with the Cursor bundle under `.cursor/agents/`.
 
 ## Workflow
 

package/src/index.js

@@ -84,7 +84,7 @@ export function createProgram(version = '0.0.0', packageDir = '') {
   const app = program.command('app').description('Shopify app repo helpers (no theme workflows)');
   app
     .command('init')
-    .description('Set up commitlint, Cursor rules/skills, and project_type: app in package.json')
+    .description('Set up commitlint, Cursor bundle (rules/skills/agents), and project_type: app in package.json')
     .action(appInitCommand);
 
   program
@@ -95,7 +95,9 @@ export function createProgram(version = '0.0.0', packageDir = '') {
   program
     .command('add-cursor')
     .alias('add-cursor-skill')
-    .description('Install Electric Maybe Cursor rules + skills (.cursor/rules, .cursor/skills)')
+    .description(
+      'Install Electric Maybe Cursor bundle (.cursor/rules, .cursor/skills, .cursor/agents)',
+    )
     .action(addCursorSkillCommand);
 
   return program;

package/src/lib/build-workflows.js

@@ -23,14 +23,6 @@ const REQUIRED_PATHS = [
 
 const DEFAULTS = [
   { path: 'assets', kind: 'dir' },
-  {
-    path: 'release-notes.md',
-    kind: 'file',
-    content: `# Release Notes
-
-- describe key changes for this release
-`,
-  },
 ];
 
 function targetScriptPath(cwd = process.cwd()) {

package/src/lib/config.js

@@ -143,7 +143,7 @@ export function isCommitlintEnabled(cwd = process.cwd()) {
 }
 
 /**
- * Whether bundled Cursor rules + skills were installed (init or add-cursor).
+ * Whether bundled Cursor rules, skills, and subagents were installed (init or add-cursor).
  */
 export function isCursorSkillsEnabled(cwd = process.cwd()) {
   const config = readConfig(cwd);

package/src/lib/cursor-bundle.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-/** Bundled Electric Maybe Cursor rules + skills (shipped under src/cursor/). */
+/** Bundled Electric Maybe Cursor rules, skills, and subagents (shipped under src/cursor/). */
 const BUNDLE_ROOT = join(__dirname, '..', 'cursor');
 
 const SKIP_NAMES = new Set(['.DS_Store']);
@@ -30,18 +30,20 @@ function copyTree(src, dest) {
 }
 
 /**
- * Install bundled `.cursor/rules` and `.cursor/skills` into the target repo.
+ * Install bundled `.cursor/rules`, `.cursor/skills`, and `.cursor/agents` into the target repo.
  * @param {string} [cwd] - Working directory (default process.cwd())
  * @returns {boolean} - false if bundle source is missing (broken install)
  */
 export function scaffoldCursorBundle(cwd = process.cwd()) {
   const rulesSrc = join(BUNDLE_ROOT, 'rules');
   const skillsSrc = join(BUNDLE_ROOT, 'skills');
-  if (!existsSync(rulesSrc) || !existsSync(skillsSrc)) {
+  const agentsSrc = join(BUNDLE_ROOT, 'agents');
+  if (!existsSync(rulesSrc) || !existsSync(skillsSrc) || !existsSync(agentsSrc)) {
     return false;
   }
   const cursorRoot = join(cwd, '.cursor');
   copyTree(rulesSrc, join(cursorRoot, 'rules'));
   copyTree(skillsSrc, join(cursorRoot, 'skills'));
+  copyTree(agentsSrc, join(cursorRoot, 'agents'));
   return true;
 }

package/src/lib/prompts.js

@@ -192,14 +192,14 @@ export async function promptCommitlint() {
 }
 
 /**
- * Ask whether to install bundled Cursor rules + skills (.cursor/rules, .cursor/skills).
+ * Ask whether to install bundled Cursor rules, skills, and subagents (.cursor/rules, .cursor/skills, .cursor/agents).
  */
 export async function promptCursorSkills() {
   const { enableCursorSkills } = await prompts({
     type: 'confirm',
     name: 'enableCursorSkills',
     message:
-      'Install Electric Maybe Cursor rules + skills? (Liquid/JS/a11y conventions + AI skills in .cursor/)',
+      'Install Electric Maybe Cursor bundle? (rules, skills, subagents e.g. theme-translator in .cursor/)',
     initial: true,
   });
 

package/src/lib/theme-dev-kit.js

@@ -53,6 +53,9 @@ yarn.lock
       startServerCommand: 'shopify theme serve',
       startServerReadyPattern: 'Preview your theme',
       startServerReadyTimeout: 60000,
+      settings: {
+        chromeFlags: '--no-sandbox --disable-dev-shm-usage',
+      },
     },
     assert: {
       assertions: {

package/src/workflows/build/create-release.yml

@@ -4,21 +4,69 @@ on:
   push:
     tags:
       - "v*"
+  workflow_run:
+    workflows: ['Post-Merge Tag', 'Nightly Hotfix Tag']
+    types: [completed]
+    branches: [main]
+
+permissions:
+  contents: write
 
 jobs:
   build:
+    if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Resolve release tag
+        id: tag
+        run: |
+          if [ "${{ github.event_name }}" = "push" ]; then
+            TAG_NAME="${GITHUB_REF#refs/tags/}"
+          else
+            git fetch --tags origin
+            TAG_NAME=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+            if [ -z "$TAG_NAME" ]; then
+              TAG_NAME=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+            fi
+          fi
+
+          if [ -z "$TAG_NAME" ]; then
+            echo "No release tag found, skipping."
+            echo "tag_name=" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+          echo "Using tag: $TAG_NAME"
+
+      - name: Check if release already exists
+        id: release_check
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TAG_NAME="${{ steps.tag.outputs.tag_name }}"
+          if [ -z "$TAG_NAME" ]; then
+            echo "release_exists=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          if gh release view "$TAG_NAME" >/dev/null 2>&1; then
+            echo "Release for $TAG_NAME already exists, skipping."
+            echo "release_exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "release_exists=false" >> $GITHUB_OUTPUT
+          fi
 
       - name: Create release archive
+        if: steps.release_check.outputs.release_exists != 'true'
         run: |
           mkdir release-temp
           mkdir -p .sys/release-notes
 
-          TAG_NAME=${GITHUB_REF#refs/tags/}
-          cp release-notes.md ".sys/release-notes/release-note-${TAG_NAME}.md"
-
           for dir in assets layout locales sections snippets config; do
             mkdir -p "release-temp/$dir"
             find "$dir" -type f ! -name "*.md" -exec cp --parents {} release-temp/ \;
@@ -43,10 +91,113 @@ jobs:
           cd ..
           rm -rf release-temp
 
+      - name: Generate release notes from commits
+        if: steps.release_check.outputs.release_exists != 'true'
+        id: notes
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+        run: |
+          TAG_NAME="${{ steps.tag.outputs.tag_name }}"
+          NOTES_FILE=".sys/release-notes/release-note-${TAG_NAME}.md"
+          mkdir -p .sys/release-notes
+
+          git fetch --tags origin
+
+          PREV_TAG=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -Fxv "$TAG_NAME" | head -1 || true)
+          if [ -z "$PREV_TAG" ]; then
+            PREV_TAG=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+$' | grep -Fxv "$TAG_NAME" | head -1 || true)
+          fi
+
+          if [ -n "$PREV_TAG" ]; then
+            RANGE="${PREV_TAG}..${TAG_NAME}"
+          else
+            RANGE="$TAG_NAME"
+          fi
+
+          COMMITS=$(git log --pretty=format:"%s" "$RANGE" 2>/dev/null || true)
+          if [ -z "$COMMITS" ]; then
+            COMMITS=$(git log --pretty=format:"%s" -n 30 "$TAG_NAME" 2>/dev/null || true)
+          fi
+
+          # Score how many commit subjects follow conventional-commit style.
+          TOTAL_COUNT=$(printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | wc -l | tr -d ' ')
+          CONVENTIONAL_COUNT=$(printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | grep -Eic '^(feat|fix|refactor|perf|docs|style|test|build|ci|chore|revert)(\([^)]+\))?!?: ')
+          if [ -z "$TOTAL_COUNT" ] || [ "$TOTAL_COUNT" -eq 0 ]; then
+            TOTAL_COUNT=1
+          fi
+          QUALITY=$((CONVENTIONAL_COUNT * 100 / TOTAL_COUNT))
+
+          {
+            echo "# Release Notes"
+            echo
+            echo "## ${TAG_NAME}"
+            if [ -n "$PREV_TAG" ]; then
+              echo
+              echo "_Changes since ${PREV_TAG}_"
+            fi
+            echo
+          } > "$NOTES_FILE"
+
+          # If commit quality is low and Gemini is available, ask AI to summarize merchant-facing notes.
+          if [ "$QUALITY" -lt 50 ] && [ -n "$GEMINI_API_KEY" ]; then
+            printf '%s\n' "$COMMITS" > .sys/release-notes/commits-for-ai.txt
+
+            PROMPT=$(cat <<'PROMPT_EOF'
+          You generate release notes for a Shopify theme.
+          Given commit subjects, write concise markdown with these sections when relevant:
+          - Features
+          - Fixes
+          - Improvements
+          - Chore
+
+          Rules:
+          - Keep notes merchant-friendly and specific.
+          - Do not include commit hashes.
+          - Do not invent changes.
+          - If a section has no items, omit it.
+          PROMPT_EOF
+            )
+
+            PAYLOAD=$(jq -n \
+              --arg prompt "$PROMPT" \
+              --rawfile commits .sys/release-notes/commits-for-ai.txt \
+              '{
+                "contents": [{
+                  "parts": [{"text": ($prompt + "\n\nCommits:\n" + $commits)}]
+                }],
+                "generationConfig": {
+                  "temperature": 0.2,
+                  "maxOutputTokens": 1024
+                }
+              }')
+
+            RESPONSE=$(curl -s -X POST \
+              "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=${GEMINI_API_KEY}" \
+              -H "Content-Type: application/json" \
+              -d "$PAYLOAD")
+            AI_NOTES=$(echo "$RESPONSE" | jq -r '.candidates[0].content.parts[0].text // empty' 2>/dev/null || true)
+
+            if [ -n "$AI_NOTES" ] && [ "$AI_NOTES" != "null" ]; then
+              printf '%s\n' "$AI_NOTES" >> "$NOTES_FILE"
+            else
+              echo "## Changes" >> "$NOTES_FILE"
+              echo >> "$NOTES_FILE"
+              printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+            fi
+          else
+            echo "## Changes" >> "$NOTES_FILE"
+            echo >> "$NOTES_FILE"
+            printf '%s\n' "$COMMITS" | sed '/^[[:space:]]*$/d' | sed 's/^/- /' >> "$NOTES_FILE"
+          fi
+
+          echo "notes_file=$NOTES_FILE" >> $GITHUB_OUTPUT
+
       - name: Create Release
+        if: steps.release_check.outputs.release_exists != 'true'
         uses: softprops/action-gh-release@v1
         with:
+          tag_name: ${{ steps.tag.outputs.tag_name }}
           files: release.zip
-          body_path: release-notes.md
+          body_path: ${{ steps.notes.outputs.notes_file }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}