diff --git a/.agents/skills/PR_WORKFLOW.md b/.agents/skills/PR_WORKFLOW.md
index 402dc42f1c..4030650735 100644
--- a/.agents/skills/PR_WORKFLOW.md
+++ b/.agents/skills/PR_WORKFLOW.md
@@ -107,7 +107,7 @@ Before any substantive review or prep work, **always rebase the PR branch onto c
 
 - In normal `prepare-pr` runs, commits are created via `scripts/committer "<msg>" <file...>`. Use it manually only when operating outside the skill flow; avoid manual `git add`/`git commit` so staging stays scoped.
 - Follow concise, action-oriented commit messages (e.g., `CLI: add verbose flag to send`).
-- During `prepare-pr`, use this commit subject format: `fix: <summary> (openclaw#<PR>) thanks @<pr-author>`.
+- During `prepare-pr`, use concise, action-oriented subjects **without** PR numbers or thanks; reserve `(#<PR>) thanks @<pr-author>` for the final merge/squash commit.
 - Group related changes; avoid bundling unrelated refactors.
 - Changelog workflow: keep the latest released version at the top (no `Unreleased`); after publishing, bump the version and start a new top section.
 - When working on a PR: add a changelog entry with the PR number and thank the contributor (mandatory in this workflow).
diff --git a/.agents/skills/prepare-pr/SKILL.md b/.agents/skills/prepare-pr/SKILL.md
index 95252ef061..462e5bc2bd 100644
--- a/.agents/skills/prepare-pr/SKILL.md
+++ b/.agents/skills/prepare-pr/SKILL.md
@@ -34,7 +34,7 @@ scripts/pr-prepare init <PR>
 - `.local/review.json` is mandatory.
 - Resolve all `BLOCKER` and `IMPORTANT` items.
 
-3. Commit with required subject format and validate it.
+3. Commit scoped changes with concise subjects (no PR number/thanks; those belong on the final merge/squash commit).
 
 4. Run gates via wrapper.
 
@@ -76,21 +76,12 @@ jq -r '.docs' .local/review.json
 
 4. Commit scoped changes
 
-Required commit subject format:
-
-- `fix: <summary> (openclaw#<PR>) thanks @<pr-author>`
+Use concise, action-oriented subject lines without PR numbers/thanks. The final merge/squash commit is the only place we include PR numbers and contributor thanks.
 
 Use explicit file list:
 
 ```sh
-source .local/pr-meta.env
-scripts/committer "fix: <summary> (openclaw#$PR_NUMBER) thanks @$PR_AUTHOR" <file1> <file2> ...
-```
-
-Validate commit subject:
-
-```sh
-scripts/pr-prepare validate-commit <PR>
+scripts/committer "fix: <summary>" <file1> <file2> ...
 ```
 
 5. Run gates
diff --git a/.pi/prompts/landpr.md b/.pi/prompts/landpr.md
index 1b150c05e0..95e4692f3e 100644
--- a/.pi/prompts/landpr.md
+++ b/.pi/prompts/landpr.md
@@ -42,8 +42,9 @@ Goal: PR must end in GitHub state = MERGED (never CLOSED). Use `gh pr merge` wit
    - If unclear, ask
 10. Full gate (BEFORE commit):
     - `pnpm lint && pnpm build && pnpm test`
-11. Commit via committer (include # + contributor in commit message):
-    - `committer "fix: <summary> (#<PR>) (thanks @$contrib)" CHANGELOG.md <changed files>`
+11. Commit via committer (final merge commit only includes PR # + thanks):
+    - For the final merge-ready commit: `committer "fix: <summary> (#<PR>) (thanks @$contrib)" CHANGELOG.md <changed files>`
+    - If you need intermediate fix commits before the final merge commit, keep those messages concise and **omit** PR number/thanks.
     - `land_sha=$(git rev-parse HEAD)`
 12. Push updated PR branch (rebase => usually needs force):