ace-git 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e24b5a2b72ed3954edc211b222e6ac5c1c10707899cf2acc4b566b45b8721ac
-  data.tar.gz: e6b63023d6abd0b82816cf6dc10f082b45e77051da5a96f96e404990fce0705b
+  metadata.gz: 1c027540195a5081320ef9e440582480cd4b3682190e40c24d123b4a54dd41f9
+  data.tar.gz: a2ae2188b33cb9762a9436c335da45903d8342f4531dd0a56a19522637bc3e81
 SHA512:
-  metadata.gz: 8b6390363985035acb8a8d95e9fe1c4578543599caac3cf86a7e867458d89ba6935bcc92e7b5ef862d648fe209dd7fd2c2a51c06938bc608c2c0ea56e7370d7b
-  data.tar.gz: 3ede04b073b37bde6682e105a0e2853f5b14d5f9ed382fabeb2abad44f30ad8c3d2106d2dced513e86a3e889da66cb64354457b56f55f1e94a89ff194037ce0b
+  metadata.gz: a87fcd62b3731fdd3061621431b70ba3cb68c63fa17e8f353ddeef68f84dd603beb9e39e9a9d360a33e73b4160bd73097224995fcb8a4984372eca83751c3d17
+  data.tar.gz: 73e2fc197ad8772004f7244e483434d1555e73cca95641a472900f007fc94a87ad9a044f294785e15003797915925d20e894842b70bc4f75bce2de2c89048392

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.18.5] - 2026-03-29
+
+### Added
+- Added Step 1.5 "Finalize Unreleased Content" to `github/release-publish` workflow: assigns version number and commits `[Unreleased]` content at publish time.
+
+### Changed
+- Updated `as-github-release-publish` skill with `Edit` and `ace-git-commit` tool permissions for changelog finalization.
+- Updated rebase workflow CHANGELOG conflict advice for unreleased-mode branches.
+
 ## [0.18.4] - 2026-03-29
 
 ### Technical

data/handbook/skills/as-github-release-publish/SKILL.md

@@ -1,13 +1,15 @@
 ---
 name: as-github-release-publish
-description: Create GitHub releases from unpublished CHANGELOG entries
+description: Finalize unreleased changelog and create GitHub releases
 # bundle: wfi://github/release-publish
 # agent: general-purpose
 user-invocable: true
 allowed-tools:
   - Bash(gh:*)
   - Bash(ace-bundle:*)
+  - Bash(ace-git-commit:*)
   - Read
+  - Edit
 argument-hint: "[version-or-range] [--since duration] [--group-by package|date] [--category-order fixed,added,changed,technical] [--dry-run]"
 last_modified: 2026-03-21
 source: ace-git

data/handbook/workflow-instructions/git/rebase.wf.md

@@ -190,7 +190,7 @@ if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
     echo "Strategy: continue-first"
     echo "Resolve conflicts, then run: git add <files> && git rebase --continue"
     echo "Escalate only if the next rebase stop is also conflicted or resolution coordination becomes complex."
-    echo "CHANGELOG.md note: prefer git checkout --theirs CHANGELOG.md, then re-apply your entries on top before git add."
+    echo "CHANGELOG.md note: with unreleased-mode, merge both sides' items under [Unreleased] (keep all). For legacy versioned entries, prefer git checkout --theirs CHANGELOG.md, then re-apply your entries on top before git add."
   else
     echo "Strategy: cherry-pick fallback (conflict set is large)"
     echo "Abort the rebase and proceed to Phase 3."
@@ -370,7 +370,7 @@ find .ace-local/git -name "*-rebase" -type d -mtime +7 -exec rm -rf {} +
 git rebase "$target_branch"
 # On conflict: resolve files, git add, git rebase --continue
 # Escalate to Phase 3 only if conflicts keep repeating or require per-commit replay
-# CHANGELOG: git checkout --theirs CHANGELOG.md, add your entries on top
+# CHANGELOG: with unreleased-mode, merge both sides' [Unreleased] items. For versioned entries: git checkout --theirs CHANGELOG.md, add your entries on top
 ```
 
 ### Interactive Rebase

data/handbook/workflow-instructions/github/release-publish.wf.md

@@ -33,6 +33,59 @@ gh release list --limit 50 --json tagName,name --jq '[.[] | select(.tagName | st
 
 If no `v*` release exists, treat all changelog versions as unpublished.
 
+### 1.5. Finalize Unreleased Content
+
+Check if the `## [Unreleased]` section in `CHANGELOG.md` has substantive content (any lines between
+`## [Unreleased]` and the next `## [` heading that are not blank or HTML comments).
+
+If `[Unreleased]` is empty, skip to step 2.
+
+If `[Unreleased]` has content:
+
+1. **Determine the next version number:**
+   - Find the highest existing versioned entry (`## [X.Y.Z]`) in `CHANGELOG.md`.
+   - Increment its patch number by 1 (e.g., `0.9.932` → `0.9.933`).
+
+2. **Rewrite the unreleased section:**
+   - Move all category headings and bullet items from the `[Unreleased]` block into a new versioned entry.
+   - Leave the `[Unreleased]` section empty.
+   - Use today's date in ISO format.
+
+   Before:
+   ```markdown
+   ## [Unreleased]
+
+   ### Fixed
+   - item 1
+
+   ### Added
+   - item 2
+
+   ## [0.9.932] - 2026-03-29
+   ```
+
+   After:
+   ```markdown
+   ## [Unreleased]
+
+   ## [0.9.933] - 2026-03-30
+
+   ### Fixed
+   - item 1
+
+   ### Added
+   - item 2
+
+   ## [0.9.932] - 2026-03-29
+   ```
+
+3. **Commit the finalization:**
+   ```bash
+   ace-git-commit CHANGELOG.md -i "finalize changelog v0.9.933 from unreleased"
+   ```
+
+4. Proceed to step 2 with the newly created versioned entry available for publishing.
+
 ### 2. Parse Root CHANGELOG
 
 Read `CHANGELOG.md` and extract all version entries matching `## [X.Y.Z] - YYYY-MM-DD`.

data/lib/ace/git/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module Git
-    VERSION = '0.18.4'
+    VERSION = '0.18.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-git
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - Michal Czyz