Merge remote-tracking branch 'origin/main' into garrytan/design

# Conflicts:
#	CHANGELOG.md
#	VERSION

scripts/gen-skill-docs.ts

@@ -174,6 +174,27 @@ If \`NEEDS_SETUP\`:
 3. If \`bun\` is not installed: \`curl -fsSL https://bun.sh/install | bash\``;
 }
 
+function generateBaseBranchDetect(): string {
+  return `## Step 0: Detect base branch
+
+Determine which branch this PR targets. Use the result as "the base branch" in all subsequent steps.
+
+1. Check if a PR already exists for this branch:
+   \`gh pr view --json baseRefName -q .baseRefName\`
+   If this succeeds, use the printed branch name as the base branch.
+
+2. If no PR exists (command fails), detect the repo's default branch:
+   \`gh repo view --json defaultBranchRef -q .defaultBranchRef.name\`
+
+3. If both commands fail, fall back to \`main\`.
+
+Print the detected base branch name. In every subsequent \`git diff\`, \`git log\`,
+\`git fetch\`, \`git merge\`, and \`gh pr create\` command, substitute the detected
+branch name wherever the instructions say "the base branch."
+
+---`;
+}
+
 function generateQAMethodology(): string {
   return `## Modes
 
@@ -788,6 +809,7 @@ const RESOLVERS: Record<string, () => string> = {
   SNAPSHOT_FLAGS: generateSnapshotFlags,
   PREAMBLE: generatePreamble,
   BROWSE_SETUP: generateBrowseSetup,
+  BASE_BRANCH_DETECT: generateBaseBranchDetect,
   QA_METHODOLOGY: generateQAMethodology,
   DESIGN_METHODOLOGY: generateDesignMethodology,
 };