[RC] 2.2.0

.claude-plugin/kora-keychain-sync/.claude-plugin/plugin.json

@@ -0,0 +1,11 @@
+{
+  "name": "kora-keychain-sync",
+  "version": "0.1.0",
+  "description": "Sync solana-keychain dependency and generate signer adapters",
+  "mcpServers": {
+    "repomix": {
+      "command": "npx",
+      "args": ["-y", "repomix-mcp"]
+    }
+  }
+}

.claude-plugin/kora-keychain-sync/commands/sync-keychain.md

@@ -0,0 +1,120 @@
+---
+description: Sync solana-keychain version and generate new signer adapters
+allowed-tools: WebFetch, Read, Edit, Grep, Glob, Bash(cargo:*), mcp__repomix__pack_remote_repository, mcp__repomix__grep_repomix_output
+---
+
+# Sync solana-keychain Dependency
+
+Execute this workflow to sync solana-keychain and detect new signers:
+
+## Step 1: Fetch Latest Version
+
+Use WebFetch on `https://crates.io/api/v1/crates/solana-keychain`
+- Extract `crate.max_version` from JSON response
+
+## Step 2: Check Current Version
+
+Read `crates/lib/Cargo.toml` and find current `solana-keychain` version.
+
+If different: update the version line using Edit tool.
+
+## Step 3: Scan solana-keychain for Signer Types
+
+Use `pack_remote_repository`:
+- Remote: `solana-foundation/solana-keychain`
+- Include pattern: `**/*.rs`
+
+Then use `grep_repomix_output` to find all signer constructors:
+- Pattern: `pub (async )?fn from_\w+`
+
+These `from_*` methods are the available signer backends.
+
+## Step 4: Compare Against Existing Adapters
+
+Read `crates/lib/src/signer/config.rs` and identify existing `SignerTypeConfig` enum variants:
+- Memory
+- Turnkey
+- Privy
+- Vault
+
+Identify any NEW signers from Step 3 not in this list.
+
+## Step 5: Generate Scaffolding for New Signers
+
+For each NEW signer:
+
+1. **Analyze the `from_*` method signature** to understand required parameters
+
+2. **Generate config struct** (after line ~91):
+```rust
+/// [SignerName] signer configuration
+#[derive(Clone, Serialize, Deserialize)]
+pub struct [SignerName]SignerConfig {
+    pub param1_env: String,
+    pub param2_env: String,
+}
+```
+
+3. **Add enum variant** to `SignerTypeConfig`:
+```rust
+/// [SignerName] signer configuration
+[SignerName] {
+    #[serde(flatten)]
+    config: [SignerName]SignerConfig,
+},
+```
+
+4. **Add build function** (check if async based on `from_*` signature):
+```rust
+fn build_[signer_name]_signer(
+    config: &[SignerName]SignerConfig,
+    signer_name: &str,
+) -> Result<Signer, KoraError> {
+    let param1 = get_env_var_for_signer(&config.param1_env, signer_name)?;
+    Signer::from_[signer_name](param1).map_err(|e| {
+        KoraError::SigningError(format!(
+            "Failed to create [SignerName] signer '{signer_name}': {}",
+            sanitize_error!(e)
+        ))
+    })
+}
+```
+
+5. **Add validation function**:
+```rust
+fn validate_[signer_name]_config(
+    config: &[SignerName]SignerConfig,
+    signer_name: &str,
+) -> Result<(), KoraError> {
+    let env_vars = [
+        ("param1_env", &config.param1_env),
+    ];
+    for (field_name, env_var) in env_vars {
+        if env_var.is_empty() {
+            return Err(KoraError::ValidationError(format!(
+                "[SignerName] signer '{signer_name}' must specify non-empty {field_name}"
+            )));
+        }
+    }
+    Ok(())
+}
+```
+
+6. **Update match arms** in `build_signer_from_config` and `validate_individual_signer_config`
+
+## Step 6: Apply Edits
+
+Use Edit tool to insert code into `crates/lib/src/signer/config.rs`:
+- Config structs after existing ones
+- Enum variants in SignerTypeConfig
+- Build/validate functions in SignerConfig impl
+- Update match arms
+
+## Step 7: Verify
+
+Run `cargo check -p kora-lib` to verify compilation.
+
+Report summary:
+- Version: [old] -> [new] (or "already latest")
+- New signers: [list or "none"]
+- Files modified: [list]

.claude-plugin/marketplace.json

@@ -0,0 +1,14 @@
+{
+  "name": "kora-plugins",
+  "description": "Kora project plugins for Claude Code",
+  "owner": {
+    "name": "Kora"
+  },
+  "plugins": [
+    {
+      "name": "kora-keychain-sync",
+      "description": "Sync solana-keychain dependency and generate signer adapters",
+      "source": "./.claude-plugin/kora-keychain-sync"
+    }
+  ]
+}

.claude/skills/cherry-pick-sync/SKILL.md

@@ -0,0 +1,151 @@
+---
+name: cherry-pick-sync
+description: >-
+  Sync commits from main to the active release/* branch via cherry-pick PR.
+  Use when the user says "sync main to release", "cherry-pick to release",
+  "sync release branch", "backport to release", "keep release up to date",
+  or wants to ensure hotfixes/patches on main are reflected in the release branch.
+  Also use when the user asks to "cherry-pick commits" between branches.
+---
+
+# Cherry-Pick Sync: Main to Release Branch
+
+Cherry-pick commits from `main` into the active `release/*` branch and create a PR.
+Resolve conflicts automatically when safe; ask the user when ambiguous.
+
+## Workflow
+
+### 1. Identify the release branch
+
+```bash
+# Prefer: open PRs from release/* branches (shows active work)
+gh pr list --state open --head "release/" --json headRefName --jq '.[].headRefName' 2>/dev/null
+
+# Fallback: most recent remote release branch by commit date
+git branch -r --sort=-committerdate | grep 'origin/release/' | head -5
+```
+
+- One active `release/*` branch → use it.
+- Multiple → ask the user; suggest the most recently committed as the default.
+- User specified one → use that.
+
+### 2. Determine commits to cherry-pick
+
+**Find the last sync point first.** Prior cherry-pick syncs are often squash-merged, so `git cherry` and `git log` cannot detect them as equivalent. Instead:
+
+```bash
+git fetch origin main <release-branch>
+
+# Find the most recent cherry-pick sync PR on the release branch
+git log --oneline origin/<release-branch> | grep -i -E "cherry.pick|sync.*main|bring back commits from main" | head -3
+```
+
+Read the PR body of the most recent sync (use `gh pr view <number>`) to identify which main commits it included. The **last main commit referenced** in that PR is your sync baseline.
+
+Then list only commits **after** the sync baseline:
+
+```bash
+git log --oneline --reverse <last-synced-sha>..origin/main
+```
+
+If no prior sync PR exists, fall back to the full range:
+
+```bash
+git log --oneline --reverse origin/<release-branch>..origin/main
+```
+
+**Filtering rules:**
+- User specified commits (SHAs/keywords) → use only those.
+- User said to skip certain commits → exclude them.
+- Default → take ALL commits from the log above.
+- **Auto-skip** release-only commits: version bumps, CHANGELOG updates, "chore: release v*". Flag these as skipped with reason.
+- **Auto-skip** commits already on release: use `git cherry -v origin/<release-branch> origin/main` as a secondary check — lines starting with `-` are already applied.
+- Show the final commit list to the user and confirm before proceeding.
+
+### 3. Check preconditions
+
+```bash
+# Must have clean working directory
+git status --porcelain
+```
+
+If dirty, ask the user to commit or stash first.
+
+### 4. Create working branch
+
+Replace `/` with `-` in the release branch name when constructing the working branch:
+
+```bash
+git checkout -b chore/cherry-pick-main-into-$(echo <release-branch> | tr '/' '-')-YYYYMMDD origin/<release-branch>
+```
+
+Example: `release/2.2.0` → `chore/cherry-pick-main-into-release-2.2.0-20260313`.
+
+### 5. Cherry-pick commits
+
+Cherry-pick one at a time to isolate conflicts:
+
+```bash
+git cherry-pick <sha>
+```
+
+**On conflict:**
+1. Inspect the conflict markers.
+2. **Auto-resolve** if obvious and low-risk: import ordering, trivial merge context, whitespace.
+3. **Ask the user** if: logic changes, behavioral differences, unclear intent, or risk of breaking something.
+4. After resolving: `git add .` then `git cherry-pick --continue`.
+5. If a commit cannot be applied and user agrees → `git cherry-pick --skip`.
+
+Track all skipped and conflict-resolved commits for the PR body.
+
+**Abort/rollback:** If the user wants to cancel the entire operation:
+```bash
+git cherry-pick --abort
+git checkout -
+git branch -D <working-branch>
+```
+Inform the user the repo has been restored to its original state.
+
+**Already applied:** If cherry-pick says "already applied" or produces an empty commit, skip silently.
+
+### 6. Push and create PR
+
+```bash
+git push -u origin HEAD
+
+gh pr create \
+  --base <release-branch> \
+  --title "chore: sync main into <release-branch> (YYYY-MM-DD)" \
+  --body "<see template below>"
+```
+
+**PR body template:**
+
+```markdown
+## Summary
+
+Cherry-pick commits from `main` into `<release-branch>` to keep the release branch in sync with hotfixes and patches.
+
+### Commits included
+
+- `abc1234` fix: description (#123)
+- `def5678` feat: description (#456)
+
+### Commits skipped
+
+- `ghi9012` chore: release v2.0.5 (release-only)
+- _None_ (if empty)
+
+### Conflicts resolved
+
+- `path/to/file.rs`: brief explanation of resolution
+- _None_ (if empty)
+```
+
+### 7. Return the PR URL
+
+## Edge Cases
+
+- **No new commits** → tell user branches are in sync. Do not create empty PR.
+- **User on wrong branch** → always create working branch from `origin/<release-branch>` regardless of current branch.
+- **Multiple release branches** → ask which one; suggest the most recently committed as default.