diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 6bcd749..5deb9b5 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -43,7 +43,11 @@ jobs:
           ALIAS_LOWER=$(echo "$ALIAS" | tr '[:upper:]' '[:lower:]')
 
           case "$ALIAS_LOWER" in
-            opus|opus-4-6)
+            opus|opus-4-7)
+              echo "model=claude-opus-4-7" >> "$GITHUB_OUTPUT"
+              echo "Resolved model alias '$ALIAS' -> claude-opus-4-7"
+              ;;
+            opus-4-6)
               echo "model=claude-opus-4-6" >> "$GITHUB_OUTPUT"
               echo "Resolved model alias '$ALIAS' -> claude-opus-4-6"
               ;;
@@ -51,6 +55,10 @@ jobs:
               echo "model=claude-sonnet-4-6" >> "$GITHUB_OUTPUT"
               echo "Resolved model alias '$ALIAS' -> claude-sonnet-4-6"
               ;;
+            haiku|haiku-4-5)
+              echo "model=claude-haiku-4-5-20251001" >> "$GITHUB_OUTPUT"
+              echo "Resolved model alias '$ALIAS' -> claude-haiku-4-5-20251001"
+              ;;
             *)
               echo "model=claude-sonnet-4-6" >> "$GITHUB_OUTPUT"
               echo "No known alias found (got '$ALIAS'), using default claude-sonnet-4-6"
@@ -64,9 +72,9 @@ jobs:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           claude_args: '--model ${{ steps.parse-model.outputs.model }}'
           plugin_marketplaces: |
-            https://github.com/xxthunder/xxthunder-dev-skills.git
+            https://github.com/xxthunder/xxthunder-agentic-skills.git
           plugins: |
-            xxthunder-dev-skills@xxthunder-skills
+            xxthunder-dev-skills@xxthunder-agentic-skills
 
           additional_permissions: |
             actions: read
diff --git a/AGENTS.md b/AGENTS.md
index e077e90..b7a1ba7 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -655,7 +655,7 @@ Provide specific feedback with `file:line` references.
 
 ### Shared Skills Plugin
 
-This project uses the [xxthunder/xxthunder-dev-skills](https://github.com/xxthunder/xxthunder-dev-skills) plugin for shared skills (refinement, commit-helper, tdd-workflow, retrospective). The plugin is loaded automatically:
+This project uses the [xxthunder/xxthunder-agentic-skills](https://github.com/xxthunder/xxthunder-agentic-skills) plugin for shared skills (refinement, commit-helper, tdd-workflow, retrospective). The plugin is loaded automatically:
 
 - **Locally**: installed to `~/.claude/plugins/` via `claude plugins add`
 - **GitHub Actions**: configured via the `plugins` input in `.github/workflows/claude.yml`
diff --git a/docs/backlog/README.md b/docs/backlog/README.md
index d44624a..2c39b92 100644
--- a/docs/backlog/README.md
+++ b/docs/backlog/README.md
@@ -35,6 +35,8 @@
 
 ### Done
 
+- [SC-039 — Refresh @claude model aliases to current 4.x family](sc-039.md)
+- [SC-038 — Repoint claude.yml shared-skills plugin to renamed xxthunder-agentic-skills repo](sc-038.md)
 - [SC-017 — Auto-terminate distros instead of prompting the user](sc-017.md)
 - [SC-036a — Add setup-proxy mode/auth prompts and mode marker](sc-036a.md)
 - [SC-035 — Add sync-ssh-config command for Windows DevPod access](sc-035.md)
diff --git a/docs/backlog/sc-038.md b/docs/backlog/sc-038.md
new file mode 100644
index 0000000..19b8852
--- /dev/null
+++ b/docs/backlog/sc-038.md
@@ -0,0 +1,33 @@
+[← Back to Backlog](README.md)
+
+# [SC-038] ✅ DONE - Repoint claude.yml shared-skills plugin to renamed xxthunder-agentic-skills repo
+
+**Status**: Done (2026-05-24)
+**Priority**: High
+**Component**: `.github/workflows/claude.yml`, `AGENTS.md`
+
+**Summary**:
+As a contributor using `@claude` on GitHub, I want the shared-skills plugin reference repointed to the renamed `xxthunder-agentic-skills` repo, so that the Claude GitHub Action resolves the marketplace and loads the shared skills instead of failing on a 404.
+
+**Description**:
+SC-027 wired the Claude GitHub Action to load shared skills from a plugin marketplace. That marketplace repo has since been renamed from `xxthunder/xxthunder-dev-skills` to `xxthunder/xxthunder-agentic-skills`, and the marketplace name in its `marketplace.json` changed from `xxthunder-skills` to `xxthunder-agentic-skills`. The plugin name is unchanged (`xxthunder-dev-skills`). `claude.yml` still pointed at the old URL and old marketplace name, so the action could no longer resolve the marketplace and `@claude` runs lost the shared skills.
+
+Changes applied (verified against the renamed repo, default branch `develop`):
+- `claude.yml:67` marketplace URL → `https://github.com/xxthunder/xxthunder-agentic-skills.git`
+- `claude.yml:69` plugin pin → `xxthunder-dev-skills@xxthunder-agentic-skills`
+- `AGENTS.md:658` doc link → `[xxthunder/xxthunder-agentic-skills](https://github.com/xxthunder/xxthunder-agentic-skills)`
+
+Out of scope:
+- `AGENTS.md:539` ("from the `xxthunder-dev-skills` plugin") — plugin name unchanged, stays correct.
+- Historical backlog entries (`sc-027.md`, `chore-001.md`) — kept as historical record.
+
+**Acceptance Criteria**:
+- [x] `claude.yml` marketplace URL points to `xxthunder-agentic-skills.git`
+- [x] `claude.yml` plugin pin is `xxthunder-dev-skills@xxthunder-agentic-skills`
+- [x] `AGENTS.md` shared-skills link points to the renamed repo
+- [x] Plugin pin matches the live marketplace manifest — verified against the renamed repo (marketplace `xxthunder-agentic-skills`, plugin `xxthunder-dev-skills` v1.3.0)
+- [x] No active references to the old repo URL remain outside historical backlog entries
+
+**Note**: A live `@claude` trigger on a GitHub issue/PR is the recommended real-world smoke test to confirm the action loads a shared skill (e.g. commit-helper); it cannot be exercised from a local session.
+
+[← Back to Backlog](README.md)
diff --git a/docs/backlog/sc-039.md b/docs/backlog/sc-039.md
new file mode 100644
index 0000000..b9ee10e
--- /dev/null
+++ b/docs/backlog/sc-039.md
@@ -0,0 +1,30 @@
+[← Back to Backlog](README.md)
+
+# [SC-039] ✅ DONE - Refresh @claude model aliases to current 4.x family
+
+**Status**: Done (2026-05-24)
+**Priority**: Low
+**Component**: `.github/workflows/claude.yml`
+
+**Summary**:
+As a contributor using `@claude` on GitHub, I want the model aliases to map to the current Claude 4.x family, so that `@claude opus` selects the latest Opus (4.7) and a Haiku option is available.
+
+**Description**:
+The `parse-model` step in `claude.yml` mapped `opus` to `claude-opus-4-6`, which is now one release behind the latest Opus (4.7), and offered no Haiku alias. This refreshes the alias table:
+
+- `opus` / `opus-4-7` → `claude-opus-4-7` (latest Opus)
+- `opus-4-6` → `claude-opus-4-6` (explicit legacy pin retained)
+- `sonnet` / `sonnet-4-6` → `claude-sonnet-4-6`
+- `haiku` / `haiku-4-5` → `claude-haiku-4-5-20251001`
+- default (unknown alias) → `claude-sonnet-4-6` (unchanged)
+
+The default is deliberately left as `claude-sonnet-4-6` to preserve existing cost-conscious behavior.
+
+**Acceptance Criteria**:
+- [x] `opus` and `opus-4-7` resolve to `claude-opus-4-7`
+- [x] Explicit `opus-4-6` still resolves to `claude-opus-4-6`
+- [x] `haiku` / `haiku-4-5` resolves to `claude-haiku-4-5-20251001`
+- [x] `sonnet` / `sonnet-4-6` resolves to `claude-sonnet-4-6`
+- [x] Default for an unknown alias remains `claude-sonnet-4-6`
+
+[← Back to Backlog](README.md)