Fix --base flag, duplicate docs, and silent base branch failures

- Apply --base flag override after baseBranch is determined from PR metadata or git symbolic-ref
- Consolidate duplicate Skills and Cursor Skills doc sections into single Skills section
- Verify base branch exists before diffing; try origin/branch fallback and exit with clear error if not found

Author: cursoragent

.cursor/skills/review-code/scripts/review-prep.js

@@ -193,6 +193,11 @@ if (prNumber) {
     ) || 'master'
 }
 
+// Apply --base override if provided
+if (flags.base) {
+  baseBranch = flags.base
+}
+
 // ---------------------------------------------------------------------------
 // Diff generation
 // ---------------------------------------------------------------------------
@@ -202,6 +207,29 @@ log('Generating diff...')
 let diff
 let changedFiles
 
+// Verify base branch exists before attempting to diff against it
+let baseBranchExists = run(`git rev-parse --verify ${baseBranch}`, {
+  cwd: repoDir,
+  allowFailure: true
+})
+
+if (isLocalBranch && !baseBranchExists) {
+  log(`Warning: Base branch '${baseBranch}' not found. Trying 'origin/${baseBranch}'...`)
+  const originBase = `origin/${baseBranch}`
+  const originExists = run(`git rev-parse --verify ${originBase}`, {
+    cwd: repoDir,
+    allowFailure: true
+  })
+  if (originExists) {
+    baseBranch = originBase
+    baseBranchExists = originExists
+  } else {
+    log(`Error: Base branch '${baseBranch}' does not exist locally or on origin.`)
+    log('Please specify a valid base branch with --base <branch>')
+    process.exit(1)
+  }
+}
+
 const hasCommits = run(`git log --oneline ${baseBranch}..HEAD`, {
   cwd: repoDir,
   allowFailure: true

docs/agent-setup.md

@@ -30,17 +30,19 @@ Execute a planning document and iteratively refine the implementation until it p
 
 ## Skills
 
-Skills are defined in `.cursor/skills/` and are automatically invoked by Cursor when relevant. They can also be referenced from commands via `@.cursor/skills/<name>/SKILL.md`.
+Skills are defined in `.cursor/skills/` and provide reusable workflows that commands and other skills can invoke. They are automatically invoked by Cursor when relevant and can also be referenced from commands via `@.cursor/skills/<name>/SKILL.md`.
 
 ### debug-edge
 
 Compile, launch, and debug the Edge wallet app on an iOS simulator.
 
 **Prerequisites**: Xcode, working directory `edge-react-gui`, MCP servers `xcodebuild` and `mobile-mcp`
 
-**Workflow**: Install deps → Clean iOS → Prepare iOS → Start Metro → Build and launch → Login if needed
+**Workflow**: Install deps → Clean iOS build artifacts → Prepare iOS → Clean Xcode build → Start Metro bundler → Build and launch app → Log into test account if needed
 
-**Tip**: For plugin repo debugging (edge-core-js, edge-currency-accountbased, edge-exchange-plugins, edge-currency-plugins), use `log.warn()` instead of `console.log` to see output in Metro logs.
+**Tip**: For plugin repo debugging (edge-core-js, edge-currency-accountbased, edge-exchange-plugins, edge-currency-plugins), use `log.warn()` instead of `console.log` to see output in Metro logs. Enable the corresponding `DEBUG_*` flag in `env.json` and run `yarn start` in the plugin repo for hot-reload.
+
+---
 
 ### fix-code
 
@@ -52,46 +54,6 @@ Implement fixes from a plan document by editing code.
 
 **Constraints**: Does not commit or push. Leaves changes unstaged for user review.
 
-### fix-pr
-
-Address reviewer comments on a GitHub pull request.
-
-**Usage**: Provide a GitHub PR URL or number.
-
-**Workflow**: Collect reviewer comments → Create fix plan → Pause for user iteration → Implement fixes with fixup commits → Push with `--force-with-lease`
-
-**Constraints**: Does not auto-squash. Leaves fixup commits visible for reviewer.
-
-### package-deps
-
-Package local dependency repos and link them to edge-react-gui for testing.
-
-**Usage**: Specify dependency repos to package.
-
-**Workflow**: `npm pack` → Rename with UTC timestamp → Copy to edge-react-gui → Update `package.json` reference
-
-### review-code
-
-Review code changes for quality and convention compliance.
-
-**Usage**: Provide a GitHub PR URL, PR number, local branch name, or "current branch".
-
-**Workflow**: Checkout code → Get diff → Launch review subagents (`review-react`, `review-errors`, `review-state`, etc.) → Compile findings → Save to `/tmp` → For PRs: submit inline comments via GitHub MCP
-
----
-
-## Cursor Skills
-
-Skills are defined in `.cursor/skills/` and provide reusable workflows that commands and other skills can invoke. They are also surfaced to the agent automatically and can be triggered directly.
-
-### review-code
-
-Review code changes for quality and convention compliance. Supports both GitHub pull requests and local branches.
-
-**Usage**: Provide a GitHub PR URL, PR number, local branch name, or "current branch".
-
-**Workflow**: Checkout code → Detect fork vs internal branch → Get diff → Launch review subagents in parallel (`review-react`, `review-errors`, `review-state`, `review-async`, `review-cleaners`, `review-code-quality`, `review-comments`, `review-strings`, `review-tests`, `review-pr`, `review-servers`, `review-repo`) → Compile findings into Critical Issues / Warnings / Suggestions → Save review to `/tmp` → For PRs: submit inline comments via GitHub
-
 ---
 
 ### fix-pr
@@ -106,41 +68,37 @@ Address reviewer comments on a GitHub pull request.
 
 ---
 
-### fix-code
+### gh-review
 
-Implement fixes from a plan document by editing code.
+Orchestrate an interactive GitHub PR review session using the `gh` CLI.
 
-**Usage**: Provide a plan document path (typically generated by `fix-pr` or `review-code`).
+**Prerequisites**: `gh` CLI installed and authenticated
 
-**Workflow**: Parse plan → Edit files → Run `yarn precommit` → Present summary
+**Usage**: Provide a PR reference (URL, number, or "current PR") and comment instructions.
 
-**Constraints**: Does not commit or push. Leaves changes unstaged for user review.
+**Workflow**: Start or resume a pending review → Add inline comments interactively (single-line or multi-line) via GraphQL API → Present summary of all comments → Submit only after explicit user confirmation as APPROVE, COMMENT, or REQUEST_CHANGES
 
----
+**Key detail**: Uses GraphQL `addPullRequestReviewThread` for incremental comments because the REST API returns 422 when a pending review already exists.
 
-### debug-edge
+---
 
-Compile, launch, and debug the Edge wallet app on an iOS simulator.
+### package-deps
 
-**Prerequisites**: Xcode, working directory `edge-react-gui`, MCP servers `xcodebuild` and `mobile-mcp`
+Package local dependency repos and link them to edge-react-gui for testing.
 
-**Workflow**: Install deps → Clean iOS build artifacts → Prepare iOS → Clean Xcode build → Start Metro bundler → Build and launch app → Log into test account if needed
+**Usage**: Specify dependency repos to package.
 
-**Tip**: For plugin repo debugging (edge-core-js, edge-currency-accountbased, edge-exchange-plugins, edge-currency-plugins), use `log.warn()` instead of `console.log` to see output in Metro logs. Enable the corresponding `DEBUG_*` flag in `env.json` and run `yarn start` in the plugin repo for hot-reload.
+**Workflow**: `npm pack` → Rename with UTC timestamp → Copy to edge-react-gui → Update `package.json` reference
 
 ---
 
-### gh-review
-
-Orchestrate an interactive GitHub PR review session using the `gh` CLI.
-
-**Prerequisites**: `gh` CLI installed and authenticated
+### review-code
 
-**Usage**: Provide a PR reference (URL, number, or "current PR") and comment instructions.
+Review code changes for quality and convention compliance. Supports both GitHub pull requests and local branches.
 
-**Workflow**: Start or resume a pending review → Add inline comments interactively (single-line or multi-line) via GraphQL API → Present summary of all comments → Submit only after explicit user confirmation as APPROVE, COMMENT, or REQUEST_CHANGES
+**Usage**: Provide a GitHub PR URL, PR number, local branch name, or "current branch".
 
-**Key detail**: Uses GraphQL `addPullRequestReviewThread` for incremental comments because the REST API returns 422 when a pending review already exists.
+**Workflow**: Checkout code → Detect fork vs internal branch → Get diff → Launch review subagents in parallel (`review-react`, `review-errors`, `review-state`, `review-async`, `review-cleaners`, `review-code-quality`, `review-comments`, `review-strings`, `review-tests`, `review-pr`, `review-servers`, `review-repo`) → Compile findings into Critical Issues / Warnings / Suggestions → Save review to `/tmp` → For PRs: submit inline comments via GitHub
 
 ---