Merge pull request #23 from zouyonghe/main

refactor: harden DMG cleanup and legacy desktop patching safeguards

Author: zouyonghe

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,106 @@
+name: "🐛 Bug Report / 问题反馈"
+title: "[Bug] "
+description: Report a reproducible bug in AstrBot Desktop. / 反馈 AstrBot Desktop 可复现问题。
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting this issue. Please provide reproducible steps and logs.
+        感谢反馈问题。请尽量提供可复现步骤和日志，信息不足的问题可能无法排查。
+
+  - type: textarea
+    attributes:
+      label: What happened? / 实际发生了什么？
+      description: Describe the actual behavior.
+      placeholder: A clear and specific description of the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior / 预期行为
+      description: What did you expect to happen?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce / 复现步骤
+      description: Please provide minimal reproducible steps.
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Desktop version / 桌面端版本
+      description: e.g. 4.17.6
+      placeholder: 4.x.x
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Installation channel / 安装来源
+      multiple: false
+      options:
+        - GitHub Release installer
+        - Built from source
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: OS / 操作系统
+      multiple: false
+      options:
+        - Windows
+        - macOS
+        - Linux
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Architecture / 架构
+      description: e.g. amd64 / arm64
+      placeholder: amd64
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Upstream AstrBot ref used by desktop build (optional) / 桌面构建使用的上游 AstrBot Ref（可选）
+      placeholder: v4.17.6 / master / commit SHA
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Logs, screenshots, and additional context / 日志、截图与补充信息
+      description: |
+        Please include desktop logs, backend logs, screenshots, and (if relevant) GitHub Actions links.
+        请附上桌面端日志、后端日志、截图，必要时附 Actions 链接。
+      placeholder: Paste logs/screenshots/links here.
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Willing to submit a PR? / 是否愿意提交 PR？
+      options:
+        - label: I am willing to submit a PR to fix this issue. / 我愿意提交 PR 修复此问题。
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      options:
+        - label: I agree to follow the project's Code of Conduct. / 我同意遵守项目行为准则。
+          required: true
+

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,54 @@
+name: "🎉 Feature Request / 功能建议"
+title: "[Feature] "
+description: Suggest a new feature or improvement for AstrBot Desktop. / 为 AstrBot Desktop 提交功能建议。
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for the suggestion. Please explain the scenario and expected outcome clearly.
+        感谢提出建议。请尽量说明使用场景和预期效果。
+
+  - type: textarea
+    attributes:
+      label: Problem to solve / 要解决的问题
+      description: What pain point does this feature address?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Proposed solution / 期望方案
+      description: Describe your ideal solution.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Alternatives considered / 备选方案
+      description: Any alternative approaches you considered.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context / 补充信息
+      description: |
+        Screenshots, design references, related issues, or technical constraints.
+        可补充截图、参考链接、相关 issue 或技术约束。
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Willing to submit a PR? / 是否愿意提交 PR？
+      options:
+        - label: Yes, I am willing to submit a PR. / 是，我愿意提交 PR。
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      options:
+        - label: I agree to follow the project's Code of Conduct. / 我同意遵守项目行为准则。
+          required: true
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!-- Please explain the motivation of this PR and what problem it solves. -->
+<!-- 请说明这个 PR 的动机，以及它解决了什么问题。 -->
+
+### Summary / 改动概述
+
+<!-- Please summarize the core changes and affected files. -->
+<!-- 请简要说明核心改动和涉及的文件。 -->
+
+### Verification / 验证方式
+
+<!-- Paste test logs, screenshots, or CI links that prove this change works. -->
+<!-- 请粘贴测试日志、截图或 CI 链接，证明改动有效。 -->
+
+---
+
+### Checklist / 检查清单
+
+- [ ] This change is **not** a breaking change. / 此改动**不是**破坏性变更。
+- [ ] I have verified the change locally (and provided logs/screenshots above). / 我已在本地验证并在上方提供日志/截图。
+- [ ] If workflows are changed, I attached at least one related Actions run link. / 如果修改了工作流，我已附上至少一个相关 Actions 运行链接。
+- [ ] If dependencies are updated, lockfiles are updated accordingly (`src-tauri/Cargo.lock`, lockfiles under changed package dirs). / 如果引入或升级依赖，已同步更新相关 lock 文件（如 `src-tauri/Cargo.lock`、对应包目录中的 lock 文件）。
+- [ ] This PR does not include malicious code. / 此 PR 不包含恶意代码。
+

.github/workflows/build-desktop-tauri.yml

@@ -278,11 +278,16 @@ jobs:
         run: |
           set -euo pipefail
 
-          max_attempts=2
+          max_attempts=3
           attempt=1
           # Only retry on known transient DMG detach failures.
           retry_pattern='hdiutil: detach:.*(timeout|not detached)|DiskArbitration expired'
+          cleanup_script="scripts/ci/cleanup-dmg.sh"
           log_file=""
+          if [ ! -f "${cleanup_script}" ]; then
+            echo "Missing DMG cleanup script: ${cleanup_script}" >&2
+            exit 1
+          fi
 
           cleanup_log_file() {
             if [ -n "${log_file:-}" ]; then
@@ -292,7 +297,14 @@ jobs:
           }
           trap cleanup_log_file EXIT
 
+          cleanup_stale_dmg_state() {
+            bash "${cleanup_script}"
+          }
+
           while [ "${attempt}" -le "${max_attempts}" ]; do
+            echo "Cleaning stale DMG state before attempt ${attempt}/${max_attempts}..."
+            cleanup_stale_dmg_state
+
             log_file="$(mktemp -t tauri-macos-build.XXXXXX.log)"
             echo "macOS build attempt ${attempt}/${max_attempts} (arch=${{ matrix.arch }}, target=${{ matrix.target }})"
 
@@ -311,28 +323,7 @@ jobs:
             fi
 
             echo "Detected transient DMG detach/bundling error. Cleaning up stale dmg mounts before retry..."
-            dmg_mounts="$(mount | awk '$3 ~ /^\/Volumes\/dmg\./ { print $3 }' || true)"
-            if [ -n "${dmg_mounts}" ]; then
-              while IFS= read -r mount_point; do
-                [ -z "${mount_point}" ] && continue
-                echo "Detaching ${mount_point}"
-                hdiutil detach "${mount_point}" || hdiutil detach -force "${mount_point}" || true
-              done <<< "${dmg_mounts}"
-
-              # Avoid broad pkill: only target likely disk image helper binaries.
-              helper_pids="$(
-                pgrep -f '/System/Library/PrivateFrameworks/.*/diskimages-helper' || true
-                pgrep -f '/usr/libexec/diskimages-helper' || true
-                pgrep -f 'diskimages-help' || true
-              )"
-              helper_pids="$(printf '%s\n' "${helper_pids}" | awk 'NF' | sort -u)"
-              if [ -n "${helper_pids}" ]; then
-                while IFS= read -r pid; do
-                  [ -z "${pid}" ] && continue
-                  kill "${pid}" || true
-                done <<< "${helper_pids}"
-              fi
-            fi
+            cleanup_stale_dmg_state
             rm -f src-tauri/target/${{ matrix.target }}/release/bundle/macos/rw.*.dmg || true
             cleanup_log_file