feat: update pyproject (#16)

* feat: update pyproject

* chore: update conf

feat: configure project release automation (#17)

* feat: update pyproject

* chore: update conf

* feat: migrate commitizen config and enhance release workflow

- Migrate Commitizen configuration from cz.json to pyproject.toml
- Add PAT_TOKEN support for GitHub Actions workflow
- Enhance release workflow with branch protection handling
- Add pre-commit hooks installation in CI
- Improve error handling and alternative push strategies
- Update version to 0.1.5 and configure changelog settings

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: remove changelog file generation and simplify release workflow

- Remove changelog_file configuration from pyproject.toml
- Remove update_changelog_on_bump setting as it's no longer needed
- Update GitHub workflow to use 'cz bump --yes' instead of 'cz bump --changelog'
- Remove changelog_start_rev updates since we don't maintain changelog files
- Keep changelog content generation via 'cz changelog --dry-run' for GitHub releases
- Simplify commit message for version updates

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

---------

Signed-off-by: 拐爷&&老拐瘦 <[email protected]>
Co-authored-by: Claude <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

bump: version 0.1.5 → 0.2.0

chore: update version to 0.2.0

fix: restore workflow configuration and resolve rebase conflicts (#18)

* fix: restore workflow configuration and resolve rebase conflicts

- Fix pyproject.toml target-version and python_version settings
- Restore ACT testing support in GitHub workflow
- Restore single commit logic for version bumps
- Restore update_changelog_on_bump setting for proper version detection
- Fix configuration conflicts from rebase

* fix: prevent sed command from corrupting other version configurations

- Use more precise sed pattern to only update commitizen version
- Prevent target-version and python_version from being overwritten with package version
- Scope sed replacement to [tool.commitizen] section only
- This resolves the root cause of configuration corruption during auto-release

bump: version 0.2.1 → 0.3.0

Author: yfge

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.PAT_TOKEN || secrets.GITHUB_TOKEN }}
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -33,26 +33,87 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install commitizen build twine
+          pip install commitizen build twine pre-commit ruff mypy
 
       - name: Configure Git
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
 
+      - name: Install pre-commit hooks
+        run: |
+          # Skip pre-commit installation during local act testing
+          if [[ "${ACT:-false}" == "true" ]]; then
+            echo "Skipping pre-commit setup in act environment"
+            git config --global init.templateDir ""
+          else
+            pre-commit install
+          fi
+
+      - name: Check branch protection status
+        id: branch-protection
+        run: |
+          # Check if we can push directly to main
+          if git push --dry-run origin main 2>/dev/null; then
+            echo "can_push_directly=true" >> $GITHUB_OUTPUT
+            echo "Branch allows direct push"
+          else
+            echo "can_push_directly=false" >> $GITHUB_OUTPUT
+            echo "Branch is protected, will need special handling"
+          fi
+
       - name: Bump version automatically
         id: bump-version
         run: |
           # Check if we need to bump version based on conventional commits
-          if cz bump --dry-run --changelog 2>/dev/null; then
+          if cz bump --dry-run 2>/dev/null; then
             echo "bump_needed=true" >> $GITHUB_OUTPUT
-            cz bump --changelog --yes
-            git push origin main --follow-tags
+
+            # Get the new version that would be created
+            NEW_VERSION=$(cz bump --dry-run | grep "bump: version" | sed 's/.*→ //')
+            echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+            # Update only the commitizen version configuration before bumping
+            sed -i.bak "/^\[tool\.commitizen\]/,/^\[/ s/^version = \"[^\"]*\"/version = \"$NEW_VERSION\"/" pyproject.toml
+            rm -f pyproject.toml.bak
+
+            # Now run cz bump which will create a single commit with all changes
+            cz bump --yes
+
+            # Generate changelog content for release (without creating file)
+            CHANGELOG_CONTENT=$(cz changelog --dry-run)
+            echo "changelog_content<<EOF" >> $GITHUB_OUTPUT
+            echo "$CHANGELOG_CONTENT" >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+
+            # Push based on branch protection status
+            if [ "${{ steps.branch-protection.outputs.can_push_directly }}" = "true" ]; then
+              echo "Pushing directly to main branch..."
+              git push origin main --follow-tags
+            else
+              echo "Branch is protected, using alternative push strategy..."
+              # Try with different authentication methods
+              git push origin main --follow-tags || {
+                echo "Standard push failed, trying with force-with-lease..."
+                git push origin main --follow-tags --force-with-lease || {
+                  echo "All push attempts failed. This might be due to branch protection rules."
+                  echo "Please check repository settings or use a Personal Access Token (PAT_TOKEN)."
+                  echo "You can also temporarily disable branch protection for releases."
+                  exit 1
+                }
+              }
+            fi
           else
             echo "bump_needed=false" >> $GITHUB_OUTPUT
             echo "No version bump needed based on commit messages"
           fi
 
+      - name: Display changelog content
+        if: steps.bump-version.outputs.bump_needed == 'true'
+        run: |
+          echo "Generated changelog content:"
+          echo "${{ steps.bump-version.outputs.changelog_content }}"
+
       - name: Get version
         id: version
         run: |
@@ -88,14 +149,19 @@ jobs:
           tag_name: ${{ steps.version.outputs.tag }}
           name: Release ${{ steps.version.outputs.tag }}
           body: |
-            ## Changes in ${{ steps.version.outputs.tag }}
-
-            See [CHANGELOG.md](https://github.com/ai-shifu/markdown-flow-agent-py/blob/main/CHANGELOG.md) for detailed changes.
+            ${{ steps.bump-version.outputs.changelog_content }}
 
             ## Installation
             ```bash
             pip install markdown-flow==${{ steps.version.outputs.version }}
             ```
+
+            ## What's Changed
+            This release includes the following changes:
+            - Automated version management with Commitizen
+            - Enhanced GitHub Actions workflow for releases
+            - Improved branch protection handling
+            - Streamlined changelog generation
           files: |
             dist/*
           draft: false

CHANGELOG.md

@@ -0,0 +1,29 @@
+## v0.3.0 (2025-09-03)
+
+### Fix
+
+- restore workflow configuration and resolve rebase conflicts (#18)
+
+## v0.2.0 (2025-09-03)
+
+### Feat
+
+- configure project release automation (#17)
+
+## v0.1.5 (2025-09-03)
+
+### Feat
+
+- update pyproject (#16)
+- update commitizen config for auto release (#15)
+- udpate cz conf to auto release
+- add automated release workflow with version management (#11)
+- add markdownlint integration for consistent documentation quality (#10)
+- add markdownlint integration for consistent documentation quality (#10)
+- add editorconfig focused on Python backend development (#8)
+- add commitizen configuration for automated version management (#6)
+- interactive syntax escape (#3)
+
+### Fix
+
+- variable parsing processing in interaction (#2)

cz.json

@@ -82,4 +82,4 @@
 ]
 
 # Version information
-__version__ = "0.1.5"
+__version__ = "0.2.0"

markdown_flow/__init__.py

@@ -144,8 +144,24 @@ disallow_incomplete_defs = false
 # =============================================================================
 [tool.commitizen]
 name = "cz_conventional_commits"
-tag_format = "v$version"
-version_scheme = "semver"
-version_provider = "pep621"
+version = "0.3.0"
+tag_format = "v$major.$minor.$patch"
 update_changelog_on_bump = true
-major_version_zero = true
+annotated_tag = true
+gpg_sign = false
+version_files = [
+    "markdown_flow/__init__.py:__version__"
+]
+bump_message = "bump: version $current_version → $new_version"
+style = [
+    ["qmark", "fg:#ff9d00 bold"],
+    ["question", "bold"],
+    ["answer", "fg:#ff9d00 bold"],
+    ["pointer", "fg:#ff9d00 bold"],
+    ["highlighted", "fg:#ff9d00 bold"],
+    ["selected", "fg:#cc5454"],
+    ["separator", "fg:#cc5454"],
+    ["instruction", ""],
+    ["text", ""],
+    ["disabled", "fg:#858585 italic"]
+]