Maybe this time

git-cliff-release/action.yaml

@@ -118,15 +118,16 @@ runs:
         dump_context_args=()
         enhance_context_args=()
         print_changelog_args=()
+        out_file=$GIT_CLIFF_WORKDIR/new_changelog.md
 
         if [[ -n "${{ inputs.existing_changelog_path }}" ]]; then
           out_file=$GIT_CLIFF_WORKDIR/existing_changelog.md
           cp "${{ github.workspace }}/${{ inputs.existing_changelog_path }}" $out_file
           sed '/<!-- git-cliff-unreleased-start -->/,/<!-- git-cliff-unreleased-end -->/d' -i $out_file
 
+          dump_context_args+=(--unreleased)
           print_changelog_args+=(--prepend "$out_file" --unreleased)
         else
-          out_file=$GIT_CLIFF_WORKDIR/new_changelog.md
           print_changelog_args+=(--output "$out_file")
         fi
 

git-cliff-release/cliff.toml

@@ -35,7 +35,7 @@ body = """
             {% else %}\
             {{ commit.message | upper_first }}\
             {% endif %}\
-            {{" "}}([{{ commit.id | truncate(length = 7, end = "") }}]({{ commit.extra.commit_link }}))\
+            {% if commit.extra.commit_link %} ([{{ commit.id | truncate(length = 7, end = "") }}]({{ commit.extra.commit_link }})){% endif %}\
             {% if commit.remote.username and extra.is_release_notes %}\
             {{" "}}by @{{ commit.remote.username }}\
             {% elif commit.remote.username %}\

git-cliff-release/enhance_context.py

@@ -44,7 +44,7 @@ def enhance_release(
 
 
 def enhance_commit(commit: dict[str, Any], pr_issues: dict[int, list[int]]) -> None:
-    pr_number = commit["remote"]["pr_number"]
+    pr_number = commit.get("remote", {}).get("pr_number")
 
     commit["extra"] = commit["extra"] or {}
     commit["extra"]["commit_link"] = f"{repo_url}/commit/{commit['id']}"