Merge branch 'master' into feat/intelligent-backend-selection

合并 master 分支的最新改动到 PR #61。冲突解决： - dev-workflow/commands/dev.md: 保留 multiSelect backend 选择逻辑 - 保留任务类型字段 type: default|ui|quick-fix - 保留 Backend 路由策略：default→codex, ui→gemini, quick-fix→claude - 修复 heredoc 示例格式合并的 master 改动包括： - codeagent-wrapper v5.4.0 structured execution report (#94) - 修复 PATH 重复条目问题 (#95) - ASCII 模式和性能优化 - 其他 bug 修复和文档更新 Generated with SWE-Agent.ai Co-Authored-By: SWE-Agent.ai <noreply@swe-agent.ai>
fix(dev-workflow): refactor backend selection to multiSelect mode
2026-02-05 02:30:26 +08:00 · 2025-12-25 22:24:15 +08:00 · 2025-12-25 22:08:33 +08:00 · 2025-12-14 21:57:13 +08:00
20 changed files with 51 additions and 1838 deletions
--- a/README.md
+++ b/README.md
@@ -346,10 +346,8 @@ $Env:PATH = "$HOME\bin;$Env:PATH"
 ```

 ```batch
-REM cmd.exe - persistent for current user (use PowerShell method above instead)
-REM WARNING: This expands %PATH% which includes system PATH, causing duplication
-REM Note: Using reg add instead of setx to avoid 1024-character truncation limit
-reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%" /f
+REM cmd.exe - persistent for current user
+setx PATH "%USERPROFILE%\bin;%PATH%"
 ```

 ---
@@ -464,105 +462,9 @@ claude -r <session_id> "test"

 ---

-## FAQ (Frequently Asked Questions)
-
-### Q1: `codeagent-wrapper` execution fails with "Unknown event format"
-
-**Problem:**
-```
-Unknown event format: {"type":"turn.started"}
-Unknown event format: {"type":"assistant", ...}
-```
-
-**Solution:**
-This is a logging event format display issue and does not affect actual functionality. It will be fixed in the next version. You can ignore these log outputs.
-
-**Related Issue:** [#96](https://github.com/cexll/myclaude/issues/96)
-
---
-
-### Q2: Gemini cannot read files ignored by `.gitignore`
-
-**Problem:**
-When using `codeagent-wrapper --backend gemini`, files in directories like `.claude/` that are ignored by `.gitignore` cannot be read.
-
-**Solution:**
- **Option 1:** Remove `.claude/` from your `.gitignore` file
- **Option 2:** Ensure files that need to be read are not in `.gitignore` list
-
-**Related Issue:** [#75](https://github.com/cexll/myclaude/issues/75)
-
---
-
-### Q3: `/dev` command parallel execution is very slow
-
-**Problem:**
-Using `/dev` command for simple features takes too long (over 30 minutes) with no visibility into task progress.
-
-**Solution:**
-1. **Check logs:** Review `C:\Users\User\AppData\Local\Temp\codeagent-wrapper-*.log` to identify bottlenecks
-2. **Adjust backend:**
-   - Try faster models like `gpt-5.1-codex-max`
-   - Running in WSL may be significantly faster
-3. **Workspace:** Use a single repository instead of monorepo with multiple sub-projects
-
-**Related Issue:** [#77](https://github.com/cexll/myclaude/issues/77)
-
---
-
-### Q4: Codex permission denied with new Go version
-
-**Problem:**
-After upgrading to the new Go-based Codex implementation, execution fails with permission denied errors.
-
-**Solution:**
-Add the following configuration to `~/.codex/config.yaml` (Windows: `c:\user\.codex\config.toml`):
-```yaml
-model = "gpt-5.1-codex-max"
-model_reasoning_effort = "high"
-model_reasoning_summary = "detailed"
-approval_policy = "never"
-sandbox_mode = "workspace-write"
-disable_response_storage = true
-network_access = true
-```
-
-**Key settings:**
- `approval_policy = "never"` - Remove approval restrictions
- `sandbox_mode = "workspace-write"` - Allow workspace write access
- `network_access = true` - Enable network access
-
-**Related Issue:** [#31](https://github.com/cexll/myclaude/issues/31)
-
---
-
-### Q5: Permission denied or sandbox restrictions during execution
-
-**Problem:**
-Execution fails with permission errors or sandbox restrictions when running codeagent-wrapper.
-
-**Solution:**
-Set the following environment variables:
-```bash
-export CODEX_BYPASS_SANDBOX=true
-export CODEAGENT_SKIP_PERMISSIONS=true
-```
-
-Or add them to your shell profile (`~/.zshrc` or `~/.bashrc`):
-```bash
-echo 'export CODEX_BYPASS_SANDBOX=true' >> ~/.zshrc
-echo 'export CODEAGENT_SKIP_PERMISSIONS=true' >> ~/.zshrc
-```
-
-**Note:** These settings bypass security restrictions. Use with caution in trusted environments only.
-
---
-
-**Still having issues?** Visit [GitHub Issues](https://github.com/cexll/myclaude/issues) to search or report new issues.
-
---
-
 ## Documentation
+
+### Core Guides
 - **[Codeagent-Wrapper Guide](docs/CODEAGENT-WRAPPER.md)** - Multi-backend execution wrapper
 - **[Hooks Documentation](docs/HOOKS.md)** - Custom hooks and automation

--- a/README_CN.md
+++ b/README_CN.md
@@ -282,10 +282,8 @@ $Env:PATH = "$HOME\bin;$Env:PATH"
 ```

 ```batch
-REM cmd.exe - 永久添加（当前用户）（建议使用上面的 PowerShell 方法）
-REM 警告：此命令会展开 %PATH% 包含系统 PATH，导致重复
-REM 注意：使用 reg add 而非 setx 以避免 1024 字符截断限制
-reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%" /f
+REM cmd.exe - 永久添加（当前用户）
+setx PATH "%USERPROFILE%\bin;%PATH%"
 ```

 ---
@@ -335,105 +333,6 @@ python3 install.py --module dev --force

 ---

-## 常见问题 (FAQ)
-
-### Q1: `codeagent-wrapper` 执行时报错 "Unknown event format"
-
-**问题描述：**
-执行 `codeagent-wrapper` 时出现错误：
-```
-Unknown event format: {"type":"turn.started"}
-Unknown event format: {"type":"assistant", ...}
-```
-
-**解决方案：**
-这是日志事件流的显示问题，不影响实际功能执行。预计在下个版本中修复。如需排查其他问题，可忽略此日志输出。
-
-**相关 Issue：** [#96](https://github.com/cexll/myclaude/issues/96)
-
---
-
-### Q2: Gemini 无法读取 `.gitignore` 忽略的文件
-
-**问题描述：**
-使用 `codeagent-wrapper --backend gemini` 时，无法读取 `.claude/` 等被 `.gitignore` 忽略的目录中的文件。
-
-**解决方案：**
- **方案一：** 在项目根目录的 `.gitignore` 中取消对 `.claude/` 的忽略
- **方案二：** 确保需要读取的文件不在 `.gitignore` 忽略列表中
-
-**相关 Issue：** [#75](https://github.com/cexll/myclaude/issues/75)
-
---
-
-### Q3: `/dev` 命令并行执行特别慢
-
-**问题描述：**
-使用 `/dev` 命令开发简单功能耗时过长（超过30分钟），无法了解任务执行状态。
-
-**解决方案：**
-1. **检查日志：** 查看 `C:\Users\User\AppData\Local\Temp\codeagent-wrapper-*.log` 分析瓶颈
-2. **调整后端：**
-   - 尝试使用 `gpt-5.1-codex-max` 等更快的模型
-   - 在 WSL 环境下运行速度可能更快
-3. **工作区选择：** 使用独立的代码仓库而非包含多个子项目的 monorepo
-
-**相关 Issue：** [#77](https://github.com/cexll/myclaude/issues/77)
-
---
-
-### Q4: 新版 Go 实现的 Codex 权限不足
-
-**问题描述：**
-升级到新版 Go 实现的 Codex 后，出现权限不足的错误。
-
-**解决方案：**
-在 `~/.codex/config.yaml` 中添加以下配置（Windows: `c:\user\.codex\config.toml`）：
-```yaml
-model = "gpt-5.1-codex-max"
-model_reasoning_effort = "high"
-model_reasoning_summary = "detailed"
-approval_policy = "never"
-sandbox_mode = "workspace-write"
-disable_response_storage = true
-network_access = true
-```
-
-**关键配置说明：**
- `approval_policy = "never"` - 移除审批限制
- `sandbox_mode = "workspace-write"` - 允许工作区写入权限
- `network_access = true` - 启用网络访问
-
-**相关 Issue：** [#31](https://github.com/cexll/myclaude/issues/31)
-
---
-
-### Q5: 执行时遇到权限拒绝或沙箱限制
-
-**问题描述：**
-运行 codeagent-wrapper 时出现权限错误或沙箱限制。
-
-**解决方案：**
-设置以下环境变量：
-```bash
-export CODEX_BYPASS_SANDBOX=true
-export CODEAGENT_SKIP_PERMISSIONS=true
-```
-
-或添加到 shell 配置文件（`~/.zshrc` 或 `~/.bashrc`）：
-```bash
-echo 'export CODEX_BYPASS_SANDBOX=true' >> ~/.zshrc
-echo 'export CODEAGENT_SKIP_PERMISSIONS=true' >> ~/.zshrc
-```
-
-**注意：** 这些设置会绕过安全限制，请仅在可信环境中使用。
-
---
-
-**仍有疑问？** 请访问 [GitHub Issues](https://github.com/cexll/myclaude/issues) 搜索或提交新问题。
-
---
-
 ## 许可证

 AGPL-3.0 License - 查看 [LICENSE](LICENSE)
--- a/codeagent-wrapper/backend.go
+++ b/codeagent-wrapper/backend.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"strings"
 )

 // Backend defines the contract for invoking different AI CLI backends.
@@ -38,48 +37,33 @@ func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {

 const maxClaudeSettingsBytes = 1 << 20 // 1MB

-type minimalClaudeSettings struct {
-	Env   map[string]string
-	Model string
-}
-
-// loadMinimalClaudeSettings 从 ~/.claude/settings.json 只提取安全的最小子集：
-// - env: 只接受字符串类型的值
-// - model: 只接受字符串类型的值
-// 文件缺失/解析失败/超限都返回空。
-func loadMinimalClaudeSettings() minimalClaudeSettings {
+// loadMinimalEnvSettings 从 ~/.claude/settings.json 只提取 env 配置。
+// 只接受字符串类型的值；文件缺失/解析失败/超限都返回空。
+func loadMinimalEnvSettings() map[string]string {
 	home, err := os.UserHomeDir()
 	if err != nil || home == "" {
-		return minimalClaudeSettings{}
+		return nil
 	}

 	settingPath := filepath.Join(home, ".claude", "settings.json")
 	info, err := os.Stat(settingPath)
 	if err != nil || info.Size() > maxClaudeSettingsBytes {
-		return minimalClaudeSettings{}
+		return nil
 	}

 	data, err := os.ReadFile(settingPath)
 	if err != nil {
-		return minimalClaudeSettings{}
+		return nil
 	}

 	var cfg struct {
-		Env   map[string]any `json:"env"`
-		Model any            `json:"model"`
+		Env map[string]any `json:"env"`
 	}
 	if err := json.Unmarshal(data, &cfg); err != nil {
-		return minimalClaudeSettings{}
+		return nil
 	}
-
-	out := minimalClaudeSettings{}
-
-	if model, ok := cfg.Model.(string); ok {
-		out.Model = strings.TrimSpace(model)
-	}
-
 	if len(cfg.Env) == 0 {
-		return out
+		return nil
 	}

 	env := make(map[string]string, len(cfg.Env))
@@ -91,19 +75,9 @@ func loadMinimalClaudeSettings() minimalClaudeSettings {
 		env[k] = s
 	}
 	if len(env) == 0 {
-		return out
-	}
-	out.Env = env
-	return out
-}
-
-// loadMinimalEnvSettings is kept for backwards tests; prefer loadMinimalClaudeSettings.
-func loadMinimalEnvSettings() map[string]string {
-	settings := loadMinimalClaudeSettings()
-	if len(settings.Env) == 0 {
 		return nil
 	}
-	return settings.Env
+	return env
 }

 func buildClaudeArgs(cfg *Config, targetArg string) []string {
@@ -119,10 +93,6 @@ func buildClaudeArgs(cfg *Config, targetArg string) []string {
 	// This ensures a clean execution environment without CLAUDE.md or skills that would trigger codeagent
 	args = append(args, "--setting-sources", "")

-	if model := strings.TrimSpace(cfg.Model); model != "" {
-		args = append(args, "--model", model)
-	}
-
 	if cfg.Mode == "resume" {
 		if cfg.SessionID != "" {
 			// Claude CLI uses -r <session_id> for resume.
@@ -152,10 +122,6 @@ func buildGeminiArgs(cfg *Config, targetArg string) []string {
 	}
 	args := []string{"-o", "stream-json", "-y"}

-	if model := strings.TrimSpace(cfg.Model); model != "" {
-		args = append(args, "-m", model)
-	}
-
 	if cfg.Mode == "resume" {
 		if cfg.SessionID != "" {
 			args = append(args, "-r", cfg.SessionID)
--- a/codeagent-wrapper/backend_test.go
+++ b/codeagent-wrapper/backend_test.go
@@ -63,42 +63,6 @@ func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
 	})
 }

-func TestBackendBuildArgs_Model(t *testing.T) {
-	t.Run("claude includes --model when set", func(t *testing.T) {
-		backend := ClaudeBackend{}
-		cfg := &Config{Mode: "new", Model: "opus"}
-		got := backend.BuildArgs(cfg, "todo")
-		want := []string{"-p", "--setting-sources", "", "--model", "opus", "--output-format", "stream-json", "--verbose", "todo"}
-		if !reflect.DeepEqual(got, want) {
-			t.Fatalf("got %v, want %v", got, want)
-		}
-	})
-
-	t.Run("gemini includes -m when set", func(t *testing.T) {
-		backend := GeminiBackend{}
-		cfg := &Config{Mode: "new", Model: "gemini-3-pro-preview"}
-		got := backend.BuildArgs(cfg, "task")
-		want := []string{"-o", "stream-json", "-y", "-m", "gemini-3-pro-preview", "-p", "task"}
-		if !reflect.DeepEqual(got, want) {
-			t.Fatalf("got %v, want %v", got, want)
-		}
-	})
-
-	t.Run("codex includes --model when set", func(t *testing.T) {
-		const key = "CODEX_BYPASS_SANDBOX"
-		t.Cleanup(func() { os.Unsetenv(key) })
-		os.Unsetenv(key)
-
-		backend := CodexBackend{}
-		cfg := &Config{Mode: "new", WorkDir: "/tmp", Model: "o3"}
-		got := backend.BuildArgs(cfg, "task")
-		want := []string{"e", "--model", "o3", "--skip-git-repo-check", "-C", "/tmp", "--json", "task"}
-		if !reflect.DeepEqual(got, want) {
-			t.Fatalf("got %v, want %v", got, want)
-		}
-	})
-}
-
 func TestClaudeBuildArgs_GeminiAndCodexModes(t *testing.T) {
 	t.Run("gemini new mode defaults workdir", func(t *testing.T) {
 		backend := GeminiBackend{}
--- a/codeagent-wrapper/config.go
+++ b/codeagent-wrapper/config.go
@@ -15,7 +15,6 @@ type Config struct {
 	Task               string
 	SessionID          string
 	WorkDir            string
-	Model              string
 	ExplicitStdin      bool
 	Timeout            int
 	Backend            string
@@ -37,7 +36,6 @@ type TaskSpec struct {
 	Dependencies []string        `json:"dependencies,omitempty"`
 	SessionID    string          `json:"session_id,omitempty"`
 	Backend      string          `json:"backend,omitempty"`
-	Model        string          `json:"model,omitempty"`
 	Mode         string          `json:"-"`
 	UseStdin     bool            `json:"-"`
 	Context      context.Context `json:"-"`
@@ -154,8 +152,6 @@ func parseParallelConfig(data []byte) (*ParallelConfig, error) {
 				task.Mode = "resume"
 			case "backend":
 				task.Backend = value
-			case "model":
-				task.Model = value
 			case "dependencies":
 				for _, dep := range strings.Split(value, ",") {
 					dep = strings.TrimSpace(dep)
@@ -202,7 +198,6 @@ func parseArgs() (*Config, error) {
 	}

 	backendName := defaultBackendName
-	model := ""
 	skipPermissions := envFlagEnabled("CODEAGENT_SKIP_PERMISSIONS")
 	filtered := make([]string, 0, len(args))
 	for i := 0; i < len(args); i++ {
@@ -225,20 +220,6 @@ func parseArgs() (*Config, error) {
 		case arg == "--skip-permissions", arg == "--dangerously-skip-permissions":
 			skipPermissions = true
 			continue
-		case arg == "--model":
-			if i+1 >= len(args) {
-				return nil, fmt.Errorf("--model flag requires a value")
-			}
-			model = args[i+1]
-			i++
-			continue
-		case strings.HasPrefix(arg, "--model="):
-			value := strings.TrimPrefix(arg, "--model=")
-			if value == "" {
-				return nil, fmt.Errorf("--model flag requires a value")
-			}
-			model = value
-			continue
 		case strings.HasPrefix(arg, "--skip-permissions="):
 			skipPermissions = parseBoolFlag(strings.TrimPrefix(arg, "--skip-permissions="), skipPermissions)
 			continue
@@ -254,7 +235,7 @@ func parseArgs() (*Config, error) {
 	}
 	args = filtered

-	cfg := &Config{WorkDir: defaultWorkdir, Backend: backendName, SkipPermissions: skipPermissions, Model: strings.TrimSpace(model)}
+	cfg := &Config{WorkDir: defaultWorkdir, Backend: backendName, SkipPermissions: skipPermissions}
 	cfg.MaxParallelWorkers = resolveMaxParallelWorkers()

 	if args[0] == "resume" {
--- a/codeagent-wrapper/executor.go
+++ b/codeagent-wrapper/executor.go
@@ -23,7 +23,6 @@ type commandRunner interface {
 	Start() error
 	Wait() error
 	StdoutPipe() (io.ReadCloser, error)
-	StderrPipe() (io.ReadCloser, error)
 	StdinPipe() (io.WriteCloser, error)
 	SetStderr(io.Writer)
 	SetDir(string)
@@ -64,13 +63,6 @@ func (r *realCmd) StdoutPipe() (io.ReadCloser, error) {
 	return r.cmd.StdoutPipe()
 }

-func (r *realCmd) StderrPipe() (io.ReadCloser, error) {
-	if r.cmd == nil {
-		return nil, errors.New("command is nil")
-	}
-	return r.cmd.StderrPipe()
-}
-
 func (r *realCmd) StdinPipe() (io.WriteCloser, error) {
 	if r.cmd == nil {
 		return nil, errors.New("command is nil")
@@ -752,10 +744,6 @@ func buildCodexArgs(cfg *Config, targetArg string) []string {
 		args = append(args, "--dangerously-bypass-approvals-and-sandbox")
 	}

-	if model := strings.TrimSpace(cfg.Model); model != "" {
-		args = append(args, "--model", model)
-	}
-
 	args = append(args, "--skip-git-repo-check")

 	if isResume {
@@ -800,7 +788,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
 		Task:      taskSpec.Task,
 		SessionID: taskSpec.SessionID,
 		WorkDir:   taskSpec.WorkDir,
-		Model:     taskSpec.Model,
 		Backend:   defaultBackendName,
 	}

@@ -829,15 +816,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
 		return result
 	}

-	var claudeEnv map[string]string
-	if cfg.Backend == "claude" {
-		settings := loadMinimalClaudeSettings()
-		claudeEnv = settings.Env
-		if cfg.Mode != "resume" && strings.TrimSpace(cfg.Model) == "" && settings.Model != "" {
-			cfg.Model = settings.Model
-		}
-	}
-
 	useStdin := taskSpec.UseStdin
 	targetArg := taskSpec.Task
 	if useStdin {
@@ -937,8 +915,10 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe

 	cmd := newCommandRunner(ctx, commandName, codexArgs...)

-	if cfg.Backend == "claude" && len(claudeEnv) > 0 {
-		cmd.SetEnv(claudeEnv)
+	if cfg.Backend == "claude" {
+		if env := loadMinimalEnvSettings(); len(env) > 0 {
+			cmd.SetEnv(env)
+		}
 	}

 	// For backends that don't support -C flag (claude, gemini), set working directory via cmd.Dir
@@ -959,40 +939,33 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
 		if cfg.Backend == "gemini" {
 			stderrFilter = newFilteringWriter(os.Stderr, geminiNoisePatterns)
 			stderrOut = stderrFilter
+			defer stderrFilter.Flush()
 		}
 		stderrWriters = append([]io.Writer{stderrOut}, stderrWriters...)
 	}
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		logErrorFn("Failed to create stderr pipe: " + err.Error())
-		result.ExitCode = 1
-		result.Error = attachStderr("failed to create stderr pipe: " + err.Error())
-		return result
+	if len(stderrWriters) == 1 {
+		cmd.SetStderr(stderrWriters[0])
+	} else {
+		cmd.SetStderr(io.MultiWriter(stderrWriters...))
 	}

 	var stdinPipe io.WriteCloser
+	var err error
 	if useStdin {
 		stdinPipe, err = cmd.StdinPipe()
 		if err != nil {
 			logErrorFn("Failed to create stdin pipe: " + err.Error())
 			result.ExitCode = 1
 			result.Error = attachStderr("failed to create stdin pipe: " + err.Error())
-			closeWithReason(stderr, "stdin-pipe-failed")
 			return result
 		}
 	}

-	stderrDone := make(chan error, 1)
-
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		logErrorFn("Failed to create stdout pipe: " + err.Error())
 		result.ExitCode = 1
 		result.Error = attachStderr("failed to create stdout pipe: " + err.Error())
-		closeWithReason(stderr, "stdout-pipe-failed")
-		if stdinPipe != nil {
-			_ = stdinPipe.Close()
-		}
 		return result
 	}

@@ -1028,11 +1001,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
 	logInfoFn(fmt.Sprintf("Starting %s with args: %s %s...", commandName, commandName, strings.Join(codexArgs[:min(5, len(codexArgs))], " ")))

 	if err := cmd.Start(); err != nil {
-		closeWithReason(stdout, "start-failed")
-		closeWithReason(stderr, "start-failed")
-		if stdinPipe != nil {
-			_ = stdinPipe.Close()
-		}
 		if strings.Contains(err.Error(), "executable file not found") {
 			msg := fmt.Sprintf("%s command not found in PATH", commandName)
 			logErrorFn(msg)
@@ -1051,15 +1019,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
 		logInfoFn(fmt.Sprintf("Log capturing to: %s", logger.Path()))
 	}

-	// Start stderr drain AFTER we know the command started, but BEFORE cmd.Wait can close the pipe.
-	go func() {
-		_, copyErr := io.Copy(io.MultiWriter(stderrWriters...), stderr)
-		if stderrFilter != nil {
-			stderrFilter.Flush()
-		}
-		stderrDone <- copyErr
-	}()
-
 	if useStdin && stdinPipe != nil {
 		logInfoFn(fmt.Sprintf("Writing %d chars to stdin...", len(taskSpec.Task)))
 		go func(data string) {
@@ -1110,11 +1069,6 @@ waitLoop:
 					terminated = true
 				}
 			}
-			// Close pipes to unblock stream readers, then wait for process exit.
-			closeWithReason(stdout, "terminate")
-			closeWithReason(stderr, "terminate")
-			waitErr = <-waitCh
-			break waitLoop
 		case <-completeSeen:
 			completeSeenObserved = true
 			if messageTimer != nil {
@@ -1169,12 +1123,6 @@ waitLoop:
 		}
 	}

-	closeWithReason(stderr, stdoutCloseReasonWait)
-	// Wait for stderr drain so stderrBuf / stderrLogger are not accessed concurrently.
-	// Important: cmd.Wait can block on internal stderr copying if cmd.Stderr is a non-file writer.
-	// We use StderrPipe and drain ourselves to avoid that deadlock class (common when children inherit pipes).
-	<-stderrDone
-
 	if ctxErr := ctx.Err(); ctxErr != nil {
 		if errors.Is(ctxErr, context.DeadlineExceeded) {
 			result.ExitCode = 124
@@ -1249,7 +1197,7 @@ func forwardSignals(ctx context.Context, cmd commandRunner, logErrorFn func(stri
 		case sig := <-sigCh:
 			logErrorFn(fmt.Sprintf("Received signal: %v", sig))
 			if proc := cmd.Process(); proc != nil {
-				_ = sendTermSignal(proc)
+				_ = proc.Signal(syscall.SIGTERM)
 				time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
 					if p := cmd.Process(); p != nil {
 						_ = p.Kill()
@@ -1319,7 +1267,7 @@ func terminateCommand(cmd commandRunner) *forceKillTimer {
 		return nil
 	}

-	_ = sendTermSignal(proc)
+	_ = proc.Signal(syscall.SIGTERM)

 	done := make(chan struct{}, 1)
 	timer := time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
@@ -1341,7 +1289,7 @@ func terminateProcess(cmd commandRunner) *time.Timer {
 		return nil
 	}

-	_ = sendTermSignal(proc)
+	_ = proc.Signal(syscall.SIGTERM)

 	return time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
 		if p := cmd.Process(); p != nil {
--- a/codeagent-wrapper/executor_concurrent_test.go
+++ b/codeagent-wrapper/executor_concurrent_test.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"slices"
 	"strings"
 	"sync"
@@ -33,12 +32,7 @@ type execFakeProcess struct {
 	mu      sync.Mutex
 }

-func (p *execFakeProcess) Pid() int {
-	if runtime.GOOS == "windows" {
-		return 0
-	}
-	return p.pid
-}
+func (p *execFakeProcess) Pid() int { return p.pid }
 func (p *execFakeProcess) Kill() error {
 	p.killed.Add(1)
 	return nil
@@ -90,7 +84,6 @@ func (rc *reasonReadCloser) record(reason string) {

 type execFakeRunner struct {
 	stdout          io.ReadCloser
-	stderr          io.ReadCloser
 	process         processHandle
 	stdin           io.WriteCloser
 	dir             string
@@ -99,7 +92,6 @@ type execFakeRunner struct {
 	waitDelay       time.Duration
 	startErr        error
 	stdoutErr       error
-	stderrErr       error
 	stdinErr        error
 	allowNilProcess bool
 	started         atomic.Bool
@@ -127,15 +119,6 @@ func (f *execFakeRunner) StdoutPipe() (io.ReadCloser, error) {
 	}
 	return f.stdout, nil
 }
-func (f *execFakeRunner) StderrPipe() (io.ReadCloser, error) {
-	if f.stderrErr != nil {
-		return nil, f.stderrErr
-	}
-	if f.stderr == nil {
-		f.stderr = io.NopCloser(strings.NewReader(""))
-	}
-	return f.stderr, nil
-}
 func (f *execFakeRunner) StdinPipe() (io.WriteCloser, error) {
 	if f.stdinErr != nil {
 		return nil, f.stdinErr
@@ -180,9 +163,6 @@ func TestExecutorHelperCoverage(t *testing.T) {
 		if _, err := rc.StdoutPipe(); err == nil {
 			t.Fatalf("expected error for nil command")
 		}
-		if _, err := rc.StderrPipe(); err == nil {
-			t.Fatalf("expected error for nil command")
-		}
 		if _, err := rc.StdinPipe(); err == nil {
 			t.Fatalf("expected error for nil command")
 		}
@@ -202,14 +182,11 @@ func TestExecutorHelperCoverage(t *testing.T) {
 		if err != nil {
 			t.Fatalf("StdoutPipe error: %v", err)
 		}
-		stderrPipe, err := rcProc.StderrPipe()
-		if err != nil {
-			t.Fatalf("StderrPipe error: %v", err)
-		}
 		stdinPipe, err := rcProc.StdinPipe()
 		if err != nil {
 			t.Fatalf("StdinPipe error: %v", err)
 		}
+		rcProc.SetStderr(io.Discard)
 		if err := rcProc.Start(); err != nil {
 			t.Fatalf("Start failed: %v", err)
 		}
@@ -223,7 +200,6 @@ func TestExecutorHelperCoverage(t *testing.T) {
 		_ = procHandle.Kill()
 		_ = rcProc.Wait()
 		_, _ = io.ReadAll(stdoutPipe)
-		_, _ = io.ReadAll(stderrPipe)

 		rp := &realProcess{}
 		if rp.Pid() != 0 {
@@ -1274,7 +1250,7 @@ func TestExecutorSignalAndTermination(t *testing.T) {
 	proc.mu.Lock()
 	signalled := len(proc.signals)
 	proc.mu.Unlock()
-	if runtime.GOOS != "windows" && signalled == 0 {
+	if signalled == 0 {
 		t.Fatalf("process did not receive signal")
 	}
 	if proc.killed.Load() == 0 {
--- a/codeagent-wrapper/main.go
+++ b/codeagent-wrapper/main.go
@@ -178,7 +178,6 @@ func run() (exitCode int) {

 		if parallelIndex != -1 {
 			backendName := defaultBackendName
-			model := ""
 			fullOutput := false
 			var extras []string

@@ -203,27 +202,13 @@ func run() (exitCode int) {
 						return 1
 					}
 					backendName = value
-				case arg == "--model":
-					if i+1 >= len(args) {
-						fmt.Fprintln(os.Stderr, "ERROR: --model flag requires a value")
-						return 1
-					}
-					model = args[i+1]
-					i++
-				case strings.HasPrefix(arg, "--model="):
-					value := strings.TrimPrefix(arg, "--model=")
-					if value == "" {
-						fmt.Fprintln(os.Stderr, "ERROR: --model flag requires a value")
-						return 1
-					}
-					model = value
 				default:
 					extras = append(extras, arg)
 				}
 			}

 			if len(extras) > 0 {
-				fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend, --model and --full-output are allowed.")
+				fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend and --full-output are allowed.")
 				fmt.Fprintln(os.Stderr, "Usage examples:")
 				fmt.Fprintf(os.Stderr, "  %s --parallel < tasks.txt\n", name)
 				fmt.Fprintf(os.Stderr, "  echo '...' | %s --parallel\n", name)
@@ -252,14 +237,10 @@ func run() (exitCode int) {
 			}

 			cfg.GlobalBackend = backendName
-			model = strings.TrimSpace(model)
 			for i := range cfg.Tasks {
 				if strings.TrimSpace(cfg.Tasks[i].Backend) == "" {
 					cfg.Tasks[i].Backend = backendName
 				}
-				if strings.TrimSpace(cfg.Tasks[i].Model) == "" && model != "" {
-					cfg.Tasks[i].Model = model
-				}
 			}

 			timeoutSec := resolveTimeout()
@@ -428,7 +409,6 @@ func run() (exitCode int) {
 		WorkDir:   cfg.WorkDir,
 		Mode:      cfg.Mode,
 		SessionID: cfg.SessionID,
-		Model:     cfg.Model,
 		UseStdin:  useStdin,
 	}

--- a/codeagent-wrapper/main_test.go
+++ b/codeagent-wrapper/main_test.go
@@ -243,10 +243,6 @@ func (d *drainBlockingCmd) StdoutPipe() (io.ReadCloser, error) {
 	return newDrainBlockingStdout(ctxReader), nil
 }

-func (d *drainBlockingCmd) StderrPipe() (io.ReadCloser, error) {
-	return d.inner.StderrPipe()
-}
-
 func (d *drainBlockingCmd) StdinPipe() (io.WriteCloser, error) {
 	return d.inner.StdinPipe()
 }
@@ -318,9 +314,6 @@ func newFakeProcess(pid int) *fakeProcess {
 }

 func (p *fakeProcess) Pid() int {
-	if runtime.GOOS == "windows" {
-		return 0
-	}
 	return p.pid
 }

@@ -396,10 +389,7 @@ type fakeCmd struct {
 	stdinWriter *bufferWriteCloser
 	stdinClaim  bool

-	stderr       *ctxAwareReader
-	stderrWriter *io.PipeWriter
-	stderrOnce   sync.Once
-	stderrClaim  bool
+	stderr io.Writer

 	env map[string]string

@@ -425,7 +415,6 @@ type fakeCmd struct {

 func newFakeCmd(cfg fakeCmdConfig) *fakeCmd {
 	r, w := io.Pipe()
-	stderrR, stderrW := io.Pipe()
 	cmd := &fakeCmd{
 		stdout:         newCtxAwareReader(r),
 		stdoutWriter:   w,
@@ -436,8 +425,6 @@ func newFakeCmd(cfg fakeCmdConfig) *fakeCmd {
 		startErr:       cfg.StartErr,
 		waitDone:       make(chan struct{}),
 		keepStdoutOpen: cfg.KeepStdoutOpen,
-		stderr:         newCtxAwareReader(stderrR),
-		stderrWriter:   stderrW,
 		process:        newFakeProcess(cfg.PID),
 	}
 	if len(cmd.stdoutPlan) == 0 {
@@ -514,16 +501,6 @@ func (f *fakeCmd) StdoutPipe() (io.ReadCloser, error) {
 	return f.stdout, nil
 }

-func (f *fakeCmd) StderrPipe() (io.ReadCloser, error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.stderrClaim {
-		return nil, errors.New("stderr pipe already claimed")
-	}
-	f.stderrClaim = true
-	return f.stderr, nil
-}
-
 func (f *fakeCmd) StdinPipe() (io.WriteCloser, error) {
 	f.mu.Lock()
 	defer f.mu.Unlock()
@@ -535,7 +512,7 @@ func (f *fakeCmd) StdinPipe() (io.WriteCloser, error) {
 }

 func (f *fakeCmd) SetStderr(w io.Writer) {
-	_ = w
+	f.stderr = w
 }

 func (f *fakeCmd) SetDir(string) {}
@@ -565,7 +542,6 @@ func (f *fakeCmd) runStdoutScript() {
 	if len(f.stdoutPlan) == 0 {
 		if !f.keepStdoutOpen {
 			f.CloseStdout(nil)
-			f.CloseStderr(nil)
 		}
 		return
 	}
@@ -577,7 +553,6 @@ func (f *fakeCmd) runStdoutScript() {
 	}
 	if !f.keepStdoutOpen {
 		f.CloseStdout(nil)
-		f.CloseStderr(nil)
 	}
 }

@@ -614,19 +589,6 @@ func (f *fakeCmd) CloseStdout(err error) {
 	})
 }

-func (f *fakeCmd) CloseStderr(err error) {
-	f.stderrOnce.Do(func() {
-		if f.stderrWriter == nil {
-			return
-		}
-		if err != nil {
-			_ = f.stderrWriter.CloseWithError(err)
-			return
-		}
-		_ = f.stderrWriter.Close()
-	})
-}
-
 func (f *fakeCmd) StdinContents() string {
 	if f.stdinWriter == nil {
 		return ""
@@ -914,17 +876,11 @@ func TestRunCodexTask_ContextTimeout(t *testing.T) {
 	if fake.process == nil {
 		t.Fatalf("fake process not initialized")
 	}
-	if runtime.GOOS == "windows" {
-		if fake.process.KillCount() == 0 {
-			t.Fatalf("expected Kill to be called, got 0")
-		}
-	} else {
-		if fake.process.SignalCount() == 0 {
-			t.Fatalf("expected SIGTERM to be sent, got 0")
-		}
-		if fake.process.KillCount() == 0 {
-			t.Fatalf("expected Kill to eventually run, got 0")
-		}
+	if fake.process.SignalCount() == 0 {
+		t.Fatalf("expected SIGTERM to be sent, got 0")
+	}
+	if fake.process.KillCount() == 0 {
+		t.Fatalf("expected Kill to eventually run, got 0")
 	}
 	if capturedTimer == nil {
 		t.Fatalf("forceKillTimer not captured")
@@ -974,51 +930,7 @@ func TestRunCodexTask_ForcesStopAfterCompletion(t *testing.T) {
 	if duration > 2*time.Second {
 		t.Fatalf("runCodexTaskWithContext took too long: %v", duration)
 	}
-	if runtime.GOOS == "windows" {
-		if fake.process.KillCount() == 0 {
-			t.Fatalf("expected Kill to be called, got 0")
-		}
-	} else if fake.process.SignalCount() == 0 {
-		t.Fatalf("expected SIGTERM to be sent, got %d", fake.process.SignalCount())
-	}
-}
-
-func TestRunCodexTask_ForcesStopAfterTurnCompleted(t *testing.T) {
-	defer resetTestHooks()
-	forceKillDelay.Store(0)
-
-	fake := newFakeCmd(fakeCmdConfig{
-		StdoutPlan: []fakeStdoutEvent{
-			{Data: `{"type":"item.completed","item":{"type":"agent_message","text":"done"}}` + "\n"},
-			{Data: `{"type":"turn.completed"}` + "\n"},
-		},
-		KeepStdoutOpen:      true,
-		BlockWait:           true,
-		ReleaseWaitOnSignal: true,
-		ReleaseWaitOnKill:   true,
-	})
-
-	newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
-		return fake
-	}
-	buildCodexArgsFn = func(cfg *Config, targetArg string) []string { return []string{targetArg} }
-	codexCommand = "fake-cmd"
-
-	start := time.Now()
-	result := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "done", WorkDir: defaultWorkdir}, nil, nil, false, false, 60)
-	duration := time.Since(start)
-
-	if result.ExitCode != 0 || result.Message != "done" {
-		t.Fatalf("unexpected result: %+v", result)
-	}
-	if duration > 2*time.Second {
-		t.Fatalf("runCodexTaskWithContext took too long: %v", duration)
-	}
-	if runtime.GOOS == "windows" {
-		if fake.process.KillCount() == 0 {
-			t.Fatalf("expected Kill to be called, got 0")
-		}
-	} else if fake.process.SignalCount() == 0 {
+	if fake.process.SignalCount() == 0 {
 		t.Fatalf("expected SIGTERM to be sent, got %d", fake.process.SignalCount())
 	}
 }
@@ -1055,11 +967,7 @@ func TestRunCodexTask_DoesNotTerminateBeforeThreadCompleted(t *testing.T) {
 	if duration > 5*time.Second {
 		t.Fatalf("runCodexTaskWithContext took too long: %v", duration)
 	}
-	if runtime.GOOS == "windows" {
-		if fake.process.KillCount() == 0 {
-			t.Fatalf("expected Kill to be called, got 0")
-		}
-	} else if fake.process.SignalCount() == 0 {
+	if fake.process.SignalCount() == 0 {
 		t.Fatalf("expected SIGTERM to be sent, got %d", fake.process.SignalCount())
 	}
 }
@@ -1231,65 +1139,6 @@ func TestBackendParseArgs_BackendFlag(t *testing.T) {
 	}
 }

-func TestBackendParseArgs_ModelFlag(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		want    string
-		wantErr bool
-	}{
-		{
-			name: "model flag",
-			args: []string{"codeagent-wrapper", "--model", "opus", "task"},
-			want: "opus",
-		},
-		{
-			name: "model equals syntax",
-			args: []string{"codeagent-wrapper", "--model=opus", "task"},
-			want: "opus",
-		},
-		{
-			name: "model trimmed",
-			args: []string{"codeagent-wrapper", "--model", "  opus  ", "task"},
-			want: "opus",
-		},
-		{
-			name: "model with resume mode",
-			args: []string{"codeagent-wrapper", "--model", "sonnet", "resume", "sid", "task"},
-			want: "sonnet",
-		},
-		{
-			name:    "missing model value",
-			args:    []string{"codeagent-wrapper", "--model"},
-			wantErr: true,
-		},
-		{
-			name:    "model equals missing value",
-			args:    []string{"codeagent-wrapper", "--model=", "task"},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			os.Args = tt.args
-			cfg, err := parseArgs()
-			if tt.wantErr {
-				if err == nil {
-					t.Fatalf("expected error, got nil")
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			if cfg.Model != tt.want {
-				t.Fatalf("Model = %q, want %q", cfg.Model, tt.want)
-			}
-		})
-	}
-}
-
 func TestBackendParseArgs_SkipPermissions(t *testing.T) {
 	const envKey = "CODEAGENT_SKIP_PERMISSIONS"
 	t.Cleanup(func() { os.Unsetenv(envKey) })
@@ -1427,26 +1276,6 @@ do something`
 	}
 }

-func TestParallelParseConfig_Model(t *testing.T) {
-	input := `---TASK---
-id: task-1
-model: opus
---CONTENT---
-do something`
-
-	cfg, err := parseParallelConfig([]byte(input))
-	if err != nil {
-		t.Fatalf("parseParallelConfig() unexpected error: %v", err)
-	}
-	if len(cfg.Tasks) != 1 {
-		t.Fatalf("expected 1 task, got %d", len(cfg.Tasks))
-	}
-	task := cfg.Tasks[0]
-	if task.Model != "opus" {
-		t.Fatalf("model = %q, want opus", task.Model)
-	}
-}
-
 func TestParallelParseConfig_EmptySessionID(t *testing.T) {
 	input := `---TASK---
 id: task-1
@@ -1529,120 +1358,6 @@ code with special chars: $var "quotes"`
 	}
 }

-func TestClaudeModel_DefaultsFromSettings(t *testing.T) {
-	defer resetTestHooks()
-
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-	t.Setenv("USERPROFILE", home)
-
-	dir := filepath.Join(home, ".claude")
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		t.Fatalf("MkdirAll: %v", err)
-	}
-
-	settingsModel := "claude-opus-4-5-20250929"
-	path := filepath.Join(dir, "settings.json")
-	data := []byte(fmt.Sprintf(`{"model":%q,"env":{"FOO":"bar"}}`, settingsModel))
-	if err := os.WriteFile(path, data, 0o600); err != nil {
-		t.Fatalf("WriteFile: %v", err)
-	}
-
-	makeRunner := func(gotName *string, gotArgs *[]string, fake **fakeCmd) func(context.Context, string, ...string) commandRunner {
-		return func(ctx context.Context, name string, args ...string) commandRunner {
-			*gotName = name
-			*gotArgs = append([]string(nil), args...)
-			cmd := newFakeCmd(fakeCmdConfig{
-				PID: 123,
-				StdoutPlan: []fakeStdoutEvent{
-					{Data: "{\"type\":\"result\",\"session_id\":\"sid\",\"result\":\"ok\"}\n"},
-				},
-			})
-			*fake = cmd
-			return cmd
-		}
-	}
-
-	t.Run("new mode inherits model when unset", func(t *testing.T) {
-		var (
-			gotName string
-			gotArgs []string
-			fake    *fakeCmd
-		)
-		origRunner := newCommandRunner
-		newCommandRunner = makeRunner(&gotName, &gotArgs, &fake)
-		t.Cleanup(func() { newCommandRunner = origRunner })
-
-		res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "hi", Mode: "new", WorkDir: defaultWorkdir}, ClaudeBackend{}, nil, false, true, 5)
-		if res.ExitCode != 0 || res.Message != "ok" {
-			t.Fatalf("unexpected result: %+v", res)
-		}
-		if gotName != "claude" {
-			t.Fatalf("command = %q, want claude", gotName)
-		}
-		found := false
-		for i := 0; i+1 < len(gotArgs); i++ {
-			if gotArgs[i] == "--model" && gotArgs[i+1] == settingsModel {
-				found = true
-				break
-			}
-		}
-		if !found {
-			t.Fatalf("expected --model %q in args, got %v", settingsModel, gotArgs)
-		}
-		if fake == nil || fake.env["FOO"] != "bar" {
-			t.Fatalf("expected env to include FOO=bar, got %v", fake.env)
-		}
-	})
-
-	t.Run("explicit model overrides settings", func(t *testing.T) {
-		var (
-			gotName string
-			gotArgs []string
-			fake    *fakeCmd
-		)
-		origRunner := newCommandRunner
-		newCommandRunner = makeRunner(&gotName, &gotArgs, &fake)
-		t.Cleanup(func() { newCommandRunner = origRunner })
-
-		res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "hi", Mode: "new", WorkDir: defaultWorkdir, Model: "sonnet"}, ClaudeBackend{}, nil, false, true, 5)
-		if res.ExitCode != 0 || res.Message != "ok" {
-			t.Fatalf("unexpected result: %+v", res)
-		}
-		found := false
-		for i := 0; i+1 < len(gotArgs); i++ {
-			if gotArgs[i] == "--model" && gotArgs[i+1] == "sonnet" {
-				found = true
-				break
-			}
-		}
-		if !found {
-			t.Fatalf("expected --model sonnet in args, got %v", gotArgs)
-		}
-	})
-
-	t.Run("resume mode does not inherit model by default", func(t *testing.T) {
-		var (
-			gotName string
-			gotArgs []string
-			fake    *fakeCmd
-		)
-		origRunner := newCommandRunner
-		newCommandRunner = makeRunner(&gotName, &gotArgs, &fake)
-		t.Cleanup(func() { newCommandRunner = origRunner })
-
-		res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "hi", Mode: "resume", SessionID: "sid-123", WorkDir: defaultWorkdir}, ClaudeBackend{}, nil, false, true, 5)
-		if res.ExitCode != 0 || res.Message != "ok" {
-			t.Fatalf("unexpected result: %+v", res)
-		}
-		for i := 0; i < len(gotArgs); i++ {
-			if gotArgs[i] == "--model" {
-				t.Fatalf("did not expect --model in resume args, got %v", gotArgs)
-			}
-		}
-	})
-}
-
 func TestRunShouldUseStdin(t *testing.T) {
 	tests := []struct {
 		name  string
@@ -2812,10 +2527,6 @@ func TestRunCodexTask_Timeout(t *testing.T) {
 }

 func TestRunCodexTask_SignalHandling(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("signal-based test is not supported on Windows")
-	}
-
 	defer resetTestHooks()
 	codexCommand = "sleep"
 	buildCodexArgsFn = func(cfg *Config, targetArg string) []string { return []string{"5"} }
@@ -2824,9 +2535,7 @@ func TestRunCodexTask_SignalHandling(t *testing.T) {
 	go func() { resultCh <- runCodexTask(TaskSpec{Task: "ignored"}, false, 5) }()

 	time.Sleep(200 * time.Millisecond)
-	if proc, err := os.FindProcess(os.Getpid()); err == nil && proc != nil {
-		_ = proc.Signal(syscall.SIGTERM)
-	}
+	syscall.Kill(os.Getpid(), syscall.SIGTERM)

 	res := <-resultCh
 	signal.Reset(syscall.SIGINT, syscall.SIGTERM)
@@ -3238,50 +2947,6 @@ do two`)
 	}
 }

-func TestParallelModelPropagation(t *testing.T) {
-	defer resetTestHooks()
-	cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
-
-	orig := runCodexTaskFn
-	var mu sync.Mutex
-	seen := make(map[string]string)
-	runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
-		mu.Lock()
-		seen[task.ID] = task.Model
-		mu.Unlock()
-		return TaskResult{TaskID: task.ID, ExitCode: 0, Message: "ok"}
-	}
-	t.Cleanup(func() { runCodexTaskFn = orig })
-
-	stdinReader = strings.NewReader(`---TASK---
-id: first
---CONTENT---
-do one
-
---TASK---
-id: second
-model: opus
---CONTENT---
-do two`)
-	os.Args = []string{"codeagent-wrapper", "--parallel", "--model", "sonnet"}
-
-	if code := run(); code != 0 {
-		t.Fatalf("run exit = %d, want 0", code)
-	}
-
-	mu.Lock()
-	firstModel, firstOK := seen["first"]
-	secondModel, secondOK := seen["second"]
-	mu.Unlock()
-
-	if !firstOK || firstModel != "sonnet" {
-		t.Fatalf("first model = %q (present=%v), want sonnet", firstModel, firstOK)
-	}
-	if !secondOK || secondModel != "opus" {
-		t.Fatalf("second model = %q (present=%v), want opus", secondModel, secondOK)
-	}
-}
-
 func TestParallelFlag(t *testing.T) {
 	oldArgs := os.Args
 	defer func() { os.Args = oldArgs }()
@@ -4082,10 +3747,6 @@ func TestRun_LoggerLifecycle(t *testing.T) {
 }

 func TestRun_LoggerRemovedOnSignal(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("signal-based test is not supported on Windows")
-	}
-
 	// Skip in CI due to unreliable signal delivery in containerized environments
 	if os.Getenv("CI") != "" || os.Getenv("GITHUB_ACTIONS") != "" {
 		t.Skip("Skipping signal test in CI environment")
@@ -4127,9 +3788,7 @@ printf '%s\n' '{"type":"item.completed","item":{"type":"agent_message","text":"l
 		time.Sleep(10 * time.Millisecond)
 	}

-	if proc, err := os.FindProcess(os.Getpid()); err == nil && proc != nil {
-		_ = proc.Signal(syscall.SIGINT)
-	}
+	_ = syscall.Kill(os.Getpid(), syscall.SIGINT)

 	var exitCode int
 	select {
--- a/codeagent-wrapper/parser.go
+++ b/codeagent-wrapper/parser.go
@@ -163,10 +163,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
 				isCodex = true
 			}
 		}
-		// Codex-specific event types without thread_id or item
-		if !isCodex && (event.Type == "turn.started" || event.Type == "turn.completed") {
-			isCodex = true
-		}
 		isClaude := event.Subtype != "" || event.Result != ""
 		if !isClaude && event.Type == "result" && event.SessionID != "" && event.Status == "" {
 			isClaude = true
@@ -198,10 +194,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
 				infoFn(fmt.Sprintf("thread.completed event thread_id=%s", event.ThreadID))
 				notifyComplete()

-			case "turn.completed":
-				infoFn("turn.completed event")
-				notifyComplete()
-
 			case "item.completed":
 				var itemType string
 				if len(event.Item) > 0 {
@@ -279,8 +271,8 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
 			continue
 		}

-		// Unknown event format from other backends (turn.started/assistant/user); ignore.
-		continue
+		// Unknown event format
+		warnFn(fmt.Sprintf("Unknown event format: %s", truncateBytes(line, 100)))
 	}

 	switch {
--- a/codeagent-wrapper/parser_unknown_event_test.go
+++ b/codeagent-wrapper/parser_unknown_event_test.go
@@ -1,33 +0,0 @@
-package main
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestBackendParseJSONStream_UnknownEventsAreSilent(t *testing.T) {
-	input := strings.Join([]string{
-		`{"type":"turn.started"}`,
-		`{"type":"assistant","text":"hi"}`,
-		`{"type":"user","text":"yo"}`,
-		`{"type":"item.completed","item":{"type":"agent_message","text":"ok"}}`,
-	}, "\n")
-
-	var infos []string
-	infoFn := func(msg string) { infos = append(infos, msg) }
-
-	message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, infoFn, nil, nil)
-	if message != "ok" {
-		t.Fatalf("message=%q, want %q (infos=%v)", message, "ok", infos)
-	}
-	if threadID != "" {
-		t.Fatalf("threadID=%q, want empty (infos=%v)", threadID, infos)
-	}
-
-	for _, msg := range infos {
-		if strings.Contains(msg, "Agent event:") {
-			t.Fatalf("unexpected log for unknown event: %q", msg)
-		}
-	}
-}
-
--- a/codeagent-wrapper/process_check_windows_test.go
+++ b/codeagent-wrapper/process_check_windows_test.go
@@ -1,64 +0,0 @@
-//go:build windows
-// +build windows
-
-package main
-
-import (
-	"os"
-	"testing"
-	"time"
-)
-
-func TestIsProcessRunning(t *testing.T) {
-	t.Run("boundary values", func(t *testing.T) {
-		if isProcessRunning(0) {
-			t.Fatalf("expected pid 0 to be reported as not running")
-		}
-		if isProcessRunning(-1) {
-			t.Fatalf("expected pid -1 to be reported as not running")
-		}
-	})
-
-	t.Run("current process", func(t *testing.T) {
-		if !isProcessRunning(os.Getpid()) {
-			t.Fatalf("expected current process (pid=%d) to be running", os.Getpid())
-		}
-	})
-
-	t.Run("fake pid", func(t *testing.T) {
-		const nonexistentPID = 1 << 30
-		if isProcessRunning(nonexistentPID) {
-			t.Fatalf("expected pid %d to be reported as not running", nonexistentPID)
-		}
-	})
-}
-
-func TestGetProcessStartTimeReadsProcStat(t *testing.T) {
-	start := getProcessStartTime(os.Getpid())
-	if start.IsZero() {
-		t.Fatalf("expected non-zero start time for current process")
-	}
-	if start.After(time.Now().Add(5 * time.Second)) {
-		t.Fatalf("start time is unexpectedly in the future: %v", start)
-	}
-}
-
-func TestGetProcessStartTimeInvalidData(t *testing.T) {
-	if !getProcessStartTime(0).IsZero() {
-		t.Fatalf("expected zero time for pid 0")
-	}
-	if !getProcessStartTime(-1).IsZero() {
-		t.Fatalf("expected zero time for negative pid")
-	}
-	if !getProcessStartTime(1 << 30).IsZero() {
-		t.Fatalf("expected zero time for non-existent pid")
-	}
-}
-
-func TestGetBootTimeParsesBtime(t *testing.T) {
-	t.Skip("getBootTime is only implemented on Unix-like systems")
-}
-
-func TestGetBootTimeInvalidData(t *testing.T) {
-	t.Skip("getBootTime is only implemented on Unix-like systems")
-}
--- a/codeagent-wrapper/signal_unix.go
+++ b/codeagent-wrapper/signal_unix.go
@@ -1,16 +0,0 @@
-//go:build unix || darwin || linux
-// +build unix darwin linux
-
-package main
-
-import (
-	"syscall"
-)
-
-// sendTermSignal sends SIGTERM for graceful shutdown on Unix.
-func sendTermSignal(proc processHandle) error {
-	if proc == nil {
-		return nil
-	}
-	return proc.Signal(syscall.SIGTERM)
-}
--- a/codeagent-wrapper/signal_windows.go
+++ b/codeagent-wrapper/signal_windows.go
@@ -1,36 +0,0 @@
-//go:build windows
-// +build windows
-
-package main
-
-import (
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-)
-
-// sendTermSignal on Windows directly kills the process.
-// SIGTERM is not supported on Windows.
-func sendTermSignal(proc processHandle) error {
-	if proc == nil {
-		return nil
-	}
-	pid := proc.Pid()
-	if pid > 0 {
-		// Kill the whole process tree to avoid leaving inheriting child processes around.
-		// This also helps prevent exec.Cmd.Wait() from blocking on stderr/stdout pipes held open by children.
-		taskkill := "taskkill"
-		if root := os.Getenv("SystemRoot"); root != "" {
-			taskkill = filepath.Join(root, "System32", "taskkill.exe")
-		}
-		cmd := exec.Command(taskkill, "/PID", strconv.Itoa(pid), "/T", "/F")
-		cmd.Stdout = io.Discard
-		cmd.Stderr = io.Discard
-		if err := cmd.Run(); err == nil {
-			return nil
-		}
-	}
-	return proc.Kill()
-}
--- a/install.bat
+++ b/install.bat
@@ -117,18 +117,11 @@ if "!ALREADY_IN_USERPATH!"=="1" (
            set "USER_PATH_NEW=!PCT!USERPROFILE!PCT!\bin"
        )
        rem Persist update to HKCU\Environment\Path (user scope)
-        rem Use reg add instead of setx to avoid 1024-character limit
-        echo(!USER_PATH_NEW! | findstr /C:"\"" /C:"!" >nul
-        if not errorlevel 1 (
-            echo WARNING: Your PATH contains quotes or exclamation marks that may cause issues.
-            echo Skipping automatic PATH update. Please add %%USERPROFILE%%\bin to your PATH manually.
+        setx Path "!USER_PATH_NEW!" >nul
+        if errorlevel 1 (
+            echo WARNING: Failed to append %%USERPROFILE%%\bin to your user PATH.
        ) else (
-            reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "!USER_PATH_NEW!" /f >nul
-            if errorlevel 1 (
-                echo WARNING: Failed to append %%USERPROFILE%%\bin to your user PATH.
-            ) else (
-                echo Added %%USERPROFILE%%\bin to your user PATH.
-            )
+            echo Added %%USERPROFILE%%\bin to your user PATH.
        )
    )
 )
--- a/skills/skill-install/SKILL.md
+++ b/skills/skill-install/SKILL.md
@@ -1,167 +0,0 @@
---
-name: skill-install
-description: Install Claude skills from GitHub repositories with automated security scanning. Triggers when users want to install skills from a GitHub URL, need to browse available skills in a repository, or want to safely add new skills to their Claude environment.
---
-
-# Skill Install
-
-## Overview
-
-Install Claude skills from GitHub repositories with built-in security scanning to protect against malicious code, backdoors, and vulnerabilities.
-
-## When to Use
-
-Trigger this skill when the user:
- Provides a GitHub repository URL and wants to install skills
- Asks to "install skills from GitHub"
- Wants to browse and select skills from a repository
- Needs to add new skills to their Claude environment
-
-## Workflow
-
-### Step 1: Parse GitHub URL
-
-Accept a GitHub repository URL from the user. The URL should point to a repository containing a `skills/` directory.
-
-Supported URL formats:
- `https://github.com/user/repo`
- `https://github.com/user/repo/tree/main/skills`
- `https://github.com/user/repo/tree/branch-name/skills`
-
-Extract:
- Repository owner
- Repository name
- Branch (default to `main` if not specified)
-
-### Step 2: Fetch Skills List
-
-Use the WebFetch tool to retrieve the skills directory listing from GitHub.
-
-GitHub API endpoint pattern:
-```
-https://api.github.com/repos/{owner}/{repo}/contents/skills?ref={branch}
-```
-
-Parse the response to extract:
- Skill directory names
- Each skill should be a subdirectory containing a SKILL.md file
-
-### Step 3: Present Skills to User
-
-Use the AskUserQuestion tool to let the user select which skills to install.
-
-Set `multiSelect: true` to allow multiple selections.
-
-Present each skill with:
- Skill name (directory name)
- Brief description (if available from SKILL.md frontmatter)
-
-### Step 4: Fetch Skill Content
-
-For each selected skill, fetch all files in the skill directory:
-
-1. Get the file tree for the skill directory
-2. Download all files (SKILL.md, scripts/, references/, assets/)
-3. Store the complete skill content for security analysis
-
-Use WebFetch with GitHub API:
-```
-https://api.github.com/repos/{owner}/{repo}/contents/skills/{skill_name}?ref={branch}
-```
-
-For each file, fetch the raw content:
-```
-https://raw.githubusercontent.com/{owner}/{repo}/{branch}/skills/{skill_name}/{file_path}
-```
-
-### Step 5: Security Scan
-
-**CRITICAL:** Before installation, perform a thorough security analysis of each skill.
-
-Read the security scan prompt template from `references/security_scan_prompt.md` and apply it to analyze the skill content.
-
-Examine for:
-1. **Malicious Command Execution** - eval, exec, subprocess with shell=True
-2. **Backdoor Detection** - obfuscated code, suspicious network requests
-3. **Credential Theft** - accessing ~/.ssh, ~/.aws, environment variables
-4. **Unauthorized Network Access** - external requests to suspicious domains
-5. **File System Abuse** - destructive operations, unauthorized writes
-6. **Privilege Escalation** - sudo attempts, system modifications
-7. **Supply Chain Attacks** - suspicious package installations
-
-Output the security analysis with:
- Security Status: SAFE / WARNING / DANGEROUS
- Risk Level: LOW / MEDIUM / HIGH / CRITICAL
- Detailed findings with file locations and severity
- Recommendation: APPROVE / APPROVE_WITH_WARNINGS / REJECT
-
-### Step 6: User Decision
-
-Based on the security scan results:
-
-**If SAFE (APPROVE):**
- Proceed directly to installation
-
-**If WARNING (APPROVE_WITH_WARNINGS):**
- Display the security warnings to the user
- Use AskUserQuestion to confirm: "Security warnings detected. Do you want to proceed with installation?"
- Options: "Yes, install anyway" / "No, skip this skill"
-
-**If DANGEROUS (REJECT):**
- Display the critical security issues
- Refuse to install
- Explain why the skill is dangerous
- Do NOT provide an option to override for CRITICAL severity issues
-
-### Step 7: Install Skills
-
-For approved skills, install to `~/.claude/skills/`:
-
-1. Create the skill directory: `~/.claude/skills/{skill_name}/`
-2. Write all skill files maintaining the directory structure
-3. Ensure proper file permissions (executable for scripts)
-4. Verify SKILL.md exists and has valid frontmatter
-
-Use the Write tool to create files.
-
-### Step 8: Confirmation
-
-After installation, provide a summary:
- List of successfully installed skills
- List of skipped skills (if any) with reasons
- Location: `~/.claude/skills/`
- Next steps: "The skills are now available. Restart Claude or use them directly."
-
-## Example Usage
-
-**User:** "Install skills from https://github.com/example/claude-skills"
-
-**Assistant:**
-1. Fetches skills list from the repository
-2. Presents available skills: "skill-a", "skill-b", "skill-c"
-3. User selects "skill-a" and "skill-b"
-4. Performs security scan on each skill
-5. skill-a: SAFE - proceeds to install
-6. skill-b: WARNING (makes HTTP request) - asks user for confirmation
-7. Installs approved skills to ~/.claude/skills/
-8. Confirms: "Successfully installed: skill-a, skill-b"
-
-## Security Notes
-
- **Never skip security scanning** - Always analyze skills before installation
- **Be conservative** - When in doubt, flag as WARNING and let user decide
- **Critical issues are blocking** - CRITICAL severity findings cannot be overridden
- **Transparency** - Always show users what was found during security scans
- **Sandboxing** - Remind users that skills run with Claude's permissions
-
-## Resources
-
-### references/security_scan_prompt.md
-
-Contains the detailed security analysis prompt template with:
- Complete list of security categories to check
- Output format requirements
- Example analyses for safe, suspicious, and dangerous skills
- Decision criteria for APPROVE/REJECT recommendations
-
-Load this file when performing security scans to ensure comprehensive analysis.
--- a/skills/skill-install/references/security_scan_prompt.md
+++ b/skills/skill-install/references/security_scan_prompt.md
@@ -1,137 +0,0 @@
-# Security Scan Prompt for Skills
-
-Use this prompt template to analyze skill content for security vulnerabilities before installation.
-
-## Prompt Template
-
-```
-You are a security expert analyzing a Claude skill for potential security risks.
-
-Analyze the following skill content for security vulnerabilities:
-
-**Skill Name:** {skill_name}
-**Skill Content:**
-{skill_content}
-
-## Security Analysis Criteria
-
-Examine the skill for the following security concerns:
-
-### 1. Malicious Command Execution
- Detect `eval()`, `exec()`, `subprocess` with `shell=True`
- Identify arbitrary code execution patterns
- Check for command injection vulnerabilities
-
-### 2. Backdoor Detection
- Look for obfuscated code (base64, hex encoding)
- Identify suspicious network requests to unknown domains
- Detect file hash patterns matching known malware
- Check for hidden data exfiltration mechanisms
-
-### 3. Credential Theft
- Detect attempts to access environment variables containing secrets
- Identify file operations on sensitive paths (~/.ssh, ~/.aws, ~/.netrc)
- Check for credential harvesting patterns
- Look for keylogging or clipboard monitoring
-
-### 4. Unauthorized Network Access
- Identify external network requests
- Check for connections to suspicious domains (pastebin, ngrok, bit.ly, etc.)
- Detect data exfiltration via HTTP/HTTPS
- Look for reverse shell patterns
-
-### 5. File System Abuse
- Detect destructive file operations (rm -rf, shutil.rmtree)
- Identify unauthorized file writes to system directories
- Check for file permission modifications
- Look for attempts to modify critical system files
-
-### 6. Privilege Escalation
- Detect sudo or privilege escalation attempts
- Identify attempts to modify system configurations
- Check for container escape patterns
-
-### 7. Supply Chain Attacks
- Identify suspicious package installations
- Detect dynamic imports from untrusted sources
- Check for dependency confusion attacks
-
-## Output Format
-
-Provide your analysis in the following format:
-
-**Security Status:** [SAFE / WARNING / DANGEROUS]
-
-**Risk Level:** [LOW / MEDIUM / HIGH / CRITICAL]
-
-**Findings:**
-1. [Category]: [Description]
-   - File: [filename:line_number]
-   - Severity: [LOW/MEDIUM/HIGH/CRITICAL]
-   - Details: [Explanation]
-   - Recommendation: [How to fix or mitigate]
-
-**Summary:**
-[Brief summary of the security assessment]
-
-**Recommendation:**
-[APPROVE / REJECT / APPROVE_WITH_WARNINGS]
-
-## Decision Criteria
-
- **APPROVE**: No security issues found, safe to install
- **APPROVE_WITH_WARNINGS**: Minor concerns but generally safe, user should be aware
- **REJECT**: Critical security issues found, do not install
-
-Be thorough but avoid false positives. Consider the context and legitimate use cases.
-```
-
-## Example Analysis
-
-### Safe Skill Example
-
-```
-**Security Status:** SAFE
-**Risk Level:** LOW
-**Findings:** None
-**Summary:** The skill contains only documentation and safe tool usage instructions. No executable code or suspicious patterns detected.
-**Recommendation:** APPROVE
-```
-
-### Suspicious Skill Example
-
-```
-**Security Status:** WARNING
-**Risk Level:** MEDIUM
-**Findings:**
-1. [Network Access]: External HTTP request detected
-   - File: scripts/helper.py:42
-   - Severity: MEDIUM
-   - Details: Script makes HTTP request to api.example.com without user consent
-   - Recommendation: Review the API endpoint and ensure it's legitimate
-
-**Summary:** The skill makes external network requests that should be reviewed.
-**Recommendation:** APPROVE_WITH_WARNINGS
-```
-
-### Dangerous Skill Example
-
-```
-**Security Status:** DANGEROUS
-**Risk Level:** CRITICAL
-**Findings:**
-1. [Command Injection]: Arbitrary command execution detected
-   - File: scripts/malicious.py:15
-   - Severity: CRITICAL
-   - Details: Uses subprocess.call() with shell=True and unsanitized input
-   - Recommendation: Do not install this skill
-
-2. [Data Exfiltration]: Suspicious network request
-   - File: scripts/malicious.py:28
-   - Severity: HIGH
-   - Details: Sends data to pastebin.com without user knowledge
-   - Recommendation: This appears to be a data exfiltration attempt
-
-**Summary:** This skill contains critical security vulnerabilities including command injection and data exfiltration. It appears to be malicious.
-**Recommendation:** REJECT
-```
--- a/test_install_path.bat
+++ b/test_install_path.bat
@@ -1,67 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-echo Testing PATH update with long strings...
-echo.
-
-rem Create a very long PATH string (over 1024 characters)
-set "LONG_PATH="
-for /L %%i in (1,1,30) do (
-    set "LONG_PATH=!LONG_PATH!C:\VeryLongDirectoryName%%i\SubDirectory\AnotherSubDirectory;"
-)
-
-echo Generated PATH length:
-echo !LONG_PATH! > temp_path.txt
-for %%A in (temp_path.txt) do set "PATH_LENGTH=%%~zA"
-del temp_path.txt
-echo !PATH_LENGTH! bytes
-
-rem Test 1: Verify reg add can handle long strings
-echo.
-echo Test 1: Testing reg add with long PATH...
-set "TEST_PATH=!LONG_PATH!%%USERPROFILE%%\bin"
-reg add "HKCU\Environment" /v TestPath /t REG_EXPAND_SZ /d "!TEST_PATH!" /f >nul 2>nul
-if errorlevel 1 (
-    echo FAIL: reg add failed with long PATH
-    goto :cleanup
-) else (
-    echo PASS: reg add succeeded with long PATH
-)
-
-rem Test 2: Verify the value was stored correctly
-echo.
-echo Test 2: Verifying stored value length...
-for /f "tokens=2*" %%A in ('reg query "HKCU\Environment" /v TestPath 2^>nul ^| findstr /I "TestPath"') do set "STORED_PATH=%%B"
-echo !STORED_PATH! > temp_stored.txt
-for %%A in (temp_stored.txt) do set "STORED_LENGTH=%%~zA"
-del temp_stored.txt
-echo Stored PATH length: !STORED_LENGTH! bytes
-
-if !STORED_LENGTH! LSS 1024 (
-    echo FAIL: Stored PATH was truncated
-    goto :cleanup
-) else (
-    echo PASS: Stored PATH was not truncated
-)
-
-rem Test 3: Verify %%USERPROFILE%%\bin is present
-echo.
-echo Test 3: Verifying %%USERPROFILE%%\bin is in stored PATH...
-echo !STORED_PATH! | findstr /I "USERPROFILE" >nul
-if errorlevel 1 (
-    echo FAIL: %%USERPROFILE%%\bin not found in stored PATH
-    goto :cleanup
-) else (
-    echo PASS: %%USERPROFILE%%\bin found in stored PATH
-)
-
-echo.
-echo ========================================
-echo All tests PASSED
-echo ========================================
-
-:cleanup
-echo.
-echo Cleaning up test registry key...
-reg delete "HKCU\Environment" /v TestPath /f >nul 2>nul
-endlocal
--- a/uninstall.py
+++ b/uninstall.py
@@ -1,302 +0,0 @@
-#!/usr/bin/env python3
-"""Uninstaller for myclaude - reads installed_modules.json for precise removal."""
-
-from __future__ import annotations
-
-import argparse
-import json
-import re
-import shutil
-import sys
-from pathlib import Path
-from typing import Any, Dict, List, Optional, Set
-
-DEFAULT_INSTALL_DIR = "~/.claude"
-
-# Files created by installer itself (not by modules)
-INSTALLER_FILES = ["install.log", "installed_modules.json", "installed_modules.json.bak"]
-
-
-def parse_args(argv: Optional[List[str]] = None) -> argparse.Namespace:
-    parser = argparse.ArgumentParser(description="Uninstall myclaude")
-    parser.add_argument(
-        "--install-dir",
-        default=DEFAULT_INSTALL_DIR,
-        help="Installation directory (defaults to ~/.claude)",
-    )
-    parser.add_argument(
-        "--module",
-        help="Comma-separated modules to uninstall (default: all installed)",
-    )
-    parser.add_argument(
-        "--list",
-        action="store_true",
-        help="List installed modules and exit",
-    )
-    parser.add_argument(
-        "--dry-run",
-        action="store_true",
-        help="Show what would be removed without actually removing",
-    )
-    parser.add_argument(
-        "--purge",
-        action="store_true",
-        help="Remove entire install directory (DANGEROUS: removes user files too)",
-    )
-    parser.add_argument(
-        "-y", "--yes",
-        action="store_true",
-        help="Skip confirmation prompt",
-    )
-    return parser.parse_args(argv)
-
-
-def load_installed_modules(install_dir: Path) -> Dict[str, Any]:
-    """Load installed_modules.json to know what was installed."""
-    status_file = install_dir / "installed_modules.json"
-    if not status_file.exists():
-        return {}
-    try:
-        with status_file.open("r", encoding="utf-8") as f:
-            return json.load(f)
-    except (json.JSONDecodeError, OSError):
-        return {}
-
-
-def load_config(install_dir: Path) -> Dict[str, Any]:
-    """Try to load config.json from source repo to understand module structure."""
-    # Look for config.json in common locations
-    candidates = [
-        Path(__file__).parent / "config.json",
-        install_dir / "config.json",
-    ]
-    for path in candidates:
-        if path.exists():
-            try:
-                with path.open("r", encoding="utf-8") as f:
-                    return json.load(f)
-            except (json.JSONDecodeError, OSError):
-                continue
-    return {}
-
-
-def get_module_files(module_name: str, config: Dict[str, Any]) -> Set[str]:
-    """Extract files/dirs that a module installs based on config.json operations."""
-    files: Set[str] = set()
-    modules = config.get("modules", {})
-    module_cfg = modules.get(module_name, {})
-
-    for op in module_cfg.get("operations", []):
-        op_type = op.get("type", "")
-        target = op.get("target", "")
-
-        if op_type == "copy_file" and target:
-            files.add(target)
-        elif op_type == "copy_dir" and target:
-            files.add(target)
-        elif op_type == "merge_dir":
-            # merge_dir merges subdirs like commands/, agents/ into install_dir
-            source = op.get("source", "")
-            source_path = Path(__file__).parent / source
-            if source_path.exists():
-                for subdir in source_path.iterdir():
-                    if subdir.is_dir():
-                        files.add(subdir.name)
-        elif op_type == "run_command":
-            # install.sh installs bin/codeagent-wrapper
-            cmd = op.get("command", "")
-            if "install.sh" in cmd or "install.bat" in cmd:
-                files.add("bin/codeagent-wrapper")
-                files.add("bin")
-
-    return files
-
-
-def cleanup_shell_config(rc_file: Path, bin_dir: Path) -> bool:
-    """Remove PATH export added by installer from shell config."""
-    if not rc_file.exists():
-        return False
-
-    content = rc_file.read_text(encoding="utf-8")
-    original = content
-
-    patterns = [
-        r"\n?# Added by myclaude installer\n",
-        rf'\nexport PATH="{re.escape(str(bin_dir))}:\$PATH"\n?',
-    ]
-
-    for pattern in patterns:
-        content = re.sub(pattern, "\n", content)
-
-    content = re.sub(r"\n{3,}$", "\n\n", content)
-
-    if content != original:
-        rc_file.write_text(content, encoding="utf-8")
-        return True
-    return False
-
-
-def list_installed(install_dir: Path) -> None:
-    """List installed modules."""
-    status = load_installed_modules(install_dir)
-    modules = status.get("modules", {})
-
-    if not modules:
-        print("No modules installed (installed_modules.json not found or empty)")
-        return
-
-    print(f"Installed modules in {install_dir}:")
-    print(f"{'Module':<15} {'Status':<10} {'Installed At'}")
-    print("-" * 50)
-    for name, info in modules.items():
-        st = info.get("status", "unknown")
-        ts = info.get("installed_at", "unknown")[:19]
-        print(f"{name:<15} {st:<10} {ts}")
-
-
-def main(argv: Optional[List[str]] = None) -> int:
-    args = parse_args(argv)
-    install_dir = Path(args.install_dir).expanduser().resolve()
-    bin_dir = install_dir / "bin"
-
-    if not install_dir.exists():
-        print(f"Install directory not found: {install_dir}")
-        print("Nothing to uninstall.")
-        return 0
-
-    if args.list:
-        list_installed(install_dir)
-        return 0
-
-    # Load installation status
-    status = load_installed_modules(install_dir)
-    installed_modules = status.get("modules", {})
-    config = load_config(install_dir)
-
-    # Determine which modules to uninstall
-    if args.module:
-        selected = [m.strip() for m in args.module.split(",") if m.strip()]
-        # Validate
-        for m in selected:
-            if m not in installed_modules:
-                print(f"Error: Module '{m}' is not installed")
-                print("Use --list to see installed modules")
-                return 1
-    else:
-        selected = list(installed_modules.keys())
-
-    if not selected and not args.purge:
-        print("No modules to uninstall.")
-        print("Use --list to see installed modules, or --purge to remove everything.")
-        return 0
-
-    # Collect files to remove
-    files_to_remove: Set[str] = set()
-    for module_name in selected:
-        files_to_remove.update(get_module_files(module_name, config))
-
-    # Add installer files if removing all modules
-    if set(selected) == set(installed_modules.keys()):
-        files_to_remove.update(INSTALLER_FILES)
-
-    # Show what will be removed
-    print(f"Install directory: {install_dir}")
-    if args.purge:
-        print(f"\n⚠️  PURGE MODE: Will remove ENTIRE directory including user files!")
-    else:
-        print(f"\nModules to uninstall: {', '.join(selected)}")
-        print(f"\nFiles/directories to remove:")
-        for f in sorted(files_to_remove):
-            path = install_dir / f
-            exists = "✓" if path.exists() else "✗ (not found)"
-            print(f"  {f} {exists}")
-
-    # Confirmation
-    if not args.yes and not args.dry_run:
-        prompt = "\nProceed with uninstallation? [y/N] "
-        response = input(prompt).strip().lower()
-        if response not in ("y", "yes"):
-            print("Aborted.")
-            return 0
-
-    if args.dry_run:
-        print("\n[Dry run] No files were removed.")
-        return 0
-
-    print(f"\nUninstalling...")
-    removed: List[str] = []
-
-    if args.purge:
-        shutil.rmtree(install_dir)
-        print(f"  ✓ Removed {install_dir}")
-        removed.append(str(install_dir))
-    else:
-        # Remove files/dirs in reverse order (files before parent dirs)
-        for item in sorted(files_to_remove, key=lambda x: x.count("/"), reverse=True):
-            path = install_dir / item
-            if not path.exists():
-                continue
-            try:
-                if path.is_dir():
-                    # Only remove if empty or if it's a known module dir
-                    if item in ("bin",):
-                        # For bin, only remove codeagent-wrapper
-                        wrapper = path / "codeagent-wrapper"
-                        if wrapper.exists():
-                            wrapper.unlink()
-                            print(f"  ✓ Removed bin/codeagent-wrapper")
-                            removed.append("bin/codeagent-wrapper")
-                        # Remove bin if empty
-                        if path.exists() and not any(path.iterdir()):
-                            path.rmdir()
-                            print(f"  ✓ Removed empty bin/")
-                    else:
-                        shutil.rmtree(path)
-                        print(f"  ✓ Removed {item}/")
-                        removed.append(item)
-                else:
-                    path.unlink()
-                    print(f"  ✓ Removed {item}")
-                    removed.append(item)
-            except OSError as e:
-                print(f"  ✗ Failed to remove {item}: {e}", file=sys.stderr)
-
-        # Update installed_modules.json
-        status_file = install_dir / "installed_modules.json"
-        if status_file.exists() and selected != list(installed_modules.keys()):
-            # Partial uninstall: update status file
-            for m in selected:
-                installed_modules.pop(m, None)
-            if installed_modules:
-                with status_file.open("w", encoding="utf-8") as f:
-                    json.dump({"modules": installed_modules}, f, indent=2)
-                print(f"  ✓ Updated installed_modules.json")
-
-        # Remove install dir if empty
-        if install_dir.exists() and not any(install_dir.iterdir()):
-            install_dir.rmdir()
-            print(f"  ✓ Removed empty install directory")
-
-    # Clean shell configs
-    for rc_name in (".bashrc", ".zshrc"):
-        rc_file = Path.home() / rc_name
-        if cleanup_shell_config(rc_file, bin_dir):
-            print(f"  ✓ Cleaned PATH from {rc_name}")
-
-    print("")
-    if removed:
-        print(f"✓ Uninstallation complete ({len(removed)} items removed)")
-    else:
-        print("✓ Nothing to remove")
-
-    if install_dir.exists() and any(install_dir.iterdir()):
-        remaining = list(install_dir.iterdir())
-        print(f"\nNote: {len(remaining)} items remain in {install_dir}")
-        print("These are either user files or from other modules.")
-        print("Use --purge to remove everything (DANGEROUS).")
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,225 +0,0 @@
-#!/bin/bash
-set -e
-
-INSTALL_DIR="${INSTALL_DIR:-$HOME/.claude}"
-BIN_DIR="${INSTALL_DIR}/bin"
-STATUS_FILE="${INSTALL_DIR}/installed_modules.json"
-DRY_RUN=false
-PURGE=false
-YES=false
-LIST_ONLY=false
-MODULES=""
-
-usage() {
-    cat <<EOF
-Usage: $0 [OPTIONS]
-
-Uninstall myclaude modules.
-
-Options:
-  --install-dir DIR   Installation directory (default: ~/.claude)
-  --module MODULES    Comma-separated modules to uninstall (default: all)
-  --list              List installed modules and exit
-  --dry-run           Show what would be removed without removing
-  --purge             Remove entire install directory (DANGEROUS)
-  -y, --yes           Skip confirmation prompt
-  -h, --help          Show this help
-
-Examples:
-  $0 --list                    # List installed modules
-  $0 --dry-run                 # Preview what would be removed
-  $0 --module dev              # Uninstall only 'dev' module
-  $0 -y                        # Uninstall all without confirmation
-  $0 --purge -y                # Remove everything (DANGEROUS)
-EOF
-    exit 0
-}
-
-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --install-dir) INSTALL_DIR="$2"; BIN_DIR="${INSTALL_DIR}/bin"; STATUS_FILE="${INSTALL_DIR}/installed_modules.json"; shift 2 ;;
-        --module) MODULES="$2"; shift 2 ;;
-        --list) LIST_ONLY=true; shift ;;
-        --dry-run) DRY_RUN=true; shift ;;
-        --purge) PURGE=true; shift ;;
-        -y|--yes) YES=true; shift ;;
-        -h|--help) usage ;;
-        *) echo "Unknown option: $1" >&2; exit 1 ;;
-    esac
-done
-
-# Check if install dir exists
-if [ ! -d "$INSTALL_DIR" ]; then
-    echo "Install directory not found: $INSTALL_DIR"
-    echo "Nothing to uninstall."
-    exit 0
-fi
-
-# List installed modules
-list_modules() {
-    if [ ! -f "$STATUS_FILE" ]; then
-        echo "No modules installed (installed_modules.json not found)"
-        return
-    fi
-    echo "Installed modules in $INSTALL_DIR:"
-    echo "Module          Status     Installed At"
-    echo "--------------------------------------------------"
-    # Parse JSON with basic tools (no jq dependency)
-    python3 -c "
-import json, sys
-try:
-    with open('$STATUS_FILE') as f:
-        data = json.load(f)
-    for name, info in data.get('modules', {}).items():
-        status = info.get('status', 'unknown')
-        ts = info.get('installed_at', 'unknown')[:19]
-        print(f'{name:<15} {status:<10} {ts}')
-except Exception as e:
-    print(f'Error reading status file: {e}', file=sys.stderr)
-    sys.exit(1)
-"
-}
-
-if [ "$LIST_ONLY" = true ]; then
-    list_modules
-    exit 0
-fi
-
-# Get installed modules from status file
-get_installed_modules() {
-    if [ ! -f "$STATUS_FILE" ]; then
-        echo ""
-        return
-    fi
-    python3 -c "
-import json
-try:
-    with open('$STATUS_FILE') as f:
-        data = json.load(f)
-    print(' '.join(data.get('modules', {}).keys()))
-except:
-    print('')
-"
-}
-
-INSTALLED=$(get_installed_modules)
-
-# Determine modules to uninstall
-if [ -n "$MODULES" ]; then
-    SELECTED="$MODULES"
-else
-    SELECTED="$INSTALLED"
-fi
-
-if [ -z "$SELECTED" ] && [ "$PURGE" != true ]; then
-    echo "No modules to uninstall."
-    echo "Use --list to see installed modules, or --purge to remove everything."
-    exit 0
-fi
-
-echo "Install directory: $INSTALL_DIR"
-
-if [ "$PURGE" = true ]; then
-    echo ""
-    echo "⚠️  PURGE MODE: Will remove ENTIRE directory including user files!"
-else
-    echo ""
-    echo "Modules to uninstall: $SELECTED"
-    echo ""
-    echo "Files/directories that may be removed:"
-    for item in commands agents skills docs bin CLAUDE.md install.log installed_modules.json; do
-        if [ -e "${INSTALL_DIR}/${item}" ]; then
-            echo "  $item ✓"
-        fi
-    done
-fi
-
-# Confirmation
-if [ "$YES" != true ] && [ "$DRY_RUN" != true ]; then
-    echo ""
-    read -p "Proceed with uninstallation? [y/N] " response
-    case "$response" in
-        [yY]|[yY][eE][sS]) ;;
-        *) echo "Aborted."; exit 0 ;;
-    esac
-fi
-
-if [ "$DRY_RUN" = true ]; then
-    echo ""
-    echo "[Dry run] No files were removed."
-    exit 0
-fi
-
-echo ""
-echo "Uninstalling..."
-
-if [ "$PURGE" = true ]; then
-    rm -rf "$INSTALL_DIR"
-    echo "  ✓ Removed $INSTALL_DIR"
-else
-    # Remove codeagent-wrapper binary
-    if [ -f "${BIN_DIR}/codeagent-wrapper" ]; then
-        rm -f "${BIN_DIR}/codeagent-wrapper"
-        echo "  ✓ Removed bin/codeagent-wrapper"
-    fi
-
-    # Remove bin directory if empty
-    if [ -d "$BIN_DIR" ] && [ -z "$(ls -A "$BIN_DIR" 2>/dev/null)" ]; then
-        rmdir "$BIN_DIR"
-        echo "  ✓ Removed empty bin/"
-    fi
-
-    # Remove installed directories
-    for dir in commands agents skills docs; do
-        if [ -d "${INSTALL_DIR}/${dir}" ]; then
-            rm -rf "${INSTALL_DIR}/${dir}"
-            echo "  ✓ Removed ${dir}/"
-        fi
-    done
-
-    # Remove installed files
-    for file in CLAUDE.md install.log installed_modules.json installed_modules.json.bak; do
-        if [ -f "${INSTALL_DIR}/${file}" ]; then
-            rm -f "${INSTALL_DIR}/${file}"
-            echo "  ✓ Removed ${file}"
-        fi
-    done
-
-    # Remove install directory if empty
-    if [ -d "$INSTALL_DIR" ] && [ -z "$(ls -A "$INSTALL_DIR" 2>/dev/null)" ]; then
-        rmdir "$INSTALL_DIR"
-        echo "  ✓ Removed empty install directory"
-    fi
-fi
-
-# Clean up PATH from shell config files
-cleanup_shell_config() {
-    local rc_file="$1"
-    if [ -f "$rc_file" ]; then
-        if grep -q "# Added by myclaude installer" "$rc_file" 2>/dev/null; then
-            # Create backup
-            cp "$rc_file" "${rc_file}.bak"
-            # Remove myclaude lines
-            grep -v "# Added by myclaude installer" "$rc_file" | \
-            grep -v "export PATH=\"${BIN_DIR}:\$PATH\"" > "${rc_file}.tmp"
-            mv "${rc_file}.tmp" "$rc_file"
-            echo "  ✓ Cleaned PATH from $(basename "$rc_file")"
-        fi
-    fi
-}
-
-cleanup_shell_config "$HOME/.bashrc"
-cleanup_shell_config "$HOME/.zshrc"
-
-echo ""
-echo "✓ Uninstallation complete"
-
-# Check for remaining files
-if [ -d "$INSTALL_DIR" ] && [ -n "$(ls -A "$INSTALL_DIR" 2>/dev/null)" ]; then
-    remaining=$(ls -1 "$INSTALL_DIR" 2>/dev/null | wc -l | tr -d ' ')
-    echo ""
-    echo "Note: $remaining items remain in $INSTALL_DIR"
-    echo "These are either user files or from other modules."
-    echo "Use --purge to remove everything (DANGEROUS)."
-fi