mirror of
https://github.com/cexll/myclaude.git
synced 2026-02-09 03:09:30 +08:00
Compare commits
2 Commits
v5.4.0
...
feature_pa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4dd735034e | ||
|
|
a08dd62b59 |
23
.github/workflows/release.yml
vendored
23
.github/workflows/release.yml
vendored
@@ -97,6 +97,11 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
path: artifacts
|
path: artifacts
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
|
||||||
- name: Prepare release files
|
- name: Prepare release files
|
||||||
run: |
|
run: |
|
||||||
mkdir -p release
|
mkdir -p release
|
||||||
@@ -104,10 +109,26 @@ jobs:
|
|||||||
cp install.sh install.bat release/
|
cp install.sh install.bat release/
|
||||||
ls -la release/
|
ls -la release/
|
||||||
|
|
||||||
|
- name: Generate release notes with git-cliff
|
||||||
|
run: |
|
||||||
|
# Install git-cliff via npx
|
||||||
|
npx git-cliff@latest --current --strip all -o release_notes.md
|
||||||
|
|
||||||
|
# Fallback if generation failed
|
||||||
|
if [ ! -s release_notes.md ]; then
|
||||||
|
echo "⚠️ Failed to generate release notes with git-cliff" > release_notes.md
|
||||||
|
echo "" >> release_notes.md
|
||||||
|
echo "## What's Changed" >> release_notes.md
|
||||||
|
echo "See commits in this release for details." >> release_notes.md
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "--- Generated Release Notes ---"
|
||||||
|
cat release_notes.md
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
files: release/*
|
files: release/*
|
||||||
generate_release_notes: true
|
body_path: release_notes.md
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,7 +1,5 @@
|
|||||||
.claude/
|
.claude/
|
||||||
.claude-trace
|
.claude-trace
|
||||||
.DS_Store
|
|
||||||
**/.DS_Store
|
|
||||||
.venv
|
.venv
|
||||||
.pytest_cache
|
.pytest_cache
|
||||||
__pycache__
|
__pycache__
|
||||||
|
|||||||
154
README.md
154
README.md
@@ -132,59 +132,6 @@ Requirements → Architecture → Sprint Plan → Development → Review → QA
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Version Requirements
|
|
||||||
|
|
||||||
### Codex CLI
|
|
||||||
**Minimum version:** Check compatibility with your installation
|
|
||||||
|
|
||||||
The codeagent-wrapper uses these Codex CLI features:
|
|
||||||
- `codex e` - Execute commands (shorthand for `codex exec`)
|
|
||||||
- `--skip-git-repo-check` - Skip git repository validation
|
|
||||||
- `--json` - JSON stream output format
|
|
||||||
- `-C <workdir>` - Set working directory
|
|
||||||
- `resume <session_id>` - Resume previous sessions
|
|
||||||
|
|
||||||
**Verify Codex CLI is installed:**
|
|
||||||
```bash
|
|
||||||
which codex
|
|
||||||
codex --version
|
|
||||||
```
|
|
||||||
|
|
||||||
### Claude CLI
|
|
||||||
**Minimum version:** Check compatibility with your installation
|
|
||||||
|
|
||||||
Required features:
|
|
||||||
- `--output-format stream-json` - Streaming JSON output format
|
|
||||||
- `--setting-sources` - Control setting sources (prevents infinite recursion)
|
|
||||||
- `--dangerously-skip-permissions` - Skip permission prompts (use with caution)
|
|
||||||
- `-p` - Prompt input flag
|
|
||||||
- `-r <session_id>` - Resume sessions
|
|
||||||
|
|
||||||
**Security Note:** The wrapper only adds `--dangerously-skip-permissions` for Claude when explicitly enabled (e.g. `--skip-permissions` / `CODEAGENT_SKIP_PERMISSIONS=true`). Keep it disabled unless you understand the risk.
|
|
||||||
|
|
||||||
**Verify Claude CLI is installed:**
|
|
||||||
```bash
|
|
||||||
which claude
|
|
||||||
claude --version
|
|
||||||
```
|
|
||||||
|
|
||||||
### Gemini CLI
|
|
||||||
**Minimum version:** Check compatibility with your installation
|
|
||||||
|
|
||||||
Required features:
|
|
||||||
- `-o stream-json` - JSON stream output format
|
|
||||||
- `-y` - Auto-approve prompts (non-interactive mode)
|
|
||||||
- `-r <session_id>` - Resume sessions
|
|
||||||
- `-p` - Prompt input flag
|
|
||||||
|
|
||||||
**Verify Gemini CLI is installed:**
|
|
||||||
```bash
|
|
||||||
which gemini
|
|
||||||
gemini --version
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
### Modular Installation (Recommended)
|
### Modular Installation (Recommended)
|
||||||
@@ -216,39 +163,15 @@ python3 install.py --force
|
|||||||
|
|
||||||
```
|
```
|
||||||
~/.claude/
|
~/.claude/
|
||||||
├── bin/
|
├── CLAUDE.md # Core instructions and role definition
|
||||||
│ └── codeagent-wrapper # Main executable
|
├── commands/ # Slash commands (/dev, /code, etc.)
|
||||||
├── CLAUDE.md # Core instructions and role definition
|
├── agents/ # Agent definitions
|
||||||
├── commands/ # Slash commands (/dev, /code, etc.)
|
|
||||||
├── agents/ # Agent definitions
|
|
||||||
├── skills/
|
├── skills/
|
||||||
│ └── codex/
|
│ └── codex/
|
||||||
│ └── SKILL.md # Codex integration skill
|
│ └── SKILL.md # Codex integration skill
|
||||||
├── config.json # Configuration
|
└── installed_modules.json # Installation status
|
||||||
└── installed_modules.json # Installation status
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Customizing Installation Directory
|
|
||||||
|
|
||||||
By default, myclaude installs to `~/.claude`. You can customize this using the `INSTALL_DIR` environment variable:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Install to custom directory
|
|
||||||
INSTALL_DIR=/opt/myclaude bash install.sh
|
|
||||||
|
|
||||||
# Update your PATH accordingly
|
|
||||||
export PATH="/opt/myclaude/bin:$PATH"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Directory Structure:**
|
|
||||||
- `$INSTALL_DIR/bin/` - codeagent-wrapper binary
|
|
||||||
- `$INSTALL_DIR/skills/` - Skill definitions
|
|
||||||
- `$INSTALL_DIR/config.json` - Configuration file
|
|
||||||
- `$INSTALL_DIR/commands/` - Slash command definitions
|
|
||||||
- `$INSTALL_DIR/agents/` - Agent definitions
|
|
||||||
|
|
||||||
**Note:** When using a custom installation directory, ensure that `$INSTALL_DIR/bin` is added to your `PATH` environment variable.
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
Edit `config.json` to customize:
|
Edit `config.json` to customize:
|
||||||
@@ -372,7 +295,7 @@ setx PATH "%USERPROFILE%\bin;%PATH%"
|
|||||||
**Codex wrapper not found:**
|
**Codex wrapper not found:**
|
||||||
```bash
|
```bash
|
||||||
# Check PATH
|
# Check PATH
|
||||||
echo $PATH | grep -q "$HOME/.claude/bin" || echo 'export PATH="$HOME/.claude/bin:$PATH"' >> ~/.zshrc
|
echo $PATH | grep -q "$HOME/bin" || echo 'export PATH="$HOME/bin:$PATH"' >> ~/.zshrc
|
||||||
|
|
||||||
# Reinstall
|
# Reinstall
|
||||||
bash install.sh
|
bash install.sh
|
||||||
@@ -392,71 +315,6 @@ cat ~/.claude/installed_modules.json
|
|||||||
python3 install.py --module dev --force
|
python3 install.py --module dev --force
|
||||||
```
|
```
|
||||||
|
|
||||||
### Version Compatibility Issues
|
|
||||||
|
|
||||||
**Backend CLI not found:**
|
|
||||||
```bash
|
|
||||||
# Check if backend CLIs are installed
|
|
||||||
which codex
|
|
||||||
which claude
|
|
||||||
which gemini
|
|
||||||
|
|
||||||
# Install missing backends
|
|
||||||
# Codex: Follow installation instructions at https://codex.docs
|
|
||||||
# Claude: Follow installation instructions at https://claude.ai/docs
|
|
||||||
# Gemini: Follow installation instructions at https://ai.google.dev/docs
|
|
||||||
```
|
|
||||||
|
|
||||||
**Unsupported CLI flags:**
|
|
||||||
```bash
|
|
||||||
# If you see errors like "unknown flag" or "invalid option"
|
|
||||||
|
|
||||||
# Check backend CLI version
|
|
||||||
codex --version
|
|
||||||
claude --version
|
|
||||||
gemini --version
|
|
||||||
|
|
||||||
# For Codex: Ensure it supports `e`, `--skip-git-repo-check`, `--json`, `-C`, and `resume`
|
|
||||||
# For Claude: Ensure it supports `--output-format stream-json`, `--setting-sources`, `-r`
|
|
||||||
# For Gemini: Ensure it supports `-o stream-json`, `-y`, `-r`, `-p`
|
|
||||||
|
|
||||||
# Update your backend CLI to the latest version if needed
|
|
||||||
```
|
|
||||||
|
|
||||||
**JSON parsing errors:**
|
|
||||||
```bash
|
|
||||||
# If you see "failed to parse JSON output" errors
|
|
||||||
|
|
||||||
# Verify the backend outputs stream-json format
|
|
||||||
codex e --json "test task" # Should output newline-delimited JSON
|
|
||||||
claude --output-format stream-json -p "test" # Should output stream JSON
|
|
||||||
|
|
||||||
# If not, your backend CLI version may be too old or incompatible
|
|
||||||
```
|
|
||||||
|
|
||||||
**Infinite recursion with Claude backend:**
|
|
||||||
```bash
|
|
||||||
# The wrapper prevents this with `--setting-sources ""` flag
|
|
||||||
# If you still see recursion, ensure your Claude CLI supports this flag
|
|
||||||
|
|
||||||
claude --help | grep "setting-sources"
|
|
||||||
|
|
||||||
# If flag is not supported, upgrade Claude CLI
|
|
||||||
```
|
|
||||||
|
|
||||||
**Session resume failures:**
|
|
||||||
```bash
|
|
||||||
# Check if session ID is valid
|
|
||||||
codex history # List recent sessions
|
|
||||||
claude history
|
|
||||||
|
|
||||||
# Ensure backend CLI supports session resumption
|
|
||||||
codex resume <session_id> "test" # Should continue from previous session
|
|
||||||
claude -r <session_id> "test"
|
|
||||||
|
|
||||||
# If not supported, use new sessions instead of resume mode
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|||||||
36
README_CN.md
36
README_CN.md
@@ -152,39 +152,15 @@ python3 install.py --force
|
|||||||
|
|
||||||
```
|
```
|
||||||
~/.claude/
|
~/.claude/
|
||||||
├── bin/
|
├── CLAUDE.md # 核心指令和角色定义
|
||||||
│ └── codeagent-wrapper # 主可执行文件
|
├── commands/ # 斜杠命令 (/dev, /code 等)
|
||||||
├── CLAUDE.md # 核心指令和角色定义
|
├── agents/ # 智能体定义
|
||||||
├── commands/ # 斜杠命令 (/dev, /code 等)
|
|
||||||
├── agents/ # 智能体定义
|
|
||||||
├── skills/
|
├── skills/
|
||||||
│ └── codex/
|
│ └── codex/
|
||||||
│ └── SKILL.md # Codex 集成技能
|
│ └── SKILL.md # Codex 集成技能
|
||||||
├── config.json # 配置文件
|
└── installed_modules.json # 安装状态
|
||||||
└── installed_modules.json # 安装状态
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### 自定义安装目录
|
|
||||||
|
|
||||||
默认情况下,myclaude 安装到 `~/.claude`。您可以使用 `INSTALL_DIR` 环境变量自定义安装目录:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 安装到自定义目录
|
|
||||||
INSTALL_DIR=/opt/myclaude bash install.sh
|
|
||||||
|
|
||||||
# 相应更新您的 PATH
|
|
||||||
export PATH="/opt/myclaude/bin:$PATH"
|
|
||||||
```
|
|
||||||
|
|
||||||
**目录结构:**
|
|
||||||
- `$INSTALL_DIR/bin/` - codeagent-wrapper 可执行文件
|
|
||||||
- `$INSTALL_DIR/skills/` - 技能定义
|
|
||||||
- `$INSTALL_DIR/config.json` - 配置文件
|
|
||||||
- `$INSTALL_DIR/commands/` - 斜杠命令定义
|
|
||||||
- `$INSTALL_DIR/agents/` - 智能体定义
|
|
||||||
|
|
||||||
**注意:** 使用自定义安装目录时,请确保将 `$INSTALL_DIR/bin` 添加到您的 `PATH` 环境变量中。
|
|
||||||
|
|
||||||
### 配置
|
### 配置
|
||||||
|
|
||||||
编辑 `config.json` 自定义:
|
编辑 `config.json` 自定义:
|
||||||
@@ -308,7 +284,7 @@ setx PATH "%USERPROFILE%\bin;%PATH%"
|
|||||||
**Codex wrapper 未找到:**
|
**Codex wrapper 未找到:**
|
||||||
```bash
|
```bash
|
||||||
# 检查 PATH
|
# 检查 PATH
|
||||||
echo $PATH | grep -q "$HOME/.claude/bin" || echo 'export PATH="$HOME/.claude/bin:$PATH"' >> ~/.zshrc
|
echo $PATH | grep -q "$HOME/bin" || echo 'export PATH="$HOME/bin:$PATH"' >> ~/.zshrc
|
||||||
|
|
||||||
# 重新安装
|
# 重新安装
|
||||||
bash install.sh
|
bash install.sh
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Backend defines the contract for invoking different AI CLI backends.
|
// Backend defines the contract for invoking different AI CLI backends.
|
||||||
// Each backend is responsible for supplying the executable command and
|
// Each backend is responsible for supplying the executable command and
|
||||||
// building the argument list based on the wrapper config.
|
// building the argument list based on the wrapper config.
|
||||||
@@ -32,62 +26,15 @@ func (ClaudeBackend) Command() string {
|
|||||||
return "claude"
|
return "claude"
|
||||||
}
|
}
|
||||||
func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
||||||
return buildClaudeArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
const maxClaudeSettingsBytes = 1 << 20 // 1MB
|
|
||||||
|
|
||||||
// loadMinimalEnvSettings 从 ~/.claude/settings.json 只提取 env 配置。
|
|
||||||
// 只接受字符串类型的值;文件缺失/解析失败/超限都返回空。
|
|
||||||
func loadMinimalEnvSettings() map[string]string {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || home == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
settingPath := filepath.Join(home, ".claude", "settings.json")
|
|
||||||
info, err := os.Stat(settingPath)
|
|
||||||
if err != nil || info.Size() > maxClaudeSettingsBytes {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(settingPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var cfg struct {
|
|
||||||
Env map[string]any `json:"env"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if len(cfg.Env) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
env := make(map[string]string, len(cfg.Env))
|
|
||||||
for k, v := range cfg.Env {
|
|
||||||
s, ok := v.(string)
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
env[k] = s
|
|
||||||
}
|
|
||||||
if len(env) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildClaudeArgs(cfg *Config, targetArg string) []string {
|
|
||||||
if cfg == nil {
|
if cfg == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
args := []string{"-p"}
|
args := []string{"-p", "--dangerously-skip-permissions"}
|
||||||
if cfg.SkipPermissions {
|
|
||||||
args = append(args, "--dangerously-skip-permissions")
|
// Only skip permissions when explicitly requested
|
||||||
}
|
// if cfg.SkipPermissions {
|
||||||
|
// args = append(args, "--dangerously-skip-permissions")
|
||||||
|
// }
|
||||||
|
|
||||||
// Prevent infinite recursion: disable all setting sources (user, project, local)
|
// Prevent infinite recursion: disable all setting sources (user, project, local)
|
||||||
// This ensures a clean execution environment without CLAUDE.md or skills that would trigger codeagent
|
// This ensures a clean execution environment without CLAUDE.md or skills that would trigger codeagent
|
||||||
@@ -113,10 +60,6 @@ func (GeminiBackend) Command() string {
|
|||||||
return "gemini"
|
return "gemini"
|
||||||
}
|
}
|
||||||
func (GeminiBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
func (GeminiBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
||||||
return buildGeminiArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildGeminiArgs(cfg *Config, targetArg string) []string {
|
|
||||||
if cfg == nil {
|
if cfg == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@@ -11,16 +8,16 @@ import (
|
|||||||
func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
||||||
backend := ClaudeBackend{}
|
backend := ClaudeBackend{}
|
||||||
|
|
||||||
t.Run("new mode omits skip-permissions by default", func(t *testing.T) {
|
t.Run("new mode uses workdir without skip by default", func(t *testing.T) {
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/repo"}
|
cfg := &Config{Mode: "new", WorkDir: "/repo"}
|
||||||
got := backend.BuildArgs(cfg, "todo")
|
got := backend.BuildArgs(cfg, "todo")
|
||||||
want := []string{"-p", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
||||||
if !reflect.DeepEqual(got, want) {
|
if !reflect.DeepEqual(got, want) {
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("new mode can opt-in skip-permissions", func(t *testing.T) {
|
t.Run("new mode opt-in skip permissions with default workdir", func(t *testing.T) {
|
||||||
cfg := &Config{Mode: "new", SkipPermissions: true}
|
cfg := &Config{Mode: "new", SkipPermissions: true}
|
||||||
got := backend.BuildArgs(cfg, "-")
|
got := backend.BuildArgs(cfg, "-")
|
||||||
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "-"}
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "-"}
|
||||||
@@ -29,10 +26,10 @@ func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("resume mode includes session id", func(t *testing.T) {
|
t.Run("resume mode uses session id and omits workdir", func(t *testing.T) {
|
||||||
cfg := &Config{Mode: "resume", SessionID: "sid-123", WorkDir: "/ignored"}
|
cfg := &Config{Mode: "resume", SessionID: "sid-123", WorkDir: "/ignored"}
|
||||||
got := backend.BuildArgs(cfg, "resume-task")
|
got := backend.BuildArgs(cfg, "resume-task")
|
||||||
want := []string{"-p", "--setting-sources", "", "-r", "sid-123", "--output-format", "stream-json", "--verbose", "resume-task"}
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "-r", "sid-123", "--output-format", "stream-json", "--verbose", "resume-task"}
|
||||||
if !reflect.DeepEqual(got, want) {
|
if !reflect.DeepEqual(got, want) {
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
}
|
}
|
||||||
@@ -41,16 +38,7 @@ func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
|||||||
t.Run("resume mode without session still returns base flags", func(t *testing.T) {
|
t.Run("resume mode without session still returns base flags", func(t *testing.T) {
|
||||||
cfg := &Config{Mode: "resume", WorkDir: "/ignored"}
|
cfg := &Config{Mode: "resume", WorkDir: "/ignored"}
|
||||||
got := backend.BuildArgs(cfg, "follow-up")
|
got := backend.BuildArgs(cfg, "follow-up")
|
||||||
want := []string{"-p", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "follow-up"}
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "follow-up"}
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("resume mode can opt-in skip permissions", func(t *testing.T) {
|
|
||||||
cfg := &Config{Mode: "resume", SessionID: "sid-123", SkipPermissions: true}
|
|
||||||
got := backend.BuildArgs(cfg, "resume-task")
|
|
||||||
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "-r", "sid-123", "--output-format", "stream-json", "--verbose", "resume-task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
if !reflect.DeepEqual(got, want) {
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
}
|
}
|
||||||
@@ -101,11 +89,7 @@ func TestClaudeBuildArgs_GeminiAndCodexModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("codex build args omits bypass flag by default", func(t *testing.T) {
|
t.Run("codex build args passthrough remains intact", func(t *testing.T) {
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Unsetenv(key)
|
|
||||||
|
|
||||||
backend := CodexBackend{}
|
backend := CodexBackend{}
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/tmp"}
|
cfg := &Config{Mode: "new", WorkDir: "/tmp"}
|
||||||
got := backend.BuildArgs(cfg, "task")
|
got := backend.BuildArgs(cfg, "task")
|
||||||
@@ -114,20 +98,6 @@ func TestClaudeBuildArgs_GeminiAndCodexModes(t *testing.T) {
|
|||||||
t.Fatalf("got %v, want %v", got, want)
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("codex build args includes bypass flag when enabled", func(t *testing.T) {
|
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Setenv(key, "true")
|
|
||||||
|
|
||||||
backend := CodexBackend{}
|
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/tmp"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"e", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "-C", "/tmp", "--json", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClaudeBuildArgs_BackendMetadata(t *testing.T) {
|
func TestClaudeBuildArgs_BackendMetadata(t *testing.T) {
|
||||||
@@ -150,64 +120,3 @@ func TestClaudeBuildArgs_BackendMetadata(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadMinimalEnvSettings(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
t.Run("missing file returns empty", func(t *testing.T) {
|
|
||||||
if got := loadMinimalEnvSettings(); len(got) != 0 {
|
|
||||||
t.Fatalf("got %v, want empty", got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("valid env returns string map", func(t *testing.T) {
|
|
||||||
dir := filepath.Join(home, ".claude")
|
|
||||||
if err := os.MkdirAll(dir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
path := filepath.Join(dir, "settings.json")
|
|
||||||
data := []byte(`{"env":{"ANTHROPIC_API_KEY":"secret","FOO":"bar"}}`)
|
|
||||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got := loadMinimalEnvSettings()
|
|
||||||
if got["ANTHROPIC_API_KEY"] != "secret" || got["FOO"] != "bar" {
|
|
||||||
t.Fatalf("got %v, want keys present", got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("non-string values are ignored", func(t *testing.T) {
|
|
||||||
dir := filepath.Join(home, ".claude")
|
|
||||||
path := filepath.Join(dir, "settings.json")
|
|
||||||
data := []byte(`{"env":{"GOOD":"ok","BAD":123,"ALSO_BAD":true}}`)
|
|
||||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got := loadMinimalEnvSettings()
|
|
||||||
if got["GOOD"] != "ok" {
|
|
||||||
t.Fatalf("got %v, want GOOD=ok", got)
|
|
||||||
}
|
|
||||||
if _, ok := got["BAD"]; ok {
|
|
||||||
t.Fatalf("got %v, want BAD omitted", got)
|
|
||||||
}
|
|
||||||
if _, ok := got["ALSO_BAD"]; ok {
|
|
||||||
t.Fatalf("got %v, want ALSO_BAD omitted", got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("oversized file returns empty", func(t *testing.T) {
|
|
||||||
dir := filepath.Join(home, ".claude")
|
|
||||||
path := filepath.Join(dir, "settings.json")
|
|
||||||
data := bytes.Repeat([]byte("a"), maxClaudeSettingsBytes+1)
|
|
||||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
if got := loadMinimalEnvSettings(); len(got) != 0 {
|
|
||||||
t.Fatalf("got %v, want empty", got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -13,16 +13,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func stripTimestampPrefix(line string) string {
|
|
||||||
if !strings.HasPrefix(line, "[") {
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
if idx := strings.Index(line, "] "); idx >= 0 {
|
|
||||||
return line[idx+2:]
|
|
||||||
}
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
|
|
||||||
// TestConcurrentStressLogger 高并发压力测试
|
// TestConcurrentStressLogger 高并发压力测试
|
||||||
func TestConcurrentStressLogger(t *testing.T) {
|
func TestConcurrentStressLogger(t *testing.T) {
|
||||||
if testing.Short() {
|
if testing.Short() {
|
||||||
@@ -89,8 +79,7 @@ func TestConcurrentStressLogger(t *testing.T) {
|
|||||||
// 验证日志格式(纯文本,无前缀)
|
// 验证日志格式(纯文本,无前缀)
|
||||||
formatRE := regexp.MustCompile(`^goroutine-\d+-msg-\d+$`)
|
formatRE := regexp.MustCompile(`^goroutine-\d+-msg-\d+$`)
|
||||||
for i, line := range lines[:min(10, len(lines))] {
|
for i, line := range lines[:min(10, len(lines))] {
|
||||||
msg := stripTimestampPrefix(line)
|
if !formatRE.MatchString(line) {
|
||||||
if !formatRE.MatchString(msg) {
|
|
||||||
t.Errorf("line %d has invalid format: %s", i, line)
|
t.Errorf("line %d has invalid format: %s", i, line)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -302,7 +291,7 @@ func TestLoggerOrderPreservation(t *testing.T) {
|
|||||||
sequences := make(map[int][]int) // goroutine ID -> sequence numbers
|
sequences := make(map[int][]int) // goroutine ID -> sequence numbers
|
||||||
|
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
line := stripTimestampPrefix(scanner.Text())
|
line := scanner.Text()
|
||||||
var gid, seq int
|
var gid, seq int
|
||||||
// Parse format: G0-SEQ0001 (without INFO: prefix)
|
// Parse format: G0-SEQ0001 (without INFO: prefix)
|
||||||
_, err := fmt.Sscanf(line, "G%d-SEQ%04d", &gid, &seq)
|
_, err := fmt.Sscanf(line, "G%d-SEQ%04d", &gid, &seq)
|
||||||
|
|||||||
@@ -49,15 +49,7 @@ type TaskResult struct {
|
|||||||
SessionID string `json:"session_id"`
|
SessionID string `json:"session_id"`
|
||||||
Error string `json:"error"`
|
Error string `json:"error"`
|
||||||
LogPath string `json:"log_path"`
|
LogPath string `json:"log_path"`
|
||||||
// Structured report fields
|
sharedLog bool
|
||||||
Coverage string `json:"coverage,omitempty"` // extracted coverage percentage (e.g., "92%")
|
|
||||||
CoverageNum float64 `json:"coverage_num,omitempty"` // numeric coverage for comparison
|
|
||||||
CoverageTarget float64 `json:"coverage_target,omitempty"` // target coverage (default 90)
|
|
||||||
FilesChanged []string `json:"files_changed,omitempty"` // list of changed files
|
|
||||||
KeyOutput string `json:"key_output,omitempty"` // brief summary of what was done
|
|
||||||
TestsPassed int `json:"tests_passed,omitempty"` // number of tests passed
|
|
||||||
TestsFailed int `json:"tests_failed,omitempty"` // number of tests failed
|
|
||||||
sharedLog bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var backendRegistry = map[string]Backend{
|
var backendRegistry = map[string]Backend{
|
||||||
@@ -172,9 +164,6 @@ func parseParallelConfig(data []byte) (*ParallelConfig, error) {
|
|||||||
if content == "" {
|
if content == "" {
|
||||||
return nil, fmt.Errorf("task block #%d (%q) missing content", taskIndex, task.ID)
|
return nil, fmt.Errorf("task block #%d (%q) missing content", taskIndex, task.ID)
|
||||||
}
|
}
|
||||||
if task.Mode == "resume" && strings.TrimSpace(task.SessionID) == "" {
|
|
||||||
return nil, fmt.Errorf("task block #%d (%q) has empty session_id", taskIndex, task.ID)
|
|
||||||
}
|
|
||||||
if _, exists := seen[task.ID]; exists {
|
if _, exists := seen[task.ID]; exists {
|
||||||
return nil, fmt.Errorf("task block #%d has duplicate id: %s", taskIndex, task.ID)
|
return nil, fmt.Errorf("task block #%d has duplicate id: %s", taskIndex, task.ID)
|
||||||
}
|
}
|
||||||
@@ -243,10 +232,7 @@ func parseArgs() (*Config, error) {
|
|||||||
return nil, fmt.Errorf("resume mode requires: resume <session_id> <task>")
|
return nil, fmt.Errorf("resume mode requires: resume <session_id> <task>")
|
||||||
}
|
}
|
||||||
cfg.Mode = "resume"
|
cfg.Mode = "resume"
|
||||||
cfg.SessionID = strings.TrimSpace(args[1])
|
cfg.SessionID = args[1]
|
||||||
if cfg.SessionID == "" {
|
|
||||||
return nil, fmt.Errorf("resume mode requires non-empty session_id")
|
|
||||||
}
|
|
||||||
cfg.Task = args[2]
|
cfg.Task = args[2]
|
||||||
cfg.ExplicitStdin = (args[2] == "-")
|
cfg.ExplicitStdin = (args[2] == "-")
|
||||||
if len(args) > 3 {
|
if len(args) > 3 {
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
const postMessageTerminateDelay = 1 * time.Second
|
|
||||||
|
|
||||||
// commandRunner abstracts exec.Cmd for testability
|
// commandRunner abstracts exec.Cmd for testability
|
||||||
type commandRunner interface {
|
type commandRunner interface {
|
||||||
Start() error
|
Start() error
|
||||||
@@ -26,7 +24,6 @@ type commandRunner interface {
|
|||||||
StdinPipe() (io.WriteCloser, error)
|
StdinPipe() (io.WriteCloser, error)
|
||||||
SetStderr(io.Writer)
|
SetStderr(io.Writer)
|
||||||
SetDir(string)
|
SetDir(string)
|
||||||
SetEnv(env map[string]string)
|
|
||||||
Process() processHandle
|
Process() processHandle
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,52 +79,6 @@ func (r *realCmd) SetDir(dir string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *realCmd) SetEnv(env map[string]string) {
|
|
||||||
if r == nil || r.cmd == nil || len(env) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
merged := make(map[string]string, len(env)+len(os.Environ()))
|
|
||||||
for _, kv := range os.Environ() {
|
|
||||||
if kv == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
idx := strings.IndexByte(kv, '=')
|
|
||||||
if idx <= 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
merged[kv[:idx]] = kv[idx+1:]
|
|
||||||
}
|
|
||||||
for _, kv := range r.cmd.Env {
|
|
||||||
if kv == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
idx := strings.IndexByte(kv, '=')
|
|
||||||
if idx <= 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
merged[kv[:idx]] = kv[idx+1:]
|
|
||||||
}
|
|
||||||
for k, v := range env {
|
|
||||||
if strings.TrimSpace(k) == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
merged[k] = v
|
|
||||||
}
|
|
||||||
|
|
||||||
keys := make([]string, 0, len(merged))
|
|
||||||
for k := range merged {
|
|
||||||
keys = append(keys, k)
|
|
||||||
}
|
|
||||||
sort.Strings(keys)
|
|
||||||
|
|
||||||
out := make([]string, 0, len(keys))
|
|
||||||
for _, k := range keys {
|
|
||||||
out = append(out, k+"="+merged[k])
|
|
||||||
}
|
|
||||||
r.cmd.Env = out
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *realCmd) Process() processHandle {
|
func (r *realCmd) Process() processHandle {
|
||||||
if r == nil || r.cmd == nil || r.cmd.Process == nil {
|
if r == nil || r.cmd == nil || r.cmd.Process == nil {
|
||||||
return nil
|
return nil
|
||||||
@@ -511,255 +462,68 @@ func shouldSkipTask(task TaskSpec, failed map[string]TaskResult) (bool, string)
|
|||||||
return true, fmt.Sprintf("skipped due to failed dependencies: %s", strings.Join(blocked, ","))
|
return true, fmt.Sprintf("skipped due to failed dependencies: %s", strings.Join(blocked, ","))
|
||||||
}
|
}
|
||||||
|
|
||||||
// getStatusSymbols returns status symbols based on ASCII mode.
|
|
||||||
func getStatusSymbols() (success, warning, failed string) {
|
|
||||||
if os.Getenv("CODEAGENT_ASCII_MODE") == "true" {
|
|
||||||
return "PASS", "WARN", "FAIL"
|
|
||||||
}
|
|
||||||
return "✓", "⚠️", "✗"
|
|
||||||
}
|
|
||||||
|
|
||||||
func generateFinalOutput(results []TaskResult) string {
|
func generateFinalOutput(results []TaskResult) string {
|
||||||
return generateFinalOutputWithMode(results, true) // default to summary mode
|
|
||||||
}
|
|
||||||
|
|
||||||
// generateFinalOutputWithMode generates output based on mode
|
|
||||||
// summaryOnly=true: structured report - every token has value
|
|
||||||
// summaryOnly=false: full output with complete messages (legacy behavior)
|
|
||||||
func generateFinalOutputWithMode(results []TaskResult, summaryOnly bool) string {
|
|
||||||
var sb strings.Builder
|
var sb strings.Builder
|
||||||
successSymbol, warningSymbol, failedSymbol := getStatusSymbols()
|
|
||||||
|
|
||||||
reportCoverageTarget := defaultCoverageTarget
|
|
||||||
for _, res := range results {
|
|
||||||
if res.CoverageTarget > 0 {
|
|
||||||
reportCoverageTarget = res.CoverageTarget
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Count results by status
|
|
||||||
success := 0
|
success := 0
|
||||||
failed := 0
|
failed := 0
|
||||||
belowTarget := 0
|
|
||||||
for _, res := range results {
|
for _, res := range results {
|
||||||
if res.ExitCode == 0 && res.Error == "" {
|
if res.ExitCode == 0 && res.Error == "" {
|
||||||
success++
|
success++
|
||||||
target := res.CoverageTarget
|
|
||||||
if target <= 0 {
|
|
||||||
target = reportCoverageTarget
|
|
||||||
}
|
|
||||||
if res.Coverage != "" && target > 0 && res.CoverageNum < target {
|
|
||||||
belowTarget++
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
failed++
|
failed++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if summaryOnly {
|
sb.WriteString(fmt.Sprintf("=== Parallel Execution Summary ===\n"))
|
||||||
// Header
|
sb.WriteString(fmt.Sprintf("Total: %d | Success: %d | Failed: %d\n\n", len(results), success, failed))
|
||||||
sb.WriteString("=== Execution Report ===\n")
|
|
||||||
sb.WriteString(fmt.Sprintf("%d tasks | %d passed | %d failed", len(results), success, failed))
|
for _, res := range results {
|
||||||
if belowTarget > 0 {
|
sb.WriteString(fmt.Sprintf("--- Task: %s ---\n", res.TaskID))
|
||||||
sb.WriteString(fmt.Sprintf(" | %d below %.0f%%", belowTarget, reportCoverageTarget))
|
if res.Error != "" {
|
||||||
|
sb.WriteString(fmt.Sprintf("Status: FAILED (exit code %d)\nError: %s\n", res.ExitCode, res.Error))
|
||||||
|
} else if res.ExitCode != 0 {
|
||||||
|
sb.WriteString(fmt.Sprintf("Status: FAILED (exit code %d)\n", res.ExitCode))
|
||||||
|
} else {
|
||||||
|
sb.WriteString("Status: SUCCESS\n")
|
||||||
}
|
}
|
||||||
sb.WriteString("\n\n")
|
if res.SessionID != "" {
|
||||||
|
sb.WriteString(fmt.Sprintf("Session: %s\n", res.SessionID))
|
||||||
// Task Results - each task gets: Did + Files + Tests + Coverage
|
}
|
||||||
sb.WriteString("## Task Results\n")
|
if res.LogPath != "" {
|
||||||
|
if res.sharedLog {
|
||||||
for _, res := range results {
|
sb.WriteString(fmt.Sprintf("Log: %s (shared)\n", res.LogPath))
|
||||||
taskID := sanitizeOutput(res.TaskID)
|
|
||||||
coverage := sanitizeOutput(res.Coverage)
|
|
||||||
keyOutput := sanitizeOutput(res.KeyOutput)
|
|
||||||
logPath := sanitizeOutput(res.LogPath)
|
|
||||||
filesChanged := sanitizeOutput(strings.Join(res.FilesChanged, ", "))
|
|
||||||
|
|
||||||
target := res.CoverageTarget
|
|
||||||
if target <= 0 {
|
|
||||||
target = reportCoverageTarget
|
|
||||||
}
|
|
||||||
|
|
||||||
isSuccess := res.ExitCode == 0 && res.Error == ""
|
|
||||||
isBelowTarget := isSuccess && coverage != "" && target > 0 && res.CoverageNum < target
|
|
||||||
|
|
||||||
if isSuccess && !isBelowTarget {
|
|
||||||
// Passed task: one block with Did/Files/Tests
|
|
||||||
sb.WriteString(fmt.Sprintf("\n### %s %s", taskID, successSymbol))
|
|
||||||
if coverage != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf(" %s", coverage))
|
|
||||||
}
|
|
||||||
sb.WriteString("\n")
|
|
||||||
|
|
||||||
if keyOutput != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Did: %s\n", keyOutput))
|
|
||||||
}
|
|
||||||
if len(res.FilesChanged) > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("Files: %s\n", filesChanged))
|
|
||||||
}
|
|
||||||
if res.TestsPassed > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("Tests: %d passed\n", res.TestsPassed))
|
|
||||||
}
|
|
||||||
if logPath != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Log: %s\n", logPath))
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if isSuccess && isBelowTarget {
|
|
||||||
// Below target: add Gap info
|
|
||||||
sb.WriteString(fmt.Sprintf("\n### %s %s %s (below %.0f%%)\n", taskID, warningSymbol, coverage, target))
|
|
||||||
|
|
||||||
if keyOutput != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Did: %s\n", keyOutput))
|
|
||||||
}
|
|
||||||
if len(res.FilesChanged) > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("Files: %s\n", filesChanged))
|
|
||||||
}
|
|
||||||
if res.TestsPassed > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("Tests: %d passed\n", res.TestsPassed))
|
|
||||||
}
|
|
||||||
// Extract what's missing from coverage
|
|
||||||
gap := sanitizeOutput(extractCoverageGap(res.Message))
|
|
||||||
if gap != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Gap: %s\n", gap))
|
|
||||||
}
|
|
||||||
if logPath != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Log: %s\n", logPath))
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Failed task: show error detail
|
sb.WriteString(fmt.Sprintf("Log: %s\n", res.LogPath))
|
||||||
sb.WriteString(fmt.Sprintf("\n### %s %s FAILED\n", taskID, failedSymbol))
|
|
||||||
sb.WriteString(fmt.Sprintf("Exit code: %d\n", res.ExitCode))
|
|
||||||
if errText := sanitizeOutput(res.Error); errText != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Error: %s\n", errText))
|
|
||||||
}
|
|
||||||
// Show context from output (last meaningful lines)
|
|
||||||
detail := sanitizeOutput(extractErrorDetail(res.Message, 300))
|
|
||||||
if detail != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Detail: %s\n", detail))
|
|
||||||
}
|
|
||||||
if logPath != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Log: %s\n", logPath))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if res.Message != "" {
|
||||||
// Summary section
|
sb.WriteString(fmt.Sprintf("\n%s\n", res.Message))
|
||||||
sb.WriteString("\n## Summary\n")
|
|
||||||
sb.WriteString(fmt.Sprintf("- %d/%d completed successfully\n", success, len(results)))
|
|
||||||
|
|
||||||
if belowTarget > 0 || failed > 0 {
|
|
||||||
var needFix []string
|
|
||||||
var needCoverage []string
|
|
||||||
for _, res := range results {
|
|
||||||
if res.ExitCode != 0 || res.Error != "" {
|
|
||||||
taskID := sanitizeOutput(res.TaskID)
|
|
||||||
reason := sanitizeOutput(res.Error)
|
|
||||||
if reason == "" && res.ExitCode != 0 {
|
|
||||||
reason = fmt.Sprintf("exit code %d", res.ExitCode)
|
|
||||||
}
|
|
||||||
reason = safeTruncate(reason, 50)
|
|
||||||
needFix = append(needFix, fmt.Sprintf("%s (%s)", taskID, reason))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
target := res.CoverageTarget
|
|
||||||
if target <= 0 {
|
|
||||||
target = reportCoverageTarget
|
|
||||||
}
|
|
||||||
if res.Coverage != "" && target > 0 && res.CoverageNum < target {
|
|
||||||
needCoverage = append(needCoverage, sanitizeOutput(res.TaskID))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(needFix) > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("- Fix: %s\n", strings.Join(needFix, ", ")))
|
|
||||||
}
|
|
||||||
if len(needCoverage) > 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("- Coverage: %s\n", strings.Join(needCoverage, ", ")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// Legacy full output mode
|
|
||||||
sb.WriteString("=== Parallel Execution Summary ===\n")
|
|
||||||
sb.WriteString(fmt.Sprintf("Total: %d | Success: %d | Failed: %d\n\n", len(results), success, failed))
|
|
||||||
|
|
||||||
for _, res := range results {
|
|
||||||
taskID := sanitizeOutput(res.TaskID)
|
|
||||||
sb.WriteString(fmt.Sprintf("--- Task: %s ---\n", taskID))
|
|
||||||
if res.Error != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Status: FAILED (exit code %d)\nError: %s\n", res.ExitCode, sanitizeOutput(res.Error)))
|
|
||||||
} else if res.ExitCode != 0 {
|
|
||||||
sb.WriteString(fmt.Sprintf("Status: FAILED (exit code %d)\n", res.ExitCode))
|
|
||||||
} else {
|
|
||||||
sb.WriteString("Status: SUCCESS\n")
|
|
||||||
}
|
|
||||||
if res.Coverage != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Coverage: %s\n", sanitizeOutput(res.Coverage)))
|
|
||||||
}
|
|
||||||
if res.SessionID != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("Session: %s\n", sanitizeOutput(res.SessionID)))
|
|
||||||
}
|
|
||||||
if res.LogPath != "" {
|
|
||||||
logPath := sanitizeOutput(res.LogPath)
|
|
||||||
if res.sharedLog {
|
|
||||||
sb.WriteString(fmt.Sprintf("Log: %s (shared)\n", logPath))
|
|
||||||
} else {
|
|
||||||
sb.WriteString(fmt.Sprintf("Log: %s\n", logPath))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if res.Message != "" {
|
|
||||||
message := sanitizeOutput(res.Message)
|
|
||||||
if message != "" {
|
|
||||||
sb.WriteString(fmt.Sprintf("\n%s\n", message))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sb.WriteString("\n")
|
|
||||||
}
|
}
|
||||||
|
sb.WriteString("\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
return sb.String()
|
return sb.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildCodexArgs(cfg *Config, targetArg string) []string {
|
func buildCodexArgs(cfg *Config, targetArg string) []string {
|
||||||
if cfg == nil {
|
if cfg.Mode == "resume" {
|
||||||
panic("buildCodexArgs: nil config")
|
return []string{
|
||||||
}
|
"e",
|
||||||
|
"--skip-git-repo-check",
|
||||||
var resumeSessionID string
|
|
||||||
isResume := cfg.Mode == "resume"
|
|
||||||
if isResume {
|
|
||||||
resumeSessionID = strings.TrimSpace(cfg.SessionID)
|
|
||||||
if resumeSessionID == "" {
|
|
||||||
logError("invalid config: resume mode requires non-empty session_id")
|
|
||||||
isResume = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
args := []string{"e"}
|
|
||||||
|
|
||||||
if envFlagEnabled("CODEX_BYPASS_SANDBOX") {
|
|
||||||
logWarn("CODEX_BYPASS_SANDBOX=true: running without approval/sandbox protection")
|
|
||||||
args = append(args, "--dangerously-bypass-approvals-and-sandbox")
|
|
||||||
}
|
|
||||||
|
|
||||||
args = append(args, "--skip-git-repo-check")
|
|
||||||
|
|
||||||
if isResume {
|
|
||||||
return append(args,
|
|
||||||
"--json",
|
"--json",
|
||||||
"resume",
|
"resume",
|
||||||
resumeSessionID,
|
cfg.SessionID,
|
||||||
targetArg,
|
targetArg,
|
||||||
)
|
}
|
||||||
}
|
}
|
||||||
|
return []string{
|
||||||
return append(args,
|
"e",
|
||||||
|
"--skip-git-repo-check",
|
||||||
"-C", cfg.WorkDir,
|
"-C", cfg.WorkDir,
|
||||||
"--json",
|
"--json",
|
||||||
targetArg,
|
targetArg,
|
||||||
)
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func runCodexTask(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
func runCodexTask(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
||||||
@@ -810,12 +574,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
cfg.WorkDir = defaultWorkdir
|
cfg.WorkDir = defaultWorkdir
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.Mode == "resume" && strings.TrimSpace(cfg.SessionID) == "" {
|
|
||||||
result.ExitCode = 1
|
|
||||||
result.Error = "resume mode requires non-empty session_id"
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
useStdin := taskSpec.UseStdin
|
useStdin := taskSpec.UseStdin
|
||||||
targetArg := taskSpec.Task
|
targetArg := taskSpec.Task
|
||||||
if useStdin {
|
if useStdin {
|
||||||
@@ -915,12 +673,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
|
|
||||||
cmd := newCommandRunner(ctx, commandName, codexArgs...)
|
cmd := newCommandRunner(ctx, commandName, codexArgs...)
|
||||||
|
|
||||||
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
|
// For backends that don't support -C flag (claude, gemini), set working directory via cmd.Dir
|
||||||
// Codex passes workdir via -C flag, so we skip setting Dir for it to avoid conflicts
|
// Codex passes workdir via -C flag, so we skip setting Dir for it to avoid conflicts
|
||||||
if cfg.Mode != "resume" && commandName != "codex" && cfg.WorkDir != "" {
|
if cfg.Mode != "resume" && commandName != "codex" && cfg.WorkDir != "" {
|
||||||
@@ -977,7 +729,6 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
// Start parse goroutine BEFORE starting the command to avoid race condition
|
// Start parse goroutine BEFORE starting the command to avoid race condition
|
||||||
// where fast-completing commands close stdout before parser starts reading
|
// where fast-completing commands close stdout before parser starts reading
|
||||||
messageSeen := make(chan struct{}, 1)
|
messageSeen := make(chan struct{}, 1)
|
||||||
completeSeen := make(chan struct{}, 1)
|
|
||||||
parseCh := make(chan parseResult, 1)
|
parseCh := make(chan parseResult, 1)
|
||||||
go func() {
|
go func() {
|
||||||
msg, tid := parseJSONStreamInternal(stdoutReader, logWarnFn, logInfoFn, func() {
|
msg, tid := parseJSONStreamInternal(stdoutReader, logWarnFn, logInfoFn, func() {
|
||||||
@@ -985,16 +736,7 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
case messageSeen <- struct{}{}:
|
case messageSeen <- struct{}{}:
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
}, func() {
|
|
||||||
select {
|
|
||||||
case completeSeen <- struct{}{}:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
select {
|
|
||||||
case completeSeen <- struct{}{}:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
parseCh <- parseResult{message: msg, threadID: tid}
|
parseCh <- parseResult{message: msg, threadID: tid}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -1031,63 +773,17 @@ func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
waitCh := make(chan error, 1)
|
waitCh := make(chan error, 1)
|
||||||
go func() { waitCh <- cmd.Wait() }()
|
go func() { waitCh <- cmd.Wait() }()
|
||||||
|
|
||||||
var (
|
var waitErr error
|
||||||
waitErr error
|
var forceKillTimer *forceKillTimer
|
||||||
forceKillTimer *forceKillTimer
|
var ctxCancelled bool
|
||||||
ctxCancelled bool
|
|
||||||
messageTimer *time.Timer
|
|
||||||
messageTimerCh <-chan time.Time
|
|
||||||
forcedAfterComplete bool
|
|
||||||
terminated bool
|
|
||||||
messageSeenObserved bool
|
|
||||||
completeSeenObserved bool
|
|
||||||
)
|
|
||||||
|
|
||||||
waitLoop:
|
select {
|
||||||
for {
|
case waitErr = <-waitCh:
|
||||||
select {
|
case <-ctx.Done():
|
||||||
case waitErr = <-waitCh:
|
ctxCancelled = true
|
||||||
break waitLoop
|
logErrorFn(cancelReason(commandName, ctx))
|
||||||
case <-ctx.Done():
|
forceKillTimer = terminateCommandFn(cmd)
|
||||||
ctxCancelled = true
|
waitErr = <-waitCh
|
||||||
logErrorFn(cancelReason(commandName, ctx))
|
|
||||||
if !terminated {
|
|
||||||
if timer := terminateCommandFn(cmd); timer != nil {
|
|
||||||
forceKillTimer = timer
|
|
||||||
terminated = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
waitErr = <-waitCh
|
|
||||||
break waitLoop
|
|
||||||
case <-messageTimerCh:
|
|
||||||
forcedAfterComplete = true
|
|
||||||
messageTimerCh = nil
|
|
||||||
if !terminated {
|
|
||||||
logWarnFn(fmt.Sprintf("%s output parsed; terminating lingering backend", commandName))
|
|
||||||
if timer := terminateCommandFn(cmd); timer != nil {
|
|
||||||
forceKillTimer = timer
|
|
||||||
terminated = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case <-completeSeen:
|
|
||||||
completeSeenObserved = true
|
|
||||||
if messageTimer != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
messageTimer = time.NewTimer(postMessageTerminateDelay)
|
|
||||||
messageTimerCh = messageTimer.C
|
|
||||||
case <-messageSeen:
|
|
||||||
messageSeenObserved = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if messageTimer != nil {
|
|
||||||
if !messageTimer.Stop() {
|
|
||||||
select {
|
|
||||||
case <-messageTimer.C:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if forceKillTimer != nil {
|
if forceKillTimer != nil {
|
||||||
@@ -1095,14 +791,10 @@ waitLoop:
|
|||||||
}
|
}
|
||||||
|
|
||||||
var parsed parseResult
|
var parsed parseResult
|
||||||
switch {
|
if ctxCancelled {
|
||||||
case ctxCancelled:
|
|
||||||
closeWithReason(stdout, stdoutCloseReasonCtx)
|
closeWithReason(stdout, stdoutCloseReasonCtx)
|
||||||
parsed = <-parseCh
|
parsed = <-parseCh
|
||||||
case messageSeenObserved || completeSeenObserved:
|
} else {
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
|
||||||
parsed = <-parseCh
|
|
||||||
default:
|
|
||||||
drainTimer := time.NewTimer(stdoutDrainTimeout)
|
drainTimer := time.NewTimer(stdoutDrainTimeout)
|
||||||
defer drainTimer.Stop()
|
defer drainTimer.Stop()
|
||||||
|
|
||||||
@@ -1110,11 +802,6 @@ waitLoop:
|
|||||||
case parsed = <-parseCh:
|
case parsed = <-parseCh:
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
closeWithReason(stdout, stdoutCloseReasonWait)
|
||||||
case <-messageSeen:
|
case <-messageSeen:
|
||||||
messageSeenObserved = true
|
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
|
||||||
parsed = <-parseCh
|
|
||||||
case <-completeSeen:
|
|
||||||
completeSeenObserved = true
|
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
closeWithReason(stdout, stdoutCloseReasonWait)
|
||||||
parsed = <-parseCh
|
parsed = <-parseCh
|
||||||
case <-drainTimer.C:
|
case <-drainTimer.C:
|
||||||
@@ -1135,21 +822,17 @@ waitLoop:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if waitErr != nil {
|
if waitErr != nil {
|
||||||
if forcedAfterComplete && parsed.message != "" {
|
if exitErr, ok := waitErr.(*exec.ExitError); ok {
|
||||||
logWarnFn(fmt.Sprintf("%s terminated after delivering output", commandName))
|
code := exitErr.ExitCode()
|
||||||
} else {
|
logErrorFn(fmt.Sprintf("%s exited with status %d", commandName, code))
|
||||||
if exitErr, ok := waitErr.(*exec.ExitError); ok {
|
result.ExitCode = code
|
||||||
code := exitErr.ExitCode()
|
result.Error = attachStderr(fmt.Sprintf("%s exited with status %d", commandName, code))
|
||||||
logErrorFn(fmt.Sprintf("%s exited with status %d", commandName, code))
|
|
||||||
result.ExitCode = code
|
|
||||||
result.Error = attachStderr(fmt.Sprintf("%s exited with status %d", commandName, code))
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
logErrorFn(commandName + " error: " + waitErr.Error())
|
|
||||||
result.ExitCode = 1
|
|
||||||
result.Error = attachStderr(commandName + " error: " + waitErr.Error())
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
logErrorFn(commandName + " error: " + waitErr.Error())
|
||||||
|
result.ExitCode = 1
|
||||||
|
result.Error = attachStderr(commandName + " error: " + waitErr.Error())
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
message := parsed.message
|
message := parsed.message
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"slices"
|
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
@@ -87,7 +86,6 @@ type execFakeRunner struct {
|
|||||||
process processHandle
|
process processHandle
|
||||||
stdin io.WriteCloser
|
stdin io.WriteCloser
|
||||||
dir string
|
dir string
|
||||||
env map[string]string
|
|
||||||
waitErr error
|
waitErr error
|
||||||
waitDelay time.Duration
|
waitDelay time.Duration
|
||||||
startErr error
|
startErr error
|
||||||
@@ -130,17 +128,6 @@ func (f *execFakeRunner) StdinPipe() (io.WriteCloser, error) {
|
|||||||
}
|
}
|
||||||
func (f *execFakeRunner) SetStderr(io.Writer) {}
|
func (f *execFakeRunner) SetStderr(io.Writer) {}
|
||||||
func (f *execFakeRunner) SetDir(dir string) { f.dir = dir }
|
func (f *execFakeRunner) SetDir(dir string) { f.dir = dir }
|
||||||
func (f *execFakeRunner) SetEnv(env map[string]string) {
|
|
||||||
if len(env) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if f.env == nil {
|
|
||||||
f.env = make(map[string]string, len(env))
|
|
||||||
}
|
|
||||||
for k, v := range env {
|
|
||||||
f.env[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
func (f *execFakeRunner) Process() processHandle {
|
func (f *execFakeRunner) Process() processHandle {
|
||||||
if f.process != nil {
|
if f.process != nil {
|
||||||
return f.process
|
return f.process
|
||||||
@@ -257,10 +244,6 @@ func TestExecutorHelperCoverage(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("generateFinalOutputAndArgs", func(t *testing.T) {
|
t.Run("generateFinalOutputAndArgs", func(t *testing.T) {
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Unsetenv(key)
|
|
||||||
|
|
||||||
out := generateFinalOutput([]TaskResult{
|
out := generateFinalOutput([]TaskResult{
|
||||||
{TaskID: "ok", ExitCode: 0},
|
{TaskID: "ok", ExitCode: 0},
|
||||||
{TaskID: "fail", ExitCode: 1, Error: "boom"},
|
{TaskID: "fail", ExitCode: 1, Error: "boom"},
|
||||||
@@ -268,66 +251,21 @@ func TestExecutorHelperCoverage(t *testing.T) {
|
|||||||
if !strings.Contains(out, "ok") || !strings.Contains(out, "fail") {
|
if !strings.Contains(out, "ok") || !strings.Contains(out, "fail") {
|
||||||
t.Fatalf("unexpected summary output: %s", out)
|
t.Fatalf("unexpected summary output: %s", out)
|
||||||
}
|
}
|
||||||
// Test summary mode (default) - should have new format with ### headers
|
|
||||||
out = generateFinalOutput([]TaskResult{{TaskID: "rich", ExitCode: 0, SessionID: "sess", LogPath: "/tmp/log", Message: "hello"}})
|
out = generateFinalOutput([]TaskResult{{TaskID: "rich", ExitCode: 0, SessionID: "sess", LogPath: "/tmp/log", Message: "hello"}})
|
||||||
if !strings.Contains(out, "### rich") {
|
|
||||||
t.Fatalf("summary output missing task header: %s", out)
|
|
||||||
}
|
|
||||||
// Test full output mode - should have Session and Message
|
|
||||||
out = generateFinalOutputWithMode([]TaskResult{{TaskID: "rich", ExitCode: 0, SessionID: "sess", LogPath: "/tmp/log", Message: "hello"}}, false)
|
|
||||||
if !strings.Contains(out, "Session: sess") || !strings.Contains(out, "Log: /tmp/log") || !strings.Contains(out, "hello") {
|
if !strings.Contains(out, "Session: sess") || !strings.Contains(out, "Log: /tmp/log") || !strings.Contains(out, "hello") {
|
||||||
t.Fatalf("full output missing fields: %s", out)
|
t.Fatalf("rich output missing fields: %s", out)
|
||||||
}
|
}
|
||||||
|
|
||||||
args := buildCodexArgs(&Config{Mode: "new", WorkDir: "/tmp"}, "task")
|
args := buildCodexArgs(&Config{Mode: "new", WorkDir: "/tmp"}, "task")
|
||||||
if !slices.Equal(args, []string{"e", "--skip-git-repo-check", "-C", "/tmp", "--json", "task"}) {
|
if len(args) == 0 || args[3] != "/tmp" {
|
||||||
t.Fatalf("unexpected codex args: %+v", args)
|
t.Fatalf("unexpected codex args: %+v", args)
|
||||||
}
|
}
|
||||||
args = buildCodexArgs(&Config{Mode: "resume", SessionID: "sess"}, "target")
|
args = buildCodexArgs(&Config{Mode: "resume", SessionID: "sess"}, "target")
|
||||||
if !slices.Equal(args, []string{"e", "--skip-git-repo-check", "--json", "resume", "sess", "target"}) {
|
if args[3] != "resume" || args[4] != "sess" {
|
||||||
t.Fatalf("unexpected resume args: %+v", args)
|
t.Fatalf("unexpected resume args: %+v", args)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("generateFinalOutputASCIIMode", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_ASCII_MODE", "true")
|
|
||||||
|
|
||||||
results := []TaskResult{
|
|
||||||
{TaskID: "ok", ExitCode: 0, Coverage: "92%", CoverageNum: 92, CoverageTarget: 90, KeyOutput: "done"},
|
|
||||||
{TaskID: "warn", ExitCode: 0, Coverage: "80%", CoverageNum: 80, CoverageTarget: 90, KeyOutput: "did"},
|
|
||||||
{TaskID: "bad", ExitCode: 2, Error: "boom"},
|
|
||||||
}
|
|
||||||
out := generateFinalOutput(results)
|
|
||||||
|
|
||||||
for _, sym := range []string{"PASS", "WARN", "FAIL"} {
|
|
||||||
if !strings.Contains(out, sym) {
|
|
||||||
t.Fatalf("ASCII mode should include %q, got: %s", sym, out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, sym := range []string{"✓", "⚠️", "✗"} {
|
|
||||||
if strings.Contains(out, sym) {
|
|
||||||
t.Fatalf("ASCII mode should not include %q, got: %s", sym, out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("generateFinalOutputUnicodeMode", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_ASCII_MODE", "false")
|
|
||||||
|
|
||||||
results := []TaskResult{
|
|
||||||
{TaskID: "ok", ExitCode: 0, Coverage: "92%", CoverageNum: 92, CoverageTarget: 90, KeyOutput: "done"},
|
|
||||||
{TaskID: "warn", ExitCode: 0, Coverage: "80%", CoverageNum: 80, CoverageTarget: 90, KeyOutput: "did"},
|
|
||||||
{TaskID: "bad", ExitCode: 2, Error: "boom"},
|
|
||||||
}
|
|
||||||
out := generateFinalOutput(results)
|
|
||||||
|
|
||||||
for _, sym := range []string{"✓", "⚠️", "✗"} {
|
|
||||||
if !strings.Contains(out, sym) {
|
|
||||||
t.Fatalf("Unicode mode should include %q, got: %s", sym, out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("executeConcurrentWrapper", func(t *testing.T) {
|
t.Run("executeConcurrentWrapper", func(t *testing.T) {
|
||||||
orig := runCodexTaskFn
|
orig := runCodexTaskFn
|
||||||
defer func() { runCodexTaskFn = orig }()
|
defer func() { runCodexTaskFn = orig }()
|
||||||
@@ -360,18 +298,6 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
origRunner := newCommandRunner
|
origRunner := newCommandRunner
|
||||||
defer func() { newCommandRunner = origRunner }()
|
defer func() { newCommandRunner = origRunner }()
|
||||||
|
|
||||||
t.Run("resumeMissingSessionID", func(t *testing.T) {
|
|
||||||
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
|
||||||
t.Fatalf("unexpected command execution for invalid resume config")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", Mode: "resume"}, nil, nil, false, false, 1)
|
|
||||||
if res.ExitCode == 0 || !strings.Contains(res.Error, "session_id") {
|
|
||||||
t.Fatalf("expected validation error, got %+v", res)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("success", func(t *testing.T) {
|
t.Run("success", func(t *testing.T) {
|
||||||
var firstStdout *reasonReadCloser
|
var firstStdout *reasonReadCloser
|
||||||
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
@@ -1156,10 +1082,9 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test full output mode for shared marker (summary mode doesn't show it)
|
summary := generateFinalOutput(results)
|
||||||
summary := generateFinalOutputWithMode(results, false)
|
|
||||||
if !strings.Contains(summary, "(shared)") {
|
if !strings.Contains(summary, "(shared)") {
|
||||||
t.Fatalf("full output missing shared marker: %s", summary)
|
t.Fatalf("summary missing shared marker: %s", summary)
|
||||||
}
|
}
|
||||||
|
|
||||||
mainLogger.Flush()
|
mainLogger.Flush()
|
||||||
|
|||||||
@@ -366,8 +366,7 @@ func (l *Logger) run() {
|
|||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
writeEntry := func(entry logEntry) {
|
writeEntry := func(entry logEntry) {
|
||||||
timestamp := time.Now().Format("2006-01-02 15:04:05.000")
|
fmt.Fprintf(l.writer, "%s\n", entry.msg)
|
||||||
fmt.Fprintf(l.writer, "[%s] %s\n", timestamp, entry.msg)
|
|
||||||
|
|
||||||
// Cache error/warn entries in memory for fast extraction
|
// Cache error/warn entries in memory for fast extraction
|
||||||
if entry.isError {
|
if entry.isError {
|
||||||
|
|||||||
@@ -14,15 +14,14 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
version = "5.4.0"
|
version = "5.2.5"
|
||||||
defaultWorkdir = "."
|
defaultWorkdir = "."
|
||||||
defaultTimeout = 7200 // seconds (2 hours)
|
defaultTimeout = 7200 // seconds
|
||||||
defaultCoverageTarget = 90.0
|
codexLogLineLimit = 1000
|
||||||
codexLogLineLimit = 1000
|
stdinSpecialChars = "\n\\\"'`$"
|
||||||
stdinSpecialChars = "\n\\\"'`$"
|
stderrCaptureLimit = 4 * 1024
|
||||||
stderrCaptureLimit = 4 * 1024
|
defaultBackendName = "codex"
|
||||||
defaultBackendName = "codex"
|
defaultCodexCommand = "codex"
|
||||||
defaultCodexCommand = "codex"
|
|
||||||
|
|
||||||
// stdout close reasons
|
// stdout close reasons
|
||||||
stdoutCloseReasonWait = "wait-done"
|
stdoutCloseReasonWait = "wait-done"
|
||||||
@@ -31,8 +30,6 @@ const (
|
|||||||
stdoutDrainTimeout = 100 * time.Millisecond
|
stdoutDrainTimeout = 100 * time.Millisecond
|
||||||
)
|
)
|
||||||
|
|
||||||
var useASCIIMode = os.Getenv("CODEAGENT_ASCII_MODE") == "true"
|
|
||||||
|
|
||||||
// Test hooks for dependency injection
|
// Test hooks for dependency injection
|
||||||
var (
|
var (
|
||||||
stdinReader io.Reader = os.Stdin
|
stdinReader io.Reader = os.Stdin
|
||||||
@@ -178,7 +175,6 @@ func run() (exitCode int) {
|
|||||||
|
|
||||||
if parallelIndex != -1 {
|
if parallelIndex != -1 {
|
||||||
backendName := defaultBackendName
|
backendName := defaultBackendName
|
||||||
fullOutput := false
|
|
||||||
var extras []string
|
var extras []string
|
||||||
|
|
||||||
for i := 0; i < len(args); i++ {
|
for i := 0; i < len(args); i++ {
|
||||||
@@ -186,8 +182,6 @@ func run() (exitCode int) {
|
|||||||
switch {
|
switch {
|
||||||
case arg == "--parallel":
|
case arg == "--parallel":
|
||||||
continue
|
continue
|
||||||
case arg == "--full-output":
|
|
||||||
fullOutput = true
|
|
||||||
case arg == "--backend":
|
case arg == "--backend":
|
||||||
if i+1 >= len(args) {
|
if i+1 >= len(args) {
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --backend flag requires a value")
|
fmt.Fprintln(os.Stderr, "ERROR: --backend flag requires a value")
|
||||||
@@ -208,12 +202,11 @@ func run() (exitCode int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(extras) > 0 {
|
if len(extras) > 0 {
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend and --full-output are allowed.")
|
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend is allowed.")
|
||||||
fmt.Fprintln(os.Stderr, "Usage examples:")
|
fmt.Fprintln(os.Stderr, "Usage examples:")
|
||||||
fmt.Fprintf(os.Stderr, " %s --parallel < tasks.txt\n", name)
|
fmt.Fprintf(os.Stderr, " %s --parallel < tasks.txt\n", name)
|
||||||
fmt.Fprintf(os.Stderr, " echo '...' | %s --parallel\n", name)
|
fmt.Fprintf(os.Stderr, " echo '...' | %s --parallel\n", name)
|
||||||
fmt.Fprintf(os.Stderr, " %s --parallel <<'EOF'\n", name)
|
fmt.Fprintf(os.Stderr, " %s --parallel <<'EOF'\n", name)
|
||||||
fmt.Fprintf(os.Stderr, " %s --parallel --full-output <<'EOF' # include full task output\n", name)
|
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,33 +244,7 @@ func run() (exitCode int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
results := executeConcurrent(layers, timeoutSec)
|
results := executeConcurrent(layers, timeoutSec)
|
||||||
|
fmt.Println(generateFinalOutput(results))
|
||||||
// Extract structured report fields from each result
|
|
||||||
for i := range results {
|
|
||||||
results[i].CoverageTarget = defaultCoverageTarget
|
|
||||||
if results[i].Message == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
lines := strings.Split(results[i].Message, "\n")
|
|
||||||
|
|
||||||
// Coverage extraction
|
|
||||||
results[i].Coverage = extractCoverageFromLines(lines)
|
|
||||||
results[i].CoverageNum = extractCoverageNum(results[i].Coverage)
|
|
||||||
|
|
||||||
// Files changed
|
|
||||||
results[i].FilesChanged = extractFilesChangedFromLines(lines)
|
|
||||||
|
|
||||||
// Test results
|
|
||||||
results[i].TestsPassed, results[i].TestsFailed = extractTestResultsFromLines(lines)
|
|
||||||
|
|
||||||
// Key output summary
|
|
||||||
results[i].KeyOutput = extractKeyOutputFromLines(lines, 150)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default: summary mode (context-efficient)
|
|
||||||
// --full-output: legacy full output mode
|
|
||||||
fmt.Println(generateFinalOutputWithMode(results, !fullOutput))
|
|
||||||
|
|
||||||
exitCode = 0
|
exitCode = 0
|
||||||
for _, res := range results {
|
for _, res := range results {
|
||||||
@@ -480,19 +447,16 @@ Usage:
|
|||||||
%[1]s resume <session_id> "task" [workdir]
|
%[1]s resume <session_id> "task" [workdir]
|
||||||
%[1]s resume <session_id> - [workdir]
|
%[1]s resume <session_id> - [workdir]
|
||||||
%[1]s --parallel Run tasks in parallel (config from stdin)
|
%[1]s --parallel Run tasks in parallel (config from stdin)
|
||||||
%[1]s --parallel --full-output Run tasks in parallel with full output (legacy)
|
|
||||||
%[1]s --version
|
%[1]s --version
|
||||||
%[1]s --help
|
%[1]s --help
|
||||||
|
|
||||||
Parallel mode examples:
|
Parallel mode examples:
|
||||||
%[1]s --parallel < tasks.txt
|
%[1]s --parallel < tasks.txt
|
||||||
echo '...' | %[1]s --parallel
|
echo '...' | %[1]s --parallel
|
||||||
%[1]s --parallel --full-output < tasks.txt
|
|
||||||
%[1]s --parallel <<'EOF'
|
%[1]s --parallel <<'EOF'
|
||||||
|
|
||||||
Environment Variables:
|
Environment Variables:
|
||||||
CODEX_TIMEOUT Timeout in milliseconds (default: 7200000)
|
CODEX_TIMEOUT Timeout in milliseconds (default: 7200000)
|
||||||
CODEAGENT_ASCII_MODE Use ASCII symbols instead of Unicode (PASS/WARN/FAIL)
|
|
||||||
|
|
||||||
Exit Codes:
|
Exit Codes:
|
||||||
0 Success
|
0 Success
|
||||||
|
|||||||
@@ -46,26 +46,10 @@ func parseIntegrationOutput(t *testing.T, out string) integrationOutput {
|
|||||||
|
|
||||||
lines := strings.Split(out, "\n")
|
lines := strings.Split(out, "\n")
|
||||||
var currentTask *TaskResult
|
var currentTask *TaskResult
|
||||||
inTaskResults := false
|
|
||||||
|
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
line = strings.TrimSpace(line)
|
line = strings.TrimSpace(line)
|
||||||
|
if strings.HasPrefix(line, "Total:") {
|
||||||
// Parse new format header: "X tasks | Y passed | Z failed"
|
|
||||||
if strings.Contains(line, "tasks |") && strings.Contains(line, "passed |") {
|
|
||||||
parts := strings.Split(line, "|")
|
|
||||||
for _, p := range parts {
|
|
||||||
p = strings.TrimSpace(p)
|
|
||||||
if strings.HasSuffix(p, "tasks") {
|
|
||||||
fmt.Sscanf(p, "%d tasks", &payload.Summary.Total)
|
|
||||||
} else if strings.HasSuffix(p, "passed") {
|
|
||||||
fmt.Sscanf(p, "%d passed", &payload.Summary.Success)
|
|
||||||
} else if strings.HasSuffix(p, "failed") {
|
|
||||||
fmt.Sscanf(p, "%d failed", &payload.Summary.Failed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if strings.HasPrefix(line, "Total:") {
|
|
||||||
// Legacy format: "Total: X | Success: Y | Failed: Z"
|
|
||||||
parts := strings.Split(line, "|")
|
parts := strings.Split(line, "|")
|
||||||
for _, p := range parts {
|
for _, p := range parts {
|
||||||
p = strings.TrimSpace(p)
|
p = strings.TrimSpace(p)
|
||||||
@@ -77,72 +61,13 @@ func parseIntegrationOutput(t *testing.T, out string) integrationOutput {
|
|||||||
fmt.Sscanf(p, "Failed: %d", &payload.Summary.Failed)
|
fmt.Sscanf(p, "Failed: %d", &payload.Summary.Failed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if line == "## Task Results" {
|
|
||||||
inTaskResults = true
|
|
||||||
} else if line == "## Summary" {
|
|
||||||
// End of task results section
|
|
||||||
if currentTask != nil {
|
|
||||||
payload.Results = append(payload.Results, *currentTask)
|
|
||||||
currentTask = nil
|
|
||||||
}
|
|
||||||
inTaskResults = false
|
|
||||||
} else if inTaskResults && strings.HasPrefix(line, "### ") {
|
|
||||||
// New task: ### task-id ✓ 92% or ### task-id PASS 92% (ASCII mode)
|
|
||||||
if currentTask != nil {
|
|
||||||
payload.Results = append(payload.Results, *currentTask)
|
|
||||||
}
|
|
||||||
currentTask = &TaskResult{}
|
|
||||||
|
|
||||||
taskLine := strings.TrimPrefix(line, "### ")
|
|
||||||
success, warning, failed := getStatusSymbols()
|
|
||||||
// Parse different formats
|
|
||||||
if strings.Contains(taskLine, " "+success) {
|
|
||||||
parts := strings.Split(taskLine, " "+success)
|
|
||||||
currentTask.TaskID = strings.TrimSpace(parts[0])
|
|
||||||
currentTask.ExitCode = 0
|
|
||||||
// Extract coverage if present
|
|
||||||
if len(parts) > 1 {
|
|
||||||
coveragePart := strings.TrimSpace(parts[1])
|
|
||||||
if strings.HasSuffix(coveragePart, "%") {
|
|
||||||
currentTask.Coverage = coveragePart
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if strings.Contains(taskLine, " "+warning) {
|
|
||||||
parts := strings.Split(taskLine, " "+warning)
|
|
||||||
currentTask.TaskID = strings.TrimSpace(parts[0])
|
|
||||||
currentTask.ExitCode = 0
|
|
||||||
} else if strings.Contains(taskLine, " "+failed) {
|
|
||||||
parts := strings.Split(taskLine, " "+failed)
|
|
||||||
currentTask.TaskID = strings.TrimSpace(parts[0])
|
|
||||||
currentTask.ExitCode = 1
|
|
||||||
} else {
|
|
||||||
currentTask.TaskID = taskLine
|
|
||||||
}
|
|
||||||
} else if currentTask != nil && inTaskResults {
|
|
||||||
// Parse task details
|
|
||||||
if strings.HasPrefix(line, "Exit code:") {
|
|
||||||
fmt.Sscanf(line, "Exit code: %d", ¤tTask.ExitCode)
|
|
||||||
} else if strings.HasPrefix(line, "Error:") {
|
|
||||||
currentTask.Error = strings.TrimPrefix(line, "Error: ")
|
|
||||||
} else if strings.HasPrefix(line, "Log:") {
|
|
||||||
currentTask.LogPath = strings.TrimSpace(strings.TrimPrefix(line, "Log:"))
|
|
||||||
} else if strings.HasPrefix(line, "Did:") {
|
|
||||||
currentTask.KeyOutput = strings.TrimSpace(strings.TrimPrefix(line, "Did:"))
|
|
||||||
} else if strings.HasPrefix(line, "Detail:") {
|
|
||||||
// Error detail for failed tasks
|
|
||||||
if currentTask.Message == "" {
|
|
||||||
currentTask.Message = strings.TrimSpace(strings.TrimPrefix(line, "Detail:"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if strings.HasPrefix(line, "--- Task:") {
|
} else if strings.HasPrefix(line, "--- Task:") {
|
||||||
// Legacy full output format
|
|
||||||
if currentTask != nil {
|
if currentTask != nil {
|
||||||
payload.Results = append(payload.Results, *currentTask)
|
payload.Results = append(payload.Results, *currentTask)
|
||||||
}
|
}
|
||||||
currentTask = &TaskResult{}
|
currentTask = &TaskResult{}
|
||||||
currentTask.TaskID = strings.TrimSuffix(strings.TrimPrefix(line, "--- Task: "), " ---")
|
currentTask.TaskID = strings.TrimSuffix(strings.TrimPrefix(line, "--- Task: "), " ---")
|
||||||
} else if currentTask != nil && !inTaskResults {
|
} else if currentTask != nil {
|
||||||
// Legacy format parsing
|
|
||||||
if strings.HasPrefix(line, "Status: SUCCESS") {
|
if strings.HasPrefix(line, "Status: SUCCESS") {
|
||||||
currentTask.ExitCode = 0
|
currentTask.ExitCode = 0
|
||||||
} else if strings.HasPrefix(line, "Status: FAILED") {
|
} else if strings.HasPrefix(line, "Status: FAILED") {
|
||||||
@@ -157,11 +82,15 @@ func parseIntegrationOutput(t *testing.T, out string) integrationOutput {
|
|||||||
currentTask.SessionID = strings.TrimPrefix(line, "Session: ")
|
currentTask.SessionID = strings.TrimPrefix(line, "Session: ")
|
||||||
} else if strings.HasPrefix(line, "Log:") {
|
} else if strings.HasPrefix(line, "Log:") {
|
||||||
currentTask.LogPath = strings.TrimSpace(strings.TrimPrefix(line, "Log:"))
|
currentTask.LogPath = strings.TrimSpace(strings.TrimPrefix(line, "Log:"))
|
||||||
|
} else if line != "" && !strings.HasPrefix(line, "===") && !strings.HasPrefix(line, "---") {
|
||||||
|
if currentTask.Message != "" {
|
||||||
|
currentTask.Message += "\n"
|
||||||
|
}
|
||||||
|
currentTask.Message += line
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle last task
|
|
||||||
if currentTask != nil {
|
if currentTask != nil {
|
||||||
payload.Results = append(payload.Results, *currentTask)
|
payload.Results = append(payload.Results, *currentTask)
|
||||||
}
|
}
|
||||||
@@ -414,10 +343,9 @@ task-beta`
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, id := range []string{"alpha", "beta"} {
|
for _, id := range []string{"alpha", "beta"} {
|
||||||
// Summary mode shows log paths in table format, not "Log: xxx"
|
want := fmt.Sprintf("Log: %s", logPathFor(id))
|
||||||
logPath := logPathFor(id)
|
if !strings.Contains(output, want) {
|
||||||
if !strings.Contains(output, logPath) {
|
t.Fatalf("parallel output missing %q for %s:\n%s", want, id, output)
|
||||||
t.Fatalf("parallel output missing log path %q for %s:\n%s", logPath, id, output)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -622,16 +550,16 @@ ok-e`
|
|||||||
if resD.LogPath != logPathFor("D") || resE.LogPath != logPathFor("E") {
|
if resD.LogPath != logPathFor("D") || resE.LogPath != logPathFor("E") {
|
||||||
t.Fatalf("expected log paths for D/E, got D=%q E=%q", resD.LogPath, resE.LogPath)
|
t.Fatalf("expected log paths for D/E, got D=%q E=%q", resD.LogPath, resE.LogPath)
|
||||||
}
|
}
|
||||||
// Summary mode shows log paths in table, verify they appear in output
|
|
||||||
for _, id := range []string{"A", "D", "E"} {
|
for _, id := range []string{"A", "D", "E"} {
|
||||||
logPath := logPathFor(id)
|
block := extractTaskBlock(t, output, id)
|
||||||
if !strings.Contains(output, logPath) {
|
want := fmt.Sprintf("Log: %s", logPathFor(id))
|
||||||
t.Fatalf("task %s log path %q not found in output:\n%s", id, logPath, output)
|
if !strings.Contains(block, want) {
|
||||||
|
t.Fatalf("task %s block missing %q:\n%s", id, want, block)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Task B was skipped, should have "-" or empty log path in table
|
blockB := extractTaskBlock(t, output, "B")
|
||||||
if resB.LogPath != "" {
|
if strings.Contains(blockB, "Log:") {
|
||||||
t.Fatalf("skipped task B should have empty log path, got %q", resB.LogPath)
|
t.Fatalf("skipped task B should not emit a log line:\n%s", blockB)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -255,10 +255,6 @@ func (d *drainBlockingCmd) SetDir(dir string) {
|
|||||||
d.inner.SetDir(dir)
|
d.inner.SetDir(dir)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *drainBlockingCmd) SetEnv(env map[string]string) {
|
|
||||||
d.inner.SetEnv(env)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *drainBlockingCmd) Process() processHandle {
|
func (d *drainBlockingCmd) Process() processHandle {
|
||||||
return d.inner.Process()
|
return d.inner.Process()
|
||||||
}
|
}
|
||||||
@@ -391,8 +387,6 @@ type fakeCmd struct {
|
|||||||
|
|
||||||
stderr io.Writer
|
stderr io.Writer
|
||||||
|
|
||||||
env map[string]string
|
|
||||||
|
|
||||||
waitDelay time.Duration
|
waitDelay time.Duration
|
||||||
waitErr error
|
waitErr error
|
||||||
startErr error
|
startErr error
|
||||||
@@ -517,20 +511,6 @@ func (f *fakeCmd) SetStderr(w io.Writer) {
|
|||||||
|
|
||||||
func (f *fakeCmd) SetDir(string) {}
|
func (f *fakeCmd) SetDir(string) {}
|
||||||
|
|
||||||
func (f *fakeCmd) SetEnv(env map[string]string) {
|
|
||||||
if len(env) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
f.mu.Lock()
|
|
||||||
defer f.mu.Unlock()
|
|
||||||
if f.env == nil {
|
|
||||||
f.env = make(map[string]string, len(env))
|
|
||||||
}
|
|
||||||
for k, v := range env {
|
|
||||||
f.env[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeCmd) Process() processHandle {
|
func (f *fakeCmd) Process() processHandle {
|
||||||
if f == nil {
|
if f == nil {
|
||||||
return nil
|
return nil
|
||||||
@@ -899,79 +879,6 @@ func TestRunCodexTask_ContextTimeout(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunCodexTask_ForcesStopAfterCompletion(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":"thread.completed","thread_id":"tid"}` + "\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 fake.process.SignalCount() == 0 {
|
|
||||||
t.Fatalf("expected SIGTERM to be sent, got %d", fake.process.SignalCount())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRunCodexTask_DoesNotTerminateBeforeThreadCompleted(t *testing.T) {
|
|
||||||
defer resetTestHooks()
|
|
||||||
forceKillDelay.Store(0)
|
|
||||||
|
|
||||||
fake := newFakeCmd(fakeCmdConfig{
|
|
||||||
StdoutPlan: []fakeStdoutEvent{
|
|
||||||
{Data: `{"type":"item.completed","item":{"type":"agent_message","text":"intermediate"}}` + "\n"},
|
|
||||||
{Delay: 1100 * time.Millisecond, Data: `{"type":"item.completed","item":{"type":"agent_message","text":"final"}}` + "\n"},
|
|
||||||
{Data: `{"type":"thread.completed","thread_id":"tid"}` + "\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 != "final" {
|
|
||||||
t.Fatalf("unexpected result: %+v", result)
|
|
||||||
}
|
|
||||||
if duration > 5*time.Second {
|
|
||||||
t.Fatalf("runCodexTaskWithContext took too long: %v", duration)
|
|
||||||
}
|
|
||||||
if fake.process.SignalCount() == 0 {
|
|
||||||
t.Fatalf("expected SIGTERM to be sent, got %d", fake.process.SignalCount())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendParseArgs_NewMode(t *testing.T) {
|
func TestBackendParseArgs_NewMode(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -1058,8 +965,6 @@ func TestBackendParseArgs_ResumeMode(t *testing.T) {
|
|||||||
},
|
},
|
||||||
{name: "resume missing session_id", args: []string{"codeagent-wrapper", "resume"}, wantErr: true},
|
{name: "resume missing session_id", args: []string{"codeagent-wrapper", "resume"}, wantErr: true},
|
||||||
{name: "resume missing task", args: []string{"codeagent-wrapper", "resume", "session-123"}, wantErr: true},
|
{name: "resume missing task", args: []string{"codeagent-wrapper", "resume", "session-123"}, wantErr: true},
|
||||||
{name: "resume empty session_id", args: []string{"codeagent-wrapper", "resume", "", "task"}, wantErr: true},
|
|
||||||
{name: "resume whitespace session_id", args: []string{"codeagent-wrapper", "resume", " ", "task"}, wantErr: true},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
@@ -1276,18 +1181,6 @@ do something`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestParallelParseConfig_EmptySessionID(t *testing.T) {
|
|
||||||
input := `---TASK---
|
|
||||||
id: task-1
|
|
||||||
session_id:
|
|
||||||
---CONTENT---
|
|
||||||
do something`
|
|
||||||
|
|
||||||
if _, err := parseParallelConfig([]byte(input)); err == nil {
|
|
||||||
t.Fatalf("expected error for empty session_id, got nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParallelParseConfig_InvalidFormat(t *testing.T) {
|
func TestParallelParseConfig_InvalidFormat(t *testing.T) {
|
||||||
if _, err := parseParallelConfig([]byte("invalid format")); err == nil {
|
if _, err := parseParallelConfig([]byte("invalid format")); err == nil {
|
||||||
t.Fatalf("expected error for invalid format, got nil")
|
t.Fatalf("expected error for invalid format, got nil")
|
||||||
@@ -1388,19 +1281,9 @@ func TestRunShouldUseStdin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRunBuildCodexArgs_NewMode(t *testing.T) {
|
func TestRunBuildCodexArgs_NewMode(t *testing.T) {
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Unsetenv(key)
|
|
||||||
|
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/test/dir"}
|
cfg := &Config{Mode: "new", WorkDir: "/test/dir"}
|
||||||
args := buildCodexArgs(cfg, "my task")
|
args := buildCodexArgs(cfg, "my task")
|
||||||
expected := []string{
|
expected := []string{"e", "--skip-git-repo-check", "-C", "/test/dir", "--json", "my task"}
|
||||||
"e",
|
|
||||||
"--skip-git-repo-check",
|
|
||||||
"-C", "/test/dir",
|
|
||||||
"--json",
|
|
||||||
"my task",
|
|
||||||
}
|
|
||||||
if len(args) != len(expected) {
|
if len(args) != len(expected) {
|
||||||
t.Fatalf("len mismatch")
|
t.Fatalf("len mismatch")
|
||||||
}
|
}
|
||||||
@@ -1412,20 +1295,9 @@ func TestRunBuildCodexArgs_NewMode(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRunBuildCodexArgs_ResumeMode(t *testing.T) {
|
func TestRunBuildCodexArgs_ResumeMode(t *testing.T) {
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Unsetenv(key)
|
|
||||||
|
|
||||||
cfg := &Config{Mode: "resume", SessionID: "session-abc"}
|
cfg := &Config{Mode: "resume", SessionID: "session-abc"}
|
||||||
args := buildCodexArgs(cfg, "-")
|
args := buildCodexArgs(cfg, "-")
|
||||||
expected := []string{
|
expected := []string{"e", "--skip-git-repo-check", "--json", "resume", "session-abc", "-"}
|
||||||
"e",
|
|
||||||
"--skip-git-repo-check",
|
|
||||||
"--json",
|
|
||||||
"resume",
|
|
||||||
"session-abc",
|
|
||||||
"-",
|
|
||||||
}
|
|
||||||
if len(args) != len(expected) {
|
if len(args) != len(expected) {
|
||||||
t.Fatalf("len mismatch")
|
t.Fatalf("len mismatch")
|
||||||
}
|
}
|
||||||
@@ -1436,61 +1308,6 @@ func TestRunBuildCodexArgs_ResumeMode(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunBuildCodexArgs_ResumeMode_EmptySessionHandledGracefully(t *testing.T) {
|
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Cleanup(func() { os.Unsetenv(key) })
|
|
||||||
os.Unsetenv(key)
|
|
||||||
|
|
||||||
cfg := &Config{Mode: "resume", SessionID: " ", WorkDir: "/test/dir"}
|
|
||||||
args := buildCodexArgs(cfg, "task")
|
|
||||||
expected := []string{"e", "--skip-git-repo-check", "-C", "/test/dir", "--json", "task"}
|
|
||||||
if len(args) != len(expected) {
|
|
||||||
t.Fatalf("len mismatch")
|
|
||||||
}
|
|
||||||
for i := range args {
|
|
||||||
if args[i] != expected[i] {
|
|
||||||
t.Fatalf("args[%d]=%s, want %s", i, args[i], expected[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRunBuildCodexArgs_BypassSandboxEnvTrue(t *testing.T) {
|
|
||||||
defer resetTestHooks()
|
|
||||||
tempDir := t.TempDir()
|
|
||||||
t.Setenv("TMPDIR", tempDir)
|
|
||||||
|
|
||||||
logger, err := NewLogger()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewLogger() error = %v", err)
|
|
||||||
}
|
|
||||||
setLogger(logger)
|
|
||||||
defer closeLogger()
|
|
||||||
|
|
||||||
t.Setenv("CODEX_BYPASS_SANDBOX", "true")
|
|
||||||
|
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/test/dir"}
|
|
||||||
args := buildCodexArgs(cfg, "my task")
|
|
||||||
found := false
|
|
||||||
for _, arg := range args {
|
|
||||||
if arg == "--dangerously-bypass-approvals-and-sandbox" {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
t.Fatalf("expected bypass flag in args, got %v", args)
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.Flush()
|
|
||||||
data, err := os.ReadFile(logger.Path())
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("failed to read log file: %v", err)
|
|
||||||
}
|
|
||||||
if !strings.Contains(string(data), "CODEX_BYPASS_SANDBOX=true") {
|
|
||||||
t.Fatalf("expected bypass warning log, got: %s", string(data))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendSelectBackend(t *testing.T) {
|
func TestBackendSelectBackend(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -1546,13 +1363,7 @@ func TestBackendBuildArgs_CodexBackend(t *testing.T) {
|
|||||||
backend := CodexBackend{}
|
backend := CodexBackend{}
|
||||||
cfg := &Config{Mode: "new", WorkDir: "/test/dir"}
|
cfg := &Config{Mode: "new", WorkDir: "/test/dir"}
|
||||||
got := backend.BuildArgs(cfg, "task")
|
got := backend.BuildArgs(cfg, "task")
|
||||||
want := []string{
|
want := []string{"e", "--skip-git-repo-check", "-C", "/test/dir", "--json", "task"}
|
||||||
"e",
|
|
||||||
"--skip-git-repo-check",
|
|
||||||
"-C", "/test/dir",
|
|
||||||
"--json",
|
|
||||||
"task",
|
|
||||||
}
|
|
||||||
if len(got) != len(want) {
|
if len(got) != len(want) {
|
||||||
t.Fatalf("length mismatch")
|
t.Fatalf("length mismatch")
|
||||||
}
|
}
|
||||||
@@ -1567,13 +1378,13 @@ func TestBackendBuildArgs_ClaudeBackend(t *testing.T) {
|
|||||||
backend := ClaudeBackend{}
|
backend := ClaudeBackend{}
|
||||||
cfg := &Config{Mode: "new", WorkDir: defaultWorkdir}
|
cfg := &Config{Mode: "new", WorkDir: defaultWorkdir}
|
||||||
got := backend.BuildArgs(cfg, "todo")
|
got := backend.BuildArgs(cfg, "todo")
|
||||||
want := []string{"-p", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
||||||
if len(got) != len(want) {
|
if len(got) != len(want) {
|
||||||
t.Fatalf("args length=%d, want %d: %v", len(got), len(want), got)
|
t.Fatalf("length mismatch")
|
||||||
}
|
}
|
||||||
for i := range want {
|
for i := range want {
|
||||||
if got[i] != want[i] {
|
if got[i] != want[i] {
|
||||||
t.Fatalf("index %d got %q want %q (args=%v)", i, got[i], want[i], got)
|
t.Fatalf("index %d got %s want %s", i, got[i], want[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1588,15 +1399,19 @@ func TestClaudeBackendBuildArgs_OutputValidation(t *testing.T) {
|
|||||||
target := "ensure-flags"
|
target := "ensure-flags"
|
||||||
|
|
||||||
args := backend.BuildArgs(cfg, target)
|
args := backend.BuildArgs(cfg, target)
|
||||||
want := []string{"-p", "--setting-sources", "", "--output-format", "stream-json", "--verbose", target}
|
expectedPrefix := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose"}
|
||||||
if len(args) != len(want) {
|
|
||||||
t.Fatalf("args length=%d, want %d: %v", len(args), len(want), args)
|
if len(args) != len(expectedPrefix)+1 {
|
||||||
|
t.Fatalf("args length=%d, want %d", len(args), len(expectedPrefix)+1)
|
||||||
}
|
}
|
||||||
for i := range want {
|
for i, val := range expectedPrefix {
|
||||||
if args[i] != want[i] {
|
if args[i] != val {
|
||||||
t.Fatalf("index %d got %q want %q (args=%v)", i, args[i], want[i], args)
|
t.Fatalf("args[%d]=%q, want %q", i, args[i], val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if args[len(args)-1] != target {
|
||||||
|
t.Fatalf("last arg=%q, want target %q", args[len(args)-1], target)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBackendBuildArgs_GeminiBackend(t *testing.T) {
|
func TestBackendBuildArgs_GeminiBackend(t *testing.T) {
|
||||||
@@ -1835,7 +1650,7 @@ func TestBackendParseJSONStream_GeminiEvents_OnMessageTriggeredOnStatus(t *testi
|
|||||||
var called int
|
var called int
|
||||||
message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, nil, func() {
|
message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, nil, func() {
|
||||||
called++
|
called++
|
||||||
}, nil)
|
})
|
||||||
|
|
||||||
if message != "Hi there" {
|
if message != "Hi there" {
|
||||||
t.Fatalf("message=%q, want %q", message, "Hi there")
|
t.Fatalf("message=%q, want %q", message, "Hi there")
|
||||||
@@ -1864,7 +1679,7 @@ func TestBackendParseJSONStream_OnMessage(t *testing.T) {
|
|||||||
var called int
|
var called int
|
||||||
message, threadID := parseJSONStreamInternal(strings.NewReader(`{"type":"item.completed","item":{"type":"agent_message","text":"hook"}}`), nil, nil, func() {
|
message, threadID := parseJSONStreamInternal(strings.NewReader(`{"type":"item.completed","item":{"type":"agent_message","text":"hook"}}`), nil, nil, func() {
|
||||||
called++
|
called++
|
||||||
}, nil)
|
})
|
||||||
if message != "hook" {
|
if message != "hook" {
|
||||||
t.Fatalf("message = %q, want hook", message)
|
t.Fatalf("message = %q, want hook", message)
|
||||||
}
|
}
|
||||||
@@ -1876,86 +1691,10 @@ func TestBackendParseJSONStream_OnMessage(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBackendParseJSONStream_OnComplete_CodexThreadCompleted(t *testing.T) {
|
|
||||||
input := `{"type":"item.completed","item":{"type":"agent_message","text":"first"}}` + "\n" +
|
|
||||||
`{"type":"item.completed","item":{"type":"agent_message","text":"second"}}` + "\n" +
|
|
||||||
`{"type":"thread.completed","thread_id":"t-1"}`
|
|
||||||
|
|
||||||
var onMessageCalls int
|
|
||||||
var onCompleteCalls int
|
|
||||||
message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, nil, func() {
|
|
||||||
onMessageCalls++
|
|
||||||
}, func() {
|
|
||||||
onCompleteCalls++
|
|
||||||
})
|
|
||||||
if message != "second" {
|
|
||||||
t.Fatalf("message = %q, want second", message)
|
|
||||||
}
|
|
||||||
if threadID != "t-1" {
|
|
||||||
t.Fatalf("threadID = %q, want t-1", threadID)
|
|
||||||
}
|
|
||||||
if onMessageCalls != 2 {
|
|
||||||
t.Fatalf("onMessage calls = %d, want 2", onMessageCalls)
|
|
||||||
}
|
|
||||||
if onCompleteCalls != 1 {
|
|
||||||
t.Fatalf("onComplete calls = %d, want 1", onCompleteCalls)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendParseJSONStream_OnComplete_ClaudeResult(t *testing.T) {
|
|
||||||
input := `{"type":"message","subtype":"stream","session_id":"s-1"}` + "\n" +
|
|
||||||
`{"type":"result","result":"OK","session_id":"s-1"}`
|
|
||||||
|
|
||||||
var onMessageCalls int
|
|
||||||
var onCompleteCalls int
|
|
||||||
message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, nil, func() {
|
|
||||||
onMessageCalls++
|
|
||||||
}, func() {
|
|
||||||
onCompleteCalls++
|
|
||||||
})
|
|
||||||
if message != "OK" {
|
|
||||||
t.Fatalf("message = %q, want OK", message)
|
|
||||||
}
|
|
||||||
if threadID != "s-1" {
|
|
||||||
t.Fatalf("threadID = %q, want s-1", threadID)
|
|
||||||
}
|
|
||||||
if onMessageCalls != 1 {
|
|
||||||
t.Fatalf("onMessage calls = %d, want 1", onMessageCalls)
|
|
||||||
}
|
|
||||||
if onCompleteCalls != 1 {
|
|
||||||
t.Fatalf("onComplete calls = %d, want 1", onCompleteCalls)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendParseJSONStream_OnComplete_GeminiTerminalResultStatus(t *testing.T) {
|
|
||||||
input := `{"type":"message","role":"assistant","content":"Hi","delta":true,"session_id":"g-1"}` + "\n" +
|
|
||||||
`{"type":"result","status":"success","session_id":"g-1"}`
|
|
||||||
|
|
||||||
var onMessageCalls int
|
|
||||||
var onCompleteCalls int
|
|
||||||
message, threadID := parseJSONStreamInternal(strings.NewReader(input), nil, nil, func() {
|
|
||||||
onMessageCalls++
|
|
||||||
}, func() {
|
|
||||||
onCompleteCalls++
|
|
||||||
})
|
|
||||||
if message != "Hi" {
|
|
||||||
t.Fatalf("message = %q, want Hi", message)
|
|
||||||
}
|
|
||||||
if threadID != "g-1" {
|
|
||||||
t.Fatalf("threadID = %q, want g-1", threadID)
|
|
||||||
}
|
|
||||||
if onMessageCalls != 1 {
|
|
||||||
t.Fatalf("onMessage calls = %d, want 1", onMessageCalls)
|
|
||||||
}
|
|
||||||
if onCompleteCalls != 1 {
|
|
||||||
t.Fatalf("onComplete calls = %d, want 1", onCompleteCalls)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendParseJSONStream_ScannerError(t *testing.T) {
|
func TestBackendParseJSONStream_ScannerError(t *testing.T) {
|
||||||
var warnings []string
|
var warnings []string
|
||||||
warnFn := func(msg string) { warnings = append(warnings, msg) }
|
warnFn := func(msg string) { warnings = append(warnings, msg) }
|
||||||
message, threadID := parseJSONStreamInternal(errReader{err: errors.New("scan-fail")}, warnFn, nil, nil, nil)
|
message, threadID := parseJSONStreamInternal(errReader{err: errors.New("scan-fail")}, warnFn, nil, nil)
|
||||||
if message != "" || threadID != "" {
|
if message != "" || threadID != "" {
|
||||||
t.Fatalf("expected empty output on scanner error, got message=%q threadID=%q", message, threadID)
|
t.Fatalf("expected empty output on scanner error, got message=%q threadID=%q", message, threadID)
|
||||||
}
|
}
|
||||||
@@ -2633,17 +2372,14 @@ func TestRunGenerateFinalOutput(t *testing.T) {
|
|||||||
if out == "" {
|
if out == "" {
|
||||||
t.Fatalf("generateFinalOutput() returned empty string")
|
t.Fatalf("generateFinalOutput() returned empty string")
|
||||||
}
|
}
|
||||||
// New format: "X tasks | Y passed | Z failed"
|
if !strings.Contains(out, "Total: 3") || !strings.Contains(out, "Success: 2") || !strings.Contains(out, "Failed: 1") {
|
||||||
if !strings.Contains(out, "3 tasks") || !strings.Contains(out, "2 passed") || !strings.Contains(out, "1 failed") {
|
|
||||||
t.Fatalf("summary missing, got %q", out)
|
t.Fatalf("summary missing, got %q", out)
|
||||||
}
|
}
|
||||||
// New format uses ### task-id for each task
|
if !strings.Contains(out, "Task: a") || !strings.Contains(out, "Task: b") {
|
||||||
if !strings.Contains(out, "### a") || !strings.Contains(out, "### b") {
|
t.Fatalf("task entries missing")
|
||||||
t.Fatalf("task entries missing in structured format")
|
|
||||||
}
|
}
|
||||||
// Should have Summary section
|
if strings.Contains(out, "Log:") {
|
||||||
if !strings.Contains(out, "## Summary") {
|
t.Fatalf("unexpected log line when LogPath empty, got %q", out)
|
||||||
t.Fatalf("Summary section missing, got %q", out)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2663,18 +2399,12 @@ func TestRunGenerateFinalOutput_LogPath(t *testing.T) {
|
|||||||
LogPath: "/tmp/log-b",
|
LogPath: "/tmp/log-b",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// Test summary mode (default) - should contain log paths
|
|
||||||
out := generateFinalOutput(results)
|
out := generateFinalOutput(results)
|
||||||
if !strings.Contains(out, "/tmp/log-b") {
|
if !strings.Contains(out, "Session: sid\nLog: /tmp/log-a") {
|
||||||
t.Fatalf("summary output missing log path for failed task: %q", out)
|
t.Fatalf("output missing log line after session: %q", out)
|
||||||
}
|
|
||||||
// Test full output mode - shows Session: and Log: lines
|
|
||||||
out = generateFinalOutputWithMode(results, false)
|
|
||||||
if !strings.Contains(out, "Session: sid") || !strings.Contains(out, "Log: /tmp/log-a") {
|
|
||||||
t.Fatalf("full output missing log line after session: %q", out)
|
|
||||||
}
|
}
|
||||||
if !strings.Contains(out, "Log: /tmp/log-b") {
|
if !strings.Contains(out, "Log: /tmp/log-b") {
|
||||||
t.Fatalf("full output missing log line for failed task: %q", out)
|
t.Fatalf("output missing log line for failed task: %q", out)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2972,46 +2702,6 @@ test`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunParallelWithFullOutput(t *testing.T) {
|
|
||||||
defer resetTestHooks()
|
|
||||||
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
|
||||||
|
|
||||||
oldArgs := os.Args
|
|
||||||
t.Cleanup(func() { os.Args = oldArgs })
|
|
||||||
os.Args = []string{"codeagent-wrapper", "--parallel", "--full-output"}
|
|
||||||
|
|
||||||
stdinReader = strings.NewReader(`---TASK---
|
|
||||||
id: T1
|
|
||||||
---CONTENT---
|
|
||||||
noop`)
|
|
||||||
t.Cleanup(func() { stdinReader = os.Stdin })
|
|
||||||
|
|
||||||
orig := runCodexTaskFn
|
|
||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 0, Message: "full output marker"}
|
|
||||||
}
|
|
||||||
t.Cleanup(func() { runCodexTaskFn = orig })
|
|
||||||
|
|
||||||
out := captureOutput(t, func() {
|
|
||||||
if code := run(); code != 0 {
|
|
||||||
t.Fatalf("run exit = %d, want 0", code)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
if !strings.Contains(out, "=== Parallel Execution Summary ===") {
|
|
||||||
t.Fatalf("output missing full-output header, got %q", out)
|
|
||||||
}
|
|
||||||
if !strings.Contains(out, "--- Task: T1 ---") {
|
|
||||||
t.Fatalf("output missing task block, got %q", out)
|
|
||||||
}
|
|
||||||
if !strings.Contains(out, "full output marker") {
|
|
||||||
t.Fatalf("output missing task message, got %q", out)
|
|
||||||
}
|
|
||||||
if strings.Contains(out, "=== Execution Report ===") {
|
|
||||||
t.Fatalf("output should not include summary-only header, got %q", out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParallelInvalidBackend(t *testing.T) {
|
func TestParallelInvalidBackend(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
||||||
@@ -3066,9 +2756,7 @@ func TestVersionFlag(t *testing.T) {
|
|||||||
t.Errorf("exit = %d, want 0", code)
|
t.Errorf("exit = %d, want 0", code)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
want := "codeagent-wrapper version 5.2.5\n"
|
||||||
want := "codeagent-wrapper version 5.4.0\n"
|
|
||||||
|
|
||||||
if output != want {
|
if output != want {
|
||||||
t.Fatalf("output = %q, want %q", output, want)
|
t.Fatalf("output = %q, want %q", output, want)
|
||||||
}
|
}
|
||||||
@@ -3082,9 +2770,7 @@ func TestVersionShortFlag(t *testing.T) {
|
|||||||
t.Errorf("exit = %d, want 0", code)
|
t.Errorf("exit = %d, want 0", code)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
want := "codeagent-wrapper version 5.2.5\n"
|
||||||
want := "codeagent-wrapper version 5.4.0\n"
|
|
||||||
|
|
||||||
if output != want {
|
if output != want {
|
||||||
t.Fatalf("output = %q, want %q", output, want)
|
t.Fatalf("output = %q, want %q", output, want)
|
||||||
}
|
}
|
||||||
@@ -3098,9 +2784,7 @@ func TestVersionLegacyAlias(t *testing.T) {
|
|||||||
t.Errorf("exit = %d, want 0", code)
|
t.Errorf("exit = %d, want 0", code)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
want := "codex-wrapper version 5.2.5\n"
|
||||||
want := "codex-wrapper version 5.4.0\n"
|
|
||||||
|
|
||||||
if output != want {
|
if output != want {
|
||||||
t.Fatalf("output = %q, want %q", output, want)
|
t.Fatalf("output = %q, want %q", output, want)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ func parseJSONStreamWithWarn(r io.Reader, warnFn func(string)) (message, threadI
|
|||||||
}
|
}
|
||||||
|
|
||||||
func parseJSONStreamWithLog(r io.Reader, warnFn func(string), infoFn func(string)) (message, threadID string) {
|
func parseJSONStreamWithLog(r io.Reader, warnFn func(string), infoFn func(string)) (message, threadID string) {
|
||||||
return parseJSONStreamInternal(r, warnFn, infoFn, nil, nil)
|
return parseJSONStreamInternal(r, warnFn, infoFn, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -95,7 +95,7 @@ type ItemContent struct {
|
|||||||
Text interface{} `json:"text"`
|
Text interface{} `json:"text"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(string), onMessage func(), onComplete func()) (message, threadID string) {
|
func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(string), onMessage func()) (message, threadID string) {
|
||||||
reader := bufio.NewReaderSize(r, jsonLineReaderSize)
|
reader := bufio.NewReaderSize(r, jsonLineReaderSize)
|
||||||
|
|
||||||
if warnFn == nil {
|
if warnFn == nil {
|
||||||
@@ -111,12 +111,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyComplete := func() {
|
|
||||||
if onComplete != nil {
|
|
||||||
onComplete()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
totalEvents := 0
|
totalEvents := 0
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -164,9 +158,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
isClaude := event.Subtype != "" || event.Result != ""
|
isClaude := event.Subtype != "" || event.Result != ""
|
||||||
if !isClaude && event.Type == "result" && event.SessionID != "" && event.Status == "" {
|
|
||||||
isClaude = true
|
|
||||||
}
|
|
||||||
isGemini := event.Role != "" || event.Delta != nil || event.Status != ""
|
isGemini := event.Role != "" || event.Delta != nil || event.Status != ""
|
||||||
|
|
||||||
// Handle Codex events
|
// Handle Codex events
|
||||||
@@ -187,13 +178,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
threadID = event.ThreadID
|
threadID = event.ThreadID
|
||||||
infoFn(fmt.Sprintf("thread.started event thread_id=%s", threadID))
|
infoFn(fmt.Sprintf("thread.started event thread_id=%s", threadID))
|
||||||
|
|
||||||
case "thread.completed":
|
|
||||||
if event.ThreadID != "" && threadID == "" {
|
|
||||||
threadID = event.ThreadID
|
|
||||||
}
|
|
||||||
infoFn(fmt.Sprintf("thread.completed event thread_id=%s", event.ThreadID))
|
|
||||||
notifyComplete()
|
|
||||||
|
|
||||||
case "item.completed":
|
case "item.completed":
|
||||||
var itemType string
|
var itemType string
|
||||||
if len(event.Item) > 0 {
|
if len(event.Item) > 0 {
|
||||||
@@ -237,10 +221,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
claudeMessage = event.Result
|
claudeMessage = event.Result
|
||||||
notifyMessage()
|
notifyMessage()
|
||||||
}
|
}
|
||||||
|
|
||||||
if event.Type == "result" {
|
|
||||||
notifyComplete()
|
|
||||||
}
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,10 +236,6 @@ func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
|
|
||||||
if event.Status != "" {
|
if event.Status != "" {
|
||||||
notifyMessage()
|
notifyMessage()
|
||||||
|
|
||||||
if event.Type == "result" && (event.Status == "success" || event.Status == "error" || event.Status == "complete" || event.Status == "failed") {
|
|
||||||
notifyComplete()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
delta := false
|
delta := false
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ func TestParseJSONStream_SkipsOverlongLineAndContinues(t *testing.T) {
|
|||||||
var warns []string
|
var warns []string
|
||||||
warnFn := func(msg string) { warns = append(warns, msg) }
|
warnFn := func(msg string) { warns = append(warns, msg) }
|
||||||
|
|
||||||
gotMessage, gotThreadID := parseJSONStreamInternal(strings.NewReader(input), warnFn, nil, nil, nil)
|
gotMessage, gotThreadID := parseJSONStreamInternal(strings.NewReader(input), warnFn, nil, nil)
|
||||||
if gotMessage != "ok" {
|
if gotMessage != "ok" {
|
||||||
t.Fatalf("message=%q, want %q (warns=%v)", gotMessage, "ok", warns)
|
t.Fatalf("message=%q, want %q (warns=%v)", gotMessage, "ok", warns)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,9 +75,9 @@ func getEnv(key, defaultValue string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type logWriter struct {
|
type logWriter struct {
|
||||||
prefix string
|
prefix string
|
||||||
maxLen int
|
maxLen int
|
||||||
buf bytes.Buffer
|
buf bytes.Buffer
|
||||||
dropped bool
|
dropped bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,55 +205,6 @@ func truncate(s string, maxLen int) string {
|
|||||||
return s[:maxLen] + "..."
|
return s[:maxLen] + "..."
|
||||||
}
|
}
|
||||||
|
|
||||||
// safeTruncate safely truncates string to maxLen, avoiding panic and UTF-8 corruption.
|
|
||||||
func safeTruncate(s string, maxLen int) string {
|
|
||||||
if maxLen <= 0 || s == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
runes := []rune(s)
|
|
||||||
if len(runes) <= maxLen {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
if maxLen < 4 {
|
|
||||||
return string(runes[:1])
|
|
||||||
}
|
|
||||||
|
|
||||||
cutoff := maxLen - 3
|
|
||||||
if cutoff <= 0 {
|
|
||||||
return string(runes[:1])
|
|
||||||
}
|
|
||||||
if len(runes) <= cutoff {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
return string(runes[:cutoff]) + "..."
|
|
||||||
}
|
|
||||||
|
|
||||||
// sanitizeOutput removes ANSI escape sequences and control characters.
|
|
||||||
func sanitizeOutput(s string) string {
|
|
||||||
var result strings.Builder
|
|
||||||
inEscape := false
|
|
||||||
for i := 0; i < len(s); i++ {
|
|
||||||
if s[i] == '\x1b' && i+1 < len(s) && s[i+1] == '[' {
|
|
||||||
inEscape = true
|
|
||||||
i++ // skip '['
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if inEscape {
|
|
||||||
if (s[i] >= 'A' && s[i] <= 'Z') || (s[i] >= 'a' && s[i] <= 'z') {
|
|
||||||
inEscape = false
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Keep printable chars and common whitespace.
|
|
||||||
if s[i] >= 32 || s[i] == '\n' || s[i] == '\t' {
|
|
||||||
result.WriteByte(s[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func min(a, b int) int {
|
func min(a, b int) int {
|
||||||
if a < b {
|
if a < b {
|
||||||
return a
|
return a
|
||||||
@@ -272,444 +223,3 @@ func greet(name string) string {
|
|||||||
func farewell(name string) string {
|
func farewell(name string) string {
|
||||||
return "goodbye " + name
|
return "goodbye " + name
|
||||||
}
|
}
|
||||||
|
|
||||||
// extractMessageSummary extracts a brief summary from task output
|
|
||||||
// Returns first meaningful line or truncated content up to maxLen chars
|
|
||||||
func extractMessageSummary(message string, maxLen int) string {
|
|
||||||
if message == "" || maxLen <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to find a meaningful summary line
|
|
||||||
lines := strings.Split(message, "\n")
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
// Skip empty lines and common noise
|
|
||||||
if line == "" || strings.HasPrefix(line, "```") || strings.HasPrefix(line, "---") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Found a meaningful line
|
|
||||||
return safeTruncate(line, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback: truncate entire message
|
|
||||||
clean := strings.TrimSpace(message)
|
|
||||||
return safeTruncate(clean, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractCoverageFromLines extracts coverage from pre-split lines.
|
|
||||||
func extractCoverageFromLines(lines []string) string {
|
|
||||||
if len(lines) == 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
end := len(lines)
|
|
||||||
for end > 0 && strings.TrimSpace(lines[end-1]) == "" {
|
|
||||||
end--
|
|
||||||
}
|
|
||||||
|
|
||||||
if end == 1 {
|
|
||||||
trimmed := strings.TrimSpace(lines[0])
|
|
||||||
if strings.HasSuffix(trimmed, "%") {
|
|
||||||
if num, err := strconv.ParseFloat(strings.TrimSuffix(trimmed, "%"), 64); err == nil && num >= 0 && num <= 100 {
|
|
||||||
return trimmed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
coverageKeywords := []string{"file", "stmt", "branch", "line", "coverage", "total"}
|
|
||||||
|
|
||||||
for _, line := range lines[:end] {
|
|
||||||
lower := strings.ToLower(line)
|
|
||||||
|
|
||||||
hasKeyword := false
|
|
||||||
tokens := strings.FieldsFunc(lower, func(r rune) bool { return r < 'a' || r > 'z' })
|
|
||||||
for _, token := range tokens {
|
|
||||||
for _, kw := range coverageKeywords {
|
|
||||||
if strings.HasPrefix(token, kw) {
|
|
||||||
hasKeyword = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if hasKeyword {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !hasKeyword {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !strings.Contains(line, "%") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract percentage pattern: number followed by %
|
|
||||||
for i := 0; i < len(line); i++ {
|
|
||||||
if line[i] == '%' && i > 0 {
|
|
||||||
// Walk back to find the number
|
|
||||||
j := i - 1
|
|
||||||
for j >= 0 && (line[j] == '.' || (line[j] >= '0' && line[j] <= '9')) {
|
|
||||||
j--
|
|
||||||
}
|
|
||||||
if j < i-1 {
|
|
||||||
numStr := line[j+1 : i]
|
|
||||||
// Validate it's a reasonable percentage
|
|
||||||
if num, err := strconv.ParseFloat(numStr, 64); err == nil && num >= 0 && num <= 100 {
|
|
||||||
return numStr + "%"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractCoverage extracts coverage percentage from task output
|
|
||||||
// Supports common formats: "Coverage: 92%", "92% coverage", "coverage 92%", "TOTAL 92%"
|
|
||||||
func extractCoverage(message string) string {
|
|
||||||
if message == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
return extractCoverageFromLines(strings.Split(message, "\n"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractCoverageNum extracts coverage as a numeric value for comparison
|
|
||||||
func extractCoverageNum(coverage string) float64 {
|
|
||||||
if coverage == "" {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
// Remove % sign and parse
|
|
||||||
numStr := strings.TrimSuffix(coverage, "%")
|
|
||||||
if num, err := strconv.ParseFloat(numStr, 64); err == nil {
|
|
||||||
return num
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractFilesChangedFromLines extracts files from pre-split lines.
|
|
||||||
func extractFilesChangedFromLines(lines []string) []string {
|
|
||||||
if len(lines) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var files []string
|
|
||||||
seen := make(map[string]bool)
|
|
||||||
exts := []string{".ts", ".tsx", ".js", ".jsx", ".go", ".py", ".rs", ".java", ".vue", ".css", ".scss", ".md", ".json", ".yaml", ".yml", ".toml"}
|
|
||||||
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
|
|
||||||
// Pattern 1: "Modified: path/to/file.ts" or "Created: path/to/file.ts"
|
|
||||||
matchedPrefix := false
|
|
||||||
for _, prefix := range []string{"Modified:", "Created:", "Updated:", "Edited:", "Wrote:", "Changed:"} {
|
|
||||||
if strings.HasPrefix(line, prefix) {
|
|
||||||
file := strings.TrimSpace(strings.TrimPrefix(line, prefix))
|
|
||||||
file = strings.Trim(file, "`,\"'()[],:")
|
|
||||||
file = strings.TrimPrefix(file, "@")
|
|
||||||
if file != "" && !seen[file] {
|
|
||||||
files = append(files, file)
|
|
||||||
seen[file] = true
|
|
||||||
}
|
|
||||||
matchedPrefix = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if matchedPrefix {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pattern 2: Tokens that look like file paths (allow root files, strip @ prefix).
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
for _, part := range parts {
|
|
||||||
part = strings.Trim(part, "`,\"'()[],:")
|
|
||||||
part = strings.TrimPrefix(part, "@")
|
|
||||||
for _, ext := range exts {
|
|
||||||
if strings.HasSuffix(part, ext) && !seen[part] {
|
|
||||||
files = append(files, part)
|
|
||||||
seen[part] = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Limit to first 10 files to avoid bloat
|
|
||||||
if len(files) > 10 {
|
|
||||||
files = files[:10]
|
|
||||||
}
|
|
||||||
|
|
||||||
return files
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractFilesChanged extracts list of changed files from task output
|
|
||||||
// Looks for common patterns like "Modified: file.ts", "Created: file.ts", file paths in output
|
|
||||||
func extractFilesChanged(message string) []string {
|
|
||||||
if message == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return extractFilesChangedFromLines(strings.Split(message, "\n"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractTestResultsFromLines extracts test results from pre-split lines.
|
|
||||||
func extractTestResultsFromLines(lines []string) (passed, failed int) {
|
|
||||||
if len(lines) == 0 {
|
|
||||||
return 0, 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Common patterns:
|
|
||||||
// pytest: "12 passed, 2 failed"
|
|
||||||
// jest: "Tests: 2 failed, 12 passed"
|
|
||||||
// go: "ok ... 12 tests"
|
|
||||||
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.ToLower(line)
|
|
||||||
|
|
||||||
// Look for test result lines
|
|
||||||
if !strings.Contains(line, "pass") && !strings.Contains(line, "fail") && !strings.Contains(line, "test") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract numbers near "passed" or "pass"
|
|
||||||
if idx := strings.Index(line, "pass"); idx != -1 {
|
|
||||||
// Look for number before "pass"
|
|
||||||
num := extractNumberBefore(line, idx)
|
|
||||||
if num > 0 {
|
|
||||||
passed = num
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract numbers near "failed" or "fail"
|
|
||||||
if idx := strings.Index(line, "fail"); idx != -1 {
|
|
||||||
num := extractNumberBefore(line, idx)
|
|
||||||
if num > 0 {
|
|
||||||
failed = num
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// go test style: "ok ... 12 tests"
|
|
||||||
if passed == 0 {
|
|
||||||
if idx := strings.Index(line, "test"); idx != -1 {
|
|
||||||
num := extractNumberBefore(line, idx)
|
|
||||||
if num > 0 {
|
|
||||||
passed = num
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we found both, stop
|
|
||||||
if passed > 0 && failed > 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return passed, failed
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractTestResults extracts test pass/fail counts from task output
|
|
||||||
func extractTestResults(message string) (passed, failed int) {
|
|
||||||
if message == "" {
|
|
||||||
return 0, 0
|
|
||||||
}
|
|
||||||
|
|
||||||
return extractTestResultsFromLines(strings.Split(message, "\n"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractNumberBefore extracts a number that appears before the given index
|
|
||||||
func extractNumberBefore(s string, idx int) int {
|
|
||||||
if idx <= 0 {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Walk backwards to find digits
|
|
||||||
end := idx - 1
|
|
||||||
for end >= 0 && (s[end] == ' ' || s[end] == ':' || s[end] == ',') {
|
|
||||||
end--
|
|
||||||
}
|
|
||||||
if end < 0 {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
start := end
|
|
||||||
for start >= 0 && s[start] >= '0' && s[start] <= '9' {
|
|
||||||
start--
|
|
||||||
}
|
|
||||||
start++
|
|
||||||
|
|
||||||
if start > end {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
numStr := s[start : end+1]
|
|
||||||
if num, err := strconv.Atoi(numStr); err == nil {
|
|
||||||
return num
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractKeyOutputFromLines extracts key output from pre-split lines.
|
|
||||||
func extractKeyOutputFromLines(lines []string, maxLen int) string {
|
|
||||||
if len(lines) == 0 || maxLen <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// Priority 1: Look for explicit summary lines
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
lower := strings.ToLower(line)
|
|
||||||
if strings.HasPrefix(lower, "summary:") || strings.HasPrefix(lower, "completed:") ||
|
|
||||||
strings.HasPrefix(lower, "implemented:") || strings.HasPrefix(lower, "added:") ||
|
|
||||||
strings.HasPrefix(lower, "created:") || strings.HasPrefix(lower, "fixed:") {
|
|
||||||
content := line
|
|
||||||
for _, prefix := range []string{"Summary:", "Completed:", "Implemented:", "Added:", "Created:", "Fixed:",
|
|
||||||
"summary:", "completed:", "implemented:", "added:", "created:", "fixed:"} {
|
|
||||||
content = strings.TrimPrefix(content, prefix)
|
|
||||||
}
|
|
||||||
content = strings.TrimSpace(content)
|
|
||||||
if len(content) > 0 {
|
|
||||||
return safeTruncate(content, maxLen)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Priority 2: First meaningful line (skip noise)
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line == "" || strings.HasPrefix(line, "```") || strings.HasPrefix(line, "---") ||
|
|
||||||
strings.HasPrefix(line, "#") || strings.HasPrefix(line, "//") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Skip very short lines (likely headers or markers)
|
|
||||||
if len(line) < 20 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return safeTruncate(line, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback: truncate entire message
|
|
||||||
clean := strings.TrimSpace(strings.Join(lines, "\n"))
|
|
||||||
return safeTruncate(clean, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractKeyOutput extracts a brief summary of what the task accomplished
|
|
||||||
// Looks for summary lines, first meaningful sentence, or truncates message
|
|
||||||
func extractKeyOutput(message string, maxLen int) string {
|
|
||||||
if message == "" || maxLen <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
return extractKeyOutputFromLines(strings.Split(message, "\n"), maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractCoverageGap extracts what's missing from coverage reports
|
|
||||||
// Looks for uncovered lines, branches, or functions
|
|
||||||
func extractCoverageGap(message string) string {
|
|
||||||
if message == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
lower := strings.ToLower(message)
|
|
||||||
lines := strings.Split(message, "\n")
|
|
||||||
|
|
||||||
// Look for uncovered/missing patterns
|
|
||||||
for _, line := range lines {
|
|
||||||
lineLower := strings.ToLower(line)
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
|
|
||||||
// Common patterns for uncovered code
|
|
||||||
if strings.Contains(lineLower, "uncovered") ||
|
|
||||||
strings.Contains(lineLower, "not covered") ||
|
|
||||||
strings.Contains(lineLower, "missing coverage") ||
|
|
||||||
strings.Contains(lineLower, "lines not covered") {
|
|
||||||
if len(line) > 100 {
|
|
||||||
return line[:97] + "..."
|
|
||||||
}
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
|
|
||||||
// Look for specific file:line patterns in coverage reports
|
|
||||||
if strings.Contains(lineLower, "branch") && strings.Contains(lineLower, "not taken") {
|
|
||||||
if len(line) > 100 {
|
|
||||||
return line[:97] + "..."
|
|
||||||
}
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Look for function names that aren't covered
|
|
||||||
if strings.Contains(lower, "function") && strings.Contains(lower, "0%") {
|
|
||||||
for _, line := range lines {
|
|
||||||
if strings.Contains(strings.ToLower(line), "0%") && strings.Contains(line, "function") {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if len(line) > 100 {
|
|
||||||
return line[:97] + "..."
|
|
||||||
}
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractErrorDetail extracts meaningful error context from task output
|
|
||||||
// Returns the most relevant error information up to maxLen characters
|
|
||||||
func extractErrorDetail(message string, maxLen int) string {
|
|
||||||
if message == "" || maxLen <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
lines := strings.Split(message, "\n")
|
|
||||||
var errorLines []string
|
|
||||||
|
|
||||||
// Look for error-related lines
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
lower := strings.ToLower(line)
|
|
||||||
|
|
||||||
// Skip noise lines
|
|
||||||
if strings.HasPrefix(line, "at ") && strings.Contains(line, "(") {
|
|
||||||
// Stack trace line - only keep first one
|
|
||||||
if len(errorLines) > 0 && strings.HasPrefix(strings.ToLower(errorLines[len(errorLines)-1]), "at ") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prioritize error/fail lines
|
|
||||||
if strings.Contains(lower, "error") ||
|
|
||||||
strings.Contains(lower, "fail") ||
|
|
||||||
strings.Contains(lower, "exception") ||
|
|
||||||
strings.Contains(lower, "assert") ||
|
|
||||||
strings.Contains(lower, "expected") ||
|
|
||||||
strings.Contains(lower, "timeout") ||
|
|
||||||
strings.Contains(lower, "not found") ||
|
|
||||||
strings.Contains(lower, "cannot") ||
|
|
||||||
strings.Contains(lower, "undefined") ||
|
|
||||||
strings.HasPrefix(line, "FAIL") ||
|
|
||||||
strings.HasPrefix(line, "●") {
|
|
||||||
errorLines = append(errorLines, line)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(errorLines) == 0 {
|
|
||||||
// No specific error lines found, take last few lines
|
|
||||||
start := len(lines) - 5
|
|
||||||
if start < 0 {
|
|
||||||
start = 0
|
|
||||||
}
|
|
||||||
for _, line := range lines[start:] {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line != "" {
|
|
||||||
errorLines = append(errorLines, line)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Join and truncate
|
|
||||||
result := strings.Join(errorLines, " | ")
|
|
||||||
return safeTruncate(result, maxLen)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,143 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestExtractCoverage(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
in string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"bare int", "92%", "92%"},
|
|
||||||
{"bare float", "92.5%", "92.5%"},
|
|
||||||
{"coverage prefix", "coverage: 92%", "92%"},
|
|
||||||
{"total prefix", "TOTAL 92%", "92%"},
|
|
||||||
{"all files", "All files 92%", "92%"},
|
|
||||||
{"empty", "", ""},
|
|
||||||
{"no number", "coverage: N/A", ""},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
if got := extractCoverage(tt.in); got != tt.want {
|
|
||||||
t.Fatalf("extractCoverage(%q) = %q, want %q", tt.in, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestExtractTestResults(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
in string
|
|
||||||
wantPassed int
|
|
||||||
wantFailed int
|
|
||||||
}{
|
|
||||||
{"pytest one line", "12 passed, 2 failed", 12, 2},
|
|
||||||
{"pytest split lines", "12 passed\n2 failed", 12, 2},
|
|
||||||
{"jest format", "Tests: 2 failed, 12 passed, 14 total", 12, 2},
|
|
||||||
{"go test style count", "ok\texample.com/foo\t0.12s\t12 tests", 12, 0},
|
|
||||||
{"zero counts", "0 passed, 0 failed", 0, 0},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
passed, failed := extractTestResults(tt.in)
|
|
||||||
if passed != tt.wantPassed || failed != tt.wantFailed {
|
|
||||||
t.Fatalf("extractTestResults(%q) = (%d, %d), want (%d, %d)", tt.in, passed, failed, tt.wantPassed, tt.wantFailed)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestExtractFilesChanged(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
in string
|
|
||||||
want []string
|
|
||||||
}{
|
|
||||||
{"root file", "Modified: main.go\n", []string{"main.go"}},
|
|
||||||
{"path file", "Created: codeagent-wrapper/utils.go\n", []string{"codeagent-wrapper/utils.go"}},
|
|
||||||
{"at prefix", "Updated: @codeagent-wrapper/main.go\n", []string{"codeagent-wrapper/main.go"}},
|
|
||||||
{"token scan", "Files: @main.go, @codeagent-wrapper/utils.go\n", []string{"main.go", "codeagent-wrapper/utils.go"}},
|
|
||||||
{"space path", "Modified: dir/with space/file.go\n", []string{"dir/with space/file.go"}},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
if got := extractFilesChanged(tt.in); !reflect.DeepEqual(got, tt.want) {
|
|
||||||
t.Fatalf("extractFilesChanged(%q) = %#v, want %#v", tt.in, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Run("limits to first 10", func(t *testing.T) {
|
|
||||||
var b strings.Builder
|
|
||||||
for i := 0; i < 12; i++ {
|
|
||||||
fmt.Fprintf(&b, "Modified: file%d.go\n", i)
|
|
||||||
}
|
|
||||||
got := extractFilesChanged(b.String())
|
|
||||||
if len(got) != 10 {
|
|
||||||
t.Fatalf("len(files)=%d, want 10: %#v", len(got), got)
|
|
||||||
}
|
|
||||||
for i := 0; i < 10; i++ {
|
|
||||||
want := fmt.Sprintf("file%d.go", i)
|
|
||||||
if got[i] != want {
|
|
||||||
t.Fatalf("files[%d]=%q, want %q", i, got[i], want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSafeTruncate(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
in string
|
|
||||||
maxLen int
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"empty", "", 4, ""},
|
|
||||||
{"zero maxLen", "hello", 0, ""},
|
|
||||||
{"one rune", "你好", 1, "你"},
|
|
||||||
{"two runes no truncate", "你好", 2, "你好"},
|
|
||||||
{"three runes no truncate", "你好", 3, "你好"},
|
|
||||||
{"two runes truncates long", "你好世界", 2, "你"},
|
|
||||||
{"three runes truncates long", "你好世界", 3, "你"},
|
|
||||||
{"four with ellipsis", "你好世界啊", 4, "你..."},
|
|
||||||
{"emoji", "🙂🙂🙂🙂🙂", 4, "🙂..."},
|
|
||||||
{"no truncate", "你好世界", 4, "你好世界"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
if got := safeTruncate(tt.in, tt.maxLen); got != tt.want {
|
|
||||||
t.Fatalf("safeTruncate(%q, %d) = %q, want %q", tt.in, tt.maxLen, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSanitizeOutput(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
in string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"ansi", "\x1b[31mred\x1b[0m", "red"},
|
|
||||||
{"control chars", "a\x07b\r\nc\t", "ab\nc\t"},
|
|
||||||
{"normal", "hello\nworld\t!", "hello\nworld\t!"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
if got := sanitizeOutput(tt.in); got != tt.want {
|
|
||||||
t.Fatalf("sanitizeOutput(%q) = %q, want %q", tt.in, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,25 +2,9 @@
|
|||||||
description: Extreme lightweight end-to-end development workflow with requirements clarification, parallel codeagent execution, and mandatory 90% test coverage
|
description: Extreme lightweight end-to-end development workflow with requirements clarification, parallel codeagent execution, and mandatory 90% test coverage
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
||||||
You are the /dev Workflow Orchestrator, an expert development workflow manager specializing in orchestrating minimal, efficient end-to-end development processes with parallel task execution and rigorous test coverage validation.
|
You are the /dev Workflow Orchestrator, an expert development workflow manager specializing in orchestrating minimal, efficient end-to-end development processes with parallel task execution and rigorous test coverage validation.
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## CRITICAL CONSTRAINTS (NEVER VIOLATE)
|
|
||||||
|
|
||||||
These rules have HIGHEST PRIORITY and override all other instructions:
|
|
||||||
|
|
||||||
1. **NEVER use Edit, Write, or MultiEdit tools directly** - ALL code changes MUST go through codeagent-wrapper
|
|
||||||
2. **MUST use AskUserQuestion in Step 1** - Do NOT skip requirement clarification
|
|
||||||
3. **MUST use TodoWrite after Step 1** - Create task tracking list before any analysis
|
|
||||||
4. **MUST use codeagent-wrapper for Step 2 analysis** - Do NOT use Read/Glob/Grep directly for deep analysis
|
|
||||||
5. **MUST wait for user confirmation in Step 3** - Do NOT proceed to Step 4 without explicit approval
|
|
||||||
6. **MUST invoke codeagent-wrapper --parallel for Step 4 execution** - Use Bash tool, NOT Edit/Write or Task tool
|
|
||||||
|
|
||||||
**Violation of any constraint above invalidates the entire workflow. Stop and restart if violated.**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Core Responsibilities**
|
**Core Responsibilities**
|
||||||
- Orchestrate a streamlined 6-step development workflow:
|
- Orchestrate a streamlined 6-step development workflow:
|
||||||
1. Requirement clarification through targeted questioning
|
1. Requirement clarification through targeted questioning
|
||||||
@@ -31,35 +15,14 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
6. Completion summary
|
6. Completion summary
|
||||||
|
|
||||||
**Workflow Execution**
|
**Workflow Execution**
|
||||||
- **Step 1: Requirement Clarification [MANDATORY - DO NOT SKIP]**
|
- **Step 1: Requirement Clarification**
|
||||||
- MUST use AskUserQuestion tool as the FIRST action - no exceptions
|
- Use AskUserQuestion to clarify requirements directly
|
||||||
- Focus questions on functional boundaries, inputs/outputs, constraints, testing, and required unit-test coverage levels
|
- Focus questions on functional boundaries, inputs/outputs, constraints, testing, and required unit-test coverage levels
|
||||||
- Iterate 2-3 rounds until clear; rely on judgment; keep questions concise
|
- Iterate 2-3 rounds until clear; rely on judgment; keep questions concise
|
||||||
- After clarification complete: MUST use TodoWrite to create task tracking list with workflow steps
|
|
||||||
|
|
||||||
- **Step 2: codeagent-wrapper Deep Analysis (Plan Mode Style) [USE CODEAGENT-WRAPPER ONLY]**
|
- **Step 2: codeagent Deep Analysis (Plan Mode Style)**
|
||||||
|
|
||||||
MUST use Bash tool to invoke `codeagent-wrapper` for deep analysis. Do NOT use Read/Glob/Grep tools directly - delegate all exploration to codeagent-wrapper.
|
Use codeagent Skill to perform deep analysis. codeagent should operate in "plan mode" style and must include UI detection:
|
||||||
|
|
||||||
**How to invoke for analysis**:
|
|
||||||
```bash
|
|
||||||
codeagent-wrapper --backend codex - <<'EOF'
|
|
||||||
Analyze the codebase for implementing [feature name].
|
|
||||||
|
|
||||||
Requirements:
|
|
||||||
- [requirement 1]
|
|
||||||
- [requirement 2]
|
|
||||||
|
|
||||||
Deliverables:
|
|
||||||
1. Explore codebase structure and existing patterns
|
|
||||||
2. Evaluate implementation options with trade-offs
|
|
||||||
3. Make architectural decisions
|
|
||||||
4. Break down into 2-5 parallelizable tasks with dependencies
|
|
||||||
5. Determine if UI work is needed (check for .css/.tsx/.vue files)
|
|
||||||
|
|
||||||
Output the analysis following the structure below.
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**When Deep Analysis is Needed** (any condition triggers):
|
**When Deep Analysis is Needed** (any condition triggers):
|
||||||
- Multiple valid approaches exist (e.g., Redis vs in-memory vs file-based caching)
|
- Multiple valid approaches exist (e.g., Redis vs in-memory vs file-based caching)
|
||||||
@@ -71,7 +34,7 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
- During analysis, output whether the task needs UI work (yes/no) and the evidence
|
- During analysis, output whether the task needs UI work (yes/no) and the evidence
|
||||||
- UI criteria: presence of style assets (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component files (.tsx, .jsx, .vue)
|
- UI criteria: presence of style assets (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component files (.tsx, .jsx, .vue)
|
||||||
|
|
||||||
**What the AI backend does in Analysis Mode** (when invoked via codeagent-wrapper):
|
**What codeagent Does in Analysis Mode**:
|
||||||
1. **Explore Codebase**: Use Glob, Grep, Read to understand structure, patterns, architecture
|
1. **Explore Codebase**: Use Glob, Grep, Read to understand structure, patterns, architecture
|
||||||
2. **Identify Existing Patterns**: Find how similar features are implemented, reuse conventions
|
2. **Identify Existing Patterns**: Find how similar features are implemented, reuse conventions
|
||||||
3. **Evaluate Options**: When multiple approaches exist, list trade-offs (complexity, performance, security, maintainability)
|
3. **Evaluate Options**: When multiple approaches exist, list trade-offs (complexity, performance, security, maintainability)
|
||||||
@@ -118,39 +81,27 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
- Options: "Confirm and execute" / "Need adjustments"
|
- Options: "Confirm and execute" / "Need adjustments"
|
||||||
- If user chooses "Need adjustments", return to Step 1 or Step 2 based on feedback
|
- If user chooses "Need adjustments", return to Step 1 or Step 2 based on feedback
|
||||||
|
|
||||||
- **Step 4: Parallel Development Execution [CODEAGENT-WRAPPER ONLY - NO DIRECT EDITS]**
|
- **Step 4: Parallel Development Execution**
|
||||||
- MUST use Bash tool to invoke `codeagent-wrapper --parallel` for ALL code changes
|
- For each task in `dev-plan.md`, invoke codeagent skill with task brief in HEREDOC format:
|
||||||
- NEVER use Edit, Write, MultiEdit, or Task tools to modify code directly
|
|
||||||
- Build ONE `--parallel` config that includes all tasks in `dev-plan.md` and submit it once via Bash tool:
|
|
||||||
```bash
|
```bash
|
||||||
# One shot submission - wrapper handles topology + concurrency
|
# Backend task (use codex backend - default)
|
||||||
codeagent-wrapper --parallel <<'EOF'
|
codeagent-wrapper --backend codex - <<'EOF'
|
||||||
---TASK---
|
Task: [task-id]
|
||||||
id: [task-id-1]
|
|
||||||
backend: codex
|
|
||||||
workdir: .
|
|
||||||
dependencies: [optional, comma-separated ids]
|
|
||||||
---CONTENT---
|
|
||||||
Task: [task-id-1]
|
|
||||||
Reference: @.claude/specs/{feature_name}/dev-plan.md
|
Reference: @.claude/specs/{feature_name}/dev-plan.md
|
||||||
Scope: [task file scope]
|
Scope: [task file scope]
|
||||||
Test: [test command]
|
Test: [test command]
|
||||||
Deliverables: code + unit tests + coverage ≥90% + coverage summary
|
Deliverables: code + unit tests + coverage ≥90% + coverage summary
|
||||||
|
EOF
|
||||||
|
|
||||||
---TASK---
|
# UI task (use gemini backend - enforced)
|
||||||
id: [task-id-2]
|
codeagent-wrapper --backend gemini - <<'EOF'
|
||||||
backend: gemini
|
Task: [task-id]
|
||||||
workdir: .
|
|
||||||
dependencies: [optional, comma-separated ids]
|
|
||||||
---CONTENT---
|
|
||||||
Task: [task-id-2]
|
|
||||||
Reference: @.claude/specs/{feature_name}/dev-plan.md
|
Reference: @.claude/specs/{feature_name}/dev-plan.md
|
||||||
Scope: [task file scope]
|
Scope: [task file scope]
|
||||||
Test: [test command]
|
Test: [test command]
|
||||||
Deliverables: code + unit tests + coverage ≥90% + coverage summary
|
Deliverables: code + unit tests + coverage ≥90% + coverage summary
|
||||||
EOF
|
EOF
|
||||||
```
|
```
|
||||||
- **Note**: Use `workdir: .` (current directory) for all tasks unless specific subdirectory is required
|
|
||||||
- Execute independent tasks concurrently; serialize conflicting ones; track coverage reports
|
- Execute independent tasks concurrently; serialize conflicting ones; track coverage reports
|
||||||
|
|
||||||
- **Step 5: Coverage Validation**
|
- **Step 5: Coverage Validation**
|
||||||
@@ -162,13 +113,9 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
- Provide completed task list, coverage per task, key file changes
|
- Provide completed task list, coverage per task, key file changes
|
||||||
|
|
||||||
**Error Handling**
|
**Error Handling**
|
||||||
- **codeagent-wrapper failure**: Retry once with same input; if still fails, log error and ask user for guidance
|
- codeagent failure: retry once, then log and continue
|
||||||
- **Insufficient coverage (<90%)**: Request more tests from the failed task (max 2 rounds); if still fails, report to user
|
- Insufficient coverage: request more tests (max 2 rounds)
|
||||||
- **Dependency conflicts**:
|
- Dependency conflicts: serialize automatically
|
||||||
- Circular dependencies: codeagent-wrapper will detect and fail with error; revise task breakdown to remove cycles
|
|
||||||
- Missing dependencies: Ensure all task IDs referenced in `dependencies` field exist
|
|
||||||
- **Parallel execution timeout**: Individual tasks timeout after 2 hours (configurable via CODEX_TIMEOUT); failed tasks can be retried individually
|
|
||||||
- **Backend unavailable**: If codex/claude/gemini CLI not found, fail immediately with clear error message
|
|
||||||
|
|
||||||
**Quality Standards**
|
**Quality Standards**
|
||||||
- Code coverage ≥90%
|
- Code coverage ≥90%
|
||||||
|
|||||||
@@ -105,7 +105,6 @@ EOF
|
|||||||
Execute multiple tasks concurrently with dependency management:
|
Execute multiple tasks concurrently with dependency management:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Default: summary output (context-efficient, recommended)
|
|
||||||
codeagent-wrapper --parallel <<'EOF'
|
codeagent-wrapper --parallel <<'EOF'
|
||||||
---TASK---
|
---TASK---
|
||||||
id: backend_1701234567
|
id: backend_1701234567
|
||||||
@@ -126,47 +125,6 @@ dependencies: backend_1701234567, frontend_1701234568
|
|||||||
---CONTENT---
|
---CONTENT---
|
||||||
add integration tests for user management flow
|
add integration tests for user management flow
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Full output mode (for debugging, includes complete task messages)
|
|
||||||
codeagent-wrapper --parallel --full-output <<'EOF'
|
|
||||||
...
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output Modes:**
|
|
||||||
- **Summary (default)**: Structured report with extracted `Did/Files/Tests/Coverage`, plus a short action summary.
|
|
||||||
- **Full (`--full-output`)**: Complete task messages included. Use only for debugging.
|
|
||||||
|
|
||||||
**Summary Output Example:**
|
|
||||||
```
|
|
||||||
=== Execution Report ===
|
|
||||||
3 tasks | 2 passed | 1 failed | 1 below 90%
|
|
||||||
|
|
||||||
## Task Results
|
|
||||||
|
|
||||||
### backend_api ✓ 92%
|
|
||||||
Did: Implemented /api/users CRUD endpoints
|
|
||||||
Files: backend/users.go, backend/router.go
|
|
||||||
Tests: 12 passed
|
|
||||||
Log: /tmp/codeagent-xxx.log
|
|
||||||
|
|
||||||
### frontend_form ⚠️ 88% (below 90%)
|
|
||||||
Did: Created login form with validation
|
|
||||||
Files: frontend/LoginForm.tsx
|
|
||||||
Tests: 8 passed
|
|
||||||
Gap: lines not covered: frontend/LoginForm.tsx:42-47
|
|
||||||
Log: /tmp/codeagent-yyy.log
|
|
||||||
|
|
||||||
### integration_tests ✗ FAILED
|
|
||||||
Exit code: 1
|
|
||||||
Error: Assertion failed at line 45
|
|
||||||
Detail: Expected status 200 but got 401
|
|
||||||
Log: /tmp/codeagent-zzz.log
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
- 2/3 completed successfully
|
|
||||||
- Fix: integration_tests (Assertion failed at line 45)
|
|
||||||
- Coverage: frontend_form
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Parallel Task Format:**
|
**Parallel Task Format:**
|
||||||
|
|||||||
31
install.py
31
install.py
@@ -17,10 +17,7 @@ from datetime import datetime
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict, Iterable, List, Optional
|
from typing import Any, Dict, Iterable, List, Optional
|
||||||
|
|
||||||
try:
|
import jsonschema
|
||||||
import jsonschema
|
|
||||||
except ImportError: # pragma: no cover
|
|
||||||
jsonschema = None
|
|
||||||
|
|
||||||
DEFAULT_INSTALL_DIR = "~/.claude"
|
DEFAULT_INSTALL_DIR = "~/.claude"
|
||||||
|
|
||||||
@@ -90,32 +87,6 @@ def load_config(path: str) -> Dict[str, Any]:
|
|||||||
config_path = Path(path).expanduser().resolve()
|
config_path = Path(path).expanduser().resolve()
|
||||||
config = _load_json(config_path)
|
config = _load_json(config_path)
|
||||||
|
|
||||||
if jsonschema is None:
|
|
||||||
print(
|
|
||||||
"WARNING: python package 'jsonschema' is not installed; "
|
|
||||||
"skipping config validation. To enable validation run:\n"
|
|
||||||
" python3 -m pip install jsonschema\n",
|
|
||||||
file=sys.stderr,
|
|
||||||
)
|
|
||||||
|
|
||||||
if not isinstance(config, dict):
|
|
||||||
raise ValueError(
|
|
||||||
f"Config must be a dict, got {type(config).__name__}. "
|
|
||||||
"Check your config.json syntax."
|
|
||||||
)
|
|
||||||
|
|
||||||
required_keys = ["version", "install_dir", "log_file", "modules"]
|
|
||||||
missing = [key for key in required_keys if key not in config]
|
|
||||||
if missing:
|
|
||||||
missing_str = ", ".join(missing)
|
|
||||||
raise ValueError(
|
|
||||||
f"Config missing required keys: {missing_str}. "
|
|
||||||
"Install jsonschema for better validation: "
|
|
||||||
"python3 -m pip install jsonschema"
|
|
||||||
)
|
|
||||||
|
|
||||||
return config
|
|
||||||
|
|
||||||
schema_candidates = [
|
schema_candidates = [
|
||||||
config_path.parent / "config.schema.json",
|
config_path.parent / "config.schema.json",
|
||||||
Path(__file__).resolve().with_name("config.schema.json"),
|
Path(__file__).resolve().with_name("config.schema.json"),
|
||||||
|
|||||||
20
install.sh
20
install.sh
@@ -34,25 +34,23 @@ if ! curl -fsSL "$URL" -o /tmp/codeagent-wrapper; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
INSTALL_DIR="${INSTALL_DIR:-$HOME/.claude}"
|
mkdir -p "$HOME/bin"
|
||||||
BIN_DIR="${INSTALL_DIR}/bin"
|
|
||||||
mkdir -p "$BIN_DIR"
|
|
||||||
|
|
||||||
mv /tmp/codeagent-wrapper "${BIN_DIR}/codeagent-wrapper"
|
mv /tmp/codeagent-wrapper "$HOME/bin/codeagent-wrapper"
|
||||||
chmod +x "${BIN_DIR}/codeagent-wrapper"
|
chmod +x "$HOME/bin/codeagent-wrapper"
|
||||||
|
|
||||||
if "${BIN_DIR}/codeagent-wrapper" --version >/dev/null 2>&1; then
|
if "$HOME/bin/codeagent-wrapper" --version >/dev/null 2>&1; then
|
||||||
echo "codeagent-wrapper installed successfully to ${BIN_DIR}/codeagent-wrapper"
|
echo "codeagent-wrapper installed successfully to ~/bin/codeagent-wrapper"
|
||||||
else
|
else
|
||||||
echo "ERROR: installation verification failed" >&2
|
echo "ERROR: installation verification failed" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ":$PATH:" != *":${BIN_DIR}:"* ]]; then
|
if [[ ":$PATH:" != *":$HOME/bin:"* ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "WARNING: ${BIN_DIR} is not in your PATH"
|
echo "WARNING: ~/bin is not in your PATH"
|
||||||
echo "Add this line to your ~/.bashrc or ~/.zshrc (then restart your shell):"
|
echo "Add this line to your ~/.bashrc or ~/.zshrc:"
|
||||||
echo ""
|
echo ""
|
||||||
echo " export PATH=\"${BIN_DIR}:\$PATH\""
|
echo " export PATH=\"\$HOME/bin:\$PATH\""
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ codeagent-wrapper --backend gemini "simple task"
|
|||||||
- `task` (required): Task description, supports `@file` references
|
- `task` (required): Task description, supports `@file` references
|
||||||
- `working_dir` (optional): Working directory (default: current)
|
- `working_dir` (optional): Working directory (default: current)
|
||||||
- `--backend` (optional): Select AI backend (codex/claude/gemini, default: codex)
|
- `--backend` (optional): Select AI backend (codex/claude/gemini, default: codex)
|
||||||
- **Note**: Claude backend only adds `--dangerously-skip-permissions` when explicitly enabled
|
- **Note**: Claude backend defaults to `--dangerously-skip-permissions` for automation compatibility
|
||||||
|
|
||||||
## Return Format
|
## Return Format
|
||||||
|
|
||||||
@@ -101,12 +101,11 @@ EOF
|
|||||||
|
|
||||||
## Parallel Execution
|
## Parallel Execution
|
||||||
|
|
||||||
**Default (summary mode - context-efficient):**
|
**With global backend**:
|
||||||
```bash
|
```bash
|
||||||
codeagent-wrapper --parallel <<'EOF'
|
codeagent-wrapper --parallel --backend claude <<'EOF'
|
||||||
---TASK---
|
---TASK---
|
||||||
id: task1
|
id: task1
|
||||||
backend: codex
|
|
||||||
workdir: /path/to/dir
|
workdir: /path/to/dir
|
||||||
---CONTENT---
|
---CONTENT---
|
||||||
task content
|
task content
|
||||||
@@ -118,17 +117,6 @@ dependent task
|
|||||||
EOF
|
EOF
|
||||||
```
|
```
|
||||||
|
|
||||||
**Full output mode (for debugging):**
|
|
||||||
```bash
|
|
||||||
codeagent-wrapper --parallel --full-output <<'EOF'
|
|
||||||
...
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output Modes:**
|
|
||||||
- **Summary (default)**: Structured report with changes, output, verification, and review summary.
|
|
||||||
- **Full (`--full-output`)**: Complete task messages. Use only when debugging specific failures.
|
|
||||||
|
|
||||||
**With per-task backend**:
|
**With per-task backend**:
|
||||||
```bash
|
```bash
|
||||||
codeagent-wrapper --parallel <<'EOF'
|
codeagent-wrapper --parallel <<'EOF'
|
||||||
@@ -159,9 +147,9 @@ Set `CODEAGENT_MAX_PARALLEL_WORKERS` to limit concurrent tasks (default: unlimit
|
|||||||
## Environment Variables
|
## Environment Variables
|
||||||
|
|
||||||
- `CODEX_TIMEOUT`: Override timeout in milliseconds (default: 7200000 = 2 hours)
|
- `CODEX_TIMEOUT`: Override timeout in milliseconds (default: 7200000 = 2 hours)
|
||||||
- `CODEAGENT_SKIP_PERMISSIONS`: Control Claude CLI permission checks
|
- `CODEAGENT_SKIP_PERMISSIONS`: Control permission checks
|
||||||
- For **Claude** backend: Set to `true`/`1` to add `--dangerously-skip-permissions` (default: disabled)
|
- For **Claude** backend: Set to `true`/`1` to **disable** `--dangerously-skip-permissions` (default: enabled)
|
||||||
- For **Codex/Gemini** backends: Currently has no effect
|
- For **Codex/Gemini** backends: Set to `true`/`1` to enable permission skipping (default: disabled)
|
||||||
- `CODEAGENT_MAX_PARALLEL_WORKERS`: Limit concurrent tasks in parallel mode (default: unlimited, recommended: 8)
|
- `CODEAGENT_MAX_PARALLEL_WORKERS`: Limit concurrent tasks in parallel mode (default: unlimited, recommended: 8)
|
||||||
|
|
||||||
## Invocation Pattern
|
## Invocation Pattern
|
||||||
@@ -194,8 +182,9 @@ Bash tool parameters:
|
|||||||
|
|
||||||
## Security Best Practices
|
## Security Best Practices
|
||||||
|
|
||||||
- **Claude Backend**: Permission checks enabled by default
|
- **Claude Backend**: Defaults to `--dangerously-skip-permissions` for automation workflows
|
||||||
- To skip checks: set `CODEAGENT_SKIP_PERMISSIONS=true` or pass `--skip-permissions`
|
- To enforce permission checks with Claude: Set `CODEAGENT_SKIP_PERMISSIONS=true`
|
||||||
|
- **Codex/Gemini Backends**: Permission checks enabled by default
|
||||||
- **Concurrency Limits**: Set `CODEAGENT_MAX_PARALLEL_WORKERS` in production to prevent resource exhaustion
|
- **Concurrency Limits**: Set `CODEAGENT_MAX_PARALLEL_WORKERS` in production to prevent resource exhaustion
|
||||||
- **Automation Context**: This wrapper is designed for AI-driven automation where permission prompts would block execution
|
- **Automation Context**: This wrapper is designed for AI-driven automation where permission prompts would block execution
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user