Fix Windows/PowerShell invocation of superpowers-codex

Windows doesn't respect shebangs, so directly invoking the extensionless superpowers-codex script triggers an "Open with" dialog. Prefix all invocations with `node` (harmless on Unix, required on Windows) and add a .cmd wrapper for manual invocation on Windows. Fixes #285, #243 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Merge pull request #382 from clkao/fix/subagent-worktree-requirement
2026-04-21 08:59:04 +08:00 · 2026-02-05 11:18:56 -08:00 · 2026-01-30 09:51:30 -08:00 · 2026-01-30 09:48:29 -08:00 · 2026-01-29 15:12:50 -08:00 · 2026-01-29 14:48:24 -08:00
35 changed files with 197 additions and 2916 deletions
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "superpowers",
  "description": "Core skills library for Claude Code: TDD, debugging, collaboration patterns, and proven techniques",
-  "version": "4.0.3",
+  "version": "4.1.1",
  "author": {
    "name": "Jesse Vincent",
    "email": "jesse@fsck.com"
--- a/.codex/INSTALL.md
+++ b/.codex/INSTALL.md
@@ -21,7 +21,7 @@ Quick setup to enable superpowers skills in Codex.
   ## Superpowers System

   <EXTREMELY_IMPORTANT>
-   You have superpowers. Superpowers teach you new skills and capabilities. RIGHT NOW run: `~/.codex/superpowers/.codex/superpowers-codex bootstrap` and follow the instructions it returns.
+   You have superpowers. Superpowers teach you new skills and capabilities. RIGHT NOW run: `node ~/.codex/superpowers/.codex/superpowers-codex bootstrap` and follow the instructions it returns.
   </EXTREMELY_IMPORTANT>
   ```

@@ -29,7 +29,7 @@ Quick setup to enable superpowers skills in Codex.

 Test the installation:
 ```bash
-~/.codex/superpowers/.codex/superpowers-codex bootstrap
+node ~/.codex/superpowers/.codex/superpowers-codex bootstrap
 ```

 You should see skill listings and bootstrap instructions. The system is now ready for use.
--- a/.codex/superpowers-bootstrap.md
+++ b/.codex/superpowers-bootstrap.md
@@ -4,13 +4,14 @@
 You have superpowers.

 **Tool for running skills:**
- `~/.codex/superpowers/.codex/superpowers-codex use-skill <skill-name>`
+- `node ~/.codex/superpowers/.codex/superpowers-codex use-skill <skill-name>`

 **Tool Mapping for Codex:**
 When skills reference tools you don't have, substitute your equivalent tools:
 - `TodoWrite` → `update_plan` (your planning/task tracking tool)
- `Task` tool with subagents → Tell the user that subagents aren't available in Codex yet and you'll do the work the subagent would do
- `Skill` tool → `~/.codex/superpowers/.codex/superpowers-codex use-skill` command (already available)
+- `Task` tool with subagents → Use Codex collab `spawn_agent` + `wait` when available; if collab is disabled, state that and proceed sequentially
+- `Subagent` / `Agent` tool mentions → Map to `spawn_agent` (collab) or sequential fallback when collab is disabled
+- `Skill` tool → `node ~/.codex/superpowers/.codex/superpowers-codex use-skill` command (already available)
 - `Read`, `Write`, `Edit`, `Bash` → Use your native tools with similar functions

 **Skills naming:**
@@ -20,7 +21,7 @@ When skills reference tools you don't have, substitute your equivalent tools:

 **Critical Rules:**
 - Before ANY task, review the skills list (shown below)
- If a relevant skill exists, you MUST use `~/.codex/superpowers/.codex/superpowers-codex use-skill` to load it
+- If a relevant skill exists, you MUST use `node ~/.codex/superpowers/.codex/superpowers-codex use-skill` to load it
 - Announce: "I've read the [Skill Name] skill and I'm using it to [purpose]"
 - Skills with checklists require `update_plan` todos for each item
 - NEVER skip mandatory workflows (brainstorming before coding, TDD, systematic debugging)
@@ -30,4 +31,4 @@ When skills reference tools you don't have, substitute your equivalent tools:
 - Personal skills: ~/.codex/skills/ (override superpowers when names match)

 IF A SKILL APPLIES TO YOUR TASK, YOU DO NOT HAVE A CHOICE. YOU MUST USE IT.
-</EXTREMELY_IMPORTANT>
+</EXTREMELY_IMPORTANT>
--- a/.codex/superpowers-codex.cmd
+++ b/.codex/superpowers-codex.cmd
@@ -0,0 +1 @@
+@node "%~dp0superpowers-codex" %*
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,17 @@
+# Ensure shell scripts always have LF line endings
+*.sh text eol=lf
+
+# Ensure the polyglot wrapper keeps LF (it's parsed by both cmd and bash)
+*.cmd text eol=lf
+
+# Common text files
+*.md text eol=lf
+*.json text eol=lf
+*.js text eol=lf
+*.mjs text eol=lf
+*.ts text eol=lf
+
+# Explicitly mark binary files
+*.png binary
+*.jpg binary
+*.gif binary
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 .worktrees/
 .private-journal/
 .claude/
-node_modules/
--- a/.opencode/INSTALL.md
+++ b/.opencode/INSTALL.md
@@ -3,15 +3,13 @@
 ## Prerequisites

 - [OpenCode.ai](https://opencode.ai) installed
- Node.js installed
 - Git installed

 ## Installation Steps

-### 1. Install Superpowers
+### 1. Clone Superpowers

 ```bash
-mkdir -p ~/.config/opencode/superpowers
 git clone https://github.com/obra/superpowers.git ~/.config/opencode/superpowers
 ```

@@ -20,32 +18,43 @@ git clone https://github.com/obra/superpowers.git ~/.config/opencode/superpowers
 Create a symlink so OpenCode discovers the plugin:

 ```bash
-mkdir -p ~/.config/opencode/plugin
-ln -sf ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js ~/.config/opencode/plugin/superpowers.js
+mkdir -p ~/.config/opencode/plugins
+rm -f ~/.config/opencode/plugins/superpowers.js
+ln -s ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js ~/.config/opencode/plugins/superpowers.js
 ```

-### 3. Restart OpenCode
+### 3. Symlink Skills

-Restart OpenCode. The plugin will automatically inject superpowers context via the chat.message hook.
+Create a symlink so OpenCode's native skill tool discovers superpowers skills:

-You should see superpowers is active when you ask "do you have superpowers?"
+```bash
+mkdir -p ~/.config/opencode/skills
+rm -rf ~/.config/opencode/skills/superpowers
+ln -s ~/.config/opencode/superpowers/skills ~/.config/opencode/skills/superpowers
+```
+
+### 4. Restart OpenCode
+
+Restart OpenCode. The plugin will automatically inject superpowers context.
+
+Verify by asking: "do you have superpowers?"

 ## Usage

 ### Finding Skills

-Use the `find_skills` tool to list all available skills:
+Use OpenCode's native `skill` tool to list available skills:

 ```
-use find_skills tool
+use skill tool to list skills
 ```

 ### Loading a Skill

-Use the `use_skill` tool to load a specific skill:
+Use OpenCode's native `skill` tool to load a specific skill:

 ```
-use use_skill tool with skill_name: "superpowers:brainstorming"
+use skill tool to load superpowers/brainstorming
 ```

 ### Personal Skills
@@ -69,36 +78,11 @@ description: Use when [condition] - [what it does]
 [Your skill content here]
 ```

-Personal skills override superpowers skills with the same name.
-
 ### Project Skills

-Create project-specific skills in your OpenCode project:
+Create project-specific skills in `.opencode/skills/` within your project.

-```bash
-# In your OpenCode project
-mkdir -p .opencode/skills/my-project-skill
-```
-
-Create `.opencode/skills/my-project-skill/SKILL.md`:
-
-```markdown
---
-name: my-project-skill
-description: Use when [condition] - [what it does]
---
-
-# My Project Skill
-
-[Your skill content here]
-```
-
-**Skill Priority:** Project skills override personal skills, which override superpowers skills.
-
-**Skill Naming:**
- `project:skill-name` - Force project skill lookup
- `skill-name` - Searches project → personal → superpowers
- `superpowers:skill-name` - Force superpowers skill lookup
+**Skill Priority:** Project skills > Personal skills > Superpowers skills

 ## Updating

@@ -111,25 +95,25 @@ git pull

 ### Plugin not loading

-1. Check plugin file exists: `ls ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js`
-2. Check OpenCode logs for errors
-3. Verify Node.js is installed: `node --version`
+1. Check plugin symlink: `ls -l ~/.config/opencode/plugins/superpowers.js`
+2. Check source exists: `ls ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js`
+3. Check OpenCode logs for errors

 ### Skills not found

-1. Verify skills directory exists: `ls ~/.config/opencode/superpowers/skills`
-2. Use `find_skills` tool to see what's discovered
-3. Check file structure: each skill should have a `SKILL.md` file
+1. Check skills symlink: `ls -l ~/.config/opencode/skills/superpowers`
+2. Verify it points to: `~/.config/opencode/superpowers/skills`
+3. Use `skill` tool to list what's discovered

-### Tool mapping issues
+### Tool mapping

-When a skill references a Claude Code tool you don't have:
- `TodoWrite` → use `update_plan`
- `Task` with subagents → use `@mention` syntax to invoke OpenCode subagents
- `Skill` → use `use_skill` tool
- File operations → use your native tools
+When skills reference Claude Code tools:
+- `TodoWrite` → `update_plan`
+- `Task` with subagents → `@mention` syntax
+- `Skill` tool → OpenCode's native `skill` tool
+- File operations → your native tools

 ## Getting Help

 - Report issues: https://github.com/obra/superpowers/issues
- Documentation: https://github.com/obra/superpowers
+- Full documentation: https://github.com/obra/superpowers/blob/main/docs/README.opencode.md
--- a/.opencode/plugins/superpowers.js
+++ b/.opencode/plugins/superpowers.js
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,27 @@
 # Superpowers Release Notes

-## Unreleased
+## v4.1.1 (2026-01-23)
+
+### Fixes
+
+**OpenCode: Standardized on `plugins/` directory per official docs (#343)**
+
+OpenCode's official documentation uses `~/.config/opencode/plugins/` (plural). Our docs previously used `plugin/` (singular). While OpenCode accepts both forms, we've standardized on the official convention to avoid confusion.
+
+Changes:
+- Renamed `.opencode/plugin/` to `.opencode/plugins/` in repo structure
+- Updated all installation docs (INSTALL.md, README.opencode.md) across all platforms
+- Updated test scripts to match
+
+**OpenCode: Fixed symlink instructions (#339, #342)**
+
+- Added explicit `rm` before `ln -s` (fixes "file already exists" errors on reinstall)
+- Added missing skills symlink step that was absent from INSTALL.md
+- Updated from deprecated `use_skill`/`find_skills` to native `skill` tool references
+
+---
+
+## v4.1.0 (2026-01-23)

 ### Breaking Changes

@@ -22,31 +43,11 @@ The previous bootstrap injection method using `session.prompt({ noReply: true })
 - Added comprehensive Windows installation docs for cmd.exe, PowerShell, and Git Bash
 - Documented proper symlink vs junction usage for each platform

-### New Features
+**Claude Code: Fixed Windows hook execution for Claude Code 2.1.x**

-**Visual companion for brainstorming skill**
+Claude Code 2.1.x changed how hooks execute on Windows: it now auto-detects `.sh` files in commands and prepends `bash `. This broke the polyglot wrapper pattern because `bash "run-hook.cmd" session-start.sh` tries to execute the .cmd file as a bash script.

-Added optional browser-based visual companion for brainstorming sessions. When users have a browser available, brainstorming can display interactive screens showing current phase, questions, and design decisions in a more readable format than terminal output.
-
-Components:
- `lib/brainstorm-server/` - WebSocket server for real-time updates
- `skills/brainstorming/visual-companion.md` - Integration guide
- Helper scripts for session management with proper isolation
- Browser helper library for event capture
-
-The visual companion is opt-in and falls back gracefully to terminal-only operation.
-
-### Improvements
-
-**Instruction priority clarified in using-superpowers**
-
-Added explicit instruction priority hierarchy to prevent conflicts with user preferences:
-
-1. User's explicit instructions (CLAUDE.md, direct requests) — highest priority
-2. Superpowers skills — override default system behavior where they conflict
-3. Default system prompt — lowest priority
-
-This ensures users remain in control. If CLAUDE.md says "don't use TDD" and a skill says "always use TDD," CLAUDE.md wins.
+Fix: hooks.json now calls session-start.sh directly. Claude Code 2.1.x handles the bash invocation automatically. Also added .gitattributes to enforce LF line endings for shell scripts (fixes CRLF issues on Windows checkout).

 ---

--- a/docs/README.codex.md
+++ b/docs/README.codex.md
@@ -35,7 +35,7 @@ The bootstrap file is included in the repository at `.codex/superpowers-bootstra
 Tell Codex:

 ```
-Run ~/.codex/superpowers/.codex/superpowers-codex find-skills to show available skills
+Run node ~/.codex/superpowers/.codex/superpowers-codex find-skills to show available skills
 ```

 You should see a list of available skills with descriptions.
@@ -45,19 +45,19 @@ You should see a list of available skills with descriptions.
 ### Finding Skills

 ```
-Run ~/.codex/superpowers/.codex/superpowers-codex find-skills
+Run node ~/.codex/superpowers/.codex/superpowers-codex find-skills
 ```

 ### Loading a Skill

 ```
-Run ~/.codex/superpowers/.codex/superpowers-codex use-skill superpowers:brainstorming
+Run node ~/.codex/superpowers/.codex/superpowers-codex use-skill superpowers:brainstorming
 ```

 ### Bootstrap All Skills

 ```
-Run ~/.codex/superpowers/.codex/superpowers-codex bootstrap
+Run node ~/.codex/superpowers/.codex/superpowers-codex bootstrap
 ```

 This loads the complete bootstrap with all skill information.
@@ -107,8 +107,9 @@ The Codex implementation uses the shared `skills-core` module (ES module format)
 Skills written for Claude Code are adapted for Codex with these mappings:

 - `TodoWrite` → `update_plan`
- `Task` with subagents → Tell user subagents aren't available, do work directly
- `Skill` tool → `~/.codex/superpowers/.codex/superpowers-codex use-skill`
+- `Task` with subagents → Use collab `spawn_agent` + `wait` when available; if collab is disabled, say so and proceed sequentially
+- `Subagent` / `Agent` tool mentions → Map to `spawn_agent` (collab) or sequential fallback when collab is disabled
+- `Skill` tool → `node ~/.codex/superpowers/.codex/superpowers-codex use-skill`
 - File operations → Native Codex tools

 ## Updating
@@ -123,7 +124,7 @@ git pull
 ### Skills not found

 1. Verify installation: `ls ~/.codex/superpowers/skills`
-2. Check CLI works: `~/.codex/superpowers/.codex/superpowers-codex find-skills`
+2. Check CLI works: `node ~/.codex/superpowers/.codex/superpowers-codex find-skills`
 3. Verify skills have SKILL.md files

 ### CLI script not executable
--- a/docs/README.opencode.md
+++ b/docs/README.opencode.md
@@ -7,7 +7,7 @@ Complete guide for using Superpowers with [OpenCode.ai](https://opencode.ai).
 Tell OpenCode:

 ```
-Clone https://github.com/obra/superpowers to ~/.config/opencode/superpowers, then create directory ~/.config/opencode/plugin, then symlink ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js to ~/.config/opencode/plugin/superpowers.js, then symlink ~/.config/opencode/superpowers/skills to ~/.config/opencode/skills/superpowers, then restart opencode.
+Clone https://github.com/obra/superpowers to ~/.config/opencode/superpowers, then create directory ~/.config/opencode/plugins, then symlink ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js to ~/.config/opencode/plugins/superpowers.js, then symlink ~/.config/opencode/superpowers/skills to ~/.config/opencode/skills/superpowers, then restart opencode.
 ```

 ## Manual Installation
@@ -28,19 +28,23 @@ else
 fi

 # 2. Create directories
-mkdir -p ~/.config/opencode/plugin ~/.config/opencode/skills
+mkdir -p ~/.config/opencode/plugins ~/.config/opencode/skills

-# 3. Create symlinks (safe for reinstalls - ln -sf overwrites)
-ln -sf ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js ~/.config/opencode/plugin/superpowers.js
-ln -sf ~/.config/opencode/superpowers/skills ~/.config/opencode/skills/superpowers
+# 3. Remove old symlinks/directories if they exist
+rm -f ~/.config/opencode/plugins/superpowers.js
+rm -rf ~/.config/opencode/skills/superpowers

-# 4. Restart OpenCode
+# 4. Create symlinks
+ln -s ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js ~/.config/opencode/plugins/superpowers.js
+ln -s ~/.config/opencode/superpowers/skills ~/.config/opencode/skills/superpowers
+
+# 5. Restart OpenCode
 ```

 #### Verify Installation

 ```bash
-ls -l ~/.config/opencode/plugin/superpowers.js
+ls -l ~/.config/opencode/plugins/superpowers.js
 ls -l ~/.config/opencode/skills/superpowers
 ```

@@ -65,15 +69,15 @@ Run as Administrator, or with Developer Mode enabled:
 git clone https://github.com/obra/superpowers.git "%USERPROFILE%\.config\opencode\superpowers"

 :: 2. Create directories
-mkdir "%USERPROFILE%\.config\opencode\plugin" 2>nul
+mkdir "%USERPROFILE%\.config\opencode\plugins" 2>nul
 mkdir "%USERPROFILE%\.config\opencode\skills" 2>nul

 :: 3. Remove existing links (safe for reinstalls)
-del "%USERPROFILE%\.config\opencode\plugin\superpowers.js" 2>nul
+del "%USERPROFILE%\.config\opencode\plugins\superpowers.js" 2>nul
 rmdir "%USERPROFILE%\.config\opencode\skills\superpowers" 2>nul

 :: 4. Create plugin symlink (requires Developer Mode or Admin)
-mklink "%USERPROFILE%\.config\opencode\plugin\superpowers.js" "%USERPROFILE%\.config\opencode\superpowers\.opencode\plugin\superpowers.js"
+mklink "%USERPROFILE%\.config\opencode\plugins\superpowers.js" "%USERPROFILE%\.config\opencode\superpowers\.opencode\plugins\superpowers.js"

 :: 5. Create skills junction (works without special privileges)
 mklink /J "%USERPROFILE%\.config\opencode\skills\superpowers" "%USERPROFILE%\.config\opencode\superpowers\skills"
@@ -90,15 +94,15 @@ Run as Administrator, or with Developer Mode enabled:
 git clone https://github.com/obra/superpowers.git "$env:USERPROFILE\.config\opencode\superpowers"

 # 2. Create directories
-New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.config\opencode\plugin"
+New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.config\opencode\plugins"
 New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.config\opencode\skills"

 # 3. Remove existing links (safe for reinstalls)
-Remove-Item "$env:USERPROFILE\.config\opencode\plugin\superpowers.js" -Force -ErrorAction SilentlyContinue
+Remove-Item "$env:USERPROFILE\.config\opencode\plugins\superpowers.js" -Force -ErrorAction SilentlyContinue
 Remove-Item "$env:USERPROFILE\.config\opencode\skills\superpowers" -Force -ErrorAction SilentlyContinue

 # 4. Create plugin symlink (requires Developer Mode or Admin)
-New-Item -ItemType SymbolicLink -Path "$env:USERPROFILE\.config\opencode\plugin\superpowers.js" -Target "$env:USERPROFILE\.config\opencode\superpowers\.opencode\plugin\superpowers.js"
+New-Item -ItemType SymbolicLink -Path "$env:USERPROFILE\.config\opencode\plugins\superpowers.js" -Target "$env:USERPROFILE\.config\opencode\superpowers\.opencode\plugins\superpowers.js"

 # 5. Create skills junction (works without special privileges)
 New-Item -ItemType Junction -Path "$env:USERPROFILE\.config\opencode\skills\superpowers" -Target "$env:USERPROFILE\.config\opencode\superpowers\skills"
@@ -115,14 +119,14 @@ Note: Git Bash's native `ln` command copies files instead of creating symlinks.
 git clone https://github.com/obra/superpowers.git ~/.config/opencode/superpowers

 # 2. Create directories
-mkdir -p ~/.config/opencode/plugin ~/.config/opencode/skills
+mkdir -p ~/.config/opencode/plugins ~/.config/opencode/skills

 # 3. Remove existing links (safe for reinstalls)
-rm -f ~/.config/opencode/plugin/superpowers.js 2>/dev/null
+rm -f ~/.config/opencode/plugins/superpowers.js 2>/dev/null
 rm -rf ~/.config/opencode/skills/superpowers 2>/dev/null

 # 4. Create plugin symlink (requires Developer Mode or Admin)
-cmd //c "mklink \"$(cygpath -w ~/.config/opencode/plugin/superpowers.js)\" \"$(cygpath -w ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js)\""
+cmd //c "mklink \"$(cygpath -w ~/.config/opencode/plugins/superpowers.js)\" \"$(cygpath -w ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js)\""

 # 5. Create skills junction (works without special privileges)
 cmd //c "mklink /J \"$(cygpath -w ~/.config/opencode/skills/superpowers)\" \"$(cygpath -w ~/.config/opencode/superpowers/skills)\""
@@ -138,13 +142,13 @@ If running OpenCode inside WSL, use the [macOS / Linux](#macos--linux) instructi

 **Command Prompt:**
 ```cmd
-dir /AL "%USERPROFILE%\.config\opencode\plugin"
+dir /AL "%USERPROFILE%\.config\opencode\plugins"
 dir /AL "%USERPROFILE%\.config\opencode\skills"
 ```

 **PowerShell:**
 ```powershell
-Get-ChildItem "$env:USERPROFILE\.config\opencode\plugin" | Where-Object { $_.LinkType }
+Get-ChildItem "$env:USERPROFILE\.config\opencode\plugins" | Where-Object { $_.LinkType }
 Get-ChildItem "$env:USERPROFILE\.config\opencode\skills" | Where-Object { $_.LinkType }
 ```

@@ -254,7 +258,7 @@ Skills written for Claude Code are automatically adapted for OpenCode. The boots

 ### Plugin Structure

-**Location:** `~/.config/opencode/superpowers/.opencode/plugin/superpowers.js`
+**Location:** `~/.config/opencode/superpowers/.opencode/plugins/superpowers.js`

 **Components:**
 - `experimental.chat.system.transform` hook for bootstrap injection
@@ -279,8 +283,8 @@ Restart OpenCode to load the updates.

 ### Plugin not loading

-1. Check plugin exists: `ls ~/.config/opencode/superpowers/.opencode/plugin/superpowers.js`
-2. Check symlink/junction: `ls -l ~/.config/opencode/plugin/` (macOS/Linux) or `dir /AL %USERPROFILE%\.config\opencode\plugin` (Windows)
+1. Check plugin exists: `ls ~/.config/opencode/superpowers/.opencode/plugins/superpowers.js`
+2. Check symlink/junction: `ls -l ~/.config/opencode/plugins/` (macOS/Linux) or `dir /AL %USERPROFILE%\.config\opencode\plugins` (Windows)
 3. Check OpenCode logs: `opencode run "test" --print-logs --log-level DEBUG`
 4. Look for plugin loading message in logs

--- a/docs/plans/2026-01-17-visual-brainstorming.md
+++ b/docs/plans/2026-01-17-visual-brainstorming.md
@@ -1,571 +0,0 @@
-# Visual Brainstorming Companion Implementation Plan
-
-> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
-
-**Goal:** Give Claude a browser-based visual companion for brainstorming sessions - show mockups, prototypes, and interactive choices alongside terminal conversation.
-
-**Architecture:** Claude writes HTML to a temp file. A local Node.js server watches that file and serves it with an auto-injected helper library. User interactions flow via WebSocket to server stdout, which Claude sees in background task output.
-
-**Tech Stack:** Node.js, Express, ws (WebSocket), chokidar (file watching)
-
---
-
-## Task 1: Create the Server Foundation
-
-**Files:**
- Create: `lib/brainstorm-server/index.js`
- Create: `lib/brainstorm-server/package.json`
-
-**Step 1: Create package.json**
-
-```json
-{
-  "name": "brainstorm-server",
-  "version": "1.0.0",
-  "description": "Visual brainstorming companion server for Claude Code",
-  "main": "index.js",
-  "dependencies": {
-    "chokidar": "^3.5.3",
-    "express": "^4.18.2",
-    "ws": "^8.14.2"
-  }
-}
-```
-
-**Step 2: Create minimal server that starts**
-
-```javascript
-const express = require('express');
-const http = require('http');
-const WebSocket = require('ws');
-const chokidar = require('chokidar');
-const fs = require('fs');
-const path = require('path');
-
-const PORT = process.env.BRAINSTORM_PORT || 3333;
-const SCREEN_FILE = process.env.BRAINSTORM_SCREEN || '/tmp/brainstorm/screen.html';
-const SCREEN_DIR = path.dirname(SCREEN_FILE);
-
-// Ensure screen directory exists
-if (!fs.existsSync(SCREEN_DIR)) {
-  fs.mkdirSync(SCREEN_DIR, { recursive: true });
-}
-
-// Create default screen if none exists
-if (!fs.existsSync(SCREEN_FILE)) {
-  fs.writeFileSync(SCREEN_FILE, `<!DOCTYPE html>
-<html>
-<head>
-  <title>Brainstorm Companion</title>
-  <style>
-    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }
-    h1 { color: #333; }
-    p { color: #666; }
-  </style>
-</head>
-<body>
-  <h1>Brainstorm Companion</h1>
-  <p>Waiting for Claude to push a screen...</p>
-</body>
-</html>`);
-}
-
-const app = express();
-const server = http.createServer(app);
-const wss = new WebSocket.Server({ server });
-
-// Track connected browsers for reload notifications
-const clients = new Set();
-
-wss.on('connection', (ws) => {
-  clients.add(ws);
-  ws.on('close', () => clients.delete(ws));
-
-  ws.on('message', (data) => {
-    // User interaction event - write to stdout for Claude
-    const event = JSON.parse(data.toString());
-    console.log(JSON.stringify({ type: 'user-event', ...event }));
-  });
-});
-
-// Serve current screen with helper.js injected
-app.get('/', (req, res) => {
-  let html = fs.readFileSync(SCREEN_FILE, 'utf-8');
-
-  // Inject helper script before </body>
-  const helperScript = fs.readFileSync(path.join(__dirname, 'helper.js'), 'utf-8');
-  const injection = `<script>\n${helperScript}\n</script>`;
-
-  if (html.includes('</body>')) {
-    html = html.replace('</body>', `${injection}\n</body>`);
-  } else {
-    html += injection;
-  }
-
-  res.type('html').send(html);
-});
-
-// Watch for screen file changes
-chokidar.watch(SCREEN_FILE).on('change', () => {
-  console.log(JSON.stringify({ type: 'screen-updated', file: SCREEN_FILE }));
-  // Notify all browsers to reload
-  clients.forEach(ws => {
-    if (ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify({ type: 'reload' }));
-    }
-  });
-});
-
-server.listen(PORT, '127.0.0.1', () => {
-  console.log(JSON.stringify({ type: 'server-started', port: PORT, url: `http://localhost:${PORT}` }));
-});
-```
-
-**Step 3: Run npm install**
-
-Run: `cd lib/brainstorm-server && npm install`
-Expected: Dependencies installed
-
-**Step 4: Test server starts**
-
-Run: `cd lib/brainstorm-server && timeout 3 node index.js || true`
-Expected: See JSON with `server-started` and port info
-
-**Step 5: Commit**
-
-```bash
-git add lib/brainstorm-server/
-git commit -m "feat: add brainstorm server foundation"
-```
-
---
-
-## Task 2: Create the Helper Library
-
-**Files:**
- Create: `lib/brainstorm-server/helper.js`
-
-**Step 1: Create helper.js with event auto-capture**
-
-```javascript
-(function() {
-  const WS_URL = 'ws://' + window.location.host;
-  let ws = null;
-  let eventQueue = [];
-
-  function connect() {
-    ws = new WebSocket(WS_URL);
-
-    ws.onopen = () => {
-      // Send any queued events
-      eventQueue.forEach(e => ws.send(JSON.stringify(e)));
-      eventQueue = [];
-    };
-
-    ws.onmessage = (msg) => {
-      const data = JSON.parse(msg.data);
-      if (data.type === 'reload') {
-        window.location.reload();
-      }
-    };
-
-    ws.onclose = () => {
-      // Reconnect after 1 second
-      setTimeout(connect, 1000);
-    };
-  }
-
-  function send(event) {
-    event.timestamp = Date.now();
-    if (ws && ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify(event));
-    } else {
-      eventQueue.push(event);
-    }
-  }
-
-  // Auto-capture clicks on interactive elements
-  document.addEventListener('click', (e) => {
-    const target = e.target.closest('button, a, [data-choice], [role="button"], input[type="submit"]');
-    if (!target) return;
-
-    // Don't capture regular link navigation
-    if (target.tagName === 'A' && !target.dataset.choice) return;
-
-    e.preventDefault();
-
-    send({
-      type: 'click',
-      text: target.textContent.trim(),
-      choice: target.dataset.choice || null,
-      id: target.id || null,
-      className: target.className || null
-    });
-  });
-
-  // Auto-capture form submissions
-  document.addEventListener('submit', (e) => {
-    e.preventDefault();
-    const form = e.target;
-    const formData = new FormData(form);
-    const data = {};
-    formData.forEach((value, key) => { data[key] = value; });
-
-    send({
-      type: 'submit',
-      formId: form.id || null,
-      formName: form.name || null,
-      data: data
-    });
-  });
-
-  // Auto-capture input changes (debounced)
-  let inputTimeout = null;
-  document.addEventListener('input', (e) => {
-    const target = e.target;
-    if (!target.matches('input, textarea, select')) return;
-
-    clearTimeout(inputTimeout);
-    inputTimeout = setTimeout(() => {
-      send({
-        type: 'input',
-        name: target.name || null,
-        id: target.id || null,
-        value: target.value,
-        inputType: target.type || target.tagName.toLowerCase()
-      });
-    }, 500); // 500ms debounce
-  });
-
-  // Expose for explicit use if needed
-  window.brainstorm = {
-    send: send,
-    choice: (value, metadata = {}) => send({ type: 'choice', value, ...metadata })
-  };
-
-  connect();
-})();
-```
-
-**Step 2: Verify helper.js is syntactically valid**
-
-Run: `node -c lib/brainstorm-server/helper.js`
-Expected: No syntax errors
-
-**Step 3: Commit**
-
-```bash
-git add lib/brainstorm-server/helper.js
-git commit -m "feat: add browser helper library for event capture"
-```
-
---
-
-## Task 3: Write Tests for the Server
-
-**Files:**
- Create: `tests/brainstorm-server/server.test.js`
- Create: `tests/brainstorm-server/package.json`
-
-**Step 1: Create test package.json**
-
-```json
-{
-  "name": "brainstorm-server-tests",
-  "version": "1.0.0",
-  "scripts": {
-    "test": "node server.test.js"
-  }
-}
-```
-
-**Step 2: Write server tests**
-
-```javascript
-const { spawn } = require('child_process');
-const http = require('http');
-const WebSocket = require('ws');
-const fs = require('fs');
-const path = require('path');
-const assert = require('assert');
-
-const SERVER_PATH = path.join(__dirname, '../../lib/brainstorm-server/index.js');
-const TEST_PORT = 3334;
-const TEST_SCREEN = '/tmp/brainstorm-test/screen.html';
-
-// Clean up test directory
-function cleanup() {
-  if (fs.existsSync(path.dirname(TEST_SCREEN))) {
-    fs.rmSync(path.dirname(TEST_SCREEN), { recursive: true });
-  }
-}
-
-async function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-async function fetch(url) {
-  return new Promise((resolve, reject) => {
-    http.get(url, (res) => {
-      let data = '';
-      res.on('data', chunk => data += chunk);
-      res.on('end', () => resolve({ status: res.statusCode, body: data }));
-    }).on('error', reject);
-  });
-}
-
-async function runTests() {
-  cleanup();
-
-  // Start server
-  const server = spawn('node', [SERVER_PATH], {
-    env: { ...process.env, BRAINSTORM_PORT: TEST_PORT, BRAINSTORM_SCREEN: TEST_SCREEN }
-  });
-
-  let stdout = '';
-  server.stdout.on('data', (data) => { stdout += data.toString(); });
-  server.stderr.on('data', (data) => { console.error('Server stderr:', data.toString()); });
-
-  await sleep(1000); // Wait for server to start
-
-  try {
-    // Test 1: Server starts and outputs JSON
-    console.log('Test 1: Server startup message');
-    assert(stdout.includes('server-started'), 'Should output server-started');
-    assert(stdout.includes(TEST_PORT.toString()), 'Should include port');
-    console.log('  PASS');
-
-    // Test 2: GET / returns HTML with helper injected
-    console.log('Test 2: Serves HTML with helper injected');
-    const res = await fetch(`http://localhost:${TEST_PORT}/`);
-    assert.strictEqual(res.status, 200);
-    assert(res.body.includes('brainstorm'), 'Should include brainstorm content');
-    assert(res.body.includes('WebSocket'), 'Should have helper.js injected');
-    console.log('  PASS');
-
-    // Test 3: WebSocket connection and event relay
-    console.log('Test 3: WebSocket relays events to stdout');
-    stdout = ''; // Reset stdout capture
-    const ws = new WebSocket(`ws://localhost:${TEST_PORT}`);
-    await new Promise(resolve => ws.on('open', resolve));
-
-    ws.send(JSON.stringify({ type: 'click', text: 'Test Button' }));
-    await sleep(100);
-
-    assert(stdout.includes('user-event'), 'Should relay user events');
-    assert(stdout.includes('Test Button'), 'Should include event data');
-    ws.close();
-    console.log('  PASS');
-
-    // Test 4: File change triggers reload notification
-    console.log('Test 4: File change notifies browsers');
-    const ws2 = new WebSocket(`ws://localhost:${TEST_PORT}`);
-    await new Promise(resolve => ws2.on('open', resolve));
-
-    let gotReload = false;
-    ws2.on('message', (data) => {
-      const msg = JSON.parse(data.toString());
-      if (msg.type === 'reload') gotReload = true;
-    });
-
-    // Modify the screen file
-    fs.writeFileSync(TEST_SCREEN, '<html><body>Updated</body></html>');
-    await sleep(500);
-
-    assert(gotReload, 'Should send reload message on file change');
-    ws2.close();
-    console.log('  PASS');
-
-    console.log('\nAll tests passed!');
-
-  } finally {
-    server.kill();
-    cleanup();
-  }
-}
-
-runTests().catch(err => {
-  console.error('Test failed:', err);
-  process.exit(1);
-});
-```
-
-**Step 3: Run tests**
-
-Run: `cd tests/brainstorm-server && npm install ws && node server.test.js`
-Expected: All tests pass
-
-**Step 4: Commit**
-
-```bash
-git add tests/brainstorm-server/
-git commit -m "test: add brainstorm server integration tests"
-```
-
---
-
-## Task 4: Add Visual Companion to Brainstorming Skill
-
-**Files:**
- Modify: `skills/brainstorming/SKILL.md`
- Create: `skills/brainstorming/visual-companion.md` (supporting doc)
-
-**Step 1: Create the supporting documentation**
-
-Create `skills/brainstorming/visual-companion.md`:
-
-```markdown
-# Visual Companion Reference
-
-## Starting the Server
-
-Run as a background job:
-
-```bash
-node ${PLUGIN_ROOT}/lib/brainstorm-server/index.js
-```
-
-Tell the user: "I've started a visual companion at http://localhost:3333 - open it in a browser."
-
-## Pushing Screens
-
-Write HTML to `/tmp/brainstorm/screen.html`. The server watches this file and auto-refreshes the browser.
-
-## Reading User Responses
-
-Check the background task output for JSON events:
-
-```json
-{"type":"user-event","type":"click","text":"Option A","choice":"optionA","timestamp":1234567890}
-{"type":"user-event","type":"submit","data":{"notes":"My feedback"},"timestamp":1234567891}
-```
-
-Event types:
- **click**: User clicked button or `data-choice` element
- **submit**: User submitted form (includes all form data)
- **input**: User typed in field (debounced 500ms)
-
-## HTML Patterns
-
-### Choice Cards
-
-```html
-<div class="options">
-  <button data-choice="optionA">
-    <h3>Option A</h3>
-    <p>Description</p>
-  </button>
-  <button data-choice="optionB">
-    <h3>Option B</h3>
-    <p>Description</p>
-  </button>
-</div>
-```
-
-### Interactive Mockup
-
-```html
-<div class="mockup">
-  <header data-choice="header">App Header</header>
-  <nav data-choice="nav">Navigation</nav>
-  <main data-choice="main">Content</main>
-</div>
-```
-
-### Form with Notes
-
-```html
-<form>
-  <label>Priority: <input type="range" name="priority" min="1" max="5"></label>
-  <textarea name="notes" placeholder="Additional thoughts..."></textarea>
-  <button type="submit">Submit</button>
-</form>
-```
-
-### Explicit JavaScript
-
-```html
-<button onclick="brainstorm.choice('custom', {extra: 'data'})">Custom</button>
-```
-```
-
-**Step 2: Add visual companion section to brainstorming skill**
-
-Add after "Key Principles" in `skills/brainstorming/SKILL.md`:
-
-```markdown
-
-## Visual Companion (Optional)
-
-When brainstorming involves visual elements - UI mockups, wireframes, interactive prototypes - use the browser-based visual companion.
-
-**When to use:**
- Presenting UI/UX options that benefit from visual comparison
- Showing wireframes or layout options
- Gathering structured feedback (ratings, forms)
- Prototyping click interactions
-
-**How it works:**
-1. Start the server as a background job
-2. Tell user to open http://localhost:3333
-3. Write HTML to `/tmp/brainstorm/screen.html` (auto-refreshes)
-4. Check background task output for user interactions
-
-The terminal remains the primary conversation interface. The browser is a visual aid.
-
-**Reference:** See `visual-companion.md` in this skill directory for HTML patterns and API details.
-```
-
-**Step 3: Verify the edits**
-
-Run: `grep -A5 "Visual Companion" skills/brainstorming/SKILL.md`
-Expected: Shows the new section
-
-**Step 4: Commit**
-
-```bash
-git add skills/brainstorming/
-git commit -m "feat: add visual companion to brainstorming skill"
-```
-
---
-
-## Task 5: Add Server to Plugin Ignore (Optional Cleanup)
-
-**Files:**
- Check if `.gitignore` needs node_modules exclusion for lib/brainstorm-server
-
-**Step 1: Check current gitignore**
-
-Run: `cat .gitignore 2>/dev/null || echo "No .gitignore"`
-
-**Step 2: Add node_modules if needed**
-
-If not already present, add:
-```
-lib/brainstorm-server/node_modules/
-```
-
-**Step 3: Commit if changed**
-
-```bash
-git add .gitignore
-git commit -m "chore: ignore brainstorm-server node_modules"
-```
-
---
-
-## Summary
-
-After completing all tasks:
-
-1. **Server** at `lib/brainstorm-server/` - Node.js server that watches HTML file and relays events
-2. **Helper library** auto-injected - captures clicks, forms, inputs
-3. **Tests** at `tests/brainstorm-server/` - verifies server behavior
-4. **Brainstorming skill** updated with visual companion section and `visual-companion.md` reference doc
-
-**To use:**
-1. Start server as background job: `node lib/brainstorm-server/index.js &`
-2. Tell user to open `http://localhost:3333`
-3. Write HTML to `/tmp/brainstorm/screen.html`
-4. Check task output for user events
--- a/hooks/hooks.json
+++ b/hooks/hooks.json
@@ -6,7 +6,7 @@
        "hooks": [
          {
            "type": "command",
-            "command": "\"${CLAUDE_PLUGIN_ROOT}/hooks/run-hook.cmd\" session-start.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/hooks/session-start.sh"
          }
        ]
      }
--- a/hooks/run-hook.cmd
+++ b/hooks/run-hook.cmd
@@ -1,6 +1,30 @@
 : << 'CMDBLOCK'
@echo off
-REM Polyglot wrapper: runs .sh scripts cross-platform
+REM ============================================================================
+REM DEPRECATED: This polyglot wrapper is no longer used as of Claude Code 2.1.x
+REM ============================================================================
+REM
+REM Claude Code 2.1.x changed the Windows execution model for hooks:
+REM
+REM   Before (2.0.x): Hooks ran with shell:true, using the system default shell.
+REM                   This wrapper provided cross-platform compatibility by
+REM                   being both a valid .cmd file (Windows) and bash script.
+REM
+REM   After (2.1.x):  Claude Code now auto-detects .sh files in hook commands
+REM                   and prepends "bash " on Windows. This broke the wrapper
+REM                   because the command:
+REM                     "run-hook.cmd" session-start.sh
+REM                   became:
+REM                     bash "run-hook.cmd" session-start.sh
+REM                   ...and bash cannot execute a .cmd file.
+REM
+REM The fix: hooks.json now calls session-start.sh directly. Claude Code 2.1.x
+REM handles the bash invocation automatically on Windows.
+REM
+REM This file is kept for reference and potential backward compatibility.
+REM ============================================================================
+REM
+REM Original purpose: Polyglot wrapper to run .sh scripts cross-platform
 REM Usage: run-hook.cmd <script-name> [args...]
 REM The script should be in the same directory as this wrapper

--- a/lib/brainstorm-server/CLAUDE-INSTRUCTIONS.md
+++ b/lib/brainstorm-server/CLAUDE-INSTRUCTIONS.md
@@ -1,212 +0,0 @@
-# Visual Companion Instructions for Claude
-
-This document explains how to use the brainstorm visual companion to show mockups, designs, and options to users without resorting to ASCII art.
-
-## When to Use
-
-Use the visual companion when you need to show:
- **UI mockups** - layouts, navigation patterns, component designs
- **Design comparisons** - "Which of these 3 approaches works better?"
- **Interactive prototypes** - clickable wireframes
- **Visual choices** - anything where seeing beats describing
-
-**Don't use it for:** simple text questions, code review, or when the user prefers terminal-only interaction.
-
-## Lifecycle
-
-```bash
-# Start server (returns JSON with URL and session directory)
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/start-server.sh
-# Returns: {"type":"server-started","port":52341,"url":"http://localhost:52341",
-#           "screen_dir":"/tmp/brainstorm-12345-1234567890"}
-
-# Save screen_dir from response!
-
-# Tell user to open the URL in their browser
-
-# For each screen:
-# 1. Start watcher in background FIRST (avoids race condition)
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/wait-for-feedback.sh $SCREEN_DIR
-# 2. Write HTML to a NEW file in screen_dir (e.g., platform.html, style.html)
-#    Server automatically serves the newest file by modification time
-# 3. Call TaskOutput(task_id, block=true, timeout=600000) to wait for feedback
-
-# When done, stop server (pass screen_dir)
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/stop-server.sh $SCREEN_DIR
-```
-
-## File Naming
-
- **Use semantic names**: `platform.html`, `visual-style.html`, `layout.html`, `controls.html`
- **Never reuse filenames** - each screen must be a new file
- **For iterations**: append version suffix like `layout-v2.html`, `layout-v3.html`
- Server automatically serves the newest `.html` file by modification time
-
-## Writing Screens
-
-Copy the frame template structure but replace `#claude-content` with your content:
-
-```html
-<div id="claude-content">
-  <h2>Your Question</h2>
-  <p class="subtitle">Brief context</p>
-
-  <!-- Your content here -->
-</div>
-```
-
-The frame template (`frame-template.html`) includes CSS for:
- OS-aware light/dark theming
- Fixed header and feedback footer
- Common UI patterns (see below)
-
-## CSS Helper Classes
-
-### Options (A/B/C choices)
-
-```html
-<div class="options">
-  <div class="option" data-choice="a" onclick="toggleSelect(this)">
-    <div class="letter">A</div>
-    <div class="content">
-      <h3>Option Title</h3>
-      <p>Description of this option</p>
-    </div>
-  </div>
-  <!-- More options... -->
-</div>
-```
-
-### Cards (visual designs)
-
-```html
-<div class="cards">
-  <div class="card" data-choice="design1" onclick="toggleSelect(this)">
-    <div class="card-image">
-      <!-- Put mockup content here -->
-    </div>
-    <div class="card-body">
-      <h3>Design Name</h3>
-      <p>Brief description</p>
-    </div>
-  </div>
-</div>
-```
-
-### Mockup Container
-
-```html
-<div class="mockup">
-  <div class="mockup-header">Preview: Dashboard Layout</div>
-  <div class="mockup-body">
-    <!-- Your mockup HTML -->
-  </div>
-</div>
-```
-
-### Split View (side-by-side)
-
-```html
-<div class="split">
-  <div class="mockup"><!-- Left side --></div>
-  <div class="mockup"><!-- Right side --></div>
-</div>
-```
-
-### Pros/Cons
-
-```html
-<div class="pros-cons">
-  <div class="pros">
-    <h4>Pros</h4>
-    <ul>
-      <li>Benefit one</li>
-      <li>Benefit two</li>
-    </ul>
-  </div>
-  <div class="cons">
-    <h4>Cons</h4>
-    <ul>
-      <li>Drawback one</li>
-      <li>Drawback two</li>
-    </ul>
-  </div>
-</div>
-```
-
-### Inline Mockup Elements
-
-```html
-<div class="mock-nav">Logo | Home | About | Contact</div>
-<div style="display: flex;">
-  <div class="mock-sidebar">Navigation</div>
-  <div class="mock-content">Main content area</div>
-</div>
-<button class="mock-button">Action Button</button>
-<input class="mock-input" placeholder="Input field">
-```
-
-## User Feedback
-
-When the user clicks Send, you receive JSON like:
-
-```json
-{"choice": "a", "feedback": "I like this but make the header smaller"}
-```
-
- `choice` - which option/card they selected (from `data-choice` attribute)
- `feedback` - any notes they typed
-
-## Example: Design Comparison
-
-```html
-<div id="claude-content">
-  <h2>Which blog layout works better?</h2>
-  <p class="subtitle">Consider readability and visual hierarchy</p>
-
-  <div class="cards">
-    <div class="card" data-choice="classic" onclick="toggleSelect(this)">
-      <div class="card-image">
-        <div style="padding: 1rem;">
-          <div class="mock-nav">Blog Title</div>
-          <div style="padding: 1rem;">
-            <h3 style="margin-bottom: 0.5rem;">Post Title</h3>
-            <p style="color: var(--text-secondary); font-size: 0.9rem;">
-              Content preview text goes here...
-            </p>
-          </div>
-        </div>
-      </div>
-      <div class="card-body">
-        <h3>Classic Layout</h3>
-        <p>Traditional blog with posts in a single column</p>
-      </div>
-    </div>
-
-    <div class="card" data-choice="magazine" onclick="toggleSelect(this)">
-      <div class="card-image">
-        <div style="padding: 1rem;">
-          <div class="mock-nav">Blog Title</div>
-          <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 0.5rem; padding: 0.5rem;">
-            <div class="placeholder" style="padding: 1rem;">Featured</div>
-            <div class="placeholder" style="padding: 0.5rem;">Post</div>
-          </div>
-        </div>
-      </div>
-      <div class="card-body">
-        <h3>Magazine Layout</h3>
-        <p>Grid-based with featured posts</p>
-      </div>
-    </div>
-  </div>
-</div>
-```
-
-## Tips
-
-1. **Keep mockups simple** - Focus on layout and structure, not pixel-perfect design
-2. **Use placeholders** - The `.placeholder` class works great for content areas
-3. **Label clearly** - Use `.mockup-header` to explain what each mockup shows
-4. **Limit choices** - 2-4 options is ideal; more gets overwhelming
-5. **Provide context** - Use `.subtitle` to explain what you're asking
-6. **Regenerate fully** - Write the complete HTML each turn; don't try to patch
--- a/lib/brainstorm-server/frame-template.html
+++ b/lib/brainstorm-server/frame-template.html
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Brainstorm Companion</title>
-  <style>
-    /*
-     * BRAINSTORM COMPANION FRAME TEMPLATE
-     *
-     * This template provides a consistent frame with:
-     * - OS-aware light/dark theming
-     * - Fixed header and feedback footer
-     * - Scrollable main content area
-     * - CSS helpers for common UI patterns
-     *
-     * CLAUDE: Replace the contents of #claude-content with your content.
-     * Keep the header, main wrapper, and feedback-footer intact.
-     */
-
-    * { box-sizing: border-box; margin: 0; padding: 0; }
-    html, body { height: 100%; overflow: hidden; }
-
-    /* ===== THEME VARIABLES ===== */
-    :root {
-      --bg-primary: #f5f5f7;
-      --bg-secondary: #ffffff;
-      --bg-tertiary: #e5e5e7;
-      --border: #d1d1d6;
-      --text-primary: #1d1d1f;
-      --text-secondary: #86868b;
-      --text-tertiary: #aeaeb2;
-      --accent: #0071e3;
-      --accent-hover: #0077ed;
-      --success: #34c759;
-      --warning: #ff9f0a;
-      --error: #ff3b30;
-      --selected-bg: #e8f4fd;
-      --selected-border: #0071e3;
-    }
-
-    @media (prefers-color-scheme: dark) {
-      :root {
-        --bg-primary: #1d1d1f;
-        --bg-secondary: #2d2d2f;
-        --bg-tertiary: #3d3d3f;
-        --border: #424245;
-        --text-primary: #f5f5f7;
-        --text-secondary: #86868b;
-        --text-tertiary: #636366;
-        --accent: #0a84ff;
-        --accent-hover: #409cff;
-        --selected-bg: rgba(10, 132, 255, 0.15);
-        --selected-border: #0a84ff;
-      }
-    }
-
-    body {
-      font-family: system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
-      background: var(--bg-primary);
-      color: var(--text-primary);
-      display: flex;
-      flex-direction: column;
-      line-height: 1.5;
-    }
-
-    /* ===== FRAME STRUCTURE ===== */
-    .header {
-      background: var(--bg-secondary);
-      padding: 0.5rem 1.5rem;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      border-bottom: 1px solid var(--border);
-      flex-shrink: 0;
-    }
-    .header h1 { font-size: 0.85rem; font-weight: 500; color: var(--text-secondary); }
-    .header .status { font-size: 0.7rem; color: var(--success); display: flex; align-items: center; gap: 0.4rem; }
-    .header .status::before { content: ''; width: 6px; height: 6px; background: var(--success); border-radius: 50%; }
-
-    .main { flex: 1; overflow-y: auto; }
-    #claude-content { padding: 2rem; min-height: 100%; }
-
-    .feedback-footer {
-      background: var(--bg-secondary);
-      border-top: 1px solid var(--border);
-      padding: 0.75rem 1.5rem;
-      flex-shrink: 0;
-    }
-    .feedback-footer label { display: block; font-size: 0.65rem; color: var(--text-secondary); margin-bottom: 0.4rem; text-transform: uppercase; letter-spacing: 0.05em; }
-    .feedback-row { display: flex; gap: 0.5rem; }
-    .feedback-footer textarea {
-      flex: 1;
-      background: var(--bg-primary);
-      border: 1px solid var(--border);
-      border-radius: 6px;
-      padding: 0.5rem 0.75rem;
-      color: var(--text-primary);
-      font-family: inherit;
-      font-size: 0.85rem;
-      resize: none;
-      height: 36px;
-    }
-    .feedback-footer textarea:focus { outline: none; border-color: var(--accent); }
-    .feedback-footer button {
-      background: var(--accent);
-      color: white;
-      border: none;
-      padding: 0 1rem;
-      border-radius: 6px;
-      font-size: 0.8rem;
-      cursor: pointer;
-    }
-    .feedback-footer button:hover { background: var(--accent-hover); }
-
-    /* ===== TYPOGRAPHY ===== */
-    h2 { font-size: 1.5rem; font-weight: 600; margin-bottom: 0.5rem; }
-    h3 { font-size: 1.1rem; font-weight: 600; margin-bottom: 0.25rem; }
-    .subtitle { color: var(--text-secondary); margin-bottom: 1.5rem; }
-    .section { margin-bottom: 2rem; }
-    .label { font-size: 0.7rem; color: var(--text-secondary); text-transform: uppercase; letter-spacing: 0.05em; margin-bottom: 0.5rem; }
-
-    /* ===== OPTIONS (for A/B/C choices) ===== */
-    .options { display: flex; flex-direction: column; gap: 0.75rem; }
-    .option {
-      background: var(--bg-secondary);
-      border: 2px solid var(--border);
-      border-radius: 12px;
-      padding: 1rem 1.25rem;
-      cursor: pointer;
-      transition: all 0.15s ease;
-      display: flex;
-      align-items: flex-start;
-      gap: 1rem;
-    }
-    .option:hover { border-color: var(--accent); }
-    .option.selected { background: var(--selected-bg); border-color: var(--selected-border); }
-    .option .letter {
-      background: var(--bg-tertiary);
-      color: var(--text-secondary);
-      width: 1.75rem; height: 1.75rem;
-      border-radius: 6px;
-      display: flex; align-items: center; justify-content: center;
-      font-weight: 600; font-size: 0.85rem; flex-shrink: 0;
-    }
-    .option.selected .letter { background: var(--accent); color: white; }
-    .option .content { flex: 1; }
-    .option .content h3 { font-size: 0.95rem; margin-bottom: 0.15rem; }
-    .option .content p { color: var(--text-secondary); font-size: 0.85rem; margin: 0; }
-
-    /* ===== CARDS (for showing designs/mockups) ===== */
-    .cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 1rem; }
-    .card {
-      background: var(--bg-secondary);
-      border: 1px solid var(--border);
-      border-radius: 12px;
-      overflow: hidden;
-      cursor: pointer;
-      transition: all 0.15s ease;
-    }
-    .card:hover { border-color: var(--accent); transform: translateY(-2px); box-shadow: 0 4px 12px rgba(0,0,0,0.1); }
-    .card.selected { border-color: var(--selected-border); border-width: 2px; }
-    .card-image { background: var(--bg-tertiary); aspect-ratio: 16/10; display: flex; align-items: center; justify-content: center; }
-    .card-body { padding: 1rem; }
-    .card-body h3 { margin-bottom: 0.25rem; }
-    .card-body p { color: var(--text-secondary); font-size: 0.85rem; }
-
-    /* ===== MOCKUP CONTAINER ===== */
-    .mockup {
-      background: var(--bg-secondary);
-      border: 1px solid var(--border);
-      border-radius: 12px;
-      overflow: hidden;
-      margin-bottom: 1.5rem;
-    }
-    .mockup-header {
-      background: var(--bg-tertiary);
-      padding: 0.5rem 1rem;
-      font-size: 0.75rem;
-      color: var(--text-secondary);
-      border-bottom: 1px solid var(--border);
-    }
-    .mockup-body { padding: 1.5rem; }
-
-    /* ===== SPLIT VIEW (side-by-side comparison) ===== */
-    .split { display: grid; grid-template-columns: 1fr 1fr; gap: 1.5rem; }
-    @media (max-width: 700px) { .split { grid-template-columns: 1fr; } }
-
-    /* ===== PROS/CONS ===== */
-    .pros-cons { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; margin: 1rem 0; }
-    .pros, .cons { background: var(--bg-secondary); border-radius: 8px; padding: 1rem; }
-    .pros h4 { color: var(--success); font-size: 0.85rem; margin-bottom: 0.5rem; }
-    .cons h4 { color: var(--error); font-size: 0.85rem; margin-bottom: 0.5rem; }
-    .pros ul, .cons ul { margin-left: 1.25rem; font-size: 0.85rem; color: var(--text-secondary); }
-    .pros li, .cons li { margin-bottom: 0.25rem; }
-
-    /* ===== PLACEHOLDER (for mockup areas) ===== */
-    .placeholder {
-      background: var(--bg-tertiary);
-      border: 2px dashed var(--border);
-      border-radius: 8px;
-      padding: 2rem;
-      text-align: center;
-      color: var(--text-tertiary);
-    }
-
-    /* ===== INLINE MOCKUP ELEMENTS ===== */
-    .mock-nav { background: var(--accent); color: white; padding: 0.75rem 1rem; display: flex; gap: 1.5rem; font-size: 0.9rem; }
-    .mock-sidebar { background: var(--bg-tertiary); padding: 1rem; min-width: 180px; }
-    .mock-content { padding: 1.5rem; flex: 1; }
-    .mock-button { background: var(--accent); color: white; border: none; padding: 0.5rem 1rem; border-radius: 6px; font-size: 0.85rem; }
-    .mock-input { background: var(--bg-primary); border: 1px solid var(--border); border-radius: 6px; padding: 0.5rem; width: 100%; }
-  </style>
-</head>
-<body>
-  <div class="header">
-    <h1>Brainstorm Companion</h1>
-    <div class="status">Connected</div>
-  </div>
-
-  <div class="main">
-    <div id="claude-content">
-      <!-- CLAUDE: Replace this content -->
-      <h2>Visual Brainstorming</h2>
-      <p class="subtitle">Claude will show mockups and options here.</p>
-    </div>
-  </div>
-
-  <div class="feedback-footer">
-    <label>Feedback for Claude</label>
-    <div class="feedback-row">
-      <textarea id="feedback" placeholder="Add notes (optional)..." onkeydown="if(event.key==='Enter'&&!event.shiftKey){event.preventDefault();send()}"></textarea>
-      <button onclick="send()">Send</button>
-    </div>
-  </div>
-
-  <script>
-    let selectedChoice = null;
-
-    function toggleSelect(el) {
-      const container = el.closest('.options') || el.closest('.cards');
-      if (container) {
-        container.querySelectorAll('.option, .card').forEach(o => o.classList.remove('selected'));
-      }
-      el.classList.add('selected');
-      selectedChoice = el.dataset.choice;
-    }
-
-    function send() {
-      const feedbackEl = document.getElementById('feedback');
-      const feedback = feedbackEl.value.trim();
-      const payload = {};
-      if (selectedChoice) payload.choice = selectedChoice;
-      if (feedback) payload.feedback = feedback;
-      if (Object.keys(payload).length === 0) return;
-      brainstorm.sendToClaude(payload);
-      feedbackEl.value = '';
-    }
-  </script>
-</body>
-</html>
--- a/lib/brainstorm-server/helper.js
+++ b/lib/brainstorm-server/helper.js
@@ -1,115 +0,0 @@
-(function() {
-  const WS_URL = 'ws://' + window.location.host;
-  let ws = null;
-  let eventQueue = [];
-
-  function connect() {
-    ws = new WebSocket(WS_URL);
-
-    ws.onopen = () => {
-      // Send any queued events
-      eventQueue.forEach(e => ws.send(JSON.stringify(e)));
-      eventQueue = [];
-    };
-
-    ws.onmessage = (msg) => {
-      const data = JSON.parse(msg.data);
-      if (data.type === 'reload') {
-        window.location.reload();
-      }
-    };
-
-    ws.onclose = () => {
-      // Reconnect after 1 second
-      setTimeout(connect, 1000);
-    };
-  }
-
-  function send(event) {
-    event.timestamp = Date.now();
-    if (ws && ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify(event));
-    } else {
-      eventQueue.push(event);
-    }
-  }
-
-  // Auto-capture clicks on interactive elements
-  document.addEventListener('click', (e) => {
-    const target = e.target.closest('button, a, [data-choice], [role="button"], input[type="submit"]');
-    if (!target) return;
-
-    // Don't capture regular link navigation
-    if (target.tagName === 'A' && !target.dataset.choice) return;
-
-    e.preventDefault();
-
-    send({
-      type: 'click',
-      text: target.textContent.trim(),
-      choice: target.dataset.choice || null,
-      id: target.id || null,
-      className: target.className || null
-    });
-  });
-
-  // Auto-capture form submissions
-  document.addEventListener('submit', (e) => {
-    e.preventDefault();
-    const form = e.target;
-    const formData = new FormData(form);
-    const data = {};
-    formData.forEach((value, key) => { data[key] = value; });
-
-    send({
-      type: 'submit',
-      formId: form.id || null,
-      formName: form.name || null,
-      data: data
-    });
-  });
-
-  // Auto-capture input changes (debounced)
-  let inputTimeout = null;
-  document.addEventListener('input', (e) => {
-    const target = e.target;
-    if (!target.matches('input, textarea, select')) return;
-
-    clearTimeout(inputTimeout);
-    inputTimeout = setTimeout(() => {
-      send({
-        type: 'input',
-        name: target.name || null,
-        id: target.id || null,
-        value: target.value,
-        inputType: target.type || target.tagName.toLowerCase()
-      });
-    }, 500); // 500ms debounce
-  });
-
-  // Send to Claude - triggers server to exit and return all events
-  function sendToClaude(feedback) {
-    send({
-      type: 'send-to-claude',
-      feedback: feedback || null
-    });
-    // Show confirmation to user
-    document.body.innerHTML = `
-      <div style="display: flex; align-items: center; justify-content: center; height: 100vh; font-family: system-ui, sans-serif;">
-        <div style="text-align: center; color: #666;">
-          <h2 style="color: #333;">✓ Sent to Claude</h2>
-          <p>Return to the terminal to see Claude's response.</p>
-        </div>
-      </div>
-    `;
-  }
-
-  // Expose for explicit use if needed
-  window.brainstorm = {
-    send: send,
-    choice: (value, metadata = {}) => send({ type: 'choice', value, ...metadata }),
-    sendToClaude: sendToClaude
-  };
-
-  connect();
-})();
--- a/lib/brainstorm-server/index.js
+++ b/lib/brainstorm-server/index.js
@@ -1,115 +0,0 @@
-const express = require('express');
-const http = require('http');
-const WebSocket = require('ws');
-const chokidar = require('chokidar');
-const fs = require('fs');
-const path = require('path');
-
-// Use provided port or pick a random high port (49152-65535)
-const PORT = process.env.BRAINSTORM_PORT || (49152 + Math.floor(Math.random() * 16383));
-const SCREEN_DIR = process.env.BRAINSTORM_DIR || '/tmp/brainstorm';
-
-// Ensure screen directory exists
-if (!fs.existsSync(SCREEN_DIR)) {
-  fs.mkdirSync(SCREEN_DIR, { recursive: true });
-}
-
-// Find the newest .html file in the directory by mtime
-function getNewestScreen() {
-  const files = fs.readdirSync(SCREEN_DIR)
-    .filter(f => f.endsWith('.html'))
-    .map(f => ({
-      name: f,
-      path: path.join(SCREEN_DIR, f),
-      mtime: fs.statSync(path.join(SCREEN_DIR, f)).mtime.getTime()
-    }))
-    .sort((a, b) => b.mtime - a.mtime);
-
-  return files.length > 0 ? files[0].path : null;
-}
-
-// Default waiting page (served when no screens exist yet)
-const WAITING_PAGE = `<!DOCTYPE html>
-<html>
-<head>
-  <title>Brainstorm Companion</title>
-  <style>
-    body { font-family: system-ui, sans-serif; padding: 2rem; max-width: 800px; margin: 0 auto; }
-    h1 { color: #333; }
-    p { color: #666; }
-  </style>
-</head>
-<body>
-  <h1>Brainstorm Companion</h1>
-  <p>Waiting for Claude to push a screen...</p>
-</body>
-</html>`;
-
-const app = express();
-const server = http.createServer(app);
-const wss = new WebSocket.Server({ server });
-
-// Track connected browsers for reload notifications
-const clients = new Set();
-
-wss.on('connection', (ws) => {
-  clients.add(ws);
-  ws.on('close', () => clients.delete(ws));
-
-  ws.on('message', (data) => {
-    // User interaction event - write to stdout for Claude
-    const event = JSON.parse(data.toString());
-    console.log(JSON.stringify({ source: 'user-event', ...event }));
-  });
-});
-
-// Serve newest screen with helper.js injected
-app.get('/', (req, res) => {
-  const screenFile = getNewestScreen();
-  let html = screenFile ? fs.readFileSync(screenFile, 'utf-8') : WAITING_PAGE;
-
-  // Inject helper script before </body>
-  const helperScript = fs.readFileSync(path.join(__dirname, 'helper.js'), 'utf-8');
-  const injection = `<script>\n${helperScript}\n</script>`;
-
-  if (html.includes('</body>')) {
-    html = html.replace('</body>', `${injection}\n</body>`);
-  } else {
-    html += injection;
-  }
-
-  res.type('html').send(html);
-});
-
-// Watch for new or changed .html files in the directory
-chokidar.watch(SCREEN_DIR, { ignoreInitial: true })
-  .on('add', (filePath) => {
-    if (filePath.endsWith('.html')) {
-      console.log(JSON.stringify({ type: 'screen-added', file: filePath }));
-      // Notify all browsers to reload
-      clients.forEach(ws => {
-        if (ws.readyState === WebSocket.OPEN) {
-          ws.send(JSON.stringify({ type: 'reload' }));
-        }
-      });
-    }
-  })
-  .on('change', (filePath) => {
-    if (filePath.endsWith('.html')) {
-      console.log(JSON.stringify({ type: 'screen-updated', file: filePath }));
-      clients.forEach(ws => {
-        if (ws.readyState === WebSocket.OPEN) {
-          ws.send(JSON.stringify({ type: 'reload' }));
-        }
-      });
-    }
-  });
-
-server.listen(PORT, '127.0.0.1', () => {
-  console.log(JSON.stringify({
-    type: 'server-started',
-    port: PORT,
-    url: `http://localhost:${PORT}`,
-    screen_dir: SCREEN_DIR
-  }));
-});
--- a/lib/brainstorm-server/package-lock.json
+++ b/lib/brainstorm-server/package-lock.json
--- a/lib/brainstorm-server/package.json
+++ b/lib/brainstorm-server/package.json
@@ -1,11 +0,0 @@
-{
-  "name": "brainstorm-server",
-  "version": "1.0.0",
-  "description": "Visual brainstorming companion server for Claude Code",
-  "main": "index.js",
-  "dependencies": {
-    "chokidar": "^3.5.3",
-    "express": "^4.18.2",
-    "ws": "^8.14.2"
-  }
-}
--- a/lib/brainstorm-server/start-server.sh
+++ b/lib/brainstorm-server/start-server.sh
@@ -1,45 +0,0 @@
-#!/bin/bash
-# Start the brainstorm server and output connection info
-# Usage: start-server.sh
-#
-# Starts server on a random high port, outputs JSON with URL
-# Each session gets its own temp directory to avoid conflicts
-# Server runs in background, PID saved for cleanup
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-
-# Generate unique session directory
-SESSION_ID="$$-$(date +%s)"
-SCREEN_DIR="/tmp/brainstorm-${SESSION_ID}"
-PID_FILE="${SCREEN_DIR}/.server.pid"
-LOG_FILE="${SCREEN_DIR}/.server.log"
-
-# Create fresh session directory
-mkdir -p "$SCREEN_DIR"
-
-# Kill any existing server
-if [[ -f "$PID_FILE" ]]; then
-  old_pid=$(cat "$PID_FILE")
-  kill "$old_pid" 2>/dev/null
-  rm -f "$PID_FILE"
-fi
-
-# Start server, capturing output to log file
-cd "$SCRIPT_DIR"
-BRAINSTORM_DIR="$SCREEN_DIR" node index.js > "$LOG_FILE" 2>&1 &
-SERVER_PID=$!
-echo "$SERVER_PID" > "$PID_FILE"
-
-# Wait for server-started message (check log file)
-for i in {1..50}; do
-  if grep -q "server-started" "$LOG_FILE" 2>/dev/null; then
-    # Extract and output the server-started line
-    grep "server-started" "$LOG_FILE" | head -1
-    exit 0
-  fi
-  sleep 0.1
-done
-
-# Timeout - server didn't start
-echo '{"error": "Server failed to start within 5 seconds"}'
-exit 1
--- a/lib/brainstorm-server/stop-server.sh
+++ b/lib/brainstorm-server/stop-server.sh
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Stop the brainstorm server and clean up session directory
-# Usage: stop-server.sh <screen_dir>
-
-SCREEN_DIR="$1"
-
-if [[ -z "$SCREEN_DIR" ]]; then
-  echo '{"error": "Usage: stop-server.sh <screen_dir>"}'
-  exit 1
-fi
-
-PID_FILE="${SCREEN_DIR}/.server.pid"
-
-if [[ -f "$PID_FILE" ]]; then
-  pid=$(cat "$PID_FILE")
-  kill "$pid" 2>/dev/null
-  # Clean up session directory
-  rm -rf "$SCREEN_DIR"
-  echo '{"status": "stopped"}'
-else
-  echo '{"status": "not_running"}'
-fi
--- a/lib/brainstorm-server/wait-for-feedback.sh
+++ b/lib/brainstorm-server/wait-for-feedback.sh
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Wait for user feedback from the brainstorm browser
-# Usage: wait-for-feedback.sh <screen_dir>
-#
-# Blocks until user sends feedback, then outputs the JSON.
-# Write HTML to screen_file BEFORE calling this.
-
-SCREEN_DIR="${1:?Usage: wait-for-feedback.sh <screen_dir>}"
-LOG_FILE="${SCREEN_DIR}/.server.log"
-
-if [[ ! -d "$SCREEN_DIR" ]]; then
-  echo '{"error": "Screen directory not found"}' >&2
-  exit 1
-fi
-
-# Record current position in log file
-LOG_POS=$(wc -l < "$LOG_FILE" 2>/dev/null || echo 0)
-
-# Poll for new lines containing the event
-while true; do
-  RESULT=$(tail -n +$((LOG_POS + 1)) "$LOG_FILE" 2>/dev/null | grep -m 1 "send-to-claude")
-  if [[ -n "$RESULT" ]]; then
-    echo "$RESULT"
-    exit 0
-  fi
-  sleep 0.2
-done
--- a/skills/brainstorming/SKILL.md
+++ b/skills/brainstorming/SKILL.md
@@ -52,86 +52,3 @@ Start by understanding the current project context, then ask questions one at a
 - **Explore alternatives** - Always propose 2-3 approaches before settling
 - **Incremental validation** - Present design in sections, validate each
 - **Be flexible** - Go back and clarify when something doesn't make sense
-
-## Visual Companion (Claude Code Only)
-
-A browser-based visual companion for showing mockups, diagrams, and options. Use it whenever visual representation makes feedback easier. **Only works in Claude Code.**
-
-### When to Use
-
-Use the visual companion when seeing beats describing:
- **UI mockups** - layouts, navigation, component designs
- **Architecture diagrams** - system components, data flow, relationships
- **Complex choices** - multi-option decisions with visual trade-offs
- **Design polish** - when the question is about look and feel
- **Spatial relationships** - file structures, database schemas, state machines
-
-**Always ask first:**
-> "This involves some visual decisions. Would you like me to show mockups in a browser window? (Requires opening a local URL)"
-
-Only proceed if they agree. Otherwise, describe options in text.
-
-### How to Use Effectively
-
-**Scale fidelity to the question.** If you're asking about layout structure, simple wireframes suffice. If you're asking about visual polish, show polish. Match the mockup's detail level to what you're trying to learn.
-
-**Explain the question on each page.** Don't just show options—state what decision you're seeking. "Which layout feels more professional?" not just "Pick one."
-
-**Iterate before moving on.** If feedback changes the current screen, update it and show again. Validate that your changes address their feedback before proceeding to the next question.
-
-**Limit choices to 2-4 options.** More gets overwhelming. If you have more alternatives, narrow them down first or group them.
-
-**Use real content when it matters.** For a photography portfolio, use actual images (Unsplash). For a blog, use realistic text. Placeholder content obscures design issues.
-
-### Starting a Session
-
-```bash
-# Start server (creates unique session directory)
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/start-server.sh
-
-# Returns: {"type":"server-started","port":52341,"url":"http://localhost:52341",
-#           "screen_dir":"/tmp/brainstorm-12345"}
-```
-
-Save `screen_dir` from the response. Tell user to open the URL.
-
-### The Loop
-
-1. **Start watcher first** (background bash) - avoids race condition:
-   ```bash
-   ${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/wait-for-feedback.sh $SCREEN_DIR
-   ```
-
-2. **Write HTML** to a new file in `screen_dir`:
-   - Use semantic filenames: `platform.html`, `visual-style.html`, `layout.html`
-   - **Never reuse filenames** - each screen gets a fresh file
-   - Use Write tool - **never use cat/heredoc** (dumps noise into terminal)
-   - Server automatically serves the newest file
-
-3. **Tell user what to expect:**
-   - Remind them of the URL (every step, not just first)
-   - Give a brief text summary of what's on screen (e.g., "Showing 3 layout options for the homepage")
-   - This lets them know what to look for before switching to browser
-
-4. **Wait for feedback** - call `TaskOutput(task_id, block=true, timeout=600000)`
-   - If timeout, call TaskOutput again (watcher still running)
-   - After 3 timeouts (30 min), say "Let me know when you want to continue"
-
-5. **Process feedback** - returns JSON like `{"choice": "a", "feedback": "make header smaller"}`
-
-6. **Iterate or advance** - if feedback changes current screen, write a new file (e.g., `layout-v2.html`). Only move to next question when current step is validated.
-
-7. Repeat until done.
-
-### Cleaning Up
-
-```bash
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/stop-server.sh $SCREEN_DIR
-```
-
-### Resources
-
- Frame template: `${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/frame-template.html`
- CSS classes: `.options`, `.cards`, `.mockup`, `.split`, `.pros-cons`
- Detailed examples: `${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/CLAUDE-INSTRUCTIONS.md`
- Quick reference: `${CLAUDE_PLUGIN_ROOT}/skills/brainstorming/visual-companion.md`
--- a/skills/brainstorming/visual-companion.md
+++ b/skills/brainstorming/visual-companion.md
@@ -1,130 +0,0 @@
-# Visual Companion Reference
-
-Quick reference for the browser-based visual brainstorming companion.
-
-## Files
-
-| File | Purpose |
-|------|---------|
-| `lib/brainstorm-server/start-server.sh` | Start server, outputs JSON with URL and session paths |
-| `lib/brainstorm-server/stop-server.sh` | Stop server and clean up session directory |
-| `lib/brainstorm-server/wait-for-feedback.sh` | Wait for user feedback (polling-based) |
-| `lib/brainstorm-server/frame-template.html` | Base HTML template with CSS |
-| `lib/brainstorm-server/CLAUDE-INSTRUCTIONS.md` | Detailed usage guide |
-
-## Quick Start
-
-```bash
-# 1. Start server
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/start-server.sh
-# Returns: {"screen_dir":"/tmp/brainstorm-xxx","url":"http://localhost:PORT"}
-
-# 2. Start watcher FIRST (background bash) - avoids race condition
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/wait-for-feedback.sh $SCREEN_DIR
-
-# 3. Write HTML to a NEW file in screen_dir (e.g., platform.html, style.html)
-#    Never reuse filenames - server serves newest file automatically
-
-# 4. Call TaskOutput(task_id, block=true, timeout=600000)
-#    If timeout, call again. After 3 timeouts (30 min), prompt user.
-# Returns: {"choice":"a","feedback":"user notes"}
-
-# 5. Iterate or advance - write new file if feedback changes it (e.g., style-v2.html)
-
-# 6. Clean up when done
-${CLAUDE_PLUGIN_ROOT}/lib/brainstorm-server/stop-server.sh $SCREEN_DIR
-```
-
-## Key Principles
-
- **Always ask first** before starting visual companion
- **Scale fidelity to the question** - wireframes for layout, polish for polish questions
- **Explain the question** on each page - what decision are you seeking?
- **Iterate before advancing** - if feedback changes current screen, write new version
- **2-4 options max** per screen
-
-## File Naming
-
- **Use semantic names**: `platform.html`, `visual-style.html`, `layout.html`, `controls.html`
- **Never reuse filenames** - each screen is a new file
- **For iterations**: append version suffix like `layout-v2.html`, `layout-v3.html`
- Server automatically serves the newest file by modification time
-
-## Terminal UX
-
- **Never use cat/heredoc for HTML** - dumps noise into terminal. Use Write tool instead.
- **Remind user of URL** on every step, not just the first
- **Give text summary** of what's on screen before they look (e.g., "Showing 3 API structure options")
-
-## CSS Classes
-
-### Options (A/B/C choices)
-```html
-<div class="options">
-  <div class="option" data-choice="a" onclick="toggleSelect(this)">
-    <div class="letter">A</div>
-    <div class="content">
-      <h3>Title</h3>
-      <p>Description</p>
-    </div>
-  </div>
-</div>
-```
-
-### Cards (visual designs)
-```html
-<div class="cards">
-  <div class="card" data-choice="x" onclick="toggleSelect(this)">
-    <div class="card-image"><!-- mockup --></div>
-    <div class="card-body">
-      <h3>Name</h3>
-      <p>Description</p>
-    </div>
-  </div>
-</div>
-```
-
-### Mockup container
-```html
-<div class="mockup">
-  <div class="mockup-header">Label</div>
-  <div class="mockup-body"><!-- content --></div>
-</div>
-```
-
-### Split view
-```html
-<div class="split">
-  <div><!-- left --></div>
-  <div><!-- right --></div>
-</div>
-```
-
-### Pros/Cons
-```html
-<div class="pros-cons">
-  <div class="pros"><h4>Pros</h4><ul><li>...</li></ul></div>
-  <div class="cons"><h4>Cons</h4><ul><li>...</li></ul></div>
-</div>
-```
-
-### Mock elements
-```html
-<div class="mock-nav">Nav items</div>
-<div class="mock-sidebar">Sidebar</div>
-<div class="mock-content">Content</div>
-<button class="mock-button">Button</button>
-<input class="mock-input" placeholder="Input">
-<div class="placeholder">Placeholder area</div>
-```
-
-## User Feedback Format
-
-```json
-{
-  "choice": "option-id",    // from data-choice attribute
-  "feedback": "user notes"  // from feedback textarea
-}
-```
-
-Both fields are optional - user may select without notes, or send notes without selection.
--- a/skills/executing-plans/SKILL.md
+++ b/skills/executing-plans/SKILL.md
@@ -74,3 +74,11 @@ After all tasks complete and verified:
 - Reference skills when plan says to
 - Between batches: just report and wait
 - Stop when blocked, don't guess
+- Never start implementation on main/master branch without explicit user consent
+
+## Integration
+
+**Required workflow skills:**
+- **superpowers:using-git-worktrees** - REQUIRED: Set up isolated workspace before starting
+- **superpowers:writing-plans** - Creates the plan this skill executes
+- **superpowers:finishing-a-development-branch** - Complete development after all tasks
--- a/skills/subagent-driven-development/SKILL.md
+++ b/skills/subagent-driven-development/SKILL.md
@@ -199,6 +199,7 @@ Done!
 ## Red Flags

 **Never:**
+- Start implementation on main/master branch without explicit user consent
 - Skip reviews (spec compliance OR code quality)
 - Proceed with unfixed issues
 - Dispatch multiple implementation subagents in parallel (conflicts)
@@ -229,6 +230,7 @@ Done!
 ## Integration

 **Required workflow skills:**
+- **superpowers:using-git-worktrees** - REQUIRED: Set up isolated workspace before starting
 - **superpowers:writing-plans** - Creates the plan this skill executes
 - **superpowers:requesting-code-review** - Code review template for reviewer subagents
 - **superpowers:finishing-a-development-branch** - Complete development after all tasks
--- a/skills/using-git-worktrees/SKILL.md
+++ b/skills/using-git-worktrees/SKILL.md
@@ -210,8 +210,9 @@ Ready to implement auth feature

 **Called by:**
 - **brainstorming** (Phase 4) - REQUIRED when design is approved and implementation follows
+- **subagent-driven-development** - REQUIRED before executing any tasks
+- **executing-plans** - REQUIRED before executing any tasks
 - Any skill needing isolated workspace

 **Pairs with:**
 - **finishing-a-development-branch** - REQUIRED for cleanup after work complete
- **executing-plans** or **subagent-driven-development** - Work happens in this worktree
--- a/skills/using-superpowers/SKILL.md
+++ b/skills/using-superpowers/SKILL.md
@@ -11,16 +11,6 @@ IF A SKILL APPLIES TO YOUR TASK, YOU DO NOT HAVE A CHOICE. YOU MUST USE IT.
 This is not negotiable. This is not optional. You cannot rationalize your way out of this.
 </EXTREMELY-IMPORTANT>

-## Instruction Priority
-
-Superpowers skills override default system prompt behavior, but **user instructions always take precedence**:
-
-1. **User's explicit instructions** (CLAUDE.md, direct requests) — highest priority
-2. **Superpowers skills** — override default system behavior where they conflict
-3. **Default system prompt** — lowest priority
-
-If CLAUDE.md says "don't use TDD" and a skill says "always use TDD," follow CLAUDE.md. The user is in control.
-
 ## How to Access Skills

 **In Claude Code:** Use the `Skill` tool. When you invoke a skill, its content is loaded and presented to you—follow it directly. Never use the Read tool on skill files.
--- a/tests/brainstorm-server/package-lock.json
+++ b/tests/brainstorm-server/package-lock.json
@@ -1,36 +0,0 @@
-{
-  "name": "brainstorm-server-tests",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "brainstorm-server-tests",
-      "version": "1.0.0",
-      "dependencies": {
-        "ws": "^8.19.0"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
-      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    }
-  }
-}
--- a/tests/brainstorm-server/package.json
+++ b/tests/brainstorm-server/package.json
@@ -1,10 +0,0 @@
-{
-  "name": "brainstorm-server-tests",
-  "version": "1.0.0",
-  "scripts": {
-    "test": "node server.test.js"
-  },
-  "dependencies": {
-    "ws": "^8.19.0"
-  }
-}
--- a/tests/brainstorm-server/server.test.js
+++ b/tests/brainstorm-server/server.test.js
@@ -1,106 +0,0 @@
-const { spawn } = require('child_process');
-const http = require('http');
-const WebSocket = require('ws');
-const fs = require('fs');
-const path = require('path');
-const assert = require('assert');
-
-const SERVER_PATH = path.join(__dirname, '../../lib/brainstorm-server/index.js');
-const TEST_PORT = 3334;
-const TEST_SCREEN = '/tmp/brainstorm-test/screen.html';
-
-// Clean up test directory
-function cleanup() {
-  if (fs.existsSync(path.dirname(TEST_SCREEN))) {
-    fs.rmSync(path.dirname(TEST_SCREEN), { recursive: true });
-  }
-}
-
-async function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-async function fetch(url) {
-  return new Promise((resolve, reject) => {
-    http.get(url, (res) => {
-      let data = '';
-      res.on('data', chunk => data += chunk);
-      res.on('end', () => resolve({ status: res.statusCode, body: data }));
-    }).on('error', reject);
-  });
-}
-
-async function runTests() {
-  cleanup();
-
-  // Start server
-  const server = spawn('node', [SERVER_PATH], {
-    env: { ...process.env, BRAINSTORM_PORT: TEST_PORT, BRAINSTORM_SCREEN: TEST_SCREEN }
-  });
-
-  let stdout = '';
-  server.stdout.on('data', (data) => { stdout += data.toString(); });
-  server.stderr.on('data', (data) => { console.error('Server stderr:', data.toString()); });
-
-  await sleep(1000); // Wait for server to start
-
-  try {
-    // Test 1: Server starts and outputs JSON
-    console.log('Test 1: Server startup message');
-    assert(stdout.includes('server-started'), 'Should output server-started');
-    assert(stdout.includes(TEST_PORT.toString()), 'Should include port');
-    console.log('  PASS');
-
-    // Test 2: GET / returns HTML with helper injected
-    console.log('Test 2: Serves HTML with helper injected');
-    const res = await fetch(`http://localhost:${TEST_PORT}/`);
-    assert.strictEqual(res.status, 200);
-    assert(res.body.includes('brainstorm'), 'Should include brainstorm content');
-    assert(res.body.includes('WebSocket'), 'Should have helper.js injected');
-    console.log('  PASS');
-
-    // Test 3: WebSocket connection and event relay
-    console.log('Test 3: WebSocket relays events to stdout');
-    stdout = ''; // Reset stdout capture
-    const ws = new WebSocket(`ws://localhost:${TEST_PORT}`);
-    await new Promise(resolve => ws.on('open', resolve));
-
-    ws.send(JSON.stringify({ type: 'click', text: 'Test Button' }));
-    await sleep(300);
-
-    assert(stdout.includes('"source":"user-event"'), 'Should relay user events with source field');
-    assert(stdout.includes('Test Button'), 'Should include event data');
-    ws.close();
-    console.log('  PASS');
-
-    // Test 4: File change triggers reload notification
-    console.log('Test 4: File change notifies browsers');
-    const ws2 = new WebSocket(`ws://localhost:${TEST_PORT}`);
-    await new Promise(resolve => ws2.on('open', resolve));
-
-    let gotReload = false;
-    ws2.on('message', (data) => {
-      const msg = JSON.parse(data.toString());
-      if (msg.type === 'reload') gotReload = true;
-    });
-
-    // Modify the screen file
-    fs.writeFileSync(TEST_SCREEN, '<html><body>Updated</body></html>');
-    await sleep(500);
-
-    assert(gotReload, 'Should send reload message on file change');
-    ws2.close();
-    console.log('  PASS');
-
-    console.log('\nAll tests passed!');
-
-  } finally {
-    server.kill();
-    cleanup();
-  }
-}
-
-runTests().catch(err => {
-  console.error('Test failed:', err);
-  process.exit(1);
-});
--- a/tests/claude-code/test-subagent-driven-development.sh
+++ b/tests/claude-code/test-subagent-driven-development.sh
@@ -14,7 +14,7 @@ echo "Test 1: Skill loading..."

 output=$(run_claude "What is the subagent-driven-development skill? Describe its key steps briefly." 30)

-if assert_contains "$output" "subagent-driven-development" "Skill is recognized"; then
+if assert_contains "$output" "subagent-driven-development\|Subagent-Driven Development\|Subagent Driven" "Skill is recognized"; then
    : # pass
 else
    exit 1
@@ -136,4 +136,30 @@ fi

 echo ""

+# Test 8: Verify worktree requirement
+echo "Test 8: Worktree requirement..."
+
+output=$(run_claude "What workflow skills are required before using subagent-driven-development? List any prerequisites or required skills." 30)
+
+if assert_contains "$output" "using-git-worktrees\|worktree" "Mentions worktree requirement"; then
+    : # pass
+else
+    exit 1
+fi
+
+echo ""
+
+# Test 9: Verify main branch warning
+echo "Test 9: Main branch red flag..."
+
+output=$(run_claude "In subagent-driven-development, is it okay to start implementation directly on the main branch?" 30)
+
+if assert_contains "$output" "worktree\|feature.*branch\|not.*main\|never.*main\|avoid.*main\|don't.*main\|consent\|permission" "Warns against main branch"; then
+    : # pass
+else
+    exit 1
+fi
+
+echo ""
+
 echo "=== All subagent-driven-development skill tests passed ==="
--- a/tests/opencode/setup.sh
+++ b/tests/opencode/setup.sh
@@ -18,13 +18,13 @@ cp -r "$REPO_ROOT/lib" "$HOME/.config/opencode/superpowers/"
 cp -r "$REPO_ROOT/skills" "$HOME/.config/opencode/superpowers/"

 # Copy plugin directory
-mkdir -p "$HOME/.config/opencode/superpowers/.opencode/plugin"
-cp "$REPO_ROOT/.opencode/plugin/superpowers.js" "$HOME/.config/opencode/superpowers/.opencode/plugin/"
+mkdir -p "$HOME/.config/opencode/superpowers/.opencode/plugins"
+cp "$REPO_ROOT/.opencode/plugins/superpowers.js" "$HOME/.config/opencode/superpowers/.opencode/plugins/"

 # Register plugin via symlink
-mkdir -p "$HOME/.config/opencode/plugin"
-ln -sf "$HOME/.config/opencode/superpowers/.opencode/plugin/superpowers.js" \
-       "$HOME/.config/opencode/plugin/superpowers.js"
+mkdir -p "$HOME/.config/opencode/plugins"
+ln -sf "$HOME/.config/opencode/superpowers/.opencode/plugins/superpowers.js" \
+       "$HOME/.config/opencode/plugins/superpowers.js"

 # Create test skills in different locations for testing

@@ -57,8 +57,8 @@ PROJECT_SKILL_MARKER_67890
 EOF

 echo "Setup complete: $TEST_HOME"
-echo "Plugin installed to: $HOME/.config/opencode/superpowers/.opencode/plugin/superpowers.js"
-echo "Plugin registered at: $HOME/.config/opencode/plugin/superpowers.js"
+echo "Plugin installed to: $HOME/.config/opencode/superpowers/.opencode/plugins/superpowers.js"
+echo "Plugin registered at: $HOME/.config/opencode/plugins/superpowers.js"
 echo "Test project at: $TEST_HOME/test-project"

 # Helper function for cleanup (call from tests or trap)
--- a/tests/opencode/test-plugin-loading.sh
+++ b/tests/opencode/test-plugin-loading.sh
@@ -15,15 +15,15 @@ trap cleanup_test_env EXIT

 # Test 1: Verify plugin file exists and is registered
 echo "Test 1: Checking plugin registration..."
-if [ -L "$HOME/.config/opencode/plugin/superpowers.js" ]; then
+if [ -L "$HOME/.config/opencode/plugins/superpowers.js" ]; then
    echo "  [PASS] Plugin symlink exists"
 else
-    echo "  [FAIL] Plugin symlink not found at $HOME/.config/opencode/plugin/superpowers.js"
+    echo "  [FAIL] Plugin symlink not found at $HOME/.config/opencode/plugins/superpowers.js"
    exit 1
 fi

 # Verify symlink target exists
-if [ -f "$(readlink -f "$HOME/.config/opencode/plugin/superpowers.js")" ]; then
+if [ -f "$(readlink -f "$HOME/.config/opencode/plugins/superpowers.js")" ]; then
    echo "  [PASS] Plugin symlink target exists"
 else
    echo "  [FAIL] Plugin symlink target does not exist"
@@ -60,7 +60,7 @@ fi

 # Test 5: Verify plugin JavaScript syntax (basic check)
 echo "Test 5: Checking plugin JavaScript syntax..."
-plugin_file="$HOME/.config/opencode/superpowers/.opencode/plugin/superpowers.js"
+plugin_file="$HOME/.config/opencode/superpowers/.opencode/plugins/superpowers.js"
 if node --check "$plugin_file" 2>/dev/null; then
    echo "  [PASS] Plugin JavaScript syntax is valid"
 else
Author	SHA1	Message	Date
Drew Ritter	ddab41bc61	Fix Windows/PowerShell invocation of superpowers-codex Windows doesn't respect shebangs, so directly invoking the extensionless superpowers-codex script triggers an "Open with" dialog. Prefix all invocations with `node` (harmless on Unix, required on Windows) and add a .cmd wrapper for manual invocation on Windows. Fixes #285, #243 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-05 11:18:56 -08:00
Jesse Vincent	06b92f3682	Merge pull request #382 from clkao/fix/subagent-worktree-requirement fix: require worktree setup before subagent-driven-development and executing-plans	2026-01-30 09:51:30 -08:00
Jesse Vincent	9819209bba	Merge pull request #361 from deinspanjer/codex-bootstrap-support-collab-subagent Codex: clarify subagent tool mapping in bootstrap + README	2026-01-30 09:48:29 -08:00
CL Kao	c7816ee2a6	docs: change main branch red flag to require explicit user consent Instead of prohibiting main branch work entirely, allow it with explicit user consent. This is more flexible while still ensuring users are aware of the implications. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 15:12:50 -08:00
CL Kao	b323e35805	docs(executing-plans): add worktree requirement before executing plans Add Integration section referencing using-git-worktrees skill as required, consistent with subagent-driven-development skill. Also add reminder to never start on main/master branch. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:48:24 -08:00
CL Kao	bb2ff5d309	docs(using-git-worktrees): add subagent/executing-plans as callers Update Integration section to show bidirectional relationship: subagent-driven-development and executing-plans now list using-git-worktrees as required, so this skill should list them as callers. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:46:45 -08:00
CL Kao	b63d485955	docs(subagent-driven-development): add main branch red flag to Never list Add explicit warning against starting implementation on main/master branch without first using a worktree for isolation. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:45:04 -08:00
CL Kao	fa3f46d4e9	docs(subagent-driven-development): add using-git-worktrees as required skill Adds using-git-worktrees as the first required workflow skill in the Integration section. This makes explicit that an isolated workspace should be set up before starting subagent-driven development. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:43:33 -08:00
CL Kao	f8dbe7b196	test: add Test 9 - main branch red flag warning TDD: Test verifies that subagent-driven-development skill warns against starting implementation directly on main/master branch. Test expects skill to recommend worktree or feature branch instead. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:41:39 -08:00
CL Kao	93cf2ee84f	test: add worktree requirement test for subagent-driven-development Add Test 8 to verify that using-git-worktrees is mentioned as a required skill for subagent-driven-development. This test will initially fail per TDD approach - the skill file needs to be updated to pass this test. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:39:50 -08:00
CL Kao	1872f50b64	fix(tests): handle case variations in skill recognition test The assertion now matches "subagent-driven-development", "Subagent-Driven Development", and "Subagent Driven" since Claude's responses may use different casing and formatting styles. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-29 14:34:38 -08:00
Daniel E.	8904b7d9dc	codex: clarify subagent tool mapping in bootstrap	2026-01-25 18:42:22 -05:00
Jesse Vincent	469a6d81eb	Merge pull request #349 from obra/fix/opencode-issues fix(opencode): standardize on plugins/ directory, fix symlink docs	2026-01-23 12:09:13 -08:00
Jesse Vincent	4b6cef98ac	chore: bump version to 4.1.1 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 20:08:47 +00:00
Jesse Vincent	03087b13b8	fix(opencode): standardize on plugins/ directory per official docs OpenCode officially documents ~/.config/opencode/plugins/ (plural) as the plugin directory. Our docs previously used plugin/ (singular), which also works but caused confusion. Changes: - Renamed .opencode/plugin/ to .opencode/plugins/ in repo structure - Updated INSTALL.md to use plugins/ everywhere - Updated README.opencode.md (all platforms: Linux, macOS, Windows CMD, PowerShell, Git Bash) to use plugins/ - Updated test scripts to match Tested: Both singular and plural forms work, but we now match official docs. Fixes #343 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 18:31:45 +00:00
Jesse Vincent	493ac18dfe	fix(opencode): update docs for native skills, fix symlink instructions Issues addressed: - #342: INSTALL.md still referenced removed find_skills/use_skill tools - #339: Symlink instructions could fail if target already exists Changes: - INSTALL.md: Added missing skills symlink step, updated to native skill tool - INSTALL.md: Removed Node.js prerequisite (no longer needed) - README.opencode.md: Added explicit rm before ln -s (ln -sf doesn't remove dirs) - Both files: Use ln -s instead of ln -sf for clarity Note: #343 (plugin vs plugins folder name) not addressed in this commit Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 17:33:23 +00:00
Jesse Vincent	35d4fbcd0b	chore: bump plugin version to 4.1.0 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 04:10:23 +00:00
Jesse Vincent	19c70afc99	chore: release v4.1.0 Breaking changes: - OpenCode: Switched to native skills system (migration required) Fixes: - OpenCode: Fixed agent reset on session start (#226) - OpenCode: Fixed Windows installation (#232) - Claude Code: Fixed Windows hook execution for 2.1.x Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 04:07:35 +00:00
Jesse Vincent	405a025eea	Merge pull request #335 from obra/fixes-for-main fix: OpenCode native skills + Windows hook execution	2026-01-22 20:06:45 -08:00
Jesse Vincent	36fcd57626	fix: Windows hook execution for Claude Code 2.1.x (#331 ) * fix: convert shell scripts from CRLF to LF line endings Add .gitattributes to enforce LF line endings for shell scripts, preventing bash errors like "/usr/bin/bash: line 1: : command not found" when scripts are checked out on Windows with CRLF. Fixes #317 (SessionStart hook fails due to CRLF line endings) Files converted: - hooks/session-start.sh - lib/brainstorm-server/start-server.sh - lib/brainstorm-server/stop-server.sh - lib/brainstorm-server/wait-for-feedback.sh - skills/systematic-debugging/find-polluter.sh Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: update Windows hook execution for Claude Code 2.1.x Claude Code 2.1.x changed the Windows execution model: it now auto-detects .sh files in hook commands and prepends "bash " automatically. This broke the polyglot wrapper because: Before: "run-hook.cmd" session-start.sh (wrapper executes) After: bash "run-hook.cmd" session-start.sh (bash can't run .cmd) Changes: - hooks.json now calls session-start.sh directly (Claude Code handles bash) - Added deprecation comment to run-hook.cmd explaining the change - Updated RELEASE-NOTES.md Fixes #317, #313, #275, #292 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 03:56:52 +00:00
Jesse Vincent	3964d18670	feat(opencode): use native skills and fix agent reset bug (#226 ) (#330 ) * fix use_skill agent context (#290) * fix: respect OPENCODE_CONFIG_DIR for personal skills lookup (#297) * fix: respect OPENCODE_CONFIG_DIR for personal skills lookup The plugin was hardcoded to look for personal skills in ~/.config/opencode/skills, ignoring users who set OPENCODE_CONFIG_DIR to a custom path (e.g., for dotfiles management). Now uses OPENCODE_CONFIG_DIR if set, falling back to the default path. * fix: update help text to use dynamic paths Use configDir and personalSkillsDir variables in help text so paths are accurate when OPENCODE_CONFIG_DIR is set. * fix: normalize OPENCODE_CONFIG_DIR before use Handle edge cases where the env var might be: - Empty or whitespace-only - Using ~ for home directory (common in .env files) - A relative path Now trims, expands ~, and resolves to absolute path. * feat(opencode): use native skills and fix agent reset bug (#226) - Replace custom use_skill/find_skills tools with OpenCode's native skill tool - Use experimental.chat.system.transform hook instead of session.prompt (fixes #226 agent reset on first message) - Symlink skills directory into ~/.config/opencode/skills/superpowers/ - Update installation docs with comprehensive Windows support: - Command Prompt, PowerShell, and Git Bash instructions - Proper symlink vs junction handling - Reinstall safety with cleanup steps - Verification commands for each shell * Add OpenCode native skills changes to release notes Documents: - Breaking change: switch to native skill tool - Fix for agent reset bug (#226) - Fix for Windows installation (#232) --------- Co-authored-by: Vinicius da Motta <viniciusmotta8@gmail.com> Co-authored-by: oribi <oribarilan@gmail.com>	2026-01-23 03:56:12 +00:00
oribi	a01a135fe1	fix: respect OPENCODE_CONFIG_DIR for personal skills lookup (#297 ) * fix: respect OPENCODE_CONFIG_DIR for personal skills lookup The plugin was hardcoded to look for personal skills in ~/.config/opencode/skills, ignoring users who set OPENCODE_CONFIG_DIR to a custom path (e.g., for dotfiles management). Now uses OPENCODE_CONFIG_DIR if set, falling back to the default path. * fix: update help text to use dynamic paths Use configDir and personalSkillsDir variables in help text so paths are accurate when OPENCODE_CONFIG_DIR is set. * fix: normalize OPENCODE_CONFIG_DIR before use Handle edge cases where the env var might be: - Empty or whitespace-only - Using ~ for home directory (common in .env files) - A relative path Now trims, expands ~, and resolves to absolute path.	2026-01-19 13:54:50 -08:00
Vinicius da Motta	ac471e69c2	fix use_skill agent context (#290 )	2026-01-18 17:02:48 -08:00