merge: resolve v1.0-dev conflict in dashpay/mod.rs

.claude/settings.json

@@ -1,4 +1,12 @@
 {
+  "permissions": {
+    "deny": [
+      "Edit(scripts/**)",
+      "Write(scripts/**)",
+      "Edit(.github/workflows/**)",
+      "Write(.github/workflows/**)"
+    ]
+  },
   "hooks": {
     "SessionStart": [
       {

.github/workflows/claude.yml

@@ -35,3 +35,7 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN_LKLIMEK }}
+          claude_args: |
+            --model opus
+            --allowedTools 'Bash(git fetch *),Bash(git merge *),Bash(git checkout *),Bash(git rebase *),Bash(git push *),Bash(scripts/safe-cargo.sh build *),Bash(scripts/safe-cargo.sh test *),Bash(scripts/safe-cargo.sh clippy *),Bash(scripts/safe-cargo.sh +nightly fmt *),Bash(scripts/safe-cargo.sh fmt *)'
+            --disallowedTools 'Bash(cargo *)'

.github/workflows/clippy.yml

@@ -7,6 +7,10 @@ on:
       - "v*-dev"
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
 

.github/workflows/tests.yml

@@ -7,6 +7,10 @@ on:
       - "v*-dev"
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
 

CLAUDE.md

@@ -35,10 +35,26 @@ Test locations:
 
 Always run `cargo clippy` and `cargo +nightly fmt` when finalizing your work.
 
+## CI: Safe Cargo Wrapper
+
+In GitHub Actions (Claude Code workflow), use `scripts/safe-cargo.sh` instead of `cargo` directly. This wrapper strips CI secrets from the environment before running cargo, preventing build scripts from accessing credentials.
+
+```bash
+scripts/safe-cargo.sh build --all-features
+scripts/safe-cargo.sh test --all-features --workspace
+scripts/safe-cargo.sh clippy --all-features --all-targets -- -D warnings
+scripts/safe-cargo.sh +nightly fmt --all
+```
+
 ## Architecture Overview
 
 **Dash Evo Tool** is a cross-platform GUI application (Rust + egui) for interacting with Dash Evolution. It enables DPNS username registration, contest voting, state transition viewing, wallet management, and identity operations across Mainnet/Testnet/Devnet.
 
+## Documentation
+
+- **docs/ai-design** should contain architecture and technical design files, grouped in subdirectories prefixed with ISO-formatted date
+- end-user documentation is in a separate repo: https://github.com/dashpay/docs/tree/HEAD/docs/user/network/dash-evo-tool , published at https://docs.dash.org/en/stable/docs/user/network/dash-evo-tool/
+
 ### Core Module Structure
 
 - **app.rs** - `AppState`: owns all screens, polls task results each frame, dispatches to visible screen