mirror of
https://github.com/cexll/myclaude.git
synced 2026-02-10 03:14:32 +08:00
Compare commits
2 Commits
v6.0.0
...
feature_pa
| Author | SHA1 | Date | |
|---|---|---|---|
|
4dd735034e | ||
|
a08dd62b59 |
@@ -1,54 +1,209 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://anthropic.com/claude-code/marketplace.schema.json",
|
"name": "claude-code-dev-workflows",
|
||||||
"name": "myclaude",
|
|
||||||
"version": "5.6.1",
|
|
||||||
"description": "Professional multi-agent development workflows with OmO orchestration, Requirements-Driven and BMAD methodologies",
|
|
||||||
"owner": {
|
"owner": {
|
||||||
"name": "cexll",
|
"name": "Claude Code Dev Workflows",
|
||||||
"email": "evanxian9@gmail.com"
|
"email": "contact@example.com",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"metadata": {
|
||||||
|
"description": "Professional multi-agent development workflows with Requirements-Driven and BMAD methodologies, featuring 16+ specialized agents and 12+ commands",
|
||||||
|
"version": "1.0.0"
|
||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
{
|
{
|
||||||
"name": "omo",
|
"name": "requirements-driven-development",
|
||||||
"description": "Multi-agent orchestration for code analysis, bug investigation, fix planning, and implementation with intelligent routing to specialized agents",
|
"source": "./requirements-driven-workflow/",
|
||||||
"version": "5.6.1",
|
"description": "Streamlined requirements-driven development workflow with 90% quality gates for practical feature implementation",
|
||||||
"source": "./skills/omo",
|
"version": "1.0.0",
|
||||||
"category": "development"
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"requirements",
|
||||||
|
"workflow",
|
||||||
|
"automation",
|
||||||
|
"quality-gates",
|
||||||
|
"feature-development",
|
||||||
|
"agile",
|
||||||
|
"specifications"
|
||||||
|
],
|
||||||
|
"category": "workflows",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/requirements-pilot.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/requirements-generate.md",
|
||||||
|
"./agents/requirements-code.md",
|
||||||
|
"./agents/requirements-testing.md",
|
||||||
|
"./agents/requirements-review.md"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dev",
|
"name": "bmad-agile-workflow",
|
||||||
"description": "Lightweight development workflow with requirements clarification, parallel codex execution, and mandatory 90% test coverage",
|
"source": "./bmad-agile-workflow/",
|
||||||
"version": "5.6.1",
|
|
||||||
"source": "./dev-workflow",
|
|
||||||
"category": "development"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "requirements",
|
|
||||||
"description": "Requirements-driven development workflow with quality gates for practical feature implementation",
|
|
||||||
"version": "5.6.1",
|
|
||||||
"source": "./requirements-driven-workflow",
|
|
||||||
"category": "development"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "bmad",
|
|
||||||
"description": "Full BMAD agile workflow with role-based agents (PO, Architect, SM, Dev, QA) and interactive approval gates",
|
"description": "Full BMAD agile workflow with role-based agents (PO, Architect, SM, Dev, QA) and interactive approval gates",
|
||||||
"version": "5.6.1",
|
"version": "1.0.0",
|
||||||
"source": "./bmad-agile-workflow",
|
"author": {
|
||||||
"category": "development"
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"bmad",
|
||||||
|
"agile",
|
||||||
|
"scrum",
|
||||||
|
"product-owner",
|
||||||
|
"architect",
|
||||||
|
"developer",
|
||||||
|
"qa",
|
||||||
|
"workflow-orchestration"
|
||||||
|
],
|
||||||
|
"category": "workflows",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/bmad-pilot.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/bmad-po.md",
|
||||||
|
"./agents/bmad-architect.md",
|
||||||
|
"./agents/bmad-sm.md",
|
||||||
|
"./agents/bmad-dev.md",
|
||||||
|
"./agents/bmad-qa.md",
|
||||||
|
"./agents/bmad-orchestrator.md",
|
||||||
|
"./agents/bmad-review.md"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dev-kit",
|
"name": "development-essentials",
|
||||||
|
"source": "./development-essentials/",
|
||||||
"description": "Essential development commands for coding, debugging, testing, optimization, and documentation",
|
"description": "Essential development commands for coding, debugging, testing, optimization, and documentation",
|
||||||
"version": "5.6.1",
|
"version": "1.0.0",
|
||||||
"source": "./development-essentials",
|
"author": {
|
||||||
"category": "productivity"
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"code",
|
||||||
|
"debug",
|
||||||
|
"test",
|
||||||
|
"optimize",
|
||||||
|
"review",
|
||||||
|
"bugfix",
|
||||||
|
"refactor",
|
||||||
|
"documentation"
|
||||||
|
],
|
||||||
|
"category": "essentials",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/code.md",
|
||||||
|
"./commands/debug.md",
|
||||||
|
"./commands/test.md",
|
||||||
|
"./commands/optimize.md",
|
||||||
|
"./commands/review.md",
|
||||||
|
"./commands/bugfix.md",
|
||||||
|
"./commands/refactor.md",
|
||||||
|
"./commands/docs.md",
|
||||||
|
"./commands/ask.md",
|
||||||
|
"./commands/think.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/code.md",
|
||||||
|
"./agents/bugfix.md",
|
||||||
|
"./agents/bugfix-verify.md",
|
||||||
|
"./agents/optimize.md",
|
||||||
|
"./agents/debug.md"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sparv",
|
"name": "codex-cli",
|
||||||
"description": "Minimal SPARV workflow (Specify→Plan→Act→Review→Vault) with 10-point spec gate, unified journal, 2-action saves, 3-failure protocol, and EHRB risk detection",
|
"source": "./skills/codex/",
|
||||||
"version": "1.1.0",
|
"description": "Execute Codex CLI for code analysis, refactoring, and automated code changes with file references (@syntax) and structured output",
|
||||||
"source": "./skills/sparv",
|
"version": "1.0.0",
|
||||||
"category": "development"
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"codex",
|
||||||
|
"code-analysis",
|
||||||
|
"refactoring",
|
||||||
|
"automation",
|
||||||
|
"gpt-5",
|
||||||
|
"ai-coding"
|
||||||
|
],
|
||||||
|
"category": "essentials",
|
||||||
|
"strict": false,
|
||||||
|
"skills": [
|
||||||
|
"./SKILL.md"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "gemini-cli",
|
||||||
|
"source": "./skills/gemini/",
|
||||||
|
"description": "Execute Gemini CLI for AI-powered code analysis and generation with Google's latest Gemini models",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"gemini",
|
||||||
|
"google-ai",
|
||||||
|
"code-analysis",
|
||||||
|
"code-generation",
|
||||||
|
"ai-reasoning"
|
||||||
|
],
|
||||||
|
"category": "essentials",
|
||||||
|
"strict": false,
|
||||||
|
"skills": [
|
||||||
|
"./SKILL.md"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "dev-workflow",
|
||||||
|
"source": "./dev-workflow/",
|
||||||
|
"description": "Minimal lightweight development workflow with requirements clarification, parallel codex execution, and mandatory 90% test coverage",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"dev",
|
||||||
|
"workflow",
|
||||||
|
"codex",
|
||||||
|
"testing",
|
||||||
|
"coverage",
|
||||||
|
"concurrent",
|
||||||
|
"lightweight"
|
||||||
|
],
|
||||||
|
"category": "workflows",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/dev.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/dev-plan-generator.md"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
25
.github/workflows/release.yml
vendored
25
.github/workflows/release.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
|||||||
if [ "${{ matrix.goos }}" = "windows" ]; then
|
if [ "${{ matrix.goos }}" = "windows" ]; then
|
||||||
OUTPUT_NAME="${OUTPUT_NAME}.exe"
|
OUTPUT_NAME="${OUTPUT_NAME}.exe"
|
||||||
fi
|
fi
|
||||||
go build -ldflags="-s -w -X main.version=${VERSION}" -o ${OUTPUT_NAME} ./cmd/codeagent
|
go build -ldflags="-s -w -X main.version=${VERSION}" -o ${OUTPUT_NAME} .
|
||||||
chmod +x ${OUTPUT_NAME}
|
chmod +x ${OUTPUT_NAME}
|
||||||
echo "artifact_path=codeagent-wrapper/${OUTPUT_NAME}" >> $GITHUB_OUTPUT
|
echo "artifact_path=codeagent-wrapper/${OUTPUT_NAME}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
@@ -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__
|
||||||
|
|||||||
60
CHANGELOG.md
60
CHANGELOG.md
@@ -2,66 +2,6 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
## [5.6.4] - 2026-01-15
|
|
||||||
|
|
||||||
### 🚀 Features
|
|
||||||
|
|
||||||
- add reasoning effort config for codex backend
|
|
||||||
- default to skip-permissions and bypass-sandbox
|
|
||||||
- add multi-agent support with yolo mode
|
|
||||||
- add omo module for multi-agent orchestration
|
|
||||||
- add intelligent backend selection based on task complexity (#61)
|
|
||||||
- v5.4.0 structured execution report (#94)
|
|
||||||
- add millisecond-precision timestamps to all log entries (#91)
|
|
||||||
- skill-install install script and security scan
|
|
||||||
- add uninstall scripts with selective module removal
|
|
||||||
|
|
||||||
### 🐛 Bug Fixes
|
|
||||||
|
|
||||||
- filter codex stderr noise logs
|
|
||||||
- use config override for codex reasoning effort
|
|
||||||
- propagate SkipPermissions to parallel tasks (#113)
|
|
||||||
- add timeout for Windows process termination
|
|
||||||
- reject dash as workdir parameter (#118)
|
|
||||||
- add sleep in fake script to prevent CI race condition
|
|
||||||
- fix gemini env load
|
|
||||||
- fix omo
|
|
||||||
- fix codeagent skill TaskOutput
|
|
||||||
- 修复 Gemini init 事件 session_id 未提取的问题 (#111)
|
|
||||||
- Windows 后端退出：taskkill 结束进程树 + turn.completed 支持 (#108)
|
|
||||||
- support model parameter for all backends, auto-inject from settings (#105)
|
|
||||||
- replace setx with reg add to avoid 1024-char PATH truncation (#101)
|
|
||||||
- 移除未知事件格式的日志噪声 (#96)
|
|
||||||
- prevent duplicate PATH entries on reinstall (#95)
|
|
||||||
- Minor issues #12 and #13 - ASCII mode and performance optimization
|
|
||||||
- correct settings.json filename and bump version to v5.2.8
|
|
||||||
- allow claude backend to read env from setting.json while preventing recursion (#92)
|
|
||||||
- comprehensive security and quality improvements for PR #85 & #87 (#90)
|
|
||||||
- Improve backend termination after message and extend timeout (#86)
|
|
||||||
- Parser重复解析优化 + 严重bug修复 + PR #86兼容性 (#88)
|
|
||||||
- filter noisy stderr output from gemini backend (#83)
|
|
||||||
- 修復 wsl install.sh 格式問題 (#78)
|
|
||||||
- 修复多 backend 并行日志 PID 混乱并移除包装格式 (#74) (#76)
|
|
||||||
|
|
||||||
### 🚜 Refactor
|
|
||||||
|
|
||||||
- remove sisyphus agent and unused code
|
|
||||||
- streamline agent documentation and remove sisyphus
|
|
||||||
|
|
||||||
### 📚 Documentation
|
|
||||||
|
|
||||||
- add OmO workflow to README and fix plugin marketplace structure
|
|
||||||
- update FAQ for default bypass/skip-permissions behavior
|
|
||||||
- 添加 FAQ 常见问题章节
|
|
||||||
- update troubleshooting with idempotent PATH commands (#95)
|
|
||||||
|
|
||||||
### 💼 Other
|
|
||||||
|
|
||||||
- add test-cases skill
|
|
||||||
- add browser skill
|
|
||||||
- BMADh和Requirements-Driven支持根据语义生成对应的文档 (#82)
|
|
||||||
- update all readme
|
|
||||||
|
|
||||||
## [5.2.4] - 2025-12-16
|
## [5.2.4] - 2025-12-16
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
307
README.md
307
README.md
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
[](https://www.gnu.org/licenses/agpl-3.0)
|
[](https://www.gnu.org/licenses/agpl-3.0)
|
||||||
[](https://claude.ai/code)
|
[](https://claude.ai/code)
|
||||||
[](https://github.com/cexll/myclaude)
|
[](https://github.com/cexll/myclaude)
|
||||||
|
|
||||||
> AI-powered development automation with multi-backend execution (Codex/Claude/Gemini)
|
> AI-powered development automation with multi-backend execution (Codex/Claude/Gemini)
|
||||||
|
|
||||||
@@ -35,41 +35,6 @@ python3 install.py --install-dir ~/.claude
|
|||||||
|
|
||||||
## Workflows Overview
|
## Workflows Overview
|
||||||
|
|
||||||
### 0. OmO Multi-Agent Orchestrator (Recommended for Complex Tasks)
|
|
||||||
|
|
||||||
**Intelligent multi-agent orchestration that routes tasks to specialized agents based on risk signals.**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
/omo "analyze and fix this authentication bug"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent Hierarchy:**
|
|
||||||
| Agent | Role | Backend | Model |
|
|
||||||
|-------|------|---------|-------|
|
|
||||||
| `oracle` | Technical advisor | Claude | claude-opus-4-5 |
|
|
||||||
| `librarian` | External research | Claude | claude-sonnet-4-5 |
|
|
||||||
| `explore` | Codebase search | OpenCode | grok-code |
|
|
||||||
| `develop` | Code implementation | Codex | gpt-5.2 |
|
|
||||||
| `frontend-ui-ux-engineer` | UI/UX specialist | Gemini | gemini-3-pro |
|
|
||||||
| `document-writer` | Documentation | Gemini | gemini-3-flash |
|
|
||||||
|
|
||||||
**Routing Signals (Not Fixed Pipeline):**
|
|
||||||
- Code location unclear → `explore`
|
|
||||||
- External library/API → `librarian`
|
|
||||||
- Risky/multi-file change → `oracle`
|
|
||||||
- Implementation needed → `develop` / `frontend-ui-ux-engineer`
|
|
||||||
|
|
||||||
**Common Recipes:**
|
|
||||||
- Explain code: `explore`
|
|
||||||
- Small fix with known location: `develop` directly
|
|
||||||
- Bug fix, location unknown: `explore → develop`
|
|
||||||
- Cross-cutting refactor: `explore → oracle → develop`
|
|
||||||
- External API integration: `explore + librarian → oracle → develop`
|
|
||||||
|
|
||||||
**Best For:** Complex bug investigation, multi-file refactoring, architecture decisions
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 1. Dev Workflow (Recommended)
|
### 1. Dev Workflow (Recommended)
|
||||||
|
|
||||||
**The primary workflow for most development tasks.**
|
**The primary workflow for most development tasks.**
|
||||||
@@ -167,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 adds `--dangerously-skip-permissions` for Claude by default. Set `CODEAGENT_SKIP_PERMISSIONS=false` to disable if you need permission prompts.
|
|
||||||
|
|
||||||
**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)
|
||||||
@@ -251,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:
|
||||||
@@ -381,10 +269,8 @@ $Env:PATH = "$HOME\bin;$Env:PATH"
|
|||||||
```
|
```
|
||||||
|
|
||||||
```batch
|
```batch
|
||||||
REM cmd.exe - persistent for current user (use PowerShell method above instead)
|
REM cmd.exe - persistent for current user
|
||||||
REM WARNING: This expands %PATH% which includes system PATH, causing duplication
|
setx PATH "%USERPROFILE%\bin;%PATH%"
|
||||||
REM Note: Using reg add instead of setx to avoid 1024-character truncation limit
|
|
||||||
reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%" /f
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -408,14 +294,11 @@ reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%
|
|||||||
|
|
||||||
**Codex wrapper not found:**
|
**Codex wrapper not found:**
|
||||||
```bash
|
```bash
|
||||||
# Installer auto-adds PATH, check if configured
|
# Check PATH
|
||||||
if [[ ":$PATH:" != *":$HOME/.claude/bin:"* ]]; then
|
echo $PATH | grep -q "$HOME/bin" || echo 'export PATH="$HOME/bin:$PATH"' >> ~/.zshrc
|
||||||
echo "PATH not configured. Reinstalling..."
|
|
||||||
bash install.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Or manually add (idempotent command)
|
# Reinstall
|
||||||
[[ ":$PATH:" != *":$HOME/.claude/bin:"* ]] && echo 'export PATH="$HOME/.claude/bin:$PATH"' >> ~/.zshrc
|
bash install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
**Permission denied:**
|
**Permission denied:**
|
||||||
@@ -432,173 +315,11 @@ 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
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## FAQ (Frequently Asked Questions)
|
|
||||||
|
|
||||||
### Q1: `codeagent-wrapper` execution fails with "Unknown event format"
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```
|
|
||||||
Unknown event format: {"type":"turn.started"}
|
|
||||||
Unknown event format: {"type":"assistant", ...}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
This is a logging event format display issue and does not affect actual functionality. It will be fixed in the next version. You can ignore these log outputs.
|
|
||||||
|
|
||||||
**Related Issue:** [#96](https://github.com/cexll/myclaude/issues/96)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q2: Gemini cannot read files ignored by `.gitignore`
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
When using `codeagent-wrapper --backend gemini`, files in directories like `.claude/` that are ignored by `.gitignore` cannot be read.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
- **Option 1:** Remove `.claude/` from your `.gitignore` file
|
|
||||||
- **Option 2:** Ensure files that need to be read are not in `.gitignore` list
|
|
||||||
|
|
||||||
**Related Issue:** [#75](https://github.com/cexll/myclaude/issues/75)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q3: `/dev` command parallel execution is very slow
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
Using `/dev` command for simple features takes too long (over 30 minutes) with no visibility into task progress.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
1. **Check logs:** Review `C:\Users\User\AppData\Local\Temp\codeagent-wrapper-*.log` to identify bottlenecks
|
|
||||||
2. **Adjust backend:**
|
|
||||||
- Try faster models like `gpt-5.1-codex-max`
|
|
||||||
- Running in WSL may be significantly faster
|
|
||||||
3. **Workspace:** Use a single repository instead of monorepo with multiple sub-projects
|
|
||||||
|
|
||||||
**Related Issue:** [#77](https://github.com/cexll/myclaude/issues/77)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q4: Codex permission denied with new Go version
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
After upgrading to the new Go-based Codex implementation, execution fails with permission denied errors.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
Add the following configuration to `~/.codex/config.yaml` (Windows: `c:\user\.codex\config.toml`):
|
|
||||||
```yaml
|
|
||||||
model = "gpt-5.1-codex-max"
|
|
||||||
model_reasoning_effort = "high"
|
|
||||||
model_reasoning_summary = "detailed"
|
|
||||||
approval_policy = "never"
|
|
||||||
sandbox_mode = "workspace-write"
|
|
||||||
disable_response_storage = true
|
|
||||||
network_access = true
|
|
||||||
```
|
|
||||||
|
|
||||||
**Key settings:**
|
|
||||||
- `approval_policy = "never"` - Remove approval restrictions
|
|
||||||
- `sandbox_mode = "workspace-write"` - Allow workspace write access
|
|
||||||
- `network_access = true` - Enable network access
|
|
||||||
|
|
||||||
**Related Issue:** [#31](https://github.com/cexll/myclaude/issues/31)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q5: How to disable default bypass/skip-permissions mode
|
|
||||||
|
|
||||||
**Background:**
|
|
||||||
By default, codeagent-wrapper enables bypass mode for both Codex and Claude backends:
|
|
||||||
- `CODEX_BYPASS_SANDBOX=true` - Bypasses Codex sandbox restrictions
|
|
||||||
- `CODEAGENT_SKIP_PERMISSIONS=true` - Skips Claude permission prompts
|
|
||||||
|
|
||||||
**To disable (if you need sandbox/permission protection):**
|
|
||||||
```bash
|
|
||||||
export CODEX_BYPASS_SANDBOX=false
|
|
||||||
export CODEAGENT_SKIP_PERMISSIONS=false
|
|
||||||
```
|
|
||||||
|
|
||||||
Or add to your shell profile (`~/.zshrc` or `~/.bashrc`):
|
|
||||||
```bash
|
|
||||||
echo 'export CODEX_BYPASS_SANDBOX=false' >> ~/.zshrc
|
|
||||||
echo 'export CODEAGENT_SKIP_PERMISSIONS=false' >> ~/.zshrc
|
|
||||||
```
|
|
||||||
|
|
||||||
**Note:** Disabling bypass mode will require manual approval for certain operations.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Still having issues?** Visit [GitHub Issues](https://github.com/cexll/myclaude/issues) to search or report new issues.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
|
### Core Guides
|
||||||
- **[Codeagent-Wrapper Guide](docs/CODEAGENT-WRAPPER.md)** - Multi-backend execution wrapper
|
- **[Codeagent-Wrapper Guide](docs/CODEAGENT-WRAPPER.md)** - Multi-backend execution wrapper
|
||||||
- **[Hooks Documentation](docs/HOOKS.md)** - Custom hooks and automation
|
- **[Hooks Documentation](docs/HOOKS.md)** - Custom hooks and automation
|
||||||
|
|
||||||
|
|||||||
187
README_CN.md
187
README_CN.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[](https://www.gnu.org/licenses/agpl-3.0)
|
[](https://www.gnu.org/licenses/agpl-3.0)
|
||||||
[](https://claude.ai/code)
|
[](https://claude.ai/code)
|
||||||
[](https://github.com/cexll/myclaude)
|
[](https://github.com/cexll/myclaude)
|
||||||
|
|
||||||
> AI 驱动的开发自动化 - 多后端执行架构 (Codex/Claude/Gemini)
|
> AI 驱动的开发自动化 - 多后端执行架构 (Codex/Claude/Gemini)
|
||||||
|
|
||||||
@@ -30,41 +30,6 @@ python3 install.py --install-dir ~/.claude
|
|||||||
|
|
||||||
## 工作流概览
|
## 工作流概览
|
||||||
|
|
||||||
### 0. OmO 多智能体编排器（复杂任务推荐）
|
|
||||||
|
|
||||||
**基于风险信号智能路由任务到专业智能体的多智能体编排系统。**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
/omo "分析并修复这个认证 bug"
|
|
||||||
```
|
|
||||||
|
|
||||||
**智能体层级：**
|
|
||||||
| 智能体 | 角色 | 后端 | 模型 |
|
|
||||||
|-------|------|------|------|
|
|
||||||
| `oracle` | 技术顾问 | Claude | claude-opus-4-5 |
|
|
||||||
| `librarian` | 外部研究 | Claude | claude-sonnet-4-5 |
|
|
||||||
| `explore` | 代码库搜索 | OpenCode | grok-code |
|
|
||||||
| `develop` | 代码实现 | Codex | gpt-5.2 |
|
|
||||||
| `frontend-ui-ux-engineer` | UI/UX 专家 | Gemini | gemini-3-pro |
|
|
||||||
| `document-writer` | 文档撰写 | Gemini | gemini-3-flash |
|
|
||||||
|
|
||||||
**路由信号（非固定流水线）：**
|
|
||||||
- 代码位置不明确 → `explore`
|
|
||||||
- 外部库/API → `librarian`
|
|
||||||
- 高风险/多文件变更 → `oracle`
|
|
||||||
- 需要实现 → `develop` / `frontend-ui-ux-engineer`
|
|
||||||
|
|
||||||
**常用配方：**
|
|
||||||
- 解释代码：`explore`
|
|
||||||
- 位置已知的小修复：直接 `develop`
|
|
||||||
- Bug 修复，位置未知：`explore → develop`
|
|
||||||
- 跨模块重构：`explore → oracle → develop`
|
|
||||||
- 外部 API 集成：`explore + librarian → oracle → develop`
|
|
||||||
|
|
||||||
**适用场景：** 复杂 bug 调查、多文件重构、架构决策
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 1. Dev 工作流（推荐）
|
### 1. Dev 工作流（推荐）
|
||||||
|
|
||||||
**大多数开发任务的首选工作流。**
|
**大多数开发任务的首选工作流。**
|
||||||
@@ -187,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` 自定义：
|
||||||
@@ -317,10 +258,8 @@ $Env:PATH = "$HOME\bin;$Env:PATH"
|
|||||||
```
|
```
|
||||||
|
|
||||||
```batch
|
```batch
|
||||||
REM cmd.exe - 永久添加（当前用户）（建议使用上面的 PowerShell 方法）
|
REM cmd.exe - 永久添加（当前用户）
|
||||||
REM 警告：此命令会展开 %PATH% 包含系统 PATH，导致重复
|
setx PATH "%USERPROFILE%\bin;%PATH%"
|
||||||
REM 注意：使用 reg add 而非 setx 以避免 1024 字符截断限制
|
|
||||||
reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%" /f
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -344,14 +283,11 @@ reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "%USERPROFILE%\bin;%PATH%
|
|||||||
|
|
||||||
**Codex wrapper 未找到：**
|
**Codex wrapper 未找到：**
|
||||||
```bash
|
```bash
|
||||||
# 安装程序会自动添加 PATH，检查是否已添加
|
# 检查 PATH
|
||||||
if [[ ":$PATH:" != *":$HOME/.claude/bin:"* ]]; then
|
echo $PATH | grep -q "$HOME/bin" || echo 'export PATH="$HOME/bin:$PATH"' >> ~/.zshrc
|
||||||
echo "PATH not configured. Reinstalling..."
|
|
||||||
bash install.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 或手动添加（幂等性命令）
|
# 重新安装
|
||||||
[[ ":$PATH:" != *":$HOME/.claude/bin:"* ]] && echo 'export PATH="$HOME/.claude/bin:$PATH"' >> ~/.zshrc
|
bash install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
**权限被拒绝：**
|
**权限被拒绝：**
|
||||||
@@ -370,105 +306,6 @@ python3 install.py --module dev --force
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 常见问题 (FAQ)
|
|
||||||
|
|
||||||
### Q1: `codeagent-wrapper` 执行时报错 "Unknown event format"
|
|
||||||
|
|
||||||
**问题描述：**
|
|
||||||
执行 `codeagent-wrapper` 时出现错误：
|
|
||||||
```
|
|
||||||
Unknown event format: {"type":"turn.started"}
|
|
||||||
Unknown event format: {"type":"assistant", ...}
|
|
||||||
```
|
|
||||||
|
|
||||||
**解决方案：**
|
|
||||||
这是日志事件流的显示问题，不影响实际功能执行。预计在下个版本中修复。如需排查其他问题，可忽略此日志输出。
|
|
||||||
|
|
||||||
**相关 Issue：** [#96](https://github.com/cexll/myclaude/issues/96)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q2: Gemini 无法读取 `.gitignore` 忽略的文件
|
|
||||||
|
|
||||||
**问题描述：**
|
|
||||||
使用 `codeagent-wrapper --backend gemini` 时，无法读取 `.claude/` 等被 `.gitignore` 忽略的目录中的文件。
|
|
||||||
|
|
||||||
**解决方案：**
|
|
||||||
- **方案一：** 在项目根目录的 `.gitignore` 中取消对 `.claude/` 的忽略
|
|
||||||
- **方案二：** 确保需要读取的文件不在 `.gitignore` 忽略列表中
|
|
||||||
|
|
||||||
**相关 Issue：** [#75](https://github.com/cexll/myclaude/issues/75)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q3: `/dev` 命令并行执行特别慢
|
|
||||||
|
|
||||||
**问题描述：**
|
|
||||||
使用 `/dev` 命令开发简单功能耗时过长（超过30分钟），无法了解任务执行状态。
|
|
||||||
|
|
||||||
**解决方案：**
|
|
||||||
1. **检查日志：** 查看 `C:\Users\User\AppData\Local\Temp\codeagent-wrapper-*.log` 分析瓶颈
|
|
||||||
2. **调整后端：**
|
|
||||||
- 尝试使用 `gpt-5.1-codex-max` 等更快的模型
|
|
||||||
- 在 WSL 环境下运行速度可能更快
|
|
||||||
3. **工作区选择：** 使用独立的代码仓库而非包含多个子项目的 monorepo
|
|
||||||
|
|
||||||
**相关 Issue：** [#77](https://github.com/cexll/myclaude/issues/77)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q4: 新版 Go 实现的 Codex 权限不足
|
|
||||||
|
|
||||||
**问题描述：**
|
|
||||||
升级到新版 Go 实现的 Codex 后，出现权限不足的错误。
|
|
||||||
|
|
||||||
**解决方案：**
|
|
||||||
在 `~/.codex/config.yaml` 中添加以下配置（Windows: `c:\user\.codex\config.toml`）：
|
|
||||||
```yaml
|
|
||||||
model = "gpt-5.1-codex-max"
|
|
||||||
model_reasoning_effort = "high"
|
|
||||||
model_reasoning_summary = "detailed"
|
|
||||||
approval_policy = "never"
|
|
||||||
sandbox_mode = "workspace-write"
|
|
||||||
disable_response_storage = true
|
|
||||||
network_access = true
|
|
||||||
```
|
|
||||||
|
|
||||||
**关键配置说明：**
|
|
||||||
- `approval_policy = "never"` - 移除审批限制
|
|
||||||
- `sandbox_mode = "workspace-write"` - 允许工作区写入权限
|
|
||||||
- `network_access = true` - 启用网络访问
|
|
||||||
|
|
||||||
**相关 Issue：** [#31](https://github.com/cexll/myclaude/issues/31)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q5: 执行时遇到权限拒绝或沙箱限制
|
|
||||||
|
|
||||||
**问题描述：**
|
|
||||||
运行 codeagent-wrapper 时出现权限错误或沙箱限制。
|
|
||||||
|
|
||||||
**解决方案：**
|
|
||||||
设置以下环境变量：
|
|
||||||
```bash
|
|
||||||
export CODEX_BYPASS_SANDBOX=true
|
|
||||||
export CODEAGENT_SKIP_PERMISSIONS=true
|
|
||||||
```
|
|
||||||
|
|
||||||
或添加到 shell 配置文件（`~/.zshrc` 或 `~/.bashrc`）：
|
|
||||||
```bash
|
|
||||||
echo 'export CODEX_BYPASS_SANDBOX=true' >> ~/.zshrc
|
|
||||||
echo 'export CODEAGENT_SKIP_PERMISSIONS=true' >> ~/.zshrc
|
|
||||||
```
|
|
||||||
|
|
||||||
**注意：** 这些设置会绕过安全限制，请仅在可信环境中使用。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**仍有疑问？** 请访问 [GitHub Issues](https://github.com/cexll/myclaude/issues) 搜索或提交新问题。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 许可证
|
## 许可证
|
||||||
|
|
||||||
AGPL-3.0 License - 查看 [LICENSE](LICENSE)
|
AGPL-3.0 License - 查看 [LICENSE](LICENSE)
|
||||||
|
|||||||
37
bmad-agile-workflow/.claude-plugin/marketplace.json
Normal file
37
bmad-agile-workflow/.claude-plugin/marketplace.json
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
"name": "bmad-agile-workflow",
|
||||||
|
"source": "./",
|
||||||
|
"description": "Full BMAD agile workflow with role-based agents (PO, Architect, SM, Dev, QA) and interactive approval gates",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"bmad",
|
||||||
|
"agile",
|
||||||
|
"scrum",
|
||||||
|
"product-owner",
|
||||||
|
"architect",
|
||||||
|
"developer",
|
||||||
|
"qa",
|
||||||
|
"workflow-orchestration"
|
||||||
|
],
|
||||||
|
"category": "workflows",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/bmad-pilot.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/bmad-po.md",
|
||||||
|
"./agents/bmad-architect.md",
|
||||||
|
"./agents/bmad-sm.md",
|
||||||
|
"./agents/bmad-dev.md",
|
||||||
|
"./agents/bmad-qa.md",
|
||||||
|
"./agents/bmad-orchestrator.md",
|
||||||
|
"./agents/bmad-review.md"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "bmad",
|
|
||||||
"description": "Full BMAD agile workflow with role-based agents (PO, Architect, SM, Dev, QA) and interactive approval gates",
|
|
||||||
"version": "5.6.1",
|
|
||||||
"author": {
|
|
||||||
"name": "cexll",
|
|
||||||
"email": "cexll@cexll.com"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
39
codeagent-wrapper/.github/workflows/ci.yml
vendored
39
codeagent-wrapper/.github/workflows/ci.yml
vendored
@@ -1,39 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main, master]
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
go-version: ["1.21", "1.22"]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: ${{ matrix.go-version }}
|
|
||||||
cache: true
|
|
||||||
- name: Test
|
|
||||||
run: make test
|
|
||||||
- name: Build
|
|
||||||
run: make build
|
|
||||||
|
|
||||||
lint:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: "1.22"
|
|
||||||
cache: true
|
|
||||||
- name: Lint
|
|
||||||
run: make lint
|
|
||||||
|
|
||||||
12
codeagent-wrapper/.gitignore
vendored
12
codeagent-wrapper/.gitignore
vendored
@@ -1,7 +1,4 @@
|
|||||||
# Build artifacts
|
# Build artifacts
|
||||||
bin/
|
|
||||||
codeagent
|
|
||||||
codeagent.exe
|
|
||||||
codeagent-wrapper
|
codeagent-wrapper
|
||||||
codeagent-wrapper.exe
|
codeagent-wrapper.exe
|
||||||
*.test
|
*.test
|
||||||
@@ -12,12 +9,3 @@ coverage*.out
|
|||||||
cover.out
|
cover.out
|
||||||
cover_*.out
|
cover_*.out
|
||||||
coverage.html
|
coverage.html
|
||||||
|
|
||||||
# Logs
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Temp files
|
|
||||||
*.tmp
|
|
||||||
*.swp
|
|
||||||
*~
|
|
||||||
.DS_Store
|
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
GO ?= go
|
|
||||||
|
|
||||||
BINARY ?= codeagent
|
|
||||||
CMD_PKG := ./cmd/codeagent
|
|
||||||
|
|
||||||
TOOLS_BIN := $(CURDIR)/bin
|
|
||||||
TOOLCHAIN ?= go1.22.0
|
|
||||||
GOLANGCI_LINT_VERSION := v1.56.2
|
|
||||||
STATICCHECK_VERSION := v0.4.7
|
|
||||||
|
|
||||||
GOLANGCI_LINT := $(TOOLS_BIN)/golangci-lint
|
|
||||||
STATICCHECK := $(TOOLS_BIN)/staticcheck
|
|
||||||
|
|
||||||
.PHONY: build test lint clean install
|
|
||||||
|
|
||||||
build:
|
|
||||||
$(GO) build -o $(BINARY) $(CMD_PKG)
|
|
||||||
|
|
||||||
test:
|
|
||||||
$(GO) test ./...
|
|
||||||
|
|
||||||
$(GOLANGCI_LINT):
|
|
||||||
@mkdir -p $(TOOLS_BIN)
|
|
||||||
GOTOOLCHAIN=$(TOOLCHAIN) GOBIN=$(TOOLS_BIN) $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
|
|
||||||
|
|
||||||
$(STATICCHECK):
|
|
||||||
@mkdir -p $(TOOLS_BIN)
|
|
||||||
GOTOOLCHAIN=$(TOOLCHAIN) GOBIN=$(TOOLS_BIN) $(GO) install honnef.co/go/tools/cmd/staticcheck@$(STATICCHECK_VERSION)
|
|
||||||
|
|
||||||
lint: $(GOLANGCI_LINT) $(STATICCHECK)
|
|
||||||
GOTOOLCHAIN=$(TOOLCHAIN) $(GOLANGCI_LINT) run ./...
|
|
||||||
GOTOOLCHAIN=$(TOOLCHAIN) $(STATICCHECK) ./...
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@python3 -c 'import glob, os; paths=["codeagent","codeagent.exe","codeagent-wrapper","codeagent-wrapper.exe","coverage.out","cover.out","coverage.html"]; paths += glob.glob("coverage*.out") + glob.glob("cover_*.out") + glob.glob("*.test"); [os.remove(p) for p in paths if os.path.exists(p)]'
|
|
||||||
|
|
||||||
install:
|
|
||||||
$(GO) install $(CMD_PKG)
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
# codeagent-wrapper
|
|
||||||
|
|
||||||
`codeagent-wrapper` 是一个用 Go 编写的“多后端 AI 代码代理”命令行包装器：用统一的 CLI 入口封装不同的 AI 工具后端（Codex / Claude / Gemini / Opencode），并提供一致的参数、配置与会话恢复体验。
|
|
||||||
|
|
||||||
入口：`cmd/codeagent/main.go`（生成二进制名：`codeagent`）。
|
|
||||||
|
|
||||||
## 功能特性
|
|
||||||
|
|
||||||
- 多后端支持：`codex` / `claude` / `gemini` / `opencode`
|
|
||||||
- 统一命令行：`codeagent [flags] <task>` / `codeagent resume <session_id> <task> [workdir]`
|
|
||||||
- 自动 stdin：遇到换行/特殊字符/超长任务自动走 stdin，避免 shell quoting 地狱；也可显式使用 `-`
|
|
||||||
- 配置合并：支持配置文件与 `CODEAGENT_*` 环境变量（viper）
|
|
||||||
- Agent 预设：从 `~/.codeagent/models.json` 读取 backend/model/prompt 等预设
|
|
||||||
- 并行执行：`--parallel` 从 stdin 读取多任务配置，支持依赖拓扑并发执行
|
|
||||||
- 日志清理：`codeagent cleanup` 清理旧日志（日志写入系统临时目录）
|
|
||||||
|
|
||||||
## 安装
|
|
||||||
|
|
||||||
要求：Go 1.21+。
|
|
||||||
|
|
||||||
在仓库根目录执行：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
go install ./cmd/codeagent
|
|
||||||
```
|
|
||||||
|
|
||||||
安装后确认：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent version
|
|
||||||
```
|
|
||||||
|
|
||||||
## 使用示例
|
|
||||||
|
|
||||||
最简单用法（默认后端：`codex`）：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent "分析 internal/app/cli.go 的入口逻辑，给出改进建议"
|
|
||||||
```
|
|
||||||
|
|
||||||
指定后端：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent --backend claude "解释 internal/executor/parallel_config.go 的并行配置格式"
|
|
||||||
```
|
|
||||||
|
|
||||||
指定工作目录（第 2 个位置参数）：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent "在当前 repo 下搜索潜在数据竞争" .
|
|
||||||
```
|
|
||||||
|
|
||||||
显式从 stdin 读取 task（使用 `-`）：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cat task.txt | codeagent -
|
|
||||||
```
|
|
||||||
|
|
||||||
恢复会话：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent resume <session_id> "继续上次任务"
|
|
||||||
```
|
|
||||||
|
|
||||||
并行模式（从 stdin 读取任务配置；禁止位置参数）：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codeagent --parallel <<'EOF'
|
|
||||||
---TASK---
|
|
||||||
id: t1
|
|
||||||
workdir: .
|
|
||||||
backend: codex
|
|
||||||
---CONTENT---
|
|
||||||
列出本项目的主要模块以及它们的职责。
|
|
||||||
---TASK---
|
|
||||||
id: t2
|
|
||||||
dependencies: t1
|
|
||||||
backend: claude
|
|
||||||
---CONTENT---
|
|
||||||
基于 t1 的结论，提出重构风险点与建议。
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
## 配置说明
|
|
||||||
|
|
||||||
### 配置文件
|
|
||||||
|
|
||||||
默认查找路径（当 `--config` 为空时）：
|
|
||||||
|
|
||||||
- `$HOME/.codeagent/config.(yaml|yml|json|toml|...)`
|
|
||||||
|
|
||||||
示例（YAML）：
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
backend: codex
|
|
||||||
model: gpt-4.1
|
|
||||||
skip-permissions: false
|
|
||||||
```
|
|
||||||
|
|
||||||
也可以通过 `--config /path/to/config.yaml` 显式指定。
|
|
||||||
|
|
||||||
### 环境变量（`CODEAGENT_*`）
|
|
||||||
|
|
||||||
通过 viper 读取并自动映射 `-` 为 `_`，常用项：
|
|
||||||
|
|
||||||
- `CODEAGENT_BACKEND`（`codex|claude|gemini|opencode`）
|
|
||||||
- `CODEAGENT_MODEL`
|
|
||||||
- `CODEAGENT_AGENT`
|
|
||||||
- `CODEAGENT_PROMPT_FILE`
|
|
||||||
- `CODEAGENT_REASONING_EFFORT`
|
|
||||||
- `CODEAGENT_SKIP_PERMISSIONS`
|
|
||||||
- `CODEAGENT_FULL_OUTPUT`（并行模式 legacy 输出）
|
|
||||||
- `CODEAGENT_MAX_PARALLEL_WORKERS`（0 表示不限制，上限 100）
|
|
||||||
|
|
||||||
### Agent 预设（`~/.codeagent/models.json`）
|
|
||||||
|
|
||||||
可在 `~/.codeagent/models.json` 定义 agent → backend/model/prompt 等映射，用 `--agent <name>` 选择：
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"default_backend": "opencode",
|
|
||||||
"default_model": "opencode/grok-code",
|
|
||||||
"agents": {
|
|
||||||
"develop": {
|
|
||||||
"backend": "codex",
|
|
||||||
"model": "gpt-4.1",
|
|
||||||
"prompt_file": "~/.codeagent/prompts/develop.md",
|
|
||||||
"description": "Code development"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## 支持的后端
|
|
||||||
|
|
||||||
该项目本身不内置模型能力，依赖你本机安装并可在 `PATH` 中找到对应 CLI：
|
|
||||||
|
|
||||||
- `codex`：执行 `codex e ...`（默认会添加 `--dangerously-bypass-approvals-and-sandbox`；如需关闭请设置 `CODEX_BYPASS_SANDBOX=false`）
|
|
||||||
- `claude`：执行 `claude -p ... --output-format stream-json`（默认会跳过权限提示；如需开启请设置 `CODEAGENT_SKIP_PERMISSIONS=false`）
|
|
||||||
- `gemini`：执行 `gemini ... -o stream-json`（可从 `~/.gemini/.env` 加载环境变量）
|
|
||||||
- `opencode`：执行 `opencode run --format json`
|
|
||||||
|
|
||||||
## 开发
|
|
||||||
|
|
||||||
```bash
|
|
||||||
make build
|
|
||||||
make test
|
|
||||||
make lint
|
|
||||||
make clean
|
|
||||||
```
|
|
||||||
|
|
||||||
78
codeagent-wrapper/backend.go
Normal file
78
codeagent-wrapper/backend.go
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Backend defines the contract for invoking different AI CLI backends.
|
||||||
|
// Each backend is responsible for supplying the executable command and
|
||||||
|
// building the argument list based on the wrapper config.
|
||||||
|
type Backend interface {
|
||||||
|
Name() string
|
||||||
|
BuildArgs(cfg *Config, targetArg string) []string
|
||||||
|
Command() string
|
||||||
|
}
|
||||||
|
|
||||||
|
type CodexBackend struct{}
|
||||||
|
|
||||||
|
func (CodexBackend) Name() string { return "codex" }
|
||||||
|
func (CodexBackend) Command() string {
|
||||||
|
return "codex"
|
||||||
|
}
|
||||||
|
func (CodexBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
||||||
|
return buildCodexArgs(cfg, targetArg)
|
||||||
|
}
|
||||||
|
|
||||||
|
type ClaudeBackend struct{}
|
||||||
|
|
||||||
|
func (ClaudeBackend) Name() string { return "claude" }
|
||||||
|
func (ClaudeBackend) Command() string {
|
||||||
|
return "claude"
|
||||||
|
}
|
||||||
|
func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
||||||
|
if cfg == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
args := []string{"-p", "--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)
|
||||||
|
// This ensures a clean execution environment without CLAUDE.md or skills that would trigger codeagent
|
||||||
|
args = append(args, "--setting-sources", "")
|
||||||
|
|
||||||
|
if cfg.Mode == "resume" {
|
||||||
|
if cfg.SessionID != "" {
|
||||||
|
// Claude CLI uses -r <session_id> for resume.
|
||||||
|
args = append(args, "-r", cfg.SessionID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Note: claude CLI doesn't support -C flag; workdir set via cmd.Dir
|
||||||
|
|
||||||
|
args = append(args, "--output-format", "stream-json", "--verbose", targetArg)
|
||||||
|
|
||||||
|
return args
|
||||||
|
}
|
||||||
|
|
||||||
|
type GeminiBackend struct{}
|
||||||
|
|
||||||
|
func (GeminiBackend) Name() string { return "gemini" }
|
||||||
|
func (GeminiBackend) Command() string {
|
||||||
|
return "gemini"
|
||||||
|
}
|
||||||
|
func (GeminiBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
||||||
|
if cfg == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
args := []string{"-o", "stream-json", "-y"}
|
||||||
|
|
||||||
|
if cfg.Mode == "resume" {
|
||||||
|
if cfg.SessionID != "" {
|
||||||
|
args = append(args, "-r", cfg.SessionID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Note: gemini CLI doesn't support -C flag; workdir set via cmd.Dir
|
||||||
|
|
||||||
|
args = append(args, "-p", targetArg)
|
||||||
|
|
||||||
|
return args
|
||||||
|
}
|
||||||
122
codeagent-wrapper/backend_test.go
Normal file
122
codeagent-wrapper/backend_test.go
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
||||||
|
backend := ClaudeBackend{}
|
||||||
|
|
||||||
|
t.Run("new mode uses workdir without skip by default", func(t *testing.T) {
|
||||||
|
cfg := &Config{Mode: "new", WorkDir: "/repo"}
|
||||||
|
got := backend.BuildArgs(cfg, "todo")
|
||||||
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
||||||
|
if !reflect.DeepEqual(got, want) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("new mode opt-in skip permissions with default workdir", func(t *testing.T) {
|
||||||
|
cfg := &Config{Mode: "new", SkipPermissions: true}
|
||||||
|
got := backend.BuildArgs(cfg, "-")
|
||||||
|
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "-"}
|
||||||
|
if !reflect.DeepEqual(got, want) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("resume mode uses session id and omits workdir", func(t *testing.T) {
|
||||||
|
cfg := &Config{Mode: "resume", SessionID: "sid-123", WorkDir: "/ignored"}
|
||||||
|
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) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("resume mode without session still returns base flags", func(t *testing.T) {
|
||||||
|
cfg := &Config{Mode: "resume", WorkDir: "/ignored"}
|
||||||
|
got := backend.BuildArgs(cfg, "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("nil config returns nil", func(t *testing.T) {
|
||||||
|
if backend.BuildArgs(nil, "ignored") != nil {
|
||||||
|
t.Fatalf("nil config should return nil args")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClaudeBuildArgs_GeminiAndCodexModes(t *testing.T) {
|
||||||
|
t.Run("gemini new mode defaults workdir", func(t *testing.T) {
|
||||||
|
backend := GeminiBackend{}
|
||||||
|
cfg := &Config{Mode: "new", WorkDir: "/workspace"}
|
||||||
|
got := backend.BuildArgs(cfg, "task")
|
||||||
|
want := []string{"-o", "stream-json", "-y", "-p", "task"}
|
||||||
|
if !reflect.DeepEqual(got, want) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("gemini resume mode uses session id", func(t *testing.T) {
|
||||||
|
backend := GeminiBackend{}
|
||||||
|
cfg := &Config{Mode: "resume", SessionID: "sid-999"}
|
||||||
|
got := backend.BuildArgs(cfg, "resume")
|
||||||
|
want := []string{"-o", "stream-json", "-y", "-r", "sid-999", "-p", "resume"}
|
||||||
|
if !reflect.DeepEqual(got, want) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("gemini resume mode without session omits identifier", func(t *testing.T) {
|
||||||
|
backend := GeminiBackend{}
|
||||||
|
cfg := &Config{Mode: "resume"}
|
||||||
|
got := backend.BuildArgs(cfg, "resume")
|
||||||
|
want := []string{"-o", "stream-json", "-y", "-p", "resume"}
|
||||||
|
if !reflect.DeepEqual(got, want) {
|
||||||
|
t.Fatalf("got %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("gemini nil config returns nil", func(t *testing.T) {
|
||||||
|
backend := GeminiBackend{}
|
||||||
|
if backend.BuildArgs(nil, "ignored") != nil {
|
||||||
|
t.Fatalf("nil config should return nil args")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("codex build args passthrough remains intact", func(t *testing.T) {
|
||||||
|
backend := CodexBackend{}
|
||||||
|
cfg := &Config{Mode: "new", WorkDir: "/tmp"}
|
||||||
|
got := backend.BuildArgs(cfg, "task")
|
||||||
|
want := []string{"e", "--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) {
|
||||||
|
tests := []struct {
|
||||||
|
backend Backend
|
||||||
|
name string
|
||||||
|
command string
|
||||||
|
}{
|
||||||
|
{backend: CodexBackend{}, name: "codex", command: "codex"},
|
||||||
|
{backend: ClaudeBackend{}, name: "claude", command: "claude"},
|
||||||
|
{backend: GeminiBackend{}, name: "gemini", command: "gemini"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := tt.backend.Name(); got != tt.name {
|
||||||
|
t.Fatalf("Name() = %s, want %s", got, tt.name)
|
||||||
|
}
|
||||||
|
if got := tt.backend.Command(); got != tt.command {
|
||||||
|
t.Fatalf("Command() = %s, want %s", got, tt.command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
39
codeagent-wrapper/bench_test.go
Normal file
39
codeagent-wrapper/bench_test.go
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// BenchmarkLoggerWrite 测试日志写入性能
|
||||||
|
func BenchmarkLoggerWrite(b *testing.B) {
|
||||||
|
logger, err := NewLogger()
|
||||||
|
if err != nil {
|
||||||
|
b.Fatal(err)
|
||||||
|
}
|
||||||
|
defer logger.Close()
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Info("benchmark log message")
|
||||||
|
}
|
||||||
|
b.StopTimer()
|
||||||
|
logger.Flush()
|
||||||
|
}
|
||||||
|
|
||||||
|
// BenchmarkLoggerConcurrentWrite 测试并发日志写入性能
|
||||||
|
func BenchmarkLoggerConcurrentWrite(b *testing.B) {
|
||||||
|
logger, err := NewLogger()
|
||||||
|
if err != nil {
|
||||||
|
b.Fatal(err)
|
||||||
|
}
|
||||||
|
defer logger.Close()
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
b.RunParallel(func(pb *testing.PB) {
|
||||||
|
for pb.Next() {
|
||||||
|
logger.Info("concurrent benchmark log message")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
b.StopTimer()
|
||||||
|
logger.Flush()
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import app "codeagent-wrapper/internal/app"
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
app.Run()
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package wrapper
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
@@ -11,29 +11,8 @@ import (
|
|||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func stripTimestampPrefix(line string) string {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if strings.HasPrefix(line, "{") {
|
|
||||||
var evt struct {
|
|
||||||
Message string `json:"message"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal([]byte(line), &evt); err == nil && evt.Message != "" {
|
|
||||||
return evt.Message
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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() {
|
||||||
@@ -100,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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -313,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)
|
||||||
273
codeagent-wrapper/config.go
Normal file
273
codeagent-wrapper/config.go
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config holds CLI configuration
|
||||||
|
type Config struct {
|
||||||
|
Mode string // "new" or "resume"
|
||||||
|
Task string
|
||||||
|
SessionID string
|
||||||
|
WorkDir string
|
||||||
|
ExplicitStdin bool
|
||||||
|
Timeout int
|
||||||
|
Backend string
|
||||||
|
SkipPermissions bool
|
||||||
|
MaxParallelWorkers int
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParallelConfig defines the JSON schema for parallel execution
|
||||||
|
type ParallelConfig struct {
|
||||||
|
Tasks []TaskSpec `json:"tasks"`
|
||||||
|
GlobalBackend string `json:"backend,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TaskSpec describes an individual task entry in the parallel config
|
||||||
|
type TaskSpec struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Task string `json:"task"`
|
||||||
|
WorkDir string `json:"workdir,omitempty"`
|
||||||
|
Dependencies []string `json:"dependencies,omitempty"`
|
||||||
|
SessionID string `json:"session_id,omitempty"`
|
||||||
|
Backend string `json:"backend,omitempty"`
|
||||||
|
Mode string `json:"-"`
|
||||||
|
UseStdin bool `json:"-"`
|
||||||
|
Context context.Context `json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TaskResult captures the execution outcome of a task
|
||||||
|
type TaskResult struct {
|
||||||
|
TaskID string `json:"task_id"`
|
||||||
|
ExitCode int `json:"exit_code"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
SessionID string `json:"session_id"`
|
||||||
|
Error string `json:"error"`
|
||||||
|
LogPath string `json:"log_path"`
|
||||||
|
sharedLog bool
|
||||||
|
}
|
||||||
|
|
||||||
|
var backendRegistry = map[string]Backend{
|
||||||
|
"codex": CodexBackend{},
|
||||||
|
"claude": ClaudeBackend{},
|
||||||
|
"gemini": GeminiBackend{},
|
||||||
|
}
|
||||||
|
|
||||||
|
func selectBackend(name string) (Backend, error) {
|
||||||
|
key := strings.ToLower(strings.TrimSpace(name))
|
||||||
|
if key == "" {
|
||||||
|
key = defaultBackendName
|
||||||
|
}
|
||||||
|
if backend, ok := backendRegistry[key]; ok {
|
||||||
|
return backend, nil
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("unsupported backend %q", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func envFlagEnabled(key string) bool {
|
||||||
|
val, ok := os.LookupEnv(key)
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
val = strings.TrimSpace(strings.ToLower(val))
|
||||||
|
switch val {
|
||||||
|
case "", "0", "false", "no", "off":
|
||||||
|
return false
|
||||||
|
default:
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseBoolFlag(val string, defaultValue bool) bool {
|
||||||
|
val = strings.TrimSpace(strings.ToLower(val))
|
||||||
|
switch val {
|
||||||
|
case "1", "true", "yes", "on":
|
||||||
|
return true
|
||||||
|
case "0", "false", "no", "off":
|
||||||
|
return false
|
||||||
|
default:
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseParallelConfig(data []byte) (*ParallelConfig, error) {
|
||||||
|
trimmed := bytes.TrimSpace(data)
|
||||||
|
if len(trimmed) == 0 {
|
||||||
|
return nil, fmt.Errorf("parallel config is empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks := strings.Split(string(trimmed), "---TASK---")
|
||||||
|
var cfg ParallelConfig
|
||||||
|
seen := make(map[string]struct{})
|
||||||
|
|
||||||
|
taskIndex := 0
|
||||||
|
for _, taskBlock := range tasks {
|
||||||
|
taskBlock = strings.TrimSpace(taskBlock)
|
||||||
|
if taskBlock == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
taskIndex++
|
||||||
|
|
||||||
|
parts := strings.SplitN(taskBlock, "---CONTENT---", 2)
|
||||||
|
if len(parts) != 2 {
|
||||||
|
return nil, fmt.Errorf("task block #%d missing ---CONTENT--- separator", taskIndex)
|
||||||
|
}
|
||||||
|
|
||||||
|
meta := strings.TrimSpace(parts[0])
|
||||||
|
content := strings.TrimSpace(parts[1])
|
||||||
|
|
||||||
|
task := TaskSpec{WorkDir: defaultWorkdir}
|
||||||
|
for _, line := range strings.Split(meta, "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
kv := strings.SplitN(line, ":", 2)
|
||||||
|
if len(kv) != 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := strings.TrimSpace(kv[0])
|
||||||
|
value := strings.TrimSpace(kv[1])
|
||||||
|
|
||||||
|
switch key {
|
||||||
|
case "id":
|
||||||
|
task.ID = value
|
||||||
|
case "workdir":
|
||||||
|
task.WorkDir = value
|
||||||
|
case "session_id":
|
||||||
|
task.SessionID = value
|
||||||
|
task.Mode = "resume"
|
||||||
|
case "backend":
|
||||||
|
task.Backend = value
|
||||||
|
case "dependencies":
|
||||||
|
for _, dep := range strings.Split(value, ",") {
|
||||||
|
dep = strings.TrimSpace(dep)
|
||||||
|
if dep != "" {
|
||||||
|
task.Dependencies = append(task.Dependencies, dep)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if task.Mode == "" {
|
||||||
|
task.Mode = "new"
|
||||||
|
}
|
||||||
|
|
||||||
|
if task.ID == "" {
|
||||||
|
return nil, fmt.Errorf("task block #%d missing id field", taskIndex)
|
||||||
|
}
|
||||||
|
if content == "" {
|
||||||
|
return nil, fmt.Errorf("task block #%d (%q) missing content", taskIndex, task.ID)
|
||||||
|
}
|
||||||
|
if _, exists := seen[task.ID]; exists {
|
||||||
|
return nil, fmt.Errorf("task block #%d has duplicate id: %s", taskIndex, task.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
task.Task = content
|
||||||
|
cfg.Tasks = append(cfg.Tasks, task)
|
||||||
|
seen[task.ID] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(cfg.Tasks) == 0 {
|
||||||
|
return nil, fmt.Errorf("no tasks found")
|
||||||
|
}
|
||||||
|
|
||||||
|
return &cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseArgs() (*Config, error) {
|
||||||
|
args := os.Args[1:]
|
||||||
|
if len(args) == 0 {
|
||||||
|
return nil, fmt.Errorf("task required")
|
||||||
|
}
|
||||||
|
|
||||||
|
backendName := defaultBackendName
|
||||||
|
skipPermissions := envFlagEnabled("CODEAGENT_SKIP_PERMISSIONS")
|
||||||
|
filtered := make([]string, 0, len(args))
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
arg := args[i]
|
||||||
|
switch {
|
||||||
|
case arg == "--backend":
|
||||||
|
if i+1 >= len(args) {
|
||||||
|
return nil, fmt.Errorf("--backend flag requires a value")
|
||||||
|
}
|
||||||
|
backendName = args[i+1]
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
case strings.HasPrefix(arg, "--backend="):
|
||||||
|
value := strings.TrimPrefix(arg, "--backend=")
|
||||||
|
if value == "" {
|
||||||
|
return nil, fmt.Errorf("--backend flag requires a value")
|
||||||
|
}
|
||||||
|
backendName = value
|
||||||
|
continue
|
||||||
|
case arg == "--skip-permissions", arg == "--dangerously-skip-permissions":
|
||||||
|
skipPermissions = true
|
||||||
|
continue
|
||||||
|
case strings.HasPrefix(arg, "--skip-permissions="):
|
||||||
|
skipPermissions = parseBoolFlag(strings.TrimPrefix(arg, "--skip-permissions="), skipPermissions)
|
||||||
|
continue
|
||||||
|
case strings.HasPrefix(arg, "--dangerously-skip-permissions="):
|
||||||
|
skipPermissions = parseBoolFlag(strings.TrimPrefix(arg, "--dangerously-skip-permissions="), skipPermissions)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
filtered = append(filtered, arg)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(filtered) == 0 {
|
||||||
|
return nil, fmt.Errorf("task required")
|
||||||
|
}
|
||||||
|
args = filtered
|
||||||
|
|
||||||
|
cfg := &Config{WorkDir: defaultWorkdir, Backend: backendName, SkipPermissions: skipPermissions}
|
||||||
|
cfg.MaxParallelWorkers = resolveMaxParallelWorkers()
|
||||||
|
|
||||||
|
if args[0] == "resume" {
|
||||||
|
if len(args) < 3 {
|
||||||
|
return nil, fmt.Errorf("resume mode requires: resume <session_id> <task>")
|
||||||
|
}
|
||||||
|
cfg.Mode = "resume"
|
||||||
|
cfg.SessionID = args[1]
|
||||||
|
cfg.Task = args[2]
|
||||||
|
cfg.ExplicitStdin = (args[2] == "-")
|
||||||
|
if len(args) > 3 {
|
||||||
|
cfg.WorkDir = args[3]
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
cfg.Mode = "new"
|
||||||
|
cfg.Task = args[0]
|
||||||
|
cfg.ExplicitStdin = (args[0] == "-")
|
||||||
|
if len(args) > 1 {
|
||||||
|
cfg.WorkDir = args[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxParallelWorkersLimit = 100
|
||||||
|
|
||||||
|
func resolveMaxParallelWorkers() int {
|
||||||
|
raw := strings.TrimSpace(os.Getenv("CODEAGENT_MAX_PARALLEL_WORKERS"))
|
||||||
|
if raw == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
value, err := strconv.Atoi(raw)
|
||||||
|
if err != nil || value < 0 {
|
||||||
|
logWarn(fmt.Sprintf("Invalid CODEAGENT_MAX_PARALLEL_WORKERS=%q, falling back to unlimited", raw))
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
if value > maxParallelWorkersLimit {
|
||||||
|
logWarn(fmt.Sprintf("CODEAGENT_MAX_PARALLEL_WORKERS=%d exceeds limit, capping at %d", value, maxParallelWorkersLimit))
|
||||||
|
return maxParallelWorkersLimit
|
||||||
|
}
|
||||||
|
|
||||||
|
return value
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package executor
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@@ -14,102 +14,16 @@ import (
|
|||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
backend "codeagent-wrapper/internal/backend"
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
ilogger "codeagent-wrapper/internal/logger"
|
|
||||||
parser "codeagent-wrapper/internal/parser"
|
|
||||||
utils "codeagent-wrapper/internal/utils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const postMessageTerminateDelay = 1 * time.Second
|
|
||||||
const forceKillWaitTimeout = 5 * time.Second
|
|
||||||
|
|
||||||
// Defaults duplicated from wrapper for module decoupling.
|
|
||||||
const (
|
|
||||||
defaultWorkdir = "."
|
|
||||||
defaultCoverageTarget = 90.0
|
|
||||||
defaultBackendName = "codex"
|
|
||||||
|
|
||||||
codexLogLineLimit = 1000
|
|
||||||
stderrCaptureLimit = 4 * 1024
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// stdout close reasons
|
|
||||||
stdoutCloseReasonWait = "wait-done"
|
|
||||||
stdoutCloseReasonDrain = "drain-timeout"
|
|
||||||
stdoutCloseReasonCtx = "context-cancel"
|
|
||||||
stdoutDrainTimeout = 100 * time.Millisecond
|
|
||||||
)
|
|
||||||
|
|
||||||
// Hook points (tests can override inside this package).
|
|
||||||
var (
|
|
||||||
selectBackendFn = backend.Select
|
|
||||||
commandContext = exec.CommandContext
|
|
||||||
terminateCommandFn = terminateCommand
|
|
||||||
)
|
|
||||||
|
|
||||||
var forceKillDelay atomic.Int32
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
forceKillDelay.Store(5) // seconds - default value
|
|
||||||
}
|
|
||||||
|
|
||||||
type (
|
|
||||||
Backend = backend.Backend
|
|
||||||
Config = config.Config
|
|
||||||
Logger = ilogger.Logger
|
|
||||||
)
|
|
||||||
|
|
||||||
type minimalClaudeSettings = backend.MinimalClaudeSettings
|
|
||||||
|
|
||||||
func loadMinimalClaudeSettings() minimalClaudeSettings { return backend.LoadMinimalClaudeSettings() }
|
|
||||||
|
|
||||||
func loadGeminiEnv() map[string]string { return backend.LoadGeminiEnv() }
|
|
||||||
|
|
||||||
func NewLogger() (*Logger, error) { return ilogger.NewLogger() }
|
|
||||||
|
|
||||||
func NewLoggerWithSuffix(suffix string) (*Logger, error) { return ilogger.NewLoggerWithSuffix(suffix) }
|
|
||||||
|
|
||||||
func setLogger(l *Logger) { ilogger.SetLogger(l) }
|
|
||||||
|
|
||||||
func closeLogger() error { return ilogger.CloseLogger() }
|
|
||||||
|
|
||||||
func activeLogger() *Logger { return ilogger.ActiveLogger() }
|
|
||||||
|
|
||||||
func logInfo(msg string) { ilogger.LogInfo(msg) }
|
|
||||||
|
|
||||||
func logWarn(msg string) { ilogger.LogWarn(msg) }
|
|
||||||
|
|
||||||
func logError(msg string) { ilogger.LogError(msg) }
|
|
||||||
|
|
||||||
func logConcurrencyPlanning(limit, total int) { ilogger.LogConcurrencyPlanning(limit, total) }
|
|
||||||
|
|
||||||
func logConcurrencyState(event, taskID string, active, limit int) {
|
|
||||||
ilogger.LogConcurrencyState(event, taskID, active, limit)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(string), onMessage func(), onComplete func()) (message, threadID string) {
|
|
||||||
return parser.ParseJSONStreamInternal(r, warnFn, infoFn, onMessage, onComplete)
|
|
||||||
}
|
|
||||||
|
|
||||||
func sanitizeOutput(s string) string { return utils.SanitizeOutput(s) }
|
|
||||||
|
|
||||||
func safeTruncate(s string, maxLen int) string { return utils.SafeTruncate(s, maxLen) }
|
|
||||||
|
|
||||||
func min(a, b int) int { return utils.Min(a, b) }
|
|
||||||
|
|
||||||
// commandRunner abstracts exec.Cmd for testability
|
// commandRunner abstracts exec.Cmd for testability
|
||||||
type commandRunner interface {
|
type commandRunner interface {
|
||||||
Start() error
|
Start() error
|
||||||
Wait() error
|
Wait() error
|
||||||
StdoutPipe() (io.ReadCloser, error)
|
StdoutPipe() (io.ReadCloser, error)
|
||||||
StderrPipe() (io.ReadCloser, error)
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,13 +60,6 @@ func (r *realCmd) StdoutPipe() (io.ReadCloser, error) {
|
|||||||
return r.cmd.StdoutPipe()
|
return r.cmd.StdoutPipe()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *realCmd) StderrPipe() (io.ReadCloser, error) {
|
|
||||||
if r.cmd == nil {
|
|
||||||
return nil, errors.New("command is nil")
|
|
||||||
}
|
|
||||||
return r.cmd.StderrPipe()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *realCmd) StdinPipe() (io.WriteCloser, error) {
|
func (r *realCmd) StdinPipe() (io.WriteCloser, error) {
|
||||||
if r.cmd == nil {
|
if r.cmd == nil {
|
||||||
return nil, errors.New("command is nil")
|
return nil, errors.New("command is nil")
|
||||||
@@ -172,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
|
||||||
@@ -311,21 +172,14 @@ func newTaskLoggerHandle(taskID string) taskLoggerHandle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// defaultRunCodexTaskFn is the default implementation of runCodexTaskFn (exposed for test reset)
|
// defaultRunCodexTaskFn is the default implementation of runCodexTaskFn (exposed for test reset)
|
||||||
func DefaultRunCodexTaskFn(task TaskSpec, timeout int) TaskResult {
|
func defaultRunCodexTaskFn(task TaskSpec, timeout int) TaskResult {
|
||||||
if task.WorkDir == "" {
|
if task.WorkDir == "" {
|
||||||
task.WorkDir = defaultWorkdir
|
task.WorkDir = defaultWorkdir
|
||||||
}
|
}
|
||||||
if task.Mode == "" {
|
if task.Mode == "" {
|
||||||
task.Mode = "new"
|
task.Mode = "new"
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(task.PromptFile) != "" {
|
if task.UseStdin || shouldUseStdin(task.Task, false) {
|
||||||
prompt, err := ReadAgentPromptFile(task.PromptFile, false)
|
|
||||||
if err != nil {
|
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "failed to read prompt file: " + err.Error()}
|
|
||||||
}
|
|
||||||
task.Task = WrapTaskWithAgentPrompt(prompt, task.Task)
|
|
||||||
}
|
|
||||||
if task.UseStdin || ShouldUseStdin(task.Task, false) {
|
|
||||||
task.UseStdin = true
|
task.UseStdin = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -344,10 +198,12 @@ func DefaultRunCodexTaskFn(task TaskSpec, timeout int) TaskResult {
|
|||||||
if parentCtx == nil {
|
if parentCtx == nil {
|
||||||
parentCtx = context.Background()
|
parentCtx = context.Background()
|
||||||
}
|
}
|
||||||
return RunCodexTaskWithContext(parentCtx, task, backend, "", nil, nil, false, true, timeout)
|
return runCodexTaskWithContext(parentCtx, task, backend, nil, false, true, timeout)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TopologicalSort(tasks []TaskSpec) ([][]TaskSpec, error) {
|
var runCodexTaskFn = defaultRunCodexTaskFn
|
||||||
|
|
||||||
|
func topologicalSort(tasks []TaskSpec) ([][]TaskSpec, error) {
|
||||||
idToTask := make(map[string]TaskSpec, len(tasks))
|
idToTask := make(map[string]TaskSpec, len(tasks))
|
||||||
indegree := make(map[string]int, len(tasks))
|
indegree := make(map[string]int, len(tasks))
|
||||||
adj := make(map[string][]string, len(tasks))
|
adj := make(map[string][]string, len(tasks))
|
||||||
@@ -413,16 +269,12 @@ func TopologicalSort(tasks []TaskSpec) ([][]TaskSpec, error) {
|
|||||||
return layers, nil
|
return layers, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExecuteConcurrent(layers [][]TaskSpec, timeout int, runTask func(TaskSpec, int) TaskResult) []TaskResult {
|
func executeConcurrent(layers [][]TaskSpec, timeout int) []TaskResult {
|
||||||
maxWorkers := config.ResolveMaxParallelWorkers()
|
maxWorkers := resolveMaxParallelWorkers()
|
||||||
return ExecuteConcurrentWithContext(context.Background(), layers, timeout, maxWorkers, runTask)
|
return executeConcurrentWithContext(context.Background(), layers, timeout, maxWorkers)
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExecuteConcurrentWithContext(parentCtx context.Context, layers [][]TaskSpec, timeout int, maxWorkers int, runTask func(TaskSpec, int) TaskResult) []TaskResult {
|
func executeConcurrentWithContext(parentCtx context.Context, layers [][]TaskSpec, timeout int, maxWorkers int) []TaskResult {
|
||||||
if runTask == nil {
|
|
||||||
runTask = DefaultRunCodexTaskFn
|
|
||||||
}
|
|
||||||
|
|
||||||
totalTasks := 0
|
totalTasks := 0
|
||||||
for _, layer := range layers {
|
for _, layer := range layers {
|
||||||
totalTasks += len(layer)
|
totalTasks += len(layer)
|
||||||
@@ -553,7 +405,7 @@ func ExecuteConcurrentWithContext(parentCtx context.Context, layers [][]TaskSpec
|
|||||||
|
|
||||||
printTaskStart(ts.ID, taskLogPath, handle.shared)
|
printTaskStart(ts.ID, taskLogPath, handle.shared)
|
||||||
|
|
||||||
res := runTask(ts, timeout)
|
res := runCodexTaskFn(ts, timeout)
|
||||||
if taskLogPath != "" {
|
if taskLogPath != "" {
|
||||||
if res.LogPath == "" || (handle.shared && handle.logger != nil && res.LogPath == handle.logger.Path()) {
|
if res.LogPath == "" || (handle.shared && handle.logger != nil && res.LogPath == handle.logger.Path()) {
|
||||||
res.LogPath = taskLogPath
|
res.LogPath = taskLogPath
|
||||||
@@ -610,301 +462,101 @@ 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 generateFinalOutput(results []TaskResult) string {
|
||||||
func getStatusSymbols() (success, warning, failed string) {
|
|
||||||
if os.Getenv("CODEAGENT_ASCII_MODE") == "true" {
|
|
||||||
return "PASS", "WARN", "FAIL"
|
|
||||||
}
|
|
||||||
return "✓", "⚠️", "✗"
|
|
||||||
}
|
|
||||||
|
|
||||||
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"}
|
|
||||||
|
|
||||||
// Default to bypass sandbox unless CODEX_BYPASS_SANDBOX=false
|
|
||||||
if cfg.Yolo || config.EnvFlagDefaultTrue("CODEX_BYPASS_SANDBOX") {
|
|
||||||
logWarn("YOLO mode or CODEX_BYPASS_SANDBOX enabled: running without approval/sandbox protection")
|
|
||||||
args = append(args, "--dangerously-bypass-approvals-and-sandbox")
|
|
||||||
}
|
|
||||||
|
|
||||||
if model := strings.TrimSpace(cfg.Model); model != "" {
|
|
||||||
args = append(args, "--model", model)
|
|
||||||
}
|
|
||||||
|
|
||||||
if reasoningEffort := strings.TrimSpace(cfg.ReasoningEffort); reasoningEffort != "" {
|
|
||||||
args = append(args, "-c", "model_reasoning_effort="+reasoningEffort)
|
|
||||||
}
|
|
||||||
|
|
||||||
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 RunCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backend Backend, defaultCommandName string, defaultArgsBuilder func(*Config, string) []string, customArgs []string, useCustomArgs bool, silent bool, timeoutSec int) TaskResult {
|
func runCodexTask(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
||||||
taskCtx := taskSpec.Context
|
return runCodexTaskWithContext(context.Background(), taskSpec, nil, nil, false, silent, timeoutSec)
|
||||||
|
}
|
||||||
|
|
||||||
|
func runCodexProcess(parentCtx context.Context, codexArgs []string, taskText string, useStdin bool, timeoutSec int) (message, threadID string, exitCode int) {
|
||||||
|
res := runCodexTaskWithContext(parentCtx, TaskSpec{Task: taskText, WorkDir: defaultWorkdir, Mode: "new", UseStdin: useStdin}, nil, codexArgs, true, false, timeoutSec)
|
||||||
|
return res.Message, res.SessionID, res.ExitCode
|
||||||
|
}
|
||||||
|
|
||||||
|
func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backend Backend, customArgs []string, useCustomArgs bool, silent bool, timeoutSec int) TaskResult {
|
||||||
if parentCtx == nil {
|
if parentCtx == nil {
|
||||||
parentCtx = taskCtx
|
parentCtx = taskSpec.Context
|
||||||
}
|
}
|
||||||
if parentCtx == nil {
|
if parentCtx == nil {
|
||||||
parentCtx = context.Background()
|
parentCtx = context.Background()
|
||||||
}
|
}
|
||||||
|
|
||||||
result := TaskResult{TaskID: taskSpec.ID}
|
result := TaskResult{TaskID: taskSpec.ID}
|
||||||
injectedLogger := taskLoggerFromContext(taskCtx)
|
injectedLogger := taskLoggerFromContext(parentCtx)
|
||||||
if injectedLogger == nil {
|
|
||||||
injectedLogger = taskLoggerFromContext(parentCtx)
|
|
||||||
}
|
|
||||||
logger := injectedLogger
|
logger := injectedLogger
|
||||||
|
|
||||||
cfg := &Config{
|
cfg := &Config{
|
||||||
Mode: taskSpec.Mode,
|
Mode: taskSpec.Mode,
|
||||||
Task: taskSpec.Task,
|
Task: taskSpec.Task,
|
||||||
SessionID: taskSpec.SessionID,
|
SessionID: taskSpec.SessionID,
|
||||||
WorkDir: taskSpec.WorkDir,
|
WorkDir: taskSpec.WorkDir,
|
||||||
Model: taskSpec.Model,
|
Backend: defaultBackendName,
|
||||||
ReasoningEffort: taskSpec.ReasoningEffort,
|
|
||||||
SkipPermissions: taskSpec.SkipPermissions,
|
|
||||||
Backend: defaultBackendName,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
commandName := strings.TrimSpace(defaultCommandName)
|
commandName := codexCommand
|
||||||
if commandName == "" {
|
argsBuilder := buildCodexArgsFn
|
||||||
commandName = defaultBackendName
|
|
||||||
}
|
|
||||||
argsBuilder := defaultArgsBuilder
|
|
||||||
if argsBuilder == nil {
|
|
||||||
argsBuilder = buildCodexArgs
|
|
||||||
}
|
|
||||||
if backend != nil {
|
if backend != nil {
|
||||||
commandName = backend.Command()
|
commandName = backend.Command()
|
||||||
argsBuilder = backend.BuildArgs
|
argsBuilder = backend.BuildArgs
|
||||||
@@ -922,26 +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
|
|
||||||
}
|
|
||||||
|
|
||||||
var fileEnv map[string]string
|
|
||||||
if cfg.Backend == "claude" {
|
|
||||||
settings := loadMinimalClaudeSettings()
|
|
||||||
fileEnv = settings.Env
|
|
||||||
if cfg.Mode != "resume" && strings.TrimSpace(cfg.Model) == "" && settings.Model != "" {
|
|
||||||
cfg.Model = settings.Model
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load gemini env from ~/.gemini/.env if exists
|
|
||||||
if cfg.Backend == "gemini" {
|
|
||||||
fileEnv = loadGeminiEnv()
|
|
||||||
}
|
|
||||||
|
|
||||||
useStdin := taskSpec.UseStdin
|
useStdin := taskSpec.UseStdin
|
||||||
targetArg := taskSpec.Task
|
targetArg := taskSpec.Task
|
||||||
if useStdin {
|
if useStdin {
|
||||||
@@ -1041,30 +673,6 @@ func RunCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
|
|
||||||
cmd := newCommandRunner(ctx, commandName, codexArgs...)
|
cmd := newCommandRunner(ctx, commandName, codexArgs...)
|
||||||
|
|
||||||
if len(fileEnv) > 0 {
|
|
||||||
cmd.SetEnv(fileEnv)
|
|
||||||
}
|
|
||||||
|
|
||||||
envBackend := backend
|
|
||||||
if envBackend == nil && cfg.Backend != "" {
|
|
||||||
if b, err := selectBackendFn(cfg.Backend); err == nil {
|
|
||||||
envBackend = b
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if envBackend != nil {
|
|
||||||
baseURL, apiKey := config.ResolveBackendConfig(cfg.Backend)
|
|
||||||
if agentName := strings.TrimSpace(taskSpec.Agent); agentName != "" {
|
|
||||||
agentBackend, _, _, _, agentBaseURL, agentAPIKey, _ := config.ResolveAgentConfig(agentName)
|
|
||||||
if strings.EqualFold(strings.TrimSpace(agentBackend), strings.TrimSpace(cfg.Backend)) {
|
|
||||||
baseURL, apiKey = agentBaseURL, agentAPIKey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if injected := envBackend.Env(baseURL, apiKey); len(injected) > 0 {
|
|
||||||
cmd.SetEnv(injected)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 != "" {
|
||||||
@@ -1083,43 +691,33 @@ func RunCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
if cfg.Backend == "gemini" {
|
if cfg.Backend == "gemini" {
|
||||||
stderrFilter = newFilteringWriter(os.Stderr, geminiNoisePatterns)
|
stderrFilter = newFilteringWriter(os.Stderr, geminiNoisePatterns)
|
||||||
stderrOut = stderrFilter
|
stderrOut = stderrFilter
|
||||||
} else if cfg.Backend == "codex" {
|
defer stderrFilter.Flush()
|
||||||
stderrFilter = newFilteringWriter(os.Stderr, codexNoisePatterns)
|
|
||||||
stderrOut = stderrFilter
|
|
||||||
}
|
}
|
||||||
stderrWriters = append([]io.Writer{stderrOut}, stderrWriters...)
|
stderrWriters = append([]io.Writer{stderrOut}, stderrWriters...)
|
||||||
}
|
}
|
||||||
stderr, err := cmd.StderrPipe()
|
if len(stderrWriters) == 1 {
|
||||||
if err != nil {
|
cmd.SetStderr(stderrWriters[0])
|
||||||
logErrorFn("Failed to create stderr pipe: " + err.Error())
|
} else {
|
||||||
result.ExitCode = 1
|
cmd.SetStderr(io.MultiWriter(stderrWriters...))
|
||||||
result.Error = attachStderr("failed to create stderr pipe: " + err.Error())
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var stdinPipe io.WriteCloser
|
var stdinPipe io.WriteCloser
|
||||||
|
var err error
|
||||||
if useStdin {
|
if useStdin {
|
||||||
stdinPipe, err = cmd.StdinPipe()
|
stdinPipe, err = cmd.StdinPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logErrorFn("Failed to create stdin pipe: " + err.Error())
|
logErrorFn("Failed to create stdin pipe: " + err.Error())
|
||||||
result.ExitCode = 1
|
result.ExitCode = 1
|
||||||
result.Error = attachStderr("failed to create stdin pipe: " + err.Error())
|
result.Error = attachStderr("failed to create stdin pipe: " + err.Error())
|
||||||
closeWithReason(stderr, "stdin-pipe-failed")
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stderrDone := make(chan error, 1)
|
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
stdout, err := cmd.StdoutPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logErrorFn("Failed to create stdout pipe: " + err.Error())
|
logErrorFn("Failed to create stdout pipe: " + err.Error())
|
||||||
result.ExitCode = 1
|
result.ExitCode = 1
|
||||||
result.Error = attachStderr("failed to create stdout pipe: " + err.Error())
|
result.Error = attachStderr("failed to create stdout pipe: " + err.Error())
|
||||||
closeWithReason(stderr, "stdout-pipe-failed")
|
|
||||||
if stdinPipe != nil {
|
|
||||||
_ = stdinPipe.Close()
|
|
||||||
}
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1131,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() {
|
||||||
@@ -1139,27 +736,13 @@ 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}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
logInfoFn(fmt.Sprintf("Starting %s with args: %s %s...", commandName, commandName, strings.Join(codexArgs[:min(5, len(codexArgs))], " ")))
|
logInfoFn(fmt.Sprintf("Starting %s with args: %s %s...", commandName, commandName, strings.Join(codexArgs[:min(5, len(codexArgs))], " ")))
|
||||||
|
|
||||||
if err := cmd.Start(); err != nil {
|
if err := cmd.Start(); err != nil {
|
||||||
closeWithReason(stdout, "start-failed")
|
|
||||||
closeWithReason(stderr, "start-failed")
|
|
||||||
if stdinPipe != nil {
|
|
||||||
_ = stdinPipe.Close()
|
|
||||||
}
|
|
||||||
if strings.Contains(err.Error(), "executable file not found") {
|
if strings.Contains(err.Error(), "executable file not found") {
|
||||||
msg := fmt.Sprintf("%s command not found in PATH", commandName)
|
msg := fmt.Sprintf("%s command not found in PATH", commandName)
|
||||||
logErrorFn(msg)
|
logErrorFn(msg)
|
||||||
@@ -1178,15 +761,6 @@ func RunCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
logInfoFn(fmt.Sprintf("Log capturing to: %s", logger.Path()))
|
logInfoFn(fmt.Sprintf("Log capturing to: %s", logger.Path()))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start stderr drain AFTER we know the command started, but BEFORE cmd.Wait can close the pipe.
|
|
||||||
go func() {
|
|
||||||
_, copyErr := io.Copy(io.MultiWriter(stderrWriters...), stderr)
|
|
||||||
if stderrFilter != nil {
|
|
||||||
stderrFilter.Flush()
|
|
||||||
}
|
|
||||||
stderrDone <- copyErr
|
|
||||||
}()
|
|
||||||
|
|
||||||
if useStdin && stdinPipe != nil {
|
if useStdin && stdinPipe != nil {
|
||||||
logInfoFn(fmt.Sprintf("Writing %d chars to stdin...", len(taskSpec.Task)))
|
logInfoFn(fmt.Sprintf("Writing %d chars to stdin...", len(taskSpec.Task)))
|
||||||
go func(data string) {
|
go func(data string) {
|
||||||
@@ -1199,87 +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 err := <-waitCh:
|
ctxCancelled = true
|
||||||
waitErr = err
|
logErrorFn(cancelReason(commandName, ctx))
|
||||||
break waitLoop
|
forceKillTimer = terminateCommandFn(cmd)
|
||||||
case <-ctx.Done():
|
waitErr = <-waitCh
|
||||||
ctxCancelled = true
|
|
||||||
logErrorFn(cancelReason(commandName, ctx))
|
|
||||||
if !terminated {
|
|
||||||
if timer := terminateCommandFn(cmd); timer != nil {
|
|
||||||
forceKillTimer = timer
|
|
||||||
terminated = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case err := <-waitCh:
|
|
||||||
waitErr = err
|
|
||||||
break waitLoop
|
|
||||||
case <-time.After(forceKillWaitTimeout):
|
|
||||||
if proc := cmd.Process(); proc != nil {
|
|
||||||
_ = proc.Kill()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Close pipes to unblock stream readers, then wait for process exit.
|
|
||||||
closeWithReason(stdout, "terminate")
|
|
||||||
closeWithReason(stderr, "terminate")
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case err := <-waitCh:
|
|
||||||
waitErr = err
|
|
||||||
break waitLoop
|
|
||||||
case <-time.After(forceKillWaitTimeout):
|
|
||||||
if proc := cmd.Process(); proc != nil {
|
|
||||||
_ = proc.Kill()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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 {
|
||||||
@@ -1287,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()
|
||||||
|
|
||||||
@@ -1304,21 +804,12 @@ waitLoop:
|
|||||||
case <-messageSeen:
|
case <-messageSeen:
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
closeWithReason(stdout, stdoutCloseReasonWait)
|
||||||
parsed = <-parseCh
|
parsed = <-parseCh
|
||||||
case <-completeSeen:
|
|
||||||
closeWithReason(stdout, stdoutCloseReasonWait)
|
|
||||||
parsed = <-parseCh
|
|
||||||
case <-drainTimer.C:
|
case <-drainTimer.C:
|
||||||
closeWithReason(stdout, stdoutCloseReasonDrain)
|
closeWithReason(stdout, stdoutCloseReasonDrain)
|
||||||
parsed = <-parseCh
|
parsed = <-parseCh
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
closeWithReason(stderr, stdoutCloseReasonWait)
|
|
||||||
// Wait for stderr drain so stderrBuf / stderrLogger are not accessed concurrently.
|
|
||||||
// Important: cmd.Wait can block on internal stderr copying if cmd.Stderr is a non-file writer.
|
|
||||||
// We use StderrPipe and drain ourselves to avoid that deadlock class (common when children inherit pipes).
|
|
||||||
<-stderrDone
|
|
||||||
|
|
||||||
if ctxErr := ctx.Err(); ctxErr != nil {
|
if ctxErr := ctx.Err(); ctxErr != nil {
|
||||||
if errors.Is(ctxErr, context.DeadlineExceeded) {
|
if errors.Is(ctxErr, context.DeadlineExceeded) {
|
||||||
result.ExitCode = 124
|
result.ExitCode = 124
|
||||||
@@ -1331,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
|
||||||
@@ -1374,13 +861,44 @@ waitLoop:
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func forwardSignals(ctx context.Context, cmd commandRunner, logErrorFn func(string)) {
|
||||||
|
notify := signalNotifyFn
|
||||||
|
stop := signalStopFn
|
||||||
|
if notify == nil {
|
||||||
|
notify = signal.Notify
|
||||||
|
}
|
||||||
|
if stop == nil {
|
||||||
|
stop = signal.Stop
|
||||||
|
}
|
||||||
|
|
||||||
|
sigCh := make(chan os.Signal, 1)
|
||||||
|
notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
defer stop(sigCh)
|
||||||
|
select {
|
||||||
|
case sig := <-sigCh:
|
||||||
|
logErrorFn(fmt.Sprintf("Received signal: %v", sig))
|
||||||
|
if proc := cmd.Process(); proc != nil {
|
||||||
|
_ = proc.Signal(syscall.SIGTERM)
|
||||||
|
time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
|
||||||
|
if p := cmd.Process(); p != nil {
|
||||||
|
_ = p.Kill()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
case <-ctx.Done():
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
func cancelReason(commandName string, ctx context.Context) string {
|
func cancelReason(commandName string, ctx context.Context) string {
|
||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
return "Context cancelled"
|
return "Context cancelled"
|
||||||
}
|
}
|
||||||
|
|
||||||
if commandName == "" {
|
if commandName == "" {
|
||||||
commandName = defaultBackendName
|
commandName = codexCommand
|
||||||
}
|
}
|
||||||
|
|
||||||
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
|
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
|
||||||
@@ -1432,7 +950,7 @@ func terminateCommand(cmd commandRunner) *forceKillTimer {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = sendTermSignal(proc)
|
_ = proc.Signal(syscall.SIGTERM)
|
||||||
|
|
||||||
done := make(chan struct{}, 1)
|
done := make(chan struct{}, 1)
|
||||||
timer := time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
|
timer := time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
|
||||||
@@ -1444,3 +962,21 @@ func terminateCommand(cmd commandRunner) *forceKillTimer {
|
|||||||
|
|
||||||
return &forceKillTimer{timer: timer, done: done}
|
return &forceKillTimer{timer: timer, done: done}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func terminateProcess(cmd commandRunner) *time.Timer {
|
||||||
|
if cmd == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
proc := cmd.Process()
|
||||||
|
if proc == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = proc.Signal(syscall.SIGTERM)
|
||||||
|
|
||||||
|
return time.AfterFunc(time.Duration(forceKillDelay.Load())*time.Second, func() {
|
||||||
|
if p := cmd.Process(); p != nil {
|
||||||
|
_ = p.Kill()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package wrapper
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
@@ -10,15 +10,12 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
|
||||||
"slices"
|
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
|
"syscall"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
executor "codeagent-wrapper/internal/executor"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var executorTestTaskCounter atomic.Int64
|
var executorTestTaskCounter atomic.Int64
|
||||||
@@ -34,12 +31,7 @@ type execFakeProcess struct {
|
|||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *execFakeProcess) Pid() int {
|
func (p *execFakeProcess) Pid() int { return p.pid }
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return p.pid
|
|
||||||
}
|
|
||||||
func (p *execFakeProcess) Kill() error {
|
func (p *execFakeProcess) Kill() error {
|
||||||
p.killed.Add(1)
|
p.killed.Add(1)
|
||||||
return nil
|
return nil
|
||||||
@@ -91,16 +83,13 @@ func (rc *reasonReadCloser) record(reason string) {
|
|||||||
|
|
||||||
type execFakeRunner struct {
|
type execFakeRunner struct {
|
||||||
stdout io.ReadCloser
|
stdout io.ReadCloser
|
||||||
stderr io.ReadCloser
|
process processHandle
|
||||||
process executor.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
|
||||||
stdoutErr error
|
stdoutErr error
|
||||||
stderrErr error
|
|
||||||
stdinErr error
|
stdinErr error
|
||||||
allowNilProcess bool
|
allowNilProcess bool
|
||||||
started atomic.Bool
|
started atomic.Bool
|
||||||
@@ -128,15 +117,6 @@ func (f *execFakeRunner) StdoutPipe() (io.ReadCloser, error) {
|
|||||||
}
|
}
|
||||||
return f.stdout, nil
|
return f.stdout, nil
|
||||||
}
|
}
|
||||||
func (f *execFakeRunner) StderrPipe() (io.ReadCloser, error) {
|
|
||||||
if f.stderrErr != nil {
|
|
||||||
return nil, f.stderrErr
|
|
||||||
}
|
|
||||||
if f.stderr == nil {
|
|
||||||
f.stderr = io.NopCloser(strings.NewReader(""))
|
|
||||||
}
|
|
||||||
return f.stderr, nil
|
|
||||||
}
|
|
||||||
func (f *execFakeRunner) StdinPipe() (io.WriteCloser, error) {
|
func (f *execFakeRunner) StdinPipe() (io.WriteCloser, error) {
|
||||||
if f.stdinErr != nil {
|
if f.stdinErr != nil {
|
||||||
return nil, f.stdinErr
|
return nil, f.stdinErr
|
||||||
@@ -148,18 +128,7 @@ 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) {
|
func (f *execFakeRunner) Process() processHandle {
|
||||||
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() executor.ProcessHandle {
|
|
||||||
if f.process != nil {
|
if f.process != nil {
|
||||||
return f.process
|
return f.process
|
||||||
}
|
}
|
||||||
@@ -169,32 +138,175 @@ func (f *execFakeRunner) Process() executor.ProcessHandle {
|
|||||||
return &execFakeProcess{pid: 1}
|
return &execFakeProcess{pid: 1}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
func TestExecutorHelperCoverage(t *testing.T) {
|
||||||
defer resetTestHooks()
|
t.Run("realCmdAndProcess", func(t *testing.T) {
|
||||||
|
rc := &realCmd{}
|
||||||
|
if err := rc.Start(); err == nil {
|
||||||
|
t.Fatalf("expected error for nil command")
|
||||||
|
}
|
||||||
|
if err := rc.Wait(); err == nil {
|
||||||
|
t.Fatalf("expected error for nil command")
|
||||||
|
}
|
||||||
|
if _, err := rc.StdoutPipe(); err == nil {
|
||||||
|
t.Fatalf("expected error for nil command")
|
||||||
|
}
|
||||||
|
if _, err := rc.StdinPipe(); err == nil {
|
||||||
|
t.Fatalf("expected error for nil command")
|
||||||
|
}
|
||||||
|
rc.SetStderr(io.Discard)
|
||||||
|
if rc.Process() != nil {
|
||||||
|
t.Fatalf("expected nil process")
|
||||||
|
}
|
||||||
|
rcWithCmd := &realCmd{cmd: &exec.Cmd{}}
|
||||||
|
rcWithCmd.SetStderr(io.Discard)
|
||||||
|
rcWithCmd.SetDir("/tmp")
|
||||||
|
if rcWithCmd.cmd.Dir != "/tmp" {
|
||||||
|
t.Fatalf("expected SetDir to set cmd.Dir, got %q", rcWithCmd.cmd.Dir)
|
||||||
|
}
|
||||||
|
echoCmd := exec.Command("echo", "ok")
|
||||||
|
rcProc := &realCmd{cmd: echoCmd}
|
||||||
|
stdoutPipe, err := rcProc.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("StdoutPipe error: %v", err)
|
||||||
|
}
|
||||||
|
stdinPipe, err := rcProc.StdinPipe()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("StdinPipe error: %v", err)
|
||||||
|
}
|
||||||
|
rcProc.SetStderr(io.Discard)
|
||||||
|
if err := rcProc.Start(); err != nil {
|
||||||
|
t.Fatalf("Start failed: %v", err)
|
||||||
|
}
|
||||||
|
_, _ = stdinPipe.Write([]byte{})
|
||||||
|
_ = stdinPipe.Close()
|
||||||
|
procHandle := rcProc.Process()
|
||||||
|
if procHandle == nil {
|
||||||
|
t.Fatalf("expected process handle")
|
||||||
|
}
|
||||||
|
_ = procHandle.Signal(syscall.SIGTERM)
|
||||||
|
_ = procHandle.Kill()
|
||||||
|
_ = rcProc.Wait()
|
||||||
|
_, _ = io.ReadAll(stdoutPipe)
|
||||||
|
|
||||||
t.Run("resumeMissingSessionID", func(t *testing.T) {
|
rp := &realProcess{}
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
if rp.Pid() != 0 {
|
||||||
t.Fatalf("unexpected command execution for invalid resume config")
|
t.Fatalf("nil process should have pid 0")
|
||||||
return nil
|
}
|
||||||
})
|
if rp.Kill() != nil {
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
t.Fatalf("nil process Kill should be nil")
|
||||||
|
}
|
||||||
|
if rp.Signal(syscall.SIGTERM) != nil {
|
||||||
|
t.Fatalf("nil process Signal should be nil")
|
||||||
|
}
|
||||||
|
rpLive := &realProcess{proc: &os.Process{Pid: 99}}
|
||||||
|
if rpLive.Pid() != 99 {
|
||||||
|
t.Fatalf("expected pid 99, got %d", rpLive.Pid())
|
||||||
|
}
|
||||||
|
_ = rpLive.Kill()
|
||||||
|
_ = rpLive.Signal(syscall.SIGTERM)
|
||||||
|
})
|
||||||
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", Mode: "resume"}, nil, nil, false, false, 1)
|
t.Run("topologicalSortAndSkip", func(t *testing.T) {
|
||||||
if res.ExitCode == 0 || !strings.Contains(res.Error, "session_id") {
|
layers, err := topologicalSort([]TaskSpec{{ID: "root"}, {ID: "child", Dependencies: []string{"root"}}})
|
||||||
t.Fatalf("expected validation error, got %+v", res)
|
if err != nil || len(layers) != 2 {
|
||||||
|
t.Fatalf("unexpected topological sort result: layers=%d err=%v", len(layers), err)
|
||||||
|
}
|
||||||
|
if _, err := topologicalSort([]TaskSpec{{ID: "cycle", Dependencies: []string{"cycle"}}}); err == nil {
|
||||||
|
t.Fatalf("expected cycle detection error")
|
||||||
|
}
|
||||||
|
|
||||||
|
failed := map[string]TaskResult{"root": {ExitCode: 1}}
|
||||||
|
if skip, _ := shouldSkipTask(TaskSpec{ID: "child", Dependencies: []string{"root"}}, failed); !skip {
|
||||||
|
t.Fatalf("should skip when dependency failed")
|
||||||
|
}
|
||||||
|
if skip, _ := shouldSkipTask(TaskSpec{ID: "leaf"}, failed); skip {
|
||||||
|
t.Fatalf("should not skip task without dependencies")
|
||||||
|
}
|
||||||
|
if skip, _ := shouldSkipTask(TaskSpec{ID: "child-ok", Dependencies: []string{"root"}}, map[string]TaskResult{}); skip {
|
||||||
|
t.Fatalf("should not skip when dependencies succeeded")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("cancelledTaskResult", func(t *testing.T) {
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
res := cancelledTaskResult("t1", ctx)
|
||||||
|
if res.ExitCode != 130 {
|
||||||
|
t.Fatalf("expected cancel exit code, got %d", res.ExitCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
timeoutCtx, timeoutCancel := context.WithTimeout(context.Background(), 0)
|
||||||
|
defer timeoutCancel()
|
||||||
|
res = cancelledTaskResult("t2", timeoutCtx)
|
||||||
|
if res.ExitCode != 124 {
|
||||||
|
t.Fatalf("expected timeout exit code, got %d", res.ExitCode)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("generateFinalOutputAndArgs", func(t *testing.T) {
|
||||||
|
out := generateFinalOutput([]TaskResult{
|
||||||
|
{TaskID: "ok", ExitCode: 0},
|
||||||
|
{TaskID: "fail", ExitCode: 1, Error: "boom"},
|
||||||
|
})
|
||||||
|
if !strings.Contains(out, "ok") || !strings.Contains(out, "fail") {
|
||||||
|
t.Fatalf("unexpected summary output: %s", out)
|
||||||
|
}
|
||||||
|
out = generateFinalOutput([]TaskResult{{TaskID: "rich", ExitCode: 0, SessionID: "sess", LogPath: "/tmp/log", Message: "hello"}})
|
||||||
|
if !strings.Contains(out, "Session: sess") || !strings.Contains(out, "Log: /tmp/log") || !strings.Contains(out, "hello") {
|
||||||
|
t.Fatalf("rich output missing fields: %s", out)
|
||||||
|
}
|
||||||
|
|
||||||
|
args := buildCodexArgs(&Config{Mode: "new", WorkDir: "/tmp"}, "task")
|
||||||
|
if len(args) == 0 || args[3] != "/tmp" {
|
||||||
|
t.Fatalf("unexpected codex args: %+v", args)
|
||||||
|
}
|
||||||
|
args = buildCodexArgs(&Config{Mode: "resume", SessionID: "sess"}, "target")
|
||||||
|
if args[3] != "resume" || args[4] != "sess" {
|
||||||
|
t.Fatalf("unexpected resume args: %+v", args)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("executeConcurrentWrapper", func(t *testing.T) {
|
||||||
|
orig := runCodexTaskFn
|
||||||
|
defer func() { runCodexTaskFn = orig }()
|
||||||
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
|
return TaskResult{TaskID: task.ID, ExitCode: 0, Message: "done"}
|
||||||
|
}
|
||||||
|
os.Setenv("CODEAGENT_MAX_PARALLEL_WORKERS", "1")
|
||||||
|
defer os.Unsetenv("CODEAGENT_MAX_PARALLEL_WORKERS")
|
||||||
|
|
||||||
|
results := executeConcurrent([][]TaskSpec{{{ID: "wrap"}}}, 1)
|
||||||
|
if len(results) != 1 || results[0].TaskID != "wrap" {
|
||||||
|
t.Fatalf("unexpected wrapper results: %+v", results)
|
||||||
|
}
|
||||||
|
|
||||||
|
unbounded := executeConcurrentWithContext(context.Background(), [][]TaskSpec{{{ID: "unbounded"}}}, 1, 0)
|
||||||
|
if len(unbounded) != 1 || unbounded[0].ExitCode != 0 {
|
||||||
|
t.Fatalf("unexpected unbounded result: %+v", unbounded)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
cancelled := executeConcurrentWithContext(ctx, [][]TaskSpec{{{ID: "cancel"}}}, 1, 1)
|
||||||
|
if cancelled[0].ExitCode == 0 {
|
||||||
|
t.Fatalf("expected cancelled result, got %+v", cancelled[0])
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
||||||
|
origRunner := newCommandRunner
|
||||||
|
defer func() { newCommandRunner = origRunner }()
|
||||||
|
|
||||||
t.Run("success", func(t *testing.T) {
|
t.Run("success", func(t *testing.T) {
|
||||||
var firstStdout *reasonReadCloser
|
var firstStdout *reasonReadCloser
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
rc := newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"hello"}}`)
|
rc := newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"hello"}}`)
|
||||||
if firstStdout == nil {
|
if firstStdout == nil {
|
||||||
firstStdout = rc
|
firstStdout = rc
|
||||||
}
|
}
|
||||||
return &execFakeRunner{stdout: rc, process: &execFakeProcess{pid: 1234}}
|
return &execFakeRunner{stdout: rc, process: &execFakeProcess{pid: 1234}}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{ID: "task-1", Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{ID: "task-1", Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.Error != "" || res.Message != "hello" || res.ExitCode != 0 {
|
if res.Error != "" || res.Message != "hello" || res.ExitCode != 0 {
|
||||||
@@ -224,18 +336,17 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("startErrors", func(t *testing.T) {
|
t.Run("startErrors", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{startErr: errors.New("executable file not found"), process: &execFakeProcess{pid: 1}}
|
return &execFakeRunner{startErr: errors.New("executable file not found"), process: &execFakeProcess{pid: 1}}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode != 127 {
|
if res.ExitCode != 127 {
|
||||||
t.Fatalf("expected missing executable exit code, got %d", res.ExitCode)
|
t.Fatalf("expected missing executable exit code, got %d", res.ExitCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{startErr: errors.New("start failed"), process: &execFakeProcess{pid: 2}}
|
return &execFakeRunner{startErr: errors.New("start failed"), process: &execFakeProcess{pid: 2}}
|
||||||
})
|
}
|
||||||
res = runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res = runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected non-zero exit on start failure")
|
t.Fatalf("expected non-zero exit on start failure")
|
||||||
@@ -243,14 +354,13 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("timeoutAndPipes", func(t *testing.T) {
|
t.Run("timeoutAndPipes", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"slow"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"slow"}}`),
|
||||||
process: &execFakeProcess{pid: 5},
|
process: &execFakeProcess{pid: 5},
|
||||||
waitDelay: 20 * time.Millisecond,
|
waitDelay: 20 * time.Millisecond,
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", UseStdin: true}, nil, nil, false, false, 0)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", UseStdin: true}, nil, nil, false, false, 0)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected timeout result, got %+v", res)
|
t.Fatalf("expected timeout result, got %+v", res)
|
||||||
@@ -258,18 +368,17 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("pipeErrors", func(t *testing.T) {
|
t.Run("pipeErrors", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{stdoutErr: errors.New("stdout fail"), process: &execFakeProcess{pid: 6}}
|
return &execFakeRunner{stdoutErr: errors.New("stdout fail"), process: &execFakeProcess{pid: 6}}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected failure on stdout pipe error")
|
t.Fatalf("expected failure on stdout pipe error")
|
||||||
}
|
}
|
||||||
|
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{stdinErr: errors.New("stdin fail"), process: &execFakeProcess{pid: 7}}
|
return &execFakeRunner{stdinErr: errors.New("stdin fail"), process: &execFakeProcess{pid: 7}}
|
||||||
})
|
}
|
||||||
res = runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", UseStdin: true}, nil, nil, false, false, 1)
|
res = runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: ".", UseStdin: true}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected failure on stdin pipe error")
|
t.Fatalf("expected failure on stdin pipe error")
|
||||||
@@ -282,14 +391,13 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
if exitErr == nil {
|
if exitErr == nil {
|
||||||
t.Fatalf("expected exec.ExitError")
|
t.Fatalf("expected exec.ExitError")
|
||||||
}
|
}
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"ignored"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"ignored"}}`),
|
||||||
process: &execFakeProcess{pid: 8},
|
process: &execFakeProcess{pid: 8},
|
||||||
waitErr: exitErr,
|
waitErr: exitErr,
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected non-zero exit on wait error")
|
t.Fatalf("expected non-zero exit on wait error")
|
||||||
@@ -297,14 +405,13 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("contextCancelled", func(t *testing.T) {
|
t.Run("contextCancelled", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"cancel"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"cancel"}}`),
|
||||||
process: &execFakeProcess{pid: 9},
|
process: &execFakeProcess{pid: 9},
|
||||||
waitDelay: 10 * time.Millisecond,
|
waitDelay: 10 * time.Millisecond,
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
cancel()
|
cancel()
|
||||||
res := runCodexTaskWithContext(ctx, TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(ctx, TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
@@ -314,13 +421,12 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("silentLogger", func(t *testing.T) {
|
t.Run("silentLogger", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"quiet"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"quiet"}}`),
|
||||||
process: &execFakeProcess{pid: 10},
|
process: &execFakeProcess{pid: 10},
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
_ = closeLogger()
|
_ = closeLogger()
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, true, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, true, 1)
|
||||||
if res.ExitCode != 0 || res.LogPath == "" {
|
if res.ExitCode != 0 || res.LogPath == "" {
|
||||||
@@ -330,13 +436,12 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("injectedLogger", func(t *testing.T) {
|
t.Run("injectedLogger", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"injected"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"injected"}}`),
|
||||||
process: &execFakeProcess{pid: 12},
|
process: &execFakeProcess{pid: 12},
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
_ = closeLogger()
|
_ = closeLogger()
|
||||||
|
|
||||||
injected, err := NewLoggerWithSuffix("executor-injected")
|
injected, err := NewLoggerWithSuffix("executor-injected")
|
||||||
@@ -348,7 +453,7 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
_ = os.Remove(injected.Path())
|
_ = os.Remove(injected.Path())
|
||||||
}()
|
}()
|
||||||
|
|
||||||
ctx := executor.WithTaskLogger(context.Background(), injected)
|
ctx := withTaskLogger(context.Background(), injected)
|
||||||
res := runCodexTaskWithContext(ctx, TaskSpec{ID: "task-injected", Task: "payload", WorkDir: "."}, nil, nil, false, true, 1)
|
res := runCodexTaskWithContext(ctx, TaskSpec{ID: "task-injected", Task: "payload", WorkDir: "."}, nil, nil, false, true, 1)
|
||||||
if res.ExitCode != 0 || res.LogPath != injected.Path() {
|
if res.ExitCode != 0 || res.LogPath != injected.Path() {
|
||||||
t.Fatalf("expected injected logger path, got %+v", res)
|
t.Fatalf("expected injected logger path, got %+v", res)
|
||||||
@@ -368,13 +473,12 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("contextLoggerWithoutParent", func(t *testing.T) {
|
t.Run("contextLoggerWithoutParent", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"ctx"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"ctx"}}`),
|
||||||
process: &execFakeProcess{pid: 14},
|
process: &execFakeProcess{pid: 14},
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
_ = closeLogger()
|
_ = closeLogger()
|
||||||
|
|
||||||
taskLogger, err := NewLoggerWithSuffix("executor-taskctx")
|
taskLogger, err := NewLoggerWithSuffix("executor-taskctx")
|
||||||
@@ -386,8 +490,8 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
_ = os.Remove(taskLogger.Path())
|
_ = os.Remove(taskLogger.Path())
|
||||||
})
|
})
|
||||||
|
|
||||||
ctx := executor.WithTaskLogger(context.Background(), taskLogger)
|
ctx := withTaskLogger(context.Background(), taskLogger)
|
||||||
res := runCodexTaskWithContext(context.TODO(), TaskSpec{ID: "task-context", Task: "payload", WorkDir: ".", Context: ctx}, nil, nil, false, true, 1)
|
res := runCodexTaskWithContext(nil, TaskSpec{ID: "task-context", Task: "payload", WorkDir: ".", Context: ctx}, nil, nil, false, true, 1)
|
||||||
if res.ExitCode != 0 || res.LogPath != taskLogger.Path() {
|
if res.ExitCode != 0 || res.LogPath != taskLogger.Path() {
|
||||||
t.Fatalf("expected task logger to be reused from spec context, got %+v", res)
|
t.Fatalf("expected task logger to be reused from spec context, got %+v", res)
|
||||||
}
|
}
|
||||||
@@ -407,17 +511,16 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("backendSetsDirAndNilContext", func(t *testing.T) {
|
t.Run("backendSetsDirAndNilContext", func(t *testing.T) {
|
||||||
var rc *execFakeRunner
|
var rc *execFakeRunner
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
rc = &execFakeRunner{
|
rc = &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"backend"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"backend"}}`),
|
||||||
process: &execFakeProcess{pid: 13},
|
process: &execFakeProcess{pid: 13},
|
||||||
}
|
}
|
||||||
return rc
|
return rc
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
|
|
||||||
_ = closeLogger()
|
_ = closeLogger()
|
||||||
res := runCodexTaskWithContext(context.TODO(), TaskSpec{ID: "task-backend", Task: "payload", WorkDir: "/tmp"}, ClaudeBackend{}, nil, false, false, 1)
|
res := runCodexTaskWithContext(nil, TaskSpec{ID: "task-backend", Task: "payload", WorkDir: "/tmp"}, ClaudeBackend{}, nil, false, false, 1)
|
||||||
if res.ExitCode != 0 || res.Message != "backend" {
|
if res.ExitCode != 0 || res.Message != "backend" {
|
||||||
t.Fatalf("unexpected result: %+v", res)
|
t.Fatalf("unexpected result: %+v", res)
|
||||||
}
|
}
|
||||||
@@ -426,36 +529,13 @@ func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("claudeSkipPermissionsPropagatesFromTaskSpec", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_SKIP_PERMISSIONS", "false")
|
|
||||||
var gotArgs []string
|
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
|
||||||
gotArgs = append([]string(nil), args...)
|
|
||||||
return &execFakeRunner{
|
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"agent_message","text":"ok"}}`),
|
|
||||||
process: &execFakeProcess{pid: 15},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
|
|
||||||
_ = closeLogger()
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{ID: "task-skip", Task: "payload", WorkDir: ".", SkipPermissions: true}, ClaudeBackend{}, nil, false, false, 1)
|
|
||||||
if res.ExitCode != 0 || res.Error != "" {
|
|
||||||
t.Fatalf("unexpected result: %+v", res)
|
|
||||||
}
|
|
||||||
if !slices.Contains(gotArgs, "--dangerously-skip-permissions") {
|
|
||||||
t.Fatalf("expected --dangerously-skip-permissions in args, got %v", gotArgs)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("missingMessage", func(t *testing.T) {
|
t.Run("missingMessage", func(t *testing.T) {
|
||||||
executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner {
|
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
||||||
return &execFakeRunner{
|
return &execFakeRunner{
|
||||||
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"task","text":"noop"}}`),
|
stdout: newReasonReadCloser(`{"type":"item.completed","item":{"type":"task","text":"noop"}}`),
|
||||||
process: &execFakeProcess{pid: 11},
|
process: &execFakeProcess{pid: 11},
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
t.Cleanup(func() { executor.SetNewCommandRunner(nil) })
|
|
||||||
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
res := runCodexTaskWithContext(context.Background(), TaskSpec{Task: "payload", WorkDir: "."}, nil, nil, false, false, 1)
|
||||||
if res.ExitCode == 0 {
|
if res.ExitCode == 0 {
|
||||||
t.Fatalf("expected failure when no agent_message returned")
|
t.Fatalf("expected failure when no agent_message returned")
|
||||||
@@ -481,7 +561,7 @@ func TestExecutorParallelLogIsolation(t *testing.T) {
|
|||||||
|
|
||||||
origRun := runCodexTaskFn
|
origRun := runCodexTaskFn
|
||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
logger := executor.TaskLoggerFromContext(task.Context)
|
logger := taskLoggerFromContext(task.Context)
|
||||||
if logger == nil {
|
if logger == nil {
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing task logger"}
|
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing task logger"}
|
||||||
}
|
}
|
||||||
@@ -505,7 +585,7 @@ func TestExecutorParallelLogIsolation(t *testing.T) {
|
|||||||
os.Stderr = stderrW
|
os.Stderr = stderrW
|
||||||
defer func() { os.Stderr = oldStderr }()
|
defer func() { os.Stderr = oldStderr }()
|
||||||
|
|
||||||
results := executeConcurrentWithContext(context.TODO(), [][]TaskSpec{{{ID: taskA}, {ID: taskB}}}, 1, -1)
|
results := executeConcurrentWithContext(nil, [][]TaskSpec{{{ID: taskA}, {ID: taskB}}}, 1, -1)
|
||||||
|
|
||||||
_ = stderrW.Close()
|
_ = stderrW.Close()
|
||||||
os.Stderr = oldStderr
|
os.Stderr = oldStderr
|
||||||
@@ -571,7 +651,7 @@ func TestConcurrentExecutorParallelLogIsolationAndClosure(t *testing.T) {
|
|||||||
t.Setenv("TMPDIR", tempDir)
|
t.Setenv("TMPDIR", tempDir)
|
||||||
|
|
||||||
oldArgs := os.Args
|
oldArgs := os.Args
|
||||||
os.Args = []string{wrapperName}
|
os.Args = []string{defaultWrapperName}
|
||||||
t.Cleanup(func() { os.Args = oldArgs })
|
t.Cleanup(func() { os.Args = oldArgs })
|
||||||
|
|
||||||
mainLogger, err := NewLoggerWithSuffix("concurrent-main")
|
mainLogger, err := NewLoggerWithSuffix("concurrent-main")
|
||||||
@@ -617,7 +697,7 @@ func TestConcurrentExecutorParallelLogIsolationAndClosure(t *testing.T) {
|
|||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
readyCh <- struct{}{}
|
readyCh <- struct{}{}
|
||||||
|
|
||||||
logger := executor.TaskLoggerFromContext(task.Context)
|
logger := taskLoggerFromContext(task.Context)
|
||||||
loggerCh <- taskLoggerInfo{taskID: task.ID, logger: logger}
|
loggerCh <- taskLoggerInfo{taskID: task.ID, logger: logger}
|
||||||
if logger == nil {
|
if logger == nil {
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing task logger"}
|
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing task logger"}
|
||||||
@@ -704,9 +784,15 @@ func TestConcurrentExecutorParallelLogIsolationAndClosure(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for taskID, logger := range loggers {
|
for taskID, logger := range loggers {
|
||||||
if !logger.IsClosed() {
|
if !logger.closed.Load() {
|
||||||
t.Fatalf("expected task logger to be closed for %q", taskID)
|
t.Fatalf("expected task logger to be closed for %q", taskID)
|
||||||
}
|
}
|
||||||
|
if logger.file == nil {
|
||||||
|
t.Fatalf("expected task logger file to be non-nil for %q", taskID)
|
||||||
|
}
|
||||||
|
if _, err := logger.file.Write([]byte("x")); err == nil {
|
||||||
|
t.Fatalf("expected task logger file to be closed for %q", taskID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mainLogger.Flush()
|
mainLogger.Flush()
|
||||||
@@ -776,10 +862,10 @@ func parseTaskIDFromLogLine(line string) (string, bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestExecutorTaskLoggerContext(t *testing.T) {
|
func TestExecutorTaskLoggerContext(t *testing.T) {
|
||||||
if executor.TaskLoggerFromContext(context.TODO()) != nil {
|
if taskLoggerFromContext(nil) != nil {
|
||||||
t.Fatalf("expected nil logger from TODO context")
|
t.Fatalf("expected nil logger from nil context")
|
||||||
}
|
}
|
||||||
if executor.TaskLoggerFromContext(context.Background()) != nil {
|
if taskLoggerFromContext(context.Background()) != nil {
|
||||||
t.Fatalf("expected nil logger when context has no logger")
|
t.Fatalf("expected nil logger when context has no logger")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -792,12 +878,12 @@ func TestExecutorTaskLoggerContext(t *testing.T) {
|
|||||||
_ = os.Remove(logger.Path())
|
_ = os.Remove(logger.Path())
|
||||||
}()
|
}()
|
||||||
|
|
||||||
ctx := executor.WithTaskLogger(context.Background(), logger)
|
ctx := withTaskLogger(context.Background(), logger)
|
||||||
if got := executor.TaskLoggerFromContext(ctx); got != logger {
|
if got := taskLoggerFromContext(ctx); got != logger {
|
||||||
t.Fatalf("expected logger roundtrip, got %v", got)
|
t.Fatalf("expected logger roundtrip, got %v", got)
|
||||||
}
|
}
|
||||||
|
|
||||||
if executor.TaskLoggerFromContext(executor.WithTaskLogger(context.Background(), nil)) != nil {
|
if taskLoggerFromContext(withTaskLogger(context.Background(), nil)) != nil {
|
||||||
t.Fatalf("expected nil logger when injected logger is nil")
|
t.Fatalf("expected nil logger when injected logger is nil")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -954,7 +1040,7 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
|
|
||||||
orig := runCodexTaskFn
|
orig := runCodexTaskFn
|
||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
logger := executor.TaskLoggerFromContext(task.Context)
|
logger := taskLoggerFromContext(task.Context)
|
||||||
if logger != mainLogger {
|
if logger != mainLogger {
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "unexpected logger"}
|
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "unexpected logger"}
|
||||||
}
|
}
|
||||||
@@ -988,15 +1074,17 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
if res.LogPath != mainLogger.Path() {
|
if res.LogPath != mainLogger.Path() {
|
||||||
t.Fatalf("shared log path mismatch: got %q want %q", res.LogPath, mainLogger.Path())
|
t.Fatalf("shared log path mismatch: got %q want %q", res.LogPath, mainLogger.Path())
|
||||||
}
|
}
|
||||||
|
if !res.sharedLog {
|
||||||
|
t.Fatalf("expected sharedLog flag for %+v", res)
|
||||||
|
}
|
||||||
if !strings.Contains(stderrOut, "Log (shared)") {
|
if !strings.Contains(stderrOut, "Log (shared)") {
|
||||||
t.Fatalf("stderr missing shared marker: %s", stderrOut)
|
t.Fatalf("stderr missing shared marker: %s", stderrOut)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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()
|
||||||
@@ -1016,7 +1104,7 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
|
|
||||||
orig := runCodexTaskFn
|
orig := runCodexTaskFn
|
||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
logger := executor.TaskLoggerFromContext(task.Context)
|
logger := taskLoggerFromContext(task.Context)
|
||||||
if logger == nil {
|
if logger == nil {
|
||||||
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing logger"}
|
return TaskResult{TaskID: task.ID, ExitCode: 1, Error: "missing logger"}
|
||||||
}
|
}
|
||||||
@@ -1054,14 +1142,7 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to read log %q: %v", res.LogPath, err)
|
t.Fatalf("failed to read log %q: %v", res.LogPath, err)
|
||||||
}
|
}
|
||||||
found := false
|
if !strings.Contains(string(data), "TASK="+res.TaskID) {
|
||||||
for _, line := range strings.Split(string(data), "\n") {
|
|
||||||
if strings.Contains(stripTimestampPrefix(line), "TASK="+res.TaskID) {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
t.Fatalf("log for %q missing task marker, content: %s", res.TaskID, string(data))
|
t.Fatalf("log for %q missing task marker, content: %s", res.TaskID, string(data))
|
||||||
}
|
}
|
||||||
_ = os.Remove(res.LogPath)
|
_ = os.Remove(res.LogPath)
|
||||||
@@ -1069,6 +1150,147 @@ func TestExecutorExecuteConcurrentWithContextBranches(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestExecutorSignalAndTermination(t *testing.T) {
|
||||||
|
forceKillDelay.Store(0)
|
||||||
|
defer forceKillDelay.Store(5)
|
||||||
|
|
||||||
|
proc := &execFakeProcess{pid: 42}
|
||||||
|
cmd := &execFakeRunner{process: proc}
|
||||||
|
|
||||||
|
origNotify := signalNotifyFn
|
||||||
|
origStop := signalStopFn
|
||||||
|
defer func() {
|
||||||
|
signalNotifyFn = origNotify
|
||||||
|
signalStopFn = origStop
|
||||||
|
}()
|
||||||
|
|
||||||
|
signalNotifyFn = func(c chan<- os.Signal, sigs ...os.Signal) {
|
||||||
|
go func() { c <- syscall.SIGINT }()
|
||||||
|
}
|
||||||
|
signalStopFn = func(c chan<- os.Signal) {}
|
||||||
|
|
||||||
|
forwardSignals(context.Background(), cmd, func(string) {})
|
||||||
|
time.Sleep(20 * time.Millisecond)
|
||||||
|
|
||||||
|
proc.mu.Lock()
|
||||||
|
signalled := len(proc.signals)
|
||||||
|
proc.mu.Unlock()
|
||||||
|
if signalled == 0 {
|
||||||
|
t.Fatalf("process did not receive signal")
|
||||||
|
}
|
||||||
|
if proc.killed.Load() == 0 {
|
||||||
|
t.Fatalf("process was not killed after signal")
|
||||||
|
}
|
||||||
|
|
||||||
|
timer := terminateProcess(cmd)
|
||||||
|
if timer == nil {
|
||||||
|
t.Fatalf("terminateProcess returned nil timer")
|
||||||
|
}
|
||||||
|
timer.Stop()
|
||||||
|
|
||||||
|
ft := terminateCommand(cmd)
|
||||||
|
if ft == nil {
|
||||||
|
t.Fatalf("terminateCommand returned nil")
|
||||||
|
}
|
||||||
|
ft.Stop()
|
||||||
|
|
||||||
|
cmdKill := &execFakeRunner{process: &execFakeProcess{pid: 50}}
|
||||||
|
ftKill := terminateCommand(cmdKill)
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
if p, ok := cmdKill.process.(*execFakeProcess); ok && p.killed.Load() == 0 {
|
||||||
|
t.Fatalf("terminateCommand did not kill process")
|
||||||
|
}
|
||||||
|
ftKill.Stop()
|
||||||
|
|
||||||
|
cmdKill2 := &execFakeRunner{process: &execFakeProcess{pid: 51}}
|
||||||
|
timer2 := terminateProcess(cmdKill2)
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
if p, ok := cmdKill2.process.(*execFakeProcess); ok && p.killed.Load() == 0 {
|
||||||
|
t.Fatalf("terminateProcess did not kill process")
|
||||||
|
}
|
||||||
|
timer2.Stop()
|
||||||
|
|
||||||
|
if terminateCommand(nil) != nil {
|
||||||
|
t.Fatalf("terminateCommand should return nil for nil cmd")
|
||||||
|
}
|
||||||
|
if terminateCommand(&execFakeRunner{allowNilProcess: true}) != nil {
|
||||||
|
t.Fatalf("terminateCommand should return nil when process is nil")
|
||||||
|
}
|
||||||
|
if terminateProcess(nil) != nil {
|
||||||
|
t.Fatalf("terminateProcess should return nil for nil cmd")
|
||||||
|
}
|
||||||
|
if terminateProcess(&execFakeRunner{allowNilProcess: true}) != nil {
|
||||||
|
t.Fatalf("terminateProcess should return nil when process is nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
signalNotifyFn = func(c chan<- os.Signal, sigs ...os.Signal) {}
|
||||||
|
ctxDone, cancelDone := context.WithCancel(context.Background())
|
||||||
|
cancelDone()
|
||||||
|
forwardSignals(ctxDone, &execFakeRunner{process: &execFakeProcess{pid: 70}}, func(string) {})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExecutorCancelReasonAndCloseWithReason(t *testing.T) {
|
||||||
|
if reason := cancelReason("", nil); !strings.Contains(reason, "Context") {
|
||||||
|
t.Fatalf("unexpected cancelReason for nil ctx: %s", reason)
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 0)
|
||||||
|
defer cancel()
|
||||||
|
if !strings.Contains(cancelReason("cmd", ctx), "timeout") {
|
||||||
|
t.Fatalf("expected timeout reason")
|
||||||
|
}
|
||||||
|
cancelCtx, cancelFn := context.WithCancel(context.Background())
|
||||||
|
cancelFn()
|
||||||
|
if !strings.Contains(cancelReason("cmd", cancelCtx), "Execution cancelled") {
|
||||||
|
t.Fatalf("expected cancellation reason")
|
||||||
|
}
|
||||||
|
if !strings.Contains(cancelReason("", cancelCtx), "codex") {
|
||||||
|
t.Fatalf("expected default command name in cancel reason")
|
||||||
|
}
|
||||||
|
|
||||||
|
rc := &reasonReadCloser{r: strings.NewReader("data"), closedC: make(chan struct{}, 1)}
|
||||||
|
closeWithReason(rc, "why")
|
||||||
|
select {
|
||||||
|
case <-rc.closedC:
|
||||||
|
default:
|
||||||
|
t.Fatalf("CloseWithReason was not called")
|
||||||
|
}
|
||||||
|
|
||||||
|
plain := io.NopCloser(strings.NewReader("x"))
|
||||||
|
closeWithReason(plain, "noop")
|
||||||
|
closeWithReason(nil, "noop")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExecutorForceKillTimerStop(t *testing.T) {
|
||||||
|
done := make(chan struct{}, 1)
|
||||||
|
ft := &forceKillTimer{timer: time.AfterFunc(50*time.Millisecond, func() { done <- struct{}{} }), done: done}
|
||||||
|
ft.Stop()
|
||||||
|
|
||||||
|
done2 := make(chan struct{}, 1)
|
||||||
|
ft2 := &forceKillTimer{timer: time.AfterFunc(0, func() { done2 <- struct{}{} }), done: done2}
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
ft2.Stop()
|
||||||
|
|
||||||
|
var nilTimer *forceKillTimer
|
||||||
|
nilTimer.Stop()
|
||||||
|
(&forceKillTimer{}).Stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExecutorForwardSignalsDefaults(t *testing.T) {
|
||||||
|
origNotify := signalNotifyFn
|
||||||
|
origStop := signalStopFn
|
||||||
|
signalNotifyFn = nil
|
||||||
|
signalStopFn = nil
|
||||||
|
defer func() {
|
||||||
|
signalNotifyFn = origNotify
|
||||||
|
signalStopFn = origStop
|
||||||
|
}()
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
forwardSignals(ctx, &execFakeRunner{process: &execFakeProcess{pid: 80}}, func(string) {})
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
func TestExecutorSharedLogFalseWhenCustomLogPath(t *testing.T) {
|
func TestExecutorSharedLogFalseWhenCustomLogPath(t *testing.T) {
|
||||||
devNull, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0)
|
devNull, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1124,9 +1346,10 @@ func TestExecutorSharedLogFalseWhenCustomLogPath(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
res := results[0]
|
res := results[0]
|
||||||
out := generateFinalOutputWithMode(results, false)
|
// 关键断言：即使 handle.shared=true（因为 task logger 创建失败），
|
||||||
if strings.Contains(out, "(shared)") {
|
// 但因为 LogPath 不等于主 logger 的路径，sharedLog 应为 false
|
||||||
t.Fatalf("did not expect shared marker when LogPath differs from shared logger, got: %s", out)
|
if res.sharedLog {
|
||||||
|
t.Fatalf("expected sharedLog=false when LogPath differs from shared logger, got true")
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证 LogPath 确实是自定义的
|
// 验证 LogPath 确实是自定义的
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package executor
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -18,12 +18,6 @@ var geminiNoisePatterns = []string{
|
|||||||
"YOLO mode is enabled",
|
"YOLO mode is enabled",
|
||||||
}
|
}
|
||||||
|
|
||||||
// codexNoisePatterns contains stderr patterns to filter for codex backend
|
|
||||||
var codexNoisePatterns = []string{
|
|
||||||
"ERROR codex_core::codex: needs_follow_up:",
|
|
||||||
"ERROR codex_core::skills::loader:",
|
|
||||||
}
|
|
||||||
|
|
||||||
// filteringWriter wraps an io.Writer and filters out lines matching patterns
|
// filteringWriter wraps an io.Writer and filters out lines matching patterns
|
||||||
type filteringWriter struct {
|
type filteringWriter struct {
|
||||||
w io.Writer
|
w io.Writer
|
||||||
@@ -45,7 +39,7 @@ func (f *filteringWriter) Write(p []byte) (n int, err error) {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
if !f.shouldFilter(line) {
|
if !f.shouldFilter(line) {
|
||||||
_, _ = f.w.Write([]byte(line))
|
f.w.Write([]byte(line))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return len(p), nil
|
return len(p), nil
|
||||||
@@ -65,7 +59,7 @@ func (f *filteringWriter) Flush() {
|
|||||||
if f.buf.Len() > 0 {
|
if f.buf.Len() > 0 {
|
||||||
remaining := f.buf.String()
|
remaining := f.buf.String()
|
||||||
if !f.shouldFilter(remaining) {
|
if !f.shouldFilter(remaining) {
|
||||||
_, _ = f.w.Write([]byte(remaining))
|
f.w.Write([]byte(remaining))
|
||||||
}
|
}
|
||||||
f.buf.Reset()
|
f.buf.Reset()
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package executor
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -48,7 +48,7 @@ func TestFilteringWriter(t *testing.T) {
|
|||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
fw := newFilteringWriter(&buf, tt.patterns)
|
fw := newFilteringWriter(&buf, tt.patterns)
|
||||||
_, _ = fw.Write([]byte(tt.input))
|
fw.Write([]byte(tt.input))
|
||||||
fw.Flush()
|
fw.Flush()
|
||||||
|
|
||||||
if got := buf.String(); got != tt.want {
|
if got := buf.String(); got != tt.want {
|
||||||
@@ -63,8 +63,8 @@ func TestFilteringWriterPartialLines(t *testing.T) {
|
|||||||
fw := newFilteringWriter(&buf, geminiNoisePatterns)
|
fw := newFilteringWriter(&buf, geminiNoisePatterns)
|
||||||
|
|
||||||
// Write partial line
|
// Write partial line
|
||||||
_, _ = fw.Write([]byte("Hello "))
|
fw.Write([]byte("Hello "))
|
||||||
_, _ = fw.Write([]byte("World\n"))
|
fw.Write([]byte("World\n"))
|
||||||
fw.Flush()
|
fw.Flush()
|
||||||
|
|
||||||
if got := buf.String(); got != "Hello World\n" {
|
if got := buf.String(); got != "Hello World\n" {
|
||||||
@@ -1,43 +1,3 @@
|
|||||||
module codeagent-wrapper
|
module codeagent-wrapper
|
||||||
|
|
||||||
go 1.21
|
go 1.21
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/goccy/go-json v0.10.5
|
|
||||||
github.com/rs/zerolog v1.34.0
|
|
||||||
github.com/shirou/gopsutil/v3 v3.24.5
|
|
||||||
github.com/spf13/cobra v1.8.1
|
|
||||||
github.com/spf13/pflag v1.0.5
|
|
||||||
github.com/spf13/viper v1.19.0
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/fsnotify/fsnotify v1.7.0 // indirect
|
|
||||||
github.com/go-ole/go-ole v1.2.6 // indirect
|
|
||||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
|
|
||||||
github.com/magiconair/properties v1.8.7 // indirect
|
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
|
||||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
|
|
||||||
github.com/sagikazarmark/locafero v0.4.0 // indirect
|
|
||||||
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
|
||||||
github.com/sourcegraph/conc v0.3.0 // indirect
|
|
||||||
github.com/spf13/afero v1.11.0 // indirect
|
|
||||||
github.com/spf13/cast v1.6.0 // indirect
|
|
||||||
github.com/subosito/gotenv v1.6.0 // indirect
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12 // indirect
|
|
||||||
github.com/tklauser/numcpus v0.6.1 // indirect
|
|
||||||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
|
||||||
go.uber.org/atomic v1.9.0 // indirect
|
|
||||||
go.uber.org/multierr v1.9.0 // indirect
|
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
|
|
||||||
golang.org/x/sys v0.20.0 // indirect
|
|
||||||
golang.org/x/text v0.14.0 // indirect
|
|
||||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,117 +0,0 @@
|
|||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
|
||||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
|
||||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
|
||||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
|
||||||
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
|
|
||||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
|
||||||
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
|
||||||
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
|
||||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
|
||||||
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
|
|
||||||
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
|
||||||
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
|
|
||||||
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
|
|
||||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
|
||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
|
||||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
|
||||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
|
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
|
||||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
|
||||||
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
|
|
||||||
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
|
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
|
||||||
github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
|
|
||||||
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
|
|
||||||
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
|
|
||||||
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
|
|
||||||
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
|
|
||||||
github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
|
||||||
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
|
||||||
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
|
||||||
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
|
|
||||||
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
|
|
||||||
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
|
|
||||||
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
|
|
||||||
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
|
|
||||||
github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
|
|
||||||
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
|
|
||||||
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
|
|
||||||
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
|
|
||||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
|
||||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
|
|
||||||
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
|
||||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
|
||||||
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
|
|
||||||
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
|
|
||||||
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
|
|
||||||
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
|
|
||||||
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
|
||||||
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
|
|
||||||
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
|
||||||
go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
|
|
||||||
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
|
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
|
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
|
|
||||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
|
||||||
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
@@ -1,150 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
executor "codeagent-wrapper/internal/executor"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestValidateAgentName(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
input string
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{name: "simple", input: "develop", wantErr: false},
|
|
||||||
{name: "upper", input: "ABC", wantErr: false},
|
|
||||||
{name: "digits", input: "a1", wantErr: false},
|
|
||||||
{name: "dash underscore", input: "a-b_c", wantErr: false},
|
|
||||||
{name: "empty", input: "", wantErr: true},
|
|
||||||
{name: "space", input: "a b", wantErr: true},
|
|
||||||
{name: "slash", input: "a/b", wantErr: true},
|
|
||||||
{name: "dotdot", input: "../evil", wantErr: true},
|
|
||||||
{name: "unicode", input: "中文", wantErr: true},
|
|
||||||
{name: "symbol", input: "a$b", wantErr: true},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
err := config.ValidateAgentName(tt.input)
|
|
||||||
if (err != nil) != tt.wantErr {
|
|
||||||
t.Fatalf("validateAgentName(%q) err=%v, wantErr=%v", tt.input, err, tt.wantErr)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseArgs_InvalidAgentNameRejected(t *testing.T) {
|
|
||||||
defer resetTestHooks()
|
|
||||||
os.Args = []string{"codeagent-wrapper", "--agent", "../evil", "task"}
|
|
||||||
if _, err := parseArgs(); err == nil {
|
|
||||||
t.Fatalf("expected parseArgs to reject invalid agent name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseParallelConfig_InvalidAgentNameRejected(t *testing.T) {
|
|
||||||
input := `---TASK---
|
|
||||||
id: task-1
|
|
||||||
agent: ../evil
|
|
||||||
---CONTENT---
|
|
||||||
do something`
|
|
||||||
if _, err := parseParallelConfig([]byte(input)); err == nil {
|
|
||||||
t.Fatalf("expected parseParallelConfig to reject invalid agent name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseParallelConfig_ResolvesAgentPromptFile(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
t.Cleanup(config.ResetModelsConfigCacheForTest)
|
|
||||||
config.ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
configDir := filepath.Join(home, ".codeagent")
|
|
||||||
if err := os.MkdirAll(configDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
if err := os.WriteFile(filepath.Join(configDir, "models.json"), []byte(`{
|
|
||||||
"default_backend": "codex",
|
|
||||||
"default_model": "gpt-test",
|
|
||||||
"agents": {
|
|
||||||
"custom-agent": {
|
|
||||||
"backend": "codex",
|
|
||||||
"model": "gpt-test",
|
|
||||||
"prompt_file": "~/.claude/prompt.md"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
input := `---TASK---
|
|
||||||
id: task-1
|
|
||||||
agent: custom-agent
|
|
||||||
---CONTENT---
|
|
||||||
do something`
|
|
||||||
cfg, err := parseParallelConfig([]byte(input))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("parseParallelConfig() unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if len(cfg.Tasks) != 1 {
|
|
||||||
t.Fatalf("expected 1 task, got %d", len(cfg.Tasks))
|
|
||||||
}
|
|
||||||
if got := cfg.Tasks[0].PromptFile; got != "~/.claude/prompt.md" {
|
|
||||||
t.Fatalf("PromptFile = %q, want %q", got, "~/.claude/prompt.md")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDefaultRunCodexTaskFn_AppliesAgentPromptFile(t *testing.T) {
|
|
||||||
defer resetTestHooks()
|
|
||||||
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
claudeDir := filepath.Join(home, ".claude")
|
|
||||||
if err := os.MkdirAll(claudeDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
if err := os.WriteFile(filepath.Join(claudeDir, "prompt.md"), []byte("P\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
fake := newFakeCmd(fakeCmdConfig{
|
|
||||||
StdoutPlan: []fakeStdoutEvent{
|
|
||||||
{Data: `{"type":"item.completed","item":{"type":"agent_message","text":"ok"}}` + "\n"},
|
|
||||||
},
|
|
||||||
WaitDelay: 2 * time.Millisecond,
|
|
||||||
})
|
|
||||||
|
|
||||||
_ = executor.SetNewCommandRunner(func(ctx context.Context, name string, args ...string) executor.CommandRunner { return fake })
|
|
||||||
_ = executor.SetSelectBackendFn(func(name string) (Backend, error) {
|
|
||||||
return testBackend{
|
|
||||||
name: name,
|
|
||||||
command: "fake-cmd",
|
|
||||||
argsFn: func(cfg *Config, targetArg string) []string {
|
|
||||||
return []string{targetArg}
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
})
|
|
||||||
|
|
||||||
res := defaultRunCodexTaskFn(TaskSpec{
|
|
||||||
ID: "t",
|
|
||||||
Task: "do",
|
|
||||||
Backend: "codex",
|
|
||||||
PromptFile: "~/.claude/prompt.md",
|
|
||||||
}, 5)
|
|
||||||
if res.ExitCode != 0 {
|
|
||||||
t.Fatalf("unexpected result: %+v", res)
|
|
||||||
}
|
|
||||||
|
|
||||||
want := "<agent-prompt>\nP\n</agent-prompt>\n\ndo"
|
|
||||||
if got := fake.StdinContents(); got != want {
|
|
||||||
t.Fatalf("stdin mismatch:\n got=%q\nwant=%q", got, want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,278 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
version = "6.0.0-alpha1"
|
|
||||||
defaultWorkdir = "."
|
|
||||||
defaultTimeout = 7200 // seconds (2 hours)
|
|
||||||
defaultCoverageTarget = 90.0
|
|
||||||
codexLogLineLimit = 1000
|
|
||||||
stdinSpecialChars = "\n\\\"'`$"
|
|
||||||
stderrCaptureLimit = 4 * 1024
|
|
||||||
defaultBackendName = "codex"
|
|
||||||
defaultCodexCommand = "codex"
|
|
||||||
|
|
||||||
// stdout close reasons
|
|
||||||
stdoutCloseReasonWait = "wait-done"
|
|
||||||
stdoutCloseReasonDrain = "drain-timeout"
|
|
||||||
stdoutCloseReasonCtx = "context-cancel"
|
|
||||||
stdoutDrainTimeout = 100 * time.Millisecond
|
|
||||||
)
|
|
||||||
|
|
||||||
// Test hooks for dependency injection
|
|
||||||
var (
|
|
||||||
stdinReader io.Reader = os.Stdin
|
|
||||||
isTerminalFn = defaultIsTerminal
|
|
||||||
codexCommand = defaultCodexCommand
|
|
||||||
cleanupHook func()
|
|
||||||
startupCleanupAsync = true
|
|
||||||
|
|
||||||
buildCodexArgsFn = buildCodexArgs
|
|
||||||
selectBackendFn = selectBackend
|
|
||||||
cleanupLogsFn = cleanupOldLogs
|
|
||||||
defaultBuildArgsFn = buildCodexArgs
|
|
||||||
runTaskFn = runCodexTask
|
|
||||||
exitFn = os.Exit
|
|
||||||
)
|
|
||||||
|
|
||||||
func runStartupCleanup() {
|
|
||||||
if cleanupLogsFn == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
logWarn(fmt.Sprintf("cleanupOldLogs panic: %v", r))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if _, err := cleanupLogsFn(); err != nil {
|
|
||||||
logWarn(fmt.Sprintf("cleanupOldLogs error: %v", err))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func scheduleStartupCleanup() {
|
|
||||||
if !startupCleanupAsync {
|
|
||||||
runStartupCleanup()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if cleanupLogsFn == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fn := cleanupLogsFn
|
|
||||||
go func() {
|
|
||||||
defer func() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
logWarn(fmt.Sprintf("cleanupOldLogs panic: %v", r))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if _, err := fn(); err != nil {
|
|
||||||
logWarn(fmt.Sprintf("cleanupOldLogs error: %v", err))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func runCleanupMode() int {
|
|
||||||
if cleanupLogsFn == nil {
|
|
||||||
fmt.Fprintln(os.Stderr, "Cleanup failed: log cleanup function not configured")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
stats, err := cleanupLogsFn()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "Cleanup failed: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println("Cleanup completed")
|
|
||||||
fmt.Printf("Files scanned: %d\n", stats.Scanned)
|
|
||||||
fmt.Printf("Files deleted: %d\n", stats.Deleted)
|
|
||||||
if len(stats.DeletedFiles) > 0 {
|
|
||||||
for _, f := range stats.DeletedFiles {
|
|
||||||
fmt.Printf(" - %s\n", f)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fmt.Printf("Files kept: %d\n", stats.Kept)
|
|
||||||
if len(stats.KeptFiles) > 0 {
|
|
||||||
for _, f := range stats.KeptFiles {
|
|
||||||
fmt.Printf(" - %s\n", f)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if stats.Errors > 0 {
|
|
||||||
fmt.Printf("Deletion errors: %d\n", stats.Errors)
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func readAgentPromptFile(path string, allowOutsideClaudeDir bool) (string, error) {
|
|
||||||
raw := strings.TrimSpace(path)
|
|
||||||
if raw == "" {
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
expanded := raw
|
|
||||||
if raw == "~" || strings.HasPrefix(raw, "~/") || strings.HasPrefix(raw, "~\\") {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if raw == "~" {
|
|
||||||
expanded = home
|
|
||||||
} else {
|
|
||||||
expanded = home + raw[1:]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
absPath, err := filepath.Abs(expanded)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
absPath = filepath.Clean(absPath)
|
|
||||||
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
if !allowOutsideClaudeDir {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
logWarn(fmt.Sprintf("Failed to resolve home directory for prompt file validation: %v; proceeding without restriction", err))
|
|
||||||
} else {
|
|
||||||
allowedDirs := []string{
|
|
||||||
filepath.Clean(filepath.Join(home, ".claude")),
|
|
||||||
filepath.Clean(filepath.Join(home, ".codeagent", "agents")),
|
|
||||||
}
|
|
||||||
for i := range allowedDirs {
|
|
||||||
allowedAbs, err := filepath.Abs(allowedDirs[i])
|
|
||||||
if err == nil {
|
|
||||||
allowedDirs[i] = filepath.Clean(allowedAbs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isWithinDir := func(path, dir string) bool {
|
|
||||||
rel, err := filepath.Rel(dir, path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
rel = filepath.Clean(rel)
|
|
||||||
if rel == "." {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if rel == ".." {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
prefix := ".." + string(os.PathSeparator)
|
|
||||||
return !strings.HasPrefix(rel, prefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !allowOutsideClaudeDir {
|
|
||||||
withinAllowed := false
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
if isWithinDir(absPath, dir) {
|
|
||||||
withinAllowed = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinAllowed {
|
|
||||||
logWarn(fmt.Sprintf("Refusing to read prompt file outside allowed dirs (%s): %s", strings.Join(allowedDirs, ", "), absPath))
|
|
||||||
return "", fmt.Errorf("prompt file must be under ~/.claude or ~/.codeagent/agents")
|
|
||||||
}
|
|
||||||
|
|
||||||
resolvedPath, errPath := filepath.EvalSymlinks(absPath)
|
|
||||||
if errPath == nil {
|
|
||||||
resolvedPath = filepath.Clean(resolvedPath)
|
|
||||||
resolvedAllowed := make([]string, 0, len(allowedDirs))
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
resolvedBase, errBase := filepath.EvalSymlinks(dir)
|
|
||||||
if errBase != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resolvedAllowed = append(resolvedAllowed, filepath.Clean(resolvedBase))
|
|
||||||
}
|
|
||||||
if len(resolvedAllowed) > 0 {
|
|
||||||
withinResolved := false
|
|
||||||
for _, dir := range resolvedAllowed {
|
|
||||||
if isWithinDir(resolvedPath, dir) {
|
|
||||||
withinResolved = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinResolved {
|
|
||||||
logWarn(fmt.Sprintf("Refusing to read prompt file outside allowed dirs (%s) (resolved): %s", strings.Join(resolvedAllowed, ", "), resolvedPath))
|
|
||||||
return "", fmt.Errorf("prompt file must be under ~/.claude or ~/.codeagent/agents")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
withinAllowed := false
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
if isWithinDir(absPath, dir) {
|
|
||||||
withinAllowed = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinAllowed {
|
|
||||||
logWarn(fmt.Sprintf("Reading prompt file outside allowed dirs (%s): %s", strings.Join(allowedDirs, ", "), absPath))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(absPath)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return strings.TrimRight(string(data), "\r\n"), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func wrapTaskWithAgentPrompt(prompt string, task string) string {
|
|
||||||
return "<agent-prompt>\n" + prompt + "\n</agent-prompt>\n\n" + task
|
|
||||||
}
|
|
||||||
|
|
||||||
func runCleanupHook() {
|
|
||||||
if logger := activeLogger(); logger != nil {
|
|
||||||
logger.Flush()
|
|
||||||
}
|
|
||||||
if cleanupHook != nil {
|
|
||||||
cleanupHook()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func printHelp() {
|
|
||||||
name := currentWrapperName()
|
|
||||||
help := fmt.Sprintf(`%[1]s - Go wrapper for AI CLI backends
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
%[1]s "task" [workdir]
|
|
||||||
%[1]s --backend claude "task" [workdir]
|
|
||||||
%[1]s --prompt-file /path/to/prompt.md "task" [workdir]
|
|
||||||
%[1]s - [workdir] Read task from stdin
|
|
||||||
%[1]s resume <session_id> "task" [workdir]
|
|
||||||
%[1]s resume <session_id> - [workdir]
|
|
||||||
%[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 --help
|
|
||||||
|
|
||||||
Parallel mode examples:
|
|
||||||
%[1]s --parallel < tasks.txt
|
|
||||||
echo '...' | %[1]s --parallel
|
|
||||||
%[1]s --parallel --full-output < tasks.txt
|
|
||||||
%[1]s --parallel <<'EOF'
|
|
||||||
|
|
||||||
Environment Variables:
|
|
||||||
CODEX_TIMEOUT Timeout in milliseconds (default: 7200000)
|
|
||||||
CODEAGENT_ASCII_MODE Use ASCII symbols instead of Unicode (PASS/WARN/FAIL)
|
|
||||||
|
|
||||||
Exit Codes:
|
|
||||||
0 Success
|
|
||||||
1 General error (missing args, no output)
|
|
||||||
124 Timeout
|
|
||||||
127 backend command not found
|
|
||||||
130 Interrupted (Ctrl+C)
|
|
||||||
* Passthrough from backend process`, name)
|
|
||||||
fmt.Println(help)
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import backend "codeagent-wrapper/internal/backend"
|
|
||||||
|
|
||||||
type Backend = backend.Backend
|
|
||||||
type CodexBackend = backend.CodexBackend
|
|
||||||
type ClaudeBackend = backend.ClaudeBackend
|
|
||||||
type GeminiBackend = backend.GeminiBackend
|
|
||||||
type OpencodeBackend = backend.OpencodeBackend
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import backend "codeagent-wrapper/internal/backend"
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
backend.SetLogFuncs(logWarn, logError)
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import backend "codeagent-wrapper/internal/backend"
|
|
||||||
|
|
||||||
func selectBackend(name string) (Backend, error) { return backend.Select(name) }
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
benchCmdSink any
|
|
||||||
benchConfigSink *Config
|
|
||||||
benchMessageSink string
|
|
||||||
benchThreadIDSink string
|
|
||||||
)
|
|
||||||
|
|
||||||
// BenchmarkStartup_NewRootCommand measures CLI startup overhead (command+flags construction).
|
|
||||||
func BenchmarkStartup_NewRootCommand(b *testing.B) {
|
|
||||||
b.ReportAllocs()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
benchCmdSink = newRootCommand()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// BenchmarkConfigParse_ParseArgs measures config parsing from argv/env (steady-state).
|
|
||||||
func BenchmarkConfigParse_ParseArgs(b *testing.B) {
|
|
||||||
home := b.TempDir()
|
|
||||||
b.Setenv("HOME", home)
|
|
||||||
b.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
config.ResetModelsConfigCacheForTest()
|
|
||||||
b.Cleanup(config.ResetModelsConfigCacheForTest)
|
|
||||||
|
|
||||||
origArgs := os.Args
|
|
||||||
os.Args = []string{"codeagent-wrapper", "--agent", "develop", "task"}
|
|
||||||
b.Cleanup(func() { os.Args = origArgs })
|
|
||||||
|
|
||||||
if _, err := parseArgs(); err != nil {
|
|
||||||
b.Fatalf("warmup parseArgs() error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
b.ReportAllocs()
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
cfg, err := parseArgs()
|
|
||||||
if err != nil {
|
|
||||||
b.Fatalf("parseArgs() error: %v", err)
|
|
||||||
}
|
|
||||||
benchConfigSink = cfg
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// BenchmarkJSONParse_ParseJSONStreamInternal measures line-delimited JSON stream parsing.
|
|
||||||
func BenchmarkJSONParse_ParseJSONStreamInternal(b *testing.B) {
|
|
||||||
stream := []byte(
|
|
||||||
`{"type":"thread.started","thread_id":"t"}` + "\n" +
|
|
||||||
`{"type":"item.completed","item":{"type":"agent_message","text":"hello"}}` + "\n" +
|
|
||||||
`{"type":"thread.completed","thread_id":"t"}` + "\n",
|
|
||||||
)
|
|
||||||
b.SetBytes(int64(len(stream)))
|
|
||||||
|
|
||||||
b.ReportAllocs()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
message, threadID := parseJSONStreamInternal(bytes.NewReader(stream), nil, nil, nil, nil)
|
|
||||||
benchMessageSink = message
|
|
||||||
benchThreadIDSink = threadID
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// BenchmarkLoggerWrite 测试日志写入性能
|
|
||||||
func BenchmarkLoggerWrite(b *testing.B) {
|
|
||||||
logger, err := NewLogger()
|
|
||||||
if err != nil {
|
|
||||||
b.Fatal(err)
|
|
||||||
}
|
|
||||||
defer logger.Close()
|
|
||||||
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
logger.Info("benchmark log message")
|
|
||||||
}
|
|
||||||
b.StopTimer()
|
|
||||||
logger.Flush()
|
|
||||||
}
|
|
||||||
|
|
||||||
// BenchmarkLoggerConcurrentWrite 测试并发日志写入性能
|
|
||||||
func BenchmarkLoggerConcurrentWrite(b *testing.B) {
|
|
||||||
logger, err := NewLogger()
|
|
||||||
if err != nil {
|
|
||||||
b.Fatal(err)
|
|
||||||
}
|
|
||||||
defer logger.Close()
|
|
||||||
|
|
||||||
b.ResetTimer()
|
|
||||||
b.RunParallel(func(pb *testing.PB) {
|
|
||||||
for pb.Next() {
|
|
||||||
logger.Info("concurrent benchmark log message")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
b.StopTimer()
|
|
||||||
logger.Flush()
|
|
||||||
}
|
|
||||||
@@ -1,657 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"github.com/spf13/pflag"
|
|
||||||
"github.com/spf13/viper"
|
|
||||||
)
|
|
||||||
|
|
||||||
type exitError struct {
|
|
||||||
code int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e exitError) Error() string {
|
|
||||||
return fmt.Sprintf("exit %d", e.code)
|
|
||||||
}
|
|
||||||
|
|
||||||
type cliOptions struct {
|
|
||||||
Backend string
|
|
||||||
Model string
|
|
||||||
ReasoningEffort string
|
|
||||||
Agent string
|
|
||||||
PromptFile string
|
|
||||||
SkipPermissions bool
|
|
||||||
|
|
||||||
Parallel bool
|
|
||||||
FullOutput bool
|
|
||||||
|
|
||||||
Cleanup bool
|
|
||||||
Version bool
|
|
||||||
ConfigFile string
|
|
||||||
}
|
|
||||||
|
|
||||||
func Main() {
|
|
||||||
Run()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run is the program entrypoint for cmd/codeagent/main.go.
|
|
||||||
func Run() {
|
|
||||||
exitFn(run())
|
|
||||||
}
|
|
||||||
|
|
||||||
func run() int {
|
|
||||||
cmd := newRootCommand()
|
|
||||||
cmd.SetArgs(os.Args[1:])
|
|
||||||
if err := cmd.Execute(); err != nil {
|
|
||||||
var ee exitError
|
|
||||||
if errors.As(err, &ee) {
|
|
||||||
return ee.code
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func newRootCommand() *cobra.Command {
|
|
||||||
name := currentWrapperName()
|
|
||||||
opts := &cliOptions{}
|
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: fmt.Sprintf("%s [flags] <task>|resume <session_id> <task> [workdir]", name),
|
|
||||||
Short: "Go wrapper for AI CLI backends",
|
|
||||||
SilenceErrors: true,
|
|
||||||
SilenceUsage: true,
|
|
||||||
Args: cobra.ArbitraryArgs,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
if opts.Version {
|
|
||||||
fmt.Printf("%s version %s\n", name, version)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if opts.Cleanup {
|
|
||||||
code := runCleanupMode()
|
|
||||||
if code == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return exitError{code: code}
|
|
||||||
}
|
|
||||||
|
|
||||||
exitCode := runWithLoggerAndCleanup(func() int {
|
|
||||||
v, err := config.NewViper(opts.ConfigFile)
|
|
||||||
if err != nil {
|
|
||||||
logError(err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.Parallel {
|
|
||||||
return runParallelMode(cmd, args, opts, v, name)
|
|
||||||
}
|
|
||||||
|
|
||||||
logInfo("Script started")
|
|
||||||
|
|
||||||
cfg, err := buildSingleConfig(cmd, args, os.Args[1:], opts, v)
|
|
||||||
if err != nil {
|
|
||||||
logError(err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
logInfo(fmt.Sprintf("Parsed args: mode=%s, task_len=%d, backend=%s", cfg.Mode, len(cfg.Task), cfg.Backend))
|
|
||||||
return runSingleMode(cfg, name)
|
|
||||||
})
|
|
||||||
|
|
||||||
if exitCode == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return exitError{code: exitCode}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
cmd.CompletionOptions.DisableDefaultCmd = true
|
|
||||||
|
|
||||||
addRootFlags(cmd.Flags(), opts)
|
|
||||||
cmd.AddCommand(newVersionCommand(name), newCleanupCommand())
|
|
||||||
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
|
|
||||||
func addRootFlags(fs *pflag.FlagSet, opts *cliOptions) {
|
|
||||||
fs.StringVar(&opts.ConfigFile, "config", "", "Config file path (default: $HOME/.codeagent/config.*)")
|
|
||||||
fs.BoolVarP(&opts.Version, "version", "v", false, "Print version and exit")
|
|
||||||
fs.BoolVar(&opts.Cleanup, "cleanup", false, "Clean up old logs and exit")
|
|
||||||
|
|
||||||
fs.BoolVar(&opts.Parallel, "parallel", false, "Run tasks in parallel (config from stdin)")
|
|
||||||
fs.BoolVar(&opts.FullOutput, "full-output", false, "Parallel mode: include full task output (legacy)")
|
|
||||||
|
|
||||||
fs.StringVar(&opts.Backend, "backend", defaultBackendName, "Backend to use (codex, claude, gemini, opencode)")
|
|
||||||
fs.StringVar(&opts.Model, "model", "", "Model override")
|
|
||||||
fs.StringVar(&opts.ReasoningEffort, "reasoning-effort", "", "Reasoning effort (backend-specific)")
|
|
||||||
fs.StringVar(&opts.Agent, "agent", "", "Agent preset name (from ~/.codeagent/models.json)")
|
|
||||||
fs.StringVar(&opts.PromptFile, "prompt-file", "", "Prompt file path")
|
|
||||||
|
|
||||||
fs.BoolVar(&opts.SkipPermissions, "skip-permissions", false, "Skip permissions prompts (also via CODEAGENT_SKIP_PERMISSIONS)")
|
|
||||||
fs.BoolVar(&opts.SkipPermissions, "dangerously-skip-permissions", false, "Alias for --skip-permissions")
|
|
||||||
}
|
|
||||||
|
|
||||||
func newVersionCommand(name string) *cobra.Command {
|
|
||||||
return &cobra.Command{
|
|
||||||
Use: "version",
|
|
||||||
Short: "Print version and exit",
|
|
||||||
SilenceErrors: true,
|
|
||||||
SilenceUsage: true,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
fmt.Printf("%s version %s\n", name, version)
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newCleanupCommand() *cobra.Command {
|
|
||||||
return &cobra.Command{
|
|
||||||
Use: "cleanup",
|
|
||||||
Short: "Clean up old logs and exit",
|
|
||||||
SilenceErrors: true,
|
|
||||||
SilenceUsage: true,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
code := runCleanupMode()
|
|
||||||
if code == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return exitError{code: code}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func runWithLoggerAndCleanup(fn func() int) (exitCode int) {
|
|
||||||
logger, err := NewLogger()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: failed to initialize logger: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
setLogger(logger)
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
logger := activeLogger()
|
|
||||||
if logger != nil {
|
|
||||||
logger.Flush()
|
|
||||||
}
|
|
||||||
if err := closeLogger(); err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: failed to close logger: %v\n", err)
|
|
||||||
}
|
|
||||||
if logger == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if exitCode != 0 {
|
|
||||||
if entries := logger.ExtractRecentErrors(10); len(entries) > 0 {
|
|
||||||
fmt.Fprintln(os.Stderr, "\n=== Recent Errors ===")
|
|
||||||
for _, entry := range entries {
|
|
||||||
fmt.Fprintln(os.Stderr, entry)
|
|
||||||
}
|
|
||||||
fmt.Fprintf(os.Stderr, "Log file: %s (deleted)\n", logger.Path())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ = logger.RemoveLogFile()
|
|
||||||
}()
|
|
||||||
defer runCleanupHook()
|
|
||||||
|
|
||||||
// Clean up stale logs from previous runs.
|
|
||||||
scheduleStartupCleanup()
|
|
||||||
|
|
||||||
return fn()
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseArgs() (*Config, error) {
|
|
||||||
opts := &cliOptions{}
|
|
||||||
cmd := &cobra.Command{SilenceErrors: true, SilenceUsage: true, Args: cobra.ArbitraryArgs}
|
|
||||||
addRootFlags(cmd.Flags(), opts)
|
|
||||||
|
|
||||||
rawArgv := os.Args[1:]
|
|
||||||
if err := cmd.ParseFlags(rawArgv); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
args := cmd.Flags().Args()
|
|
||||||
|
|
||||||
v, err := config.NewViper(opts.ConfigFile)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return buildSingleConfig(cmd, args, rawArgv, opts, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildSingleConfig(cmd *cobra.Command, args []string, rawArgv []string, opts *cliOptions, v *viper.Viper) (*Config, error) {
|
|
||||||
backendName := defaultBackendName
|
|
||||||
model := ""
|
|
||||||
reasoningEffort := ""
|
|
||||||
agentName := ""
|
|
||||||
promptFile := ""
|
|
||||||
promptFileExplicit := false
|
|
||||||
yolo := false
|
|
||||||
|
|
||||||
if cmd.Flags().Changed("agent") {
|
|
||||||
agentName = strings.TrimSpace(opts.Agent)
|
|
||||||
if agentName == "" {
|
|
||||||
return nil, fmt.Errorf("--agent flag requires a value")
|
|
||||||
}
|
|
||||||
if err := config.ValidateAgentName(agentName); err != nil {
|
|
||||||
return nil, fmt.Errorf("--agent flag invalid value: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
agentName = strings.TrimSpace(v.GetString("agent"))
|
|
||||||
if agentName != "" {
|
|
||||||
if err := config.ValidateAgentName(agentName); err != nil {
|
|
||||||
return nil, fmt.Errorf("--agent flag invalid value: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var resolvedBackend, resolvedModel, resolvedPromptFile, resolvedReasoning string
|
|
||||||
if agentName != "" {
|
|
||||||
var resolvedYolo bool
|
|
||||||
resolvedBackend, resolvedModel, resolvedPromptFile, resolvedReasoning, _, _, resolvedYolo = config.ResolveAgentConfig(agentName)
|
|
||||||
yolo = resolvedYolo
|
|
||||||
}
|
|
||||||
|
|
||||||
if cmd.Flags().Changed("prompt-file") {
|
|
||||||
promptFile = strings.TrimSpace(opts.PromptFile)
|
|
||||||
if promptFile == "" {
|
|
||||||
return nil, fmt.Errorf("--prompt-file flag requires a value")
|
|
||||||
}
|
|
||||||
promptFileExplicit = true
|
|
||||||
} else if val := strings.TrimSpace(v.GetString("prompt-file")); val != "" {
|
|
||||||
promptFile = val
|
|
||||||
promptFileExplicit = true
|
|
||||||
} else {
|
|
||||||
promptFile = resolvedPromptFile
|
|
||||||
}
|
|
||||||
|
|
||||||
agentFlagChanged := cmd.Flags().Changed("agent")
|
|
||||||
backendFlagChanged := cmd.Flags().Changed("backend")
|
|
||||||
if backendFlagChanged {
|
|
||||||
backendName = strings.TrimSpace(opts.Backend)
|
|
||||||
if backendName == "" {
|
|
||||||
return nil, fmt.Errorf("--backend flag requires a value")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch {
|
|
||||||
case agentFlagChanged && backendFlagChanged && lastFlagIndex(rawArgv, "agent") > lastFlagIndex(rawArgv, "backend"):
|
|
||||||
backendName = resolvedBackend
|
|
||||||
case !backendFlagChanged && agentName != "":
|
|
||||||
backendName = resolvedBackend
|
|
||||||
case !backendFlagChanged:
|
|
||||||
if val := strings.TrimSpace(v.GetString("backend")); val != "" {
|
|
||||||
backendName = val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
modelFlagChanged := cmd.Flags().Changed("model")
|
|
||||||
if modelFlagChanged {
|
|
||||||
model = strings.TrimSpace(opts.Model)
|
|
||||||
if model == "" {
|
|
||||||
return nil, fmt.Errorf("--model flag requires a value")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch {
|
|
||||||
case agentFlagChanged && modelFlagChanged && lastFlagIndex(rawArgv, "agent") > lastFlagIndex(rawArgv, "model"):
|
|
||||||
model = strings.TrimSpace(resolvedModel)
|
|
||||||
case !modelFlagChanged && agentName != "":
|
|
||||||
model = strings.TrimSpace(resolvedModel)
|
|
||||||
case !modelFlagChanged:
|
|
||||||
model = strings.TrimSpace(v.GetString("model"))
|
|
||||||
}
|
|
||||||
|
|
||||||
if cmd.Flags().Changed("reasoning-effort") {
|
|
||||||
reasoningEffort = strings.TrimSpace(opts.ReasoningEffort)
|
|
||||||
if reasoningEffort == "" {
|
|
||||||
return nil, fmt.Errorf("--reasoning-effort flag requires a value")
|
|
||||||
}
|
|
||||||
} else if val := strings.TrimSpace(v.GetString("reasoning-effort")); val != "" {
|
|
||||||
reasoningEffort = val
|
|
||||||
} else if agentName != "" {
|
|
||||||
reasoningEffort = strings.TrimSpace(resolvedReasoning)
|
|
||||||
}
|
|
||||||
|
|
||||||
skipChanged := cmd.Flags().Changed("skip-permissions") || cmd.Flags().Changed("dangerously-skip-permissions")
|
|
||||||
skipPermissions := false
|
|
||||||
if skipChanged {
|
|
||||||
skipPermissions = opts.SkipPermissions
|
|
||||||
} else {
|
|
||||||
skipPermissions = v.GetBool("skip-permissions")
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(args) == 0 {
|
|
||||||
return nil, fmt.Errorf("task required")
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg := &Config{
|
|
||||||
WorkDir: defaultWorkdir,
|
|
||||||
Backend: backendName,
|
|
||||||
Agent: agentName,
|
|
||||||
PromptFile: promptFile,
|
|
||||||
PromptFileExplicit: promptFileExplicit,
|
|
||||||
SkipPermissions: skipPermissions,
|
|
||||||
Yolo: yolo,
|
|
||||||
Model: model,
|
|
||||||
ReasoningEffort: reasoningEffort,
|
|
||||||
MaxParallelWorkers: config.ResolveMaxParallelWorkers(),
|
|
||||||
}
|
|
||||||
|
|
||||||
if args[0] == "resume" {
|
|
||||||
if len(args) < 3 {
|
|
||||||
return nil, fmt.Errorf("resume mode requires: resume <session_id> <task>")
|
|
||||||
}
|
|
||||||
cfg.Mode = "resume"
|
|
||||||
cfg.SessionID = strings.TrimSpace(args[1])
|
|
||||||
if cfg.SessionID == "" {
|
|
||||||
return nil, fmt.Errorf("resume mode requires non-empty session_id")
|
|
||||||
}
|
|
||||||
cfg.Task = args[2]
|
|
||||||
cfg.ExplicitStdin = (args[2] == "-")
|
|
||||||
if len(args) > 3 {
|
|
||||||
if args[3] == "-" {
|
|
||||||
return nil, fmt.Errorf("invalid workdir: '-' is not a valid directory path")
|
|
||||||
}
|
|
||||||
cfg.WorkDir = args[3]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
cfg.Mode = "new"
|
|
||||||
cfg.Task = args[0]
|
|
||||||
cfg.ExplicitStdin = (args[0] == "-")
|
|
||||||
if len(args) > 1 {
|
|
||||||
if args[1] == "-" {
|
|
||||||
return nil, fmt.Errorf("invalid workdir: '-' is not a valid directory path")
|
|
||||||
}
|
|
||||||
cfg.WorkDir = args[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func lastFlagIndex(argv []string, name string) int {
|
|
||||||
if len(argv) == 0 {
|
|
||||||
return -1
|
|
||||||
}
|
|
||||||
name = strings.TrimSpace(name)
|
|
||||||
if name == "" {
|
|
||||||
return -1
|
|
||||||
}
|
|
||||||
|
|
||||||
needle := "--" + name
|
|
||||||
prefix := needle + "="
|
|
||||||
last := -1
|
|
||||||
for i, arg := range argv {
|
|
||||||
if arg == needle || strings.HasPrefix(arg, prefix) {
|
|
||||||
last = i
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return last
|
|
||||||
}
|
|
||||||
|
|
||||||
func runParallelMode(cmd *cobra.Command, args []string, opts *cliOptions, v *viper.Viper, name string) int {
|
|
||||||
if len(args) > 0 {
|
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; no positional arguments are allowed.")
|
|
||||||
fmt.Fprintln(os.Stderr, "Usage examples:")
|
|
||||||
fmt.Fprintf(os.Stderr, " %s --parallel < tasks.txt\n", name)
|
|
||||||
fmt.Fprintf(os.Stderr, " echo '...' | %s --parallel\n", name)
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
if cmd.Flags().Changed("agent") || cmd.Flags().Changed("prompt-file") || cmd.Flags().Changed("reasoning-effort") {
|
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend, --model, --full-output and --skip-permissions are allowed.")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
backendName := defaultBackendName
|
|
||||||
if cmd.Flags().Changed("backend") {
|
|
||||||
backendName = strings.TrimSpace(opts.Backend)
|
|
||||||
if backendName == "" {
|
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --backend flag requires a value")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
} else if val := strings.TrimSpace(v.GetString("backend")); val != "" {
|
|
||||||
backendName = val
|
|
||||||
}
|
|
||||||
|
|
||||||
model := ""
|
|
||||||
if cmd.Flags().Changed("model") {
|
|
||||||
model = strings.TrimSpace(opts.Model)
|
|
||||||
if model == "" {
|
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --model flag requires a value")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
model = strings.TrimSpace(v.GetString("model"))
|
|
||||||
}
|
|
||||||
|
|
||||||
fullOutput := opts.FullOutput
|
|
||||||
if !cmd.Flags().Changed("full-output") && v.IsSet("full-output") {
|
|
||||||
fullOutput = v.GetBool("full-output")
|
|
||||||
}
|
|
||||||
|
|
||||||
skipChanged := cmd.Flags().Changed("skip-permissions") || cmd.Flags().Changed("dangerously-skip-permissions")
|
|
||||||
skipPermissions := false
|
|
||||||
if skipChanged {
|
|
||||||
skipPermissions = opts.SkipPermissions
|
|
||||||
} else {
|
|
||||||
skipPermissions = v.GetBool("skip-permissions")
|
|
||||||
}
|
|
||||||
|
|
||||||
backend, err := selectBackendFn(backendName)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
backendName = backend.Name()
|
|
||||||
|
|
||||||
data, err := io.ReadAll(stdinReader)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: failed to read stdin: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg, err := parseParallelConfig(data)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.GlobalBackend = backendName
|
|
||||||
model = strings.TrimSpace(model)
|
|
||||||
for i := range cfg.Tasks {
|
|
||||||
if strings.TrimSpace(cfg.Tasks[i].Backend) == "" {
|
|
||||||
cfg.Tasks[i].Backend = backendName
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(cfg.Tasks[i].Model) == "" && model != "" {
|
|
||||||
cfg.Tasks[i].Model = model
|
|
||||||
}
|
|
||||||
cfg.Tasks[i].SkipPermissions = cfg.Tasks[i].SkipPermissions || skipPermissions
|
|
||||||
}
|
|
||||||
|
|
||||||
timeoutSec := resolveTimeout()
|
|
||||||
layers, err := topologicalSort(cfg.Tasks)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
results := executeConcurrent(layers, timeoutSec)
|
|
||||||
|
|
||||||
for i := range results {
|
|
||||||
results[i].CoverageTarget = defaultCoverageTarget
|
|
||||||
if results[i].Message == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
lines := strings.Split(results[i].Message, "\n")
|
|
||||||
results[i].Coverage = extractCoverageFromLines(lines)
|
|
||||||
results[i].CoverageNum = extractCoverageNum(results[i].Coverage)
|
|
||||||
results[i].FilesChanged = extractFilesChangedFromLines(lines)
|
|
||||||
results[i].TestsPassed, results[i].TestsFailed = extractTestResultsFromLines(lines)
|
|
||||||
results[i].KeyOutput = extractKeyOutputFromLines(lines, 150)
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println(generateFinalOutputWithMode(results, !fullOutput))
|
|
||||||
|
|
||||||
exitCode := 0
|
|
||||||
for _, res := range results {
|
|
||||||
if res.ExitCode != 0 {
|
|
||||||
exitCode = res.ExitCode
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return exitCode
|
|
||||||
}
|
|
||||||
|
|
||||||
func runSingleMode(cfg *Config, name string) int {
|
|
||||||
backend, err := selectBackendFn(cfg.Backend)
|
|
||||||
if err != nil {
|
|
||||||
logError(err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
cfg.Backend = backend.Name()
|
|
||||||
|
|
||||||
cmdInjected := codexCommand != defaultCodexCommand
|
|
||||||
argsInjected := buildCodexArgsFn != nil && reflect.ValueOf(buildCodexArgsFn).Pointer() != reflect.ValueOf(defaultBuildArgsFn).Pointer()
|
|
||||||
|
|
||||||
if backend.Name() != defaultBackendName || !cmdInjected {
|
|
||||||
codexCommand = backend.Command()
|
|
||||||
}
|
|
||||||
if backend.Name() != defaultBackendName || !argsInjected {
|
|
||||||
buildCodexArgsFn = backend.BuildArgs
|
|
||||||
}
|
|
||||||
logInfo(fmt.Sprintf("Selected backend: %s", backend.Name()))
|
|
||||||
|
|
||||||
timeoutSec := resolveTimeout()
|
|
||||||
logInfo(fmt.Sprintf("Timeout: %ds", timeoutSec))
|
|
||||||
cfg.Timeout = timeoutSec
|
|
||||||
|
|
||||||
var taskText string
|
|
||||||
var piped bool
|
|
||||||
|
|
||||||
if cfg.ExplicitStdin {
|
|
||||||
logInfo("Explicit stdin mode: reading task from stdin")
|
|
||||||
data, err := io.ReadAll(stdinReader)
|
|
||||||
if err != nil {
|
|
||||||
logError("Failed to read stdin: " + err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
taskText = string(data)
|
|
||||||
if taskText == "" {
|
|
||||||
logError("Explicit stdin mode requires task input from stdin")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
piped = !isTerminal()
|
|
||||||
} else {
|
|
||||||
pipedTask, err := readPipedTask()
|
|
||||||
if err != nil {
|
|
||||||
logError("Failed to read piped stdin: " + err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
piped = pipedTask != ""
|
|
||||||
if piped {
|
|
||||||
taskText = pipedTask
|
|
||||||
} else {
|
|
||||||
taskText = cfg.Task
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.TrimSpace(cfg.PromptFile) != "" {
|
|
||||||
prompt, err := readAgentPromptFile(cfg.PromptFile, cfg.PromptFileExplicit)
|
|
||||||
if err != nil {
|
|
||||||
logError("Failed to read prompt file: " + err.Error())
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
taskText = wrapTaskWithAgentPrompt(prompt, taskText)
|
|
||||||
}
|
|
||||||
|
|
||||||
useStdin := cfg.ExplicitStdin || shouldUseStdin(taskText, piped)
|
|
||||||
|
|
||||||
targetArg := taskText
|
|
||||||
if useStdin {
|
|
||||||
targetArg = "-"
|
|
||||||
}
|
|
||||||
codexArgs := buildCodexArgsFn(cfg, targetArg)
|
|
||||||
|
|
||||||
logger := activeLogger()
|
|
||||||
if logger == nil {
|
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: logger is not initialized")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Fprintf(os.Stderr, "[%s]\n", name)
|
|
||||||
fmt.Fprintf(os.Stderr, " Backend: %s\n", cfg.Backend)
|
|
||||||
fmt.Fprintf(os.Stderr, " Command: %s %s\n", codexCommand, strings.Join(codexArgs, " "))
|
|
||||||
fmt.Fprintf(os.Stderr, " PID: %d\n", os.Getpid())
|
|
||||||
fmt.Fprintf(os.Stderr, " Log: %s\n", logger.Path())
|
|
||||||
|
|
||||||
if useStdin {
|
|
||||||
var reasons []string
|
|
||||||
if piped {
|
|
||||||
reasons = append(reasons, "piped input")
|
|
||||||
}
|
|
||||||
if cfg.ExplicitStdin {
|
|
||||||
reasons = append(reasons, "explicit \"-\"")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "\n") {
|
|
||||||
reasons = append(reasons, "newline")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "\\") {
|
|
||||||
reasons = append(reasons, "backslash")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "\"") {
|
|
||||||
reasons = append(reasons, "double-quote")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "'") {
|
|
||||||
reasons = append(reasons, "single-quote")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "`") {
|
|
||||||
reasons = append(reasons, "backtick")
|
|
||||||
}
|
|
||||||
if strings.Contains(taskText, "$") {
|
|
||||||
reasons = append(reasons, "dollar")
|
|
||||||
}
|
|
||||||
if len(taskText) > 800 {
|
|
||||||
reasons = append(reasons, "length>800")
|
|
||||||
}
|
|
||||||
if len(reasons) > 0 {
|
|
||||||
logWarn(fmt.Sprintf("Using stdin mode for task due to: %s", strings.Join(reasons, ", ")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logInfo(fmt.Sprintf("%s running...", cfg.Backend))
|
|
||||||
|
|
||||||
taskSpec := TaskSpec{
|
|
||||||
Task: taskText,
|
|
||||||
WorkDir: cfg.WorkDir,
|
|
||||||
Mode: cfg.Mode,
|
|
||||||
SessionID: cfg.SessionID,
|
|
||||||
Model: cfg.Model,
|
|
||||||
ReasoningEffort: cfg.ReasoningEffort,
|
|
||||||
Agent: cfg.Agent,
|
|
||||||
SkipPermissions: cfg.SkipPermissions,
|
|
||||||
UseStdin: useStdin,
|
|
||||||
}
|
|
||||||
|
|
||||||
result := runTaskFn(taskSpec, false, cfg.Timeout)
|
|
||||||
|
|
||||||
if result.ExitCode != 0 {
|
|
||||||
return result.ExitCode
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println(result.Message)
|
|
||||||
if result.SessionID != "" {
|
|
||||||
fmt.Printf("\n---\nSESSION_ID: %s\n", result.SessionID)
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import config "codeagent-wrapper/internal/config"
|
|
||||||
|
|
||||||
// Keep the existing Config name throughout the codebase, but source the
|
|
||||||
// implementation from internal/config.
|
|
||||||
type Config = config.Config
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
backend "codeagent-wrapper/internal/backend"
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
executor "codeagent-wrapper/internal/executor"
|
|
||||||
)
|
|
||||||
|
|
||||||
// defaultRunCodexTaskFn is the default implementation of runCodexTaskFn (exposed for test reset).
|
|
||||||
func defaultRunCodexTaskFn(task TaskSpec, timeout int) TaskResult {
|
|
||||||
return executor.DefaultRunCodexTaskFn(task, timeout)
|
|
||||||
}
|
|
||||||
|
|
||||||
var runCodexTaskFn = defaultRunCodexTaskFn
|
|
||||||
|
|
||||||
func topologicalSort(tasks []TaskSpec) ([][]TaskSpec, error) {
|
|
||||||
return executor.TopologicalSort(tasks)
|
|
||||||
}
|
|
||||||
|
|
||||||
func executeConcurrent(layers [][]TaskSpec, timeout int) []TaskResult {
|
|
||||||
maxWorkers := config.ResolveMaxParallelWorkers()
|
|
||||||
return executeConcurrentWithContext(context.Background(), layers, timeout, maxWorkers)
|
|
||||||
}
|
|
||||||
|
|
||||||
func executeConcurrentWithContext(parentCtx context.Context, layers [][]TaskSpec, timeout int, maxWorkers int) []TaskResult {
|
|
||||||
return executor.ExecuteConcurrentWithContext(parentCtx, layers, timeout, maxWorkers, runCodexTaskFn)
|
|
||||||
}
|
|
||||||
|
|
||||||
func generateFinalOutput(results []TaskResult) string {
|
|
||||||
return executor.GenerateFinalOutput(results)
|
|
||||||
}
|
|
||||||
|
|
||||||
func generateFinalOutputWithMode(results []TaskResult, summaryOnly bool) string {
|
|
||||||
return executor.GenerateFinalOutputWithMode(results, summaryOnly)
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildCodexArgs(cfg *Config, targetArg string) []string {
|
|
||||||
return backend.BuildCodexArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func runCodexTask(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
|
||||||
return runCodexTaskWithContext(context.Background(), taskSpec, nil, nil, false, silent, timeoutSec)
|
|
||||||
}
|
|
||||||
|
|
||||||
func runCodexProcess(parentCtx context.Context, codexArgs []string, taskText string, useStdin bool, timeoutSec int) (message, threadID string, exitCode int) {
|
|
||||||
res := runCodexTaskWithContext(parentCtx, TaskSpec{Task: taskText, WorkDir: defaultWorkdir, Mode: "new", UseStdin: useStdin}, nil, codexArgs, true, false, timeoutSec)
|
|
||||||
return res.Message, res.SessionID, res.ExitCode
|
|
||||||
}
|
|
||||||
|
|
||||||
func runCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backend Backend, customArgs []string, useCustomArgs bool, silent bool, timeoutSec int) TaskResult {
|
|
||||||
return executor.RunCodexTaskWithContext(parentCtx, taskSpec, backend, codexCommand, buildCodexArgsFn, customArgs, useCustomArgs, silent, timeoutSec)
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import ilogger "codeagent-wrapper/internal/logger"
|
|
||||||
|
|
||||||
type Logger = ilogger.Logger
|
|
||||||
type CleanupStats = ilogger.CleanupStats
|
|
||||||
|
|
||||||
func NewLogger() (*Logger, error) { return ilogger.NewLogger() }
|
|
||||||
|
|
||||||
func NewLoggerWithSuffix(suffix string) (*Logger, error) { return ilogger.NewLoggerWithSuffix(suffix) }
|
|
||||||
|
|
||||||
func setLogger(l *Logger) { ilogger.SetLogger(l) }
|
|
||||||
|
|
||||||
func closeLogger() error { return ilogger.CloseLogger() }
|
|
||||||
|
|
||||||
func activeLogger() *Logger { return ilogger.ActiveLogger() }
|
|
||||||
|
|
||||||
func logInfo(msg string) { ilogger.LogInfo(msg) }
|
|
||||||
|
|
||||||
func logWarn(msg string) { ilogger.LogWarn(msg) }
|
|
||||||
|
|
||||||
func logError(msg string) { ilogger.LogError(msg) }
|
|
||||||
|
|
||||||
func cleanupOldLogs() (CleanupStats, error) { return ilogger.CleanupOldLogs() }
|
|
||||||
|
|
||||||
func sanitizeLogSuffix(raw string) string { return ilogger.SanitizeLogSuffix(raw) }
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
executor "codeagent-wrapper/internal/executor"
|
|
||||||
)
|
|
||||||
|
|
||||||
func parseParallelConfig(data []byte) (*ParallelConfig, error) {
|
|
||||||
return executor.ParseParallelConfig(data)
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"io"
|
|
||||||
|
|
||||||
parser "codeagent-wrapper/internal/parser"
|
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
|
||||||
)
|
|
||||||
|
|
||||||
func parseJSONStream(r io.Reader) (message, threadID string) {
|
|
||||||
return parseJSONStreamWithLog(r, logWarn, logInfo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseJSONStreamWithWarn(r io.Reader, warnFn func(string)) (message, threadID string) {
|
|
||||||
return parseJSONStreamWithLog(r, warnFn, logInfo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseJSONStreamWithLog(r io.Reader, warnFn func(string), infoFn func(string)) (message, threadID string) {
|
|
||||||
return parseJSONStreamInternal(r, warnFn, infoFn, nil, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(string), onMessage func(), onComplete func()) (message, threadID string) {
|
|
||||||
return parser.ParseJSONStreamInternal(r, warnFn, infoFn, onMessage, onComplete)
|
|
||||||
}
|
|
||||||
|
|
||||||
func hasKey(m map[string]json.RawMessage, key string) bool { return parser.HasKey(m, key) }
|
|
||||||
|
|
||||||
func discardInvalidJSON(decoder *json.Decoder, reader *bufio.Reader) (*bufio.Reader, error) {
|
|
||||||
return parser.DiscardInvalidJSON(decoder, reader)
|
|
||||||
}
|
|
||||||
|
|
||||||
func normalizeText(text interface{}) string { return parser.NormalizeText(text) }
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import executor "codeagent-wrapper/internal/executor"
|
|
||||||
|
|
||||||
// Type aliases to keep existing names in the wrapper package.
|
|
||||||
type ParallelConfig = executor.ParallelConfig
|
|
||||||
type TaskSpec = executor.TaskSpec
|
|
||||||
type TaskResult = executor.TaskResult
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestDefaultIsTerminalCoverage(t *testing.T) {
|
|
||||||
oldStdin := os.Stdin
|
|
||||||
t.Cleanup(func() { os.Stdin = oldStdin })
|
|
||||||
|
|
||||||
f, err := os.CreateTemp(t.TempDir(), "stdin-*")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("os.CreateTemp() error = %v", err)
|
|
||||||
}
|
|
||||||
defer os.Remove(f.Name())
|
|
||||||
|
|
||||||
os.Stdin = f
|
|
||||||
if got := defaultIsTerminal(); got {
|
|
||||||
t.Fatalf("defaultIsTerminal() = %v, want false for regular file", got)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := f.Close(); err != nil {
|
|
||||||
t.Fatalf("Close() error = %v", err)
|
|
||||||
}
|
|
||||||
os.Stdin = f
|
|
||||||
if got := defaultIsTerminal(); !got {
|
|
||||||
t.Fatalf("defaultIsTerminal() = %v, want true when Stat fails", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,523 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
utils "codeagent-wrapper/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
func resolveTimeout() int {
|
|
||||||
raw := os.Getenv("CODEX_TIMEOUT")
|
|
||||||
if raw == "" {
|
|
||||||
return defaultTimeout
|
|
||||||
}
|
|
||||||
|
|
||||||
parsed, err := strconv.Atoi(raw)
|
|
||||||
if err != nil || parsed <= 0 {
|
|
||||||
logWarn(fmt.Sprintf("Invalid CODEX_TIMEOUT '%s', falling back to %ds", raw, defaultTimeout))
|
|
||||||
return defaultTimeout
|
|
||||||
}
|
|
||||||
|
|
||||||
if parsed > 10000 {
|
|
||||||
return parsed / 1000
|
|
||||||
}
|
|
||||||
return parsed
|
|
||||||
}
|
|
||||||
|
|
||||||
func readPipedTask() (string, error) {
|
|
||||||
if isTerminal() {
|
|
||||||
logInfo("Stdin is tty, skipping pipe read")
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
logInfo("Reading from stdin pipe...")
|
|
||||||
data, err := io.ReadAll(stdinReader)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("read stdin: %w", err)
|
|
||||||
}
|
|
||||||
if len(data) == 0 {
|
|
||||||
logInfo("Stdin pipe returned empty data")
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
logInfo(fmt.Sprintf("Read %d bytes from stdin pipe", len(data)))
|
|
||||||
return string(data), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func shouldUseStdin(taskText string, piped bool) bool {
|
|
||||||
if piped {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if len(taskText) > 800 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return strings.ContainsAny(taskText, stdinSpecialChars)
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultIsTerminal() bool {
|
|
||||||
fi, err := os.Stdin.Stat()
|
|
||||||
if err != nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return (fi.Mode() & os.ModeCharDevice) != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func isTerminal() bool {
|
|
||||||
return isTerminalFn()
|
|
||||||
}
|
|
||||||
|
|
||||||
func getEnv(key, defaultValue string) string {
|
|
||||||
if val := os.Getenv(key); val != "" {
|
|
||||||
return val
|
|
||||||
}
|
|
||||||
return defaultValue
|
|
||||||
}
|
|
||||||
|
|
||||||
type logWriter struct {
|
|
||||||
prefix string
|
|
||||||
maxLen int
|
|
||||||
buf bytes.Buffer
|
|
||||||
dropped bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func newLogWriter(prefix string, maxLen int) *logWriter {
|
|
||||||
if maxLen <= 0 {
|
|
||||||
maxLen = codexLogLineLimit
|
|
||||||
}
|
|
||||||
return &logWriter{prefix: prefix, maxLen: maxLen}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *logWriter) Write(p []byte) (int, error) {
|
|
||||||
if lw == nil {
|
|
||||||
return len(p), nil
|
|
||||||
}
|
|
||||||
total := len(p)
|
|
||||||
for len(p) > 0 {
|
|
||||||
if idx := bytes.IndexByte(p, '\n'); idx >= 0 {
|
|
||||||
lw.writeLimited(p[:idx])
|
|
||||||
lw.logLine(true)
|
|
||||||
p = p[idx+1:]
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
lw.writeLimited(p)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
return total, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *logWriter) Flush() {
|
|
||||||
if lw == nil || lw.buf.Len() == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lw.logLine(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *logWriter) logLine(force bool) {
|
|
||||||
if lw == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
line := lw.buf.String()
|
|
||||||
dropped := lw.dropped
|
|
||||||
lw.dropped = false
|
|
||||||
lw.buf.Reset()
|
|
||||||
if line == "" && !force {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if lw.maxLen > 0 {
|
|
||||||
if dropped {
|
|
||||||
if lw.maxLen > 3 {
|
|
||||||
line = line[:min(len(line), lw.maxLen-3)] + "..."
|
|
||||||
} else {
|
|
||||||
line = line[:min(len(line), lw.maxLen)]
|
|
||||||
}
|
|
||||||
} else if len(line) > lw.maxLen {
|
|
||||||
cutoff := lw.maxLen
|
|
||||||
if cutoff > 3 {
|
|
||||||
line = line[:cutoff-3] + "..."
|
|
||||||
} else {
|
|
||||||
line = line[:cutoff]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
logInfo(lw.prefix + line)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *logWriter) writeLimited(p []byte) {
|
|
||||||
if lw == nil || len(p) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if lw.maxLen <= 0 {
|
|
||||||
lw.buf.Write(p)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
remaining := lw.maxLen - lw.buf.Len()
|
|
||||||
if remaining <= 0 {
|
|
||||||
lw.dropped = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if len(p) <= remaining {
|
|
||||||
lw.buf.Write(p)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lw.buf.Write(p[:remaining])
|
|
||||||
lw.dropped = true
|
|
||||||
}
|
|
||||||
|
|
||||||
type tailBuffer struct {
|
|
||||||
limit int
|
|
||||||
data []byte
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *tailBuffer) Write(p []byte) (int, error) {
|
|
||||||
if b.limit <= 0 {
|
|
||||||
return len(p), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(p) >= b.limit {
|
|
||||||
b.data = append(b.data[:0], p[len(p)-b.limit:]...)
|
|
||||||
return len(p), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
total := len(b.data) + len(p)
|
|
||||||
if total <= b.limit {
|
|
||||||
b.data = append(b.data, p...)
|
|
||||||
return len(p), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
overflow := total - b.limit
|
|
||||||
b.data = append(b.data[overflow:], p...)
|
|
||||||
return len(p), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *tailBuffer) String() string {
|
|
||||||
return string(b.data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func truncate(s string, maxLen int) string {
|
|
||||||
return utils.Truncate(s, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// safeTruncate safely truncates string to maxLen, avoiding panic and UTF-8 corruption.
|
|
||||||
func safeTruncate(s string, maxLen int) string {
|
|
||||||
return utils.SafeTruncate(s, maxLen)
|
|
||||||
}
|
|
||||||
|
|
||||||
// sanitizeOutput removes ANSI escape sequences and control characters.
|
|
||||||
func sanitizeOutput(s string) string {
|
|
||||||
return utils.SanitizeOutput(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func min(a, b int) int {
|
|
||||||
return utils.Min(a, b)
|
|
||||||
}
|
|
||||||
|
|
||||||
func hello() string {
|
|
||||||
return "hello world"
|
|
||||||
}
|
|
||||||
|
|
||||||
func greet(name string) string {
|
|
||||||
return "hello " + name
|
|
||||||
}
|
|
||||||
|
|
||||||
func farewell(name string) string {
|
|
||||||
return "goodbye " + name
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
}
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package wrapper
|
|
||||||
|
|
||||||
import ilogger "codeagent-wrapper/internal/logger"
|
|
||||||
|
|
||||||
const wrapperName = ilogger.WrapperName
|
|
||||||
|
|
||||||
func currentWrapperName() string { return ilogger.CurrentWrapperName() }
|
|
||||||
|
|
||||||
func primaryLogPrefix() string { return ilogger.PrimaryLogPrefix() }
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import config "codeagent-wrapper/internal/config"
|
|
||||||
|
|
||||||
// Backend defines the contract for invoking different AI CLI backends.
|
|
||||||
// Each backend is responsible for supplying the executable command and
|
|
||||||
// building the argument list based on the wrapper config.
|
|
||||||
type Backend interface {
|
|
||||||
Name() string
|
|
||||||
BuildArgs(cfg *config.Config, targetArg string) []string
|
|
||||||
Command() string
|
|
||||||
Env(baseURL, apiKey string) map[string]string
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
logWarnFn = func(string) {}
|
|
||||||
logErrorFn = func(string) {}
|
|
||||||
)
|
|
||||||
|
|
||||||
// SetLogFuncs configures optional logging hooks used by some backends.
|
|
||||||
// Callers can safely pass nil to disable the hook.
|
|
||||||
func SetLogFuncs(warnFn, errorFn func(string)) {
|
|
||||||
if warnFn != nil {
|
|
||||||
logWarnFn = warnFn
|
|
||||||
} else {
|
|
||||||
logWarnFn = func(string) {}
|
|
||||||
}
|
|
||||||
if errorFn != nil {
|
|
||||||
logErrorFn = errorFn
|
|
||||||
} else {
|
|
||||||
logErrorFn = func(string) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,322 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestClaudeBuildArgs_ModesAndPermissions(t *testing.T) {
|
|
||||||
backend := ClaudeBackend{}
|
|
||||||
|
|
||||||
t.Run("new mode omits skip-permissions when env disabled", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_SKIP_PERMISSIONS", "false")
|
|
||||||
cfg := &config.Config{Mode: "new", WorkDir: "/repo"}
|
|
||||||
got := backend.BuildArgs(cfg, "todo")
|
|
||||||
want := []string{"-p", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "todo"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("new mode includes skip-permissions by default", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "new", SkipPermissions: false}
|
|
||||||
got := backend.BuildArgs(cfg, "-")
|
|
||||||
want := []string{"-p", "--dangerously-skip-permissions", "--setting-sources", "", "--output-format", "stream-json", "--verbose", "-"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("resume mode includes session id", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_SKIP_PERMISSIONS", "false")
|
|
||||||
cfg := &config.Config{Mode: "resume", SessionID: "sid-123", WorkDir: "/ignored"}
|
|
||||||
got := backend.BuildArgs(cfg, "resume-task")
|
|
||||||
want := []string{"-p", "--setting-sources", "", "-r", "sid-123", "--output-format", "stream-json", "--verbose", "resume-task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("resume mode without session still returns base flags", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_SKIP_PERMISSIONS", "false")
|
|
||||||
cfg := &config.Config{Mode: "resume", WorkDir: "/ignored"}
|
|
||||||
got := backend.BuildArgs(cfg, "follow-up")
|
|
||||||
want := []string{"-p", "--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.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) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("nil config returns nil", func(t *testing.T) {
|
|
||||||
if backend.BuildArgs(nil, "ignored") != nil {
|
|
||||||
t.Fatalf("nil config should return nil args")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBackendBuildArgs_Model(t *testing.T) {
|
|
||||||
t.Run("claude includes --model when set", func(t *testing.T) {
|
|
||||||
t.Setenv("CODEAGENT_SKIP_PERMISSIONS", "false")
|
|
||||||
backend := ClaudeBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new", Model: "opus"}
|
|
||||||
got := backend.BuildArgs(cfg, "todo")
|
|
||||||
want := []string{"-p", "--setting-sources", "", "--model", "opus", "--output-format", "stream-json", "--verbose", "todo"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("gemini includes -m when set", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new", Model: "gemini-3-pro-preview"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"-o", "stream-json", "-y", "-m", "gemini-3-pro-preview", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("codex includes --model when set", func(t *testing.T) {
|
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Setenv(key, "false")
|
|
||||||
|
|
||||||
backend := CodexBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new", WorkDir: "/tmp", Model: "o3"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"e", "--model", "o3", "--skip-git-repo-check", "-C", "/tmp", "--json", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestClaudeBuildArgs_GeminiAndCodexModes(t *testing.T) {
|
|
||||||
t.Run("gemini new mode defaults workdir", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new", WorkDir: "/workspace"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"-o", "stream-json", "-y", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("gemini resume mode uses session id", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
cfg := &config.Config{Mode: "resume", SessionID: "sid-999"}
|
|
||||||
got := backend.BuildArgs(cfg, "resume")
|
|
||||||
want := []string{"-o", "stream-json", "-y", "-r", "sid-999", "resume"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("gemini resume mode without session omits identifier", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
cfg := &config.Config{Mode: "resume"}
|
|
||||||
got := backend.BuildArgs(cfg, "resume")
|
|
||||||
want := []string{"-o", "stream-json", "-y", "resume"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("gemini nil config returns nil", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
if backend.BuildArgs(nil, "ignored") != nil {
|
|
||||||
t.Fatalf("nil config should return nil args")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("gemini stdin mode uses -p flag", func(t *testing.T) {
|
|
||||||
backend := GeminiBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new"}
|
|
||||||
got := backend.BuildArgs(cfg, "-")
|
|
||||||
want := []string{"-o", "stream-json", "-y", "-p", "-"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Fatalf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("codex build args omits bypass flag by default", func(t *testing.T) {
|
|
||||||
const key = "CODEX_BYPASS_SANDBOX"
|
|
||||||
t.Setenv(key, "false")
|
|
||||||
|
|
||||||
backend := CodexBackend{}
|
|
||||||
cfg := &config.Config{Mode: "new", WorkDir: "/tmp"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"e", "--skip-git-repo-check", "-C", "/tmp", "--json", "task"}
|
|
||||||
if !reflect.DeepEqual(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.Setenv(key, "true")
|
|
||||||
|
|
||||||
backend := CodexBackend{}
|
|
||||||
cfg := &config.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) {
|
|
||||||
tests := []struct {
|
|
||||||
backend Backend
|
|
||||||
name string
|
|
||||||
command string
|
|
||||||
}{
|
|
||||||
{backend: CodexBackend{}, name: "codex", command: "codex"},
|
|
||||||
{backend: ClaudeBackend{}, name: "claude", command: "claude"},
|
|
||||||
{backend: GeminiBackend{}, name: "gemini", command: "gemini"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
if got := tt.backend.Name(); got != tt.name {
|
|
||||||
t.Fatalf("Name() = %s, want %s", got, tt.name)
|
|
||||||
}
|
|
||||||
if got := tt.backend.Command(); got != tt.command {
|
|
||||||
t.Fatalf("Command() = %s, want %s", got, tt.command)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestOpencodeBackend_BuildArgs(t *testing.T) {
|
|
||||||
backend := OpencodeBackend{}
|
|
||||||
|
|
||||||
t.Run("basic", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "new"}
|
|
||||||
got := backend.BuildArgs(cfg, "hello")
|
|
||||||
want := []string{"run", "--format", "json", "hello"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Errorf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("with model", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "new", Model: "opencode/grok-code"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"run", "-m", "opencode/grok-code", "--format", "json", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Errorf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("resume mode", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "resume", SessionID: "ses_123", Model: "opencode/grok-code"}
|
|
||||||
got := backend.BuildArgs(cfg, "follow-up")
|
|
||||||
want := []string{"run", "-m", "opencode/grok-code", "-s", "ses_123", "--format", "json", "follow-up"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Errorf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("resume without session", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "resume"}
|
|
||||||
got := backend.BuildArgs(cfg, "task")
|
|
||||||
want := []string{"run", "--format", "json", "task"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Errorf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("stdin mode omits dash", func(t *testing.T) {
|
|
||||||
cfg := &config.Config{Mode: "new"}
|
|
||||||
got := backend.BuildArgs(cfg, "-")
|
|
||||||
want := []string{"run", "--format", "json"}
|
|
||||||
if !reflect.DeepEqual(got, want) {
|
|
||||||
t.Errorf("got %v, want %v", got, want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestOpencodeBackend_Interface(t *testing.T) {
|
|
||||||
backend := OpencodeBackend{}
|
|
||||||
|
|
||||||
if backend.Name() != "opencode" {
|
|
||||||
t.Errorf("Name() = %q, want %q", backend.Name(), "opencode")
|
|
||||||
}
|
|
||||||
if backend.Command() != "opencode" {
|
|
||||||
t.Errorf("Command() = %q, want %q", backend.Command(), "opencode")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ClaudeBackend struct{}
|
|
||||||
|
|
||||||
func (ClaudeBackend) Name() string { return "claude" }
|
|
||||||
func (ClaudeBackend) Command() string { return "claude" }
|
|
||||||
func (ClaudeBackend) Env(baseURL, apiKey string) map[string]string {
|
|
||||||
baseURL = strings.TrimSpace(baseURL)
|
|
||||||
apiKey = strings.TrimSpace(apiKey)
|
|
||||||
if baseURL == "" && apiKey == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
env := make(map[string]string, 2)
|
|
||||||
if baseURL != "" {
|
|
||||||
env["ANTHROPIC_BASE_URL"] = baseURL
|
|
||||||
}
|
|
||||||
if apiKey != "" {
|
|
||||||
env["ANTHROPIC_API_KEY"] = apiKey
|
|
||||||
}
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
func (ClaudeBackend) BuildArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
return buildClaudeArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
const MaxClaudeSettingsBytes = 1 << 20 // 1MB
|
|
||||||
|
|
||||||
type MinimalClaudeSettings struct {
|
|
||||||
Env map[string]string
|
|
||||||
Model string
|
|
||||||
}
|
|
||||||
|
|
||||||
// LoadMinimalClaudeSettings 从 ~/.claude/settings.json 只提取安全的最小子集：
|
|
||||||
// - env: 只接受字符串类型的值
|
|
||||||
// - model: 只接受字符串类型的值
|
|
||||||
// 文件缺失/解析失败/超限都返回空。
|
|
||||||
func LoadMinimalClaudeSettings() MinimalClaudeSettings {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || home == "" {
|
|
||||||
return MinimalClaudeSettings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
claudeDir := filepath.Clean(filepath.Join(home, ".claude"))
|
|
||||||
settingPath := filepath.Clean(filepath.Join(claudeDir, "settings.json"))
|
|
||||||
rel, err := filepath.Rel(claudeDir, settingPath)
|
|
||||||
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
|
|
||||||
return MinimalClaudeSettings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
info, err := os.Stat(settingPath)
|
|
||||||
if err != nil || info.Size() > MaxClaudeSettingsBytes {
|
|
||||||
return MinimalClaudeSettings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(settingPath) // #nosec G304 -- path is fixed under user home and validated to stay within claudeDir
|
|
||||||
if err != nil {
|
|
||||||
return MinimalClaudeSettings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
var cfg struct {
|
|
||||||
Env map[string]any `json:"env"`
|
|
||||||
Model any `json:"model"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return MinimalClaudeSettings{}
|
|
||||||
}
|
|
||||||
|
|
||||||
out := MinimalClaudeSettings{}
|
|
||||||
|
|
||||||
if model, ok := cfg.Model.(string); ok {
|
|
||||||
out.Model = strings.TrimSpace(model)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(cfg.Env) == 0 {
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
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 out
|
|
||||||
}
|
|
||||||
out.Env = env
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
func LoadMinimalEnvSettings() map[string]string {
|
|
||||||
settings := LoadMinimalClaudeSettings()
|
|
||||||
if len(settings.Env) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return settings.Env
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildClaudeArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
if cfg == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
args := []string{"-p"}
|
|
||||||
// Default to skip permissions unless CODEAGENT_SKIP_PERMISSIONS=false
|
|
||||||
if cfg.SkipPermissions || cfg.Yolo || config.EnvFlagDefaultTrue("CODEAGENT_SKIP_PERMISSIONS") {
|
|
||||||
args = append(args, "--dangerously-skip-permissions")
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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
|
|
||||||
args = append(args, "--setting-sources", "")
|
|
||||||
|
|
||||||
if model := strings.TrimSpace(cfg.Model); model != "" {
|
|
||||||
args = append(args, "--model", model)
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.Mode == "resume" {
|
|
||||||
if cfg.SessionID != "" {
|
|
||||||
// Claude CLI uses -r <session_id> for resume.
|
|
||||||
args = append(args, "-r", cfg.SessionID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
args = append(args, "--output-format", "stream-json", "--verbose", targetArg)
|
|
||||||
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
type CodexBackend struct{}
|
|
||||||
|
|
||||||
func (CodexBackend) Name() string { return "codex" }
|
|
||||||
func (CodexBackend) Command() string { return "codex" }
|
|
||||||
func (CodexBackend) Env(baseURL, apiKey string) map[string]string {
|
|
||||||
baseURL = strings.TrimSpace(baseURL)
|
|
||||||
apiKey = strings.TrimSpace(apiKey)
|
|
||||||
if baseURL == "" && apiKey == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
env := make(map[string]string, 2)
|
|
||||||
if baseURL != "" {
|
|
||||||
env["OPENAI_BASE_URL"] = baseURL
|
|
||||||
}
|
|
||||||
if apiKey != "" {
|
|
||||||
env["OPENAI_API_KEY"] = apiKey
|
|
||||||
}
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
func (CodexBackend) BuildArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
return BuildCodexArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func BuildCodexArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
if cfg == nil {
|
|
||||||
panic("buildCodexArgs: nil config")
|
|
||||||
}
|
|
||||||
|
|
||||||
var resumeSessionID string
|
|
||||||
isResume := cfg.Mode == "resume"
|
|
||||||
if isResume {
|
|
||||||
resumeSessionID = strings.TrimSpace(cfg.SessionID)
|
|
||||||
if resumeSessionID == "" {
|
|
||||||
logErrorFn("invalid config: resume mode requires non-empty session_id")
|
|
||||||
isResume = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
args := []string{"e"}
|
|
||||||
|
|
||||||
// Default to bypass sandbox unless CODEX_BYPASS_SANDBOX=false
|
|
||||||
if cfg.Yolo || config.EnvFlagDefaultTrue("CODEX_BYPASS_SANDBOX") {
|
|
||||||
logWarnFn("YOLO mode or CODEX_BYPASS_SANDBOX enabled: running without approval/sandbox protection")
|
|
||||||
args = append(args, "--dangerously-bypass-approvals-and-sandbox")
|
|
||||||
}
|
|
||||||
|
|
||||||
if model := strings.TrimSpace(cfg.Model); model != "" {
|
|
||||||
args = append(args, "--model", model)
|
|
||||||
}
|
|
||||||
|
|
||||||
if reasoningEffort := strings.TrimSpace(cfg.ReasoningEffort); reasoningEffort != "" {
|
|
||||||
args = append(args, "-c", "model_reasoning_effort="+reasoningEffort)
|
|
||||||
}
|
|
||||||
|
|
||||||
args = append(args, "--skip-git-repo-check")
|
|
||||||
|
|
||||||
if isResume {
|
|
||||||
return append(args,
|
|
||||||
"--json",
|
|
||||||
"resume",
|
|
||||||
resumeSessionID,
|
|
||||||
targetArg,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return append(args,
|
|
||||||
"-C", cfg.WorkDir,
|
|
||||||
"--json",
|
|
||||||
targetArg,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
type GeminiBackend struct{}
|
|
||||||
|
|
||||||
func (GeminiBackend) Name() string { return "gemini" }
|
|
||||||
func (GeminiBackend) Command() string { return "gemini" }
|
|
||||||
func (GeminiBackend) Env(baseURL, apiKey string) map[string]string {
|
|
||||||
baseURL = strings.TrimSpace(baseURL)
|
|
||||||
apiKey = strings.TrimSpace(apiKey)
|
|
||||||
if baseURL == "" && apiKey == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
env := make(map[string]string, 2)
|
|
||||||
if baseURL != "" {
|
|
||||||
env["GOOGLE_GEMINI_BASE_URL"] = baseURL
|
|
||||||
}
|
|
||||||
if apiKey != "" {
|
|
||||||
env["GEMINI_API_KEY"] = apiKey
|
|
||||||
}
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
func (GeminiBackend) BuildArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
return buildGeminiArgs(cfg, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// LoadGeminiEnv loads environment variables from ~/.gemini/.env
|
|
||||||
// Supports GEMINI_API_KEY, GEMINI_MODEL, GOOGLE_GEMINI_BASE_URL
|
|
||||||
// Also sets GEMINI_API_KEY_AUTH_MECHANISM=bearer for third-party API compatibility
|
|
||||||
func LoadGeminiEnv() map[string]string {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || home == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
envDir := filepath.Clean(filepath.Join(home, ".gemini"))
|
|
||||||
envPath := filepath.Clean(filepath.Join(envDir, ".env"))
|
|
||||||
rel, err := filepath.Rel(envDir, envPath)
|
|
||||||
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(envPath) // #nosec G304 -- path is fixed under user home and validated to stay within envDir
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
env := make(map[string]string)
|
|
||||||
for _, line := range strings.Split(string(data), "\n") {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line == "" || strings.HasPrefix(line, "#") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
idx := strings.IndexByte(line, '=')
|
|
||||||
if idx <= 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
key := strings.TrimSpace(line[:idx])
|
|
||||||
value := strings.TrimSpace(line[idx+1:])
|
|
||||||
if key != "" && value != "" {
|
|
||||||
env[key] = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set bearer auth mechanism for third-party API compatibility
|
|
||||||
if _, ok := env["GEMINI_API_KEY"]; ok {
|
|
||||||
if _, hasAuth := env["GEMINI_API_KEY_AUTH_MECHANISM"]; !hasAuth {
|
|
||||||
env["GEMINI_API_KEY_AUTH_MECHANISM"] = "bearer"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(env) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return env
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildGeminiArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
if cfg == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
args := []string{"-o", "stream-json", "-y"}
|
|
||||||
|
|
||||||
if model := strings.TrimSpace(cfg.Model); model != "" {
|
|
||||||
args = append(args, "-m", model)
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.Mode == "resume" {
|
|
||||||
if cfg.SessionID != "" {
|
|
||||||
args = append(args, "-r", cfg.SessionID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use positional argument instead of deprecated -p flag.
|
|
||||||
// For stdin mode ("-"), use -p to read from stdin.
|
|
||||||
if targetArg == "-" {
|
|
||||||
args = append(args, "-p", targetArg)
|
|
||||||
} else {
|
|
||||||
args = append(args, targetArg)
|
|
||||||
}
|
|
||||||
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
type OpencodeBackend struct{}
|
|
||||||
|
|
||||||
func (OpencodeBackend) Name() string { return "opencode" }
|
|
||||||
func (OpencodeBackend) Command() string { return "opencode" }
|
|
||||||
func (OpencodeBackend) Env(baseURL, apiKey string) map[string]string { return nil }
|
|
||||||
func (OpencodeBackend) BuildArgs(cfg *config.Config, targetArg string) []string {
|
|
||||||
args := []string{"run"}
|
|
||||||
if cfg != nil {
|
|
||||||
if model := strings.TrimSpace(cfg.Model); model != "" {
|
|
||||||
args = append(args, "-m", model)
|
|
||||||
}
|
|
||||||
if cfg.Mode == "resume" && cfg.SessionID != "" {
|
|
||||||
args = append(args, "-s", cfg.SessionID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
args = append(args, "--format", "json")
|
|
||||||
if targetArg != "-" {
|
|
||||||
args = append(args, targetArg)
|
|
||||||
}
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package backend
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var registry = map[string]Backend{
|
|
||||||
"codex": CodexBackend{},
|
|
||||||
"claude": ClaudeBackend{},
|
|
||||||
"gemini": GeminiBackend{},
|
|
||||||
"opencode": OpencodeBackend{},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Registry exposes the available backends. Intended for internal inspection/tests.
|
|
||||||
func Registry() map[string]Backend {
|
|
||||||
return registry
|
|
||||||
}
|
|
||||||
|
|
||||||
func Select(name string) (Backend, error) {
|
|
||||||
key := strings.ToLower(strings.TrimSpace(name))
|
|
||||||
if key == "" {
|
|
||||||
key = "codex"
|
|
||||||
}
|
|
||||||
if backend, ok := registry[key]; ok {
|
|
||||||
return backend, nil
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("unsupported backend %q", name)
|
|
||||||
}
|
|
||||||
@@ -1,220 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
ilogger "codeagent-wrapper/internal/logger"
|
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
|
||||||
)
|
|
||||||
|
|
||||||
type BackendConfig struct {
|
|
||||||
BaseURL string `json:"base_url,omitempty"`
|
|
||||||
APIKey string `json:"api_key,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type AgentModelConfig struct {
|
|
||||||
Backend string `json:"backend"`
|
|
||||||
Model string `json:"model"`
|
|
||||||
PromptFile string `json:"prompt_file,omitempty"`
|
|
||||||
Description string `json:"description,omitempty"`
|
|
||||||
Yolo bool `json:"yolo,omitempty"`
|
|
||||||
Reasoning string `json:"reasoning,omitempty"`
|
|
||||||
BaseURL string `json:"base_url,omitempty"`
|
|
||||||
APIKey string `json:"api_key,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ModelsConfig struct {
|
|
||||||
DefaultBackend string `json:"default_backend"`
|
|
||||||
DefaultModel string `json:"default_model"`
|
|
||||||
Agents map[string]AgentModelConfig `json:"agents"`
|
|
||||||
Backends map[string]BackendConfig `json:"backends,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var defaultModelsConfig = ModelsConfig{
|
|
||||||
DefaultBackend: "opencode",
|
|
||||||
DefaultModel: "opencode/grok-code",
|
|
||||||
Agents: map[string]AgentModelConfig{
|
|
||||||
"oracle": {Backend: "claude", Model: "claude-opus-4-5-20251101", PromptFile: "~/.claude/skills/omo/references/oracle.md", Description: "Technical advisor"},
|
|
||||||
"librarian": {Backend: "claude", Model: "claude-sonnet-4-5-20250929", PromptFile: "~/.claude/skills/omo/references/librarian.md", Description: "Researcher"},
|
|
||||||
"explore": {Backend: "opencode", Model: "opencode/grok-code", PromptFile: "~/.claude/skills/omo/references/explore.md", Description: "Code search"},
|
|
||||||
"develop": {Backend: "codex", Model: "", PromptFile: "~/.claude/skills/omo/references/develop.md", Description: "Code development"},
|
|
||||||
"frontend-ui-ux-engineer": {Backend: "gemini", Model: "", PromptFile: "~/.claude/skills/omo/references/frontend-ui-ux-engineer.md", Description: "Frontend engineer"},
|
|
||||||
"document-writer": {Backend: "gemini", Model: "", PromptFile: "~/.claude/skills/omo/references/document-writer.md", Description: "Documentation"},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
modelsConfigOnce sync.Once
|
|
||||||
modelsConfigCached *ModelsConfig
|
|
||||||
)
|
|
||||||
|
|
||||||
func modelsConfig() *ModelsConfig {
|
|
||||||
modelsConfigOnce.Do(func() {
|
|
||||||
modelsConfigCached = loadModelsConfig()
|
|
||||||
})
|
|
||||||
if modelsConfigCached == nil {
|
|
||||||
return &defaultModelsConfig
|
|
||||||
}
|
|
||||||
return modelsConfigCached
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadModelsConfig() *ModelsConfig {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
ilogger.LogWarn(fmt.Sprintf("Failed to resolve home directory for models config: %v; using defaults", err))
|
|
||||||
return &defaultModelsConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
configDir := filepath.Clean(filepath.Join(home, ".codeagent"))
|
|
||||||
configPath := filepath.Clean(filepath.Join(configDir, "models.json"))
|
|
||||||
rel, err := filepath.Rel(configDir, configPath)
|
|
||||||
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
|
|
||||||
return &defaultModelsConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(configPath) // #nosec G304 -- path is fixed under user home and validated to stay within configDir
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
ilogger.LogWarn(fmt.Sprintf("Failed to read models config %s: %v; using defaults", configPath, err))
|
|
||||||
}
|
|
||||||
return &defaultModelsConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
var cfg ModelsConfig
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
ilogger.LogWarn(fmt.Sprintf("Failed to parse models config %s: %v; using defaults", configPath, err))
|
|
||||||
return &defaultModelsConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.DefaultBackend = strings.TrimSpace(cfg.DefaultBackend)
|
|
||||||
if cfg.DefaultBackend == "" {
|
|
||||||
cfg.DefaultBackend = defaultModelsConfig.DefaultBackend
|
|
||||||
}
|
|
||||||
cfg.DefaultModel = strings.TrimSpace(cfg.DefaultModel)
|
|
||||||
if cfg.DefaultModel == "" {
|
|
||||||
cfg.DefaultModel = defaultModelsConfig.DefaultModel
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge with defaults
|
|
||||||
for name, agent := range defaultModelsConfig.Agents {
|
|
||||||
if _, exists := cfg.Agents[name]; !exists {
|
|
||||||
if cfg.Agents == nil {
|
|
||||||
cfg.Agents = make(map[string]AgentModelConfig)
|
|
||||||
}
|
|
||||||
cfg.Agents[name] = agent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Normalize backend keys so lookups can be case-insensitive.
|
|
||||||
if len(cfg.Backends) > 0 {
|
|
||||||
normalized := make(map[string]BackendConfig, len(cfg.Backends))
|
|
||||||
for k, v := range cfg.Backends {
|
|
||||||
key := strings.ToLower(strings.TrimSpace(k))
|
|
||||||
if key == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
normalized[key] = v
|
|
||||||
}
|
|
||||||
if len(normalized) > 0 {
|
|
||||||
cfg.Backends = normalized
|
|
||||||
} else {
|
|
||||||
cfg.Backends = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return &cfg
|
|
||||||
}
|
|
||||||
|
|
||||||
func LoadDynamicAgent(name string) (AgentModelConfig, bool) {
|
|
||||||
if err := ValidateAgentName(name); err != nil {
|
|
||||||
return AgentModelConfig{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || strings.TrimSpace(home) == "" {
|
|
||||||
return AgentModelConfig{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
absPath := filepath.Join(home, ".codeagent", "agents", name+".md")
|
|
||||||
info, err := os.Stat(absPath)
|
|
||||||
if err != nil || info.IsDir() {
|
|
||||||
return AgentModelConfig{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
return AgentModelConfig{PromptFile: "~/.codeagent/agents/" + name + ".md"}, true
|
|
||||||
}
|
|
||||||
|
|
||||||
func ResolveBackendConfig(backendName string) (baseURL, apiKey string) {
|
|
||||||
cfg := modelsConfig()
|
|
||||||
resolved := resolveBackendConfig(cfg, backendName)
|
|
||||||
return strings.TrimSpace(resolved.BaseURL), strings.TrimSpace(resolved.APIKey)
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveBackendConfig(cfg *ModelsConfig, backendName string) BackendConfig {
|
|
||||||
if cfg == nil || len(cfg.Backends) == 0 {
|
|
||||||
return BackendConfig{}
|
|
||||||
}
|
|
||||||
key := strings.ToLower(strings.TrimSpace(backendName))
|
|
||||||
if key == "" {
|
|
||||||
key = strings.ToLower(strings.TrimSpace(cfg.DefaultBackend))
|
|
||||||
}
|
|
||||||
if key == "" {
|
|
||||||
return BackendConfig{}
|
|
||||||
}
|
|
||||||
if backend, ok := cfg.Backends[key]; ok {
|
|
||||||
return backend
|
|
||||||
}
|
|
||||||
return BackendConfig{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveAgentConfig(agentName string) (backend, model, promptFile, reasoning, baseURL, apiKey string, yolo bool) {
|
|
||||||
cfg := modelsConfig()
|
|
||||||
if agent, ok := cfg.Agents[agentName]; ok {
|
|
||||||
backend = strings.TrimSpace(agent.Backend)
|
|
||||||
if backend == "" {
|
|
||||||
backend = cfg.DefaultBackend
|
|
||||||
}
|
|
||||||
backendCfg := resolveBackendConfig(cfg, backend)
|
|
||||||
|
|
||||||
baseURL = strings.TrimSpace(agent.BaseURL)
|
|
||||||
if baseURL == "" {
|
|
||||||
baseURL = strings.TrimSpace(backendCfg.BaseURL)
|
|
||||||
}
|
|
||||||
apiKey = strings.TrimSpace(agent.APIKey)
|
|
||||||
if apiKey == "" {
|
|
||||||
apiKey = strings.TrimSpace(backendCfg.APIKey)
|
|
||||||
}
|
|
||||||
|
|
||||||
return backend, strings.TrimSpace(agent.Model), agent.PromptFile, agent.Reasoning, baseURL, apiKey, agent.Yolo
|
|
||||||
}
|
|
||||||
|
|
||||||
if dynamic, ok := LoadDynamicAgent(agentName); ok {
|
|
||||||
backend = cfg.DefaultBackend
|
|
||||||
model = cfg.DefaultModel
|
|
||||||
backendCfg := resolveBackendConfig(cfg, backend)
|
|
||||||
baseURL = strings.TrimSpace(backendCfg.BaseURL)
|
|
||||||
apiKey = strings.TrimSpace(backendCfg.APIKey)
|
|
||||||
return backend, model, dynamic.PromptFile, "", baseURL, apiKey, false
|
|
||||||
}
|
|
||||||
|
|
||||||
backend = cfg.DefaultBackend
|
|
||||||
model = cfg.DefaultModel
|
|
||||||
backendCfg := resolveBackendConfig(cfg, backend)
|
|
||||||
baseURL = strings.TrimSpace(backendCfg.BaseURL)
|
|
||||||
apiKey = strings.TrimSpace(backendCfg.APIKey)
|
|
||||||
return backend, model, "", "", baseURL, apiKey, false
|
|
||||||
}
|
|
||||||
|
|
||||||
func ResolveAgentConfig(agentName string) (backend, model, promptFile, reasoning, baseURL, apiKey string, yolo bool) {
|
|
||||||
return resolveAgentConfig(agentName)
|
|
||||||
}
|
|
||||||
|
|
||||||
func ResetModelsConfigCacheForTest() {
|
|
||||||
modelsConfigCached = nil
|
|
||||||
modelsConfigOnce = sync.Once{}
|
|
||||||
}
|
|
||||||
@@ -1,221 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestResolveAgentConfig_Defaults(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
// Test that default agents resolve correctly without config file
|
|
||||||
tests := []struct {
|
|
||||||
agent string
|
|
||||||
wantBackend string
|
|
||||||
wantModel string
|
|
||||||
wantPromptFile string
|
|
||||||
}{
|
|
||||||
{"oracle", "claude", "claude-opus-4-5-20251101", "~/.claude/skills/omo/references/oracle.md"},
|
|
||||||
{"librarian", "claude", "claude-sonnet-4-5-20250929", "~/.claude/skills/omo/references/librarian.md"},
|
|
||||||
{"explore", "opencode", "opencode/grok-code", "~/.claude/skills/omo/references/explore.md"},
|
|
||||||
{"frontend-ui-ux-engineer", "gemini", "", "~/.claude/skills/omo/references/frontend-ui-ux-engineer.md"},
|
|
||||||
{"document-writer", "gemini", "", "~/.claude/skills/omo/references/document-writer.md"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.agent, func(t *testing.T) {
|
|
||||||
backend, model, promptFile, _, _, _, _ := resolveAgentConfig(tt.agent)
|
|
||||||
if backend != tt.wantBackend {
|
|
||||||
t.Errorf("backend = %q, want %q", backend, tt.wantBackend)
|
|
||||||
}
|
|
||||||
if model != tt.wantModel {
|
|
||||||
t.Errorf("model = %q, want %q", model, tt.wantModel)
|
|
||||||
}
|
|
||||||
if promptFile != tt.wantPromptFile {
|
|
||||||
t.Errorf("promptFile = %q, want %q", promptFile, tt.wantPromptFile)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveAgentConfig_UnknownAgent(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
backend, model, promptFile, _, _, _, _ := resolveAgentConfig("unknown-agent")
|
|
||||||
if backend != "opencode" {
|
|
||||||
t.Errorf("unknown agent backend = %q, want %q", backend, "opencode")
|
|
||||||
}
|
|
||||||
if model != "opencode/grok-code" {
|
|
||||||
t.Errorf("unknown agent model = %q, want %q", model, "opencode/grok-code")
|
|
||||||
}
|
|
||||||
if promptFile != "" {
|
|
||||||
t.Errorf("unknown agent promptFile = %q, want empty", promptFile)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoadModelsConfig_NoFile(t *testing.T) {
|
|
||||||
home := "/nonexistent/path/that/does/not/exist"
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
cfg := loadModelsConfig()
|
|
||||||
if cfg.DefaultBackend != "opencode" {
|
|
||||||
t.Errorf("DefaultBackend = %q, want %q", cfg.DefaultBackend, "opencode")
|
|
||||||
}
|
|
||||||
if len(cfg.Agents) != 6 {
|
|
||||||
t.Errorf("len(Agents) = %d, want 6", len(cfg.Agents))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoadModelsConfig_WithFile(t *testing.T) {
|
|
||||||
// Create temp dir and config file
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
configDir := filepath.Join(tmpDir, ".codeagent")
|
|
||||||
if err := os.MkdirAll(configDir, 0755); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
configContent := `{
|
|
||||||
"default_backend": "claude",
|
|
||||||
"default_model": "claude-opus-4",
|
|
||||||
"backends": {
|
|
||||||
"Claude": {
|
|
||||||
"base_url": "https://backend.example",
|
|
||||||
"api_key": "backend-key"
|
|
||||||
},
|
|
||||||
"codex": {
|
|
||||||
"base_url": "https://openai.example",
|
|
||||||
"api_key": "openai-key"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"agents": {
|
|
||||||
"custom-agent": {
|
|
||||||
"backend": "codex",
|
|
||||||
"model": "gpt-4o",
|
|
||||||
"description": "Custom agent",
|
|
||||||
"base_url": "https://agent.example",
|
|
||||||
"api_key": "agent-key"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`
|
|
||||||
configPath := filepath.Join(configDir, "models.json")
|
|
||||||
if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Setenv("HOME", tmpDir)
|
|
||||||
t.Setenv("USERPROFILE", tmpDir)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
cfg := loadModelsConfig()
|
|
||||||
|
|
||||||
if cfg.DefaultBackend != "claude" {
|
|
||||||
t.Errorf("DefaultBackend = %q, want %q", cfg.DefaultBackend, "claude")
|
|
||||||
}
|
|
||||||
if cfg.DefaultModel != "claude-opus-4" {
|
|
||||||
t.Errorf("DefaultModel = %q, want %q", cfg.DefaultModel, "claude-opus-4")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check custom agent
|
|
||||||
if agent, ok := cfg.Agents["custom-agent"]; !ok {
|
|
||||||
t.Error("custom-agent not found")
|
|
||||||
} else {
|
|
||||||
if agent.Backend != "codex" {
|
|
||||||
t.Errorf("custom-agent.Backend = %q, want %q", agent.Backend, "codex")
|
|
||||||
}
|
|
||||||
if agent.Model != "gpt-4o" {
|
|
||||||
t.Errorf("custom-agent.Model = %q, want %q", agent.Model, "gpt-4o")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check that defaults are merged
|
|
||||||
if _, ok := cfg.Agents["oracle"]; !ok {
|
|
||||||
t.Error("default agent oracle should be merged")
|
|
||||||
}
|
|
||||||
|
|
||||||
baseURL, apiKey := ResolveBackendConfig("claude")
|
|
||||||
if baseURL != "https://backend.example" {
|
|
||||||
t.Errorf("ResolveBackendConfig(baseURL) = %q, want %q", baseURL, "https://backend.example")
|
|
||||||
}
|
|
||||||
if apiKey != "backend-key" {
|
|
||||||
t.Errorf("ResolveBackendConfig(apiKey) = %q, want %q", apiKey, "backend-key")
|
|
||||||
}
|
|
||||||
|
|
||||||
backend, model, _, _, agentBaseURL, agentAPIKey, _ := ResolveAgentConfig("custom-agent")
|
|
||||||
if backend != "codex" {
|
|
||||||
t.Errorf("ResolveAgentConfig(backend) = %q, want %q", backend, "codex")
|
|
||||||
}
|
|
||||||
if model != "gpt-4o" {
|
|
||||||
t.Errorf("ResolveAgentConfig(model) = %q, want %q", model, "gpt-4o")
|
|
||||||
}
|
|
||||||
if agentBaseURL != "https://agent.example" {
|
|
||||||
t.Errorf("ResolveAgentConfig(baseURL) = %q, want %q", agentBaseURL, "https://agent.example")
|
|
||||||
}
|
|
||||||
if agentAPIKey != "agent-key" {
|
|
||||||
t.Errorf("ResolveAgentConfig(apiKey) = %q, want %q", agentAPIKey, "agent-key")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveAgentConfig_DynamicAgent(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
agentDir := filepath.Join(home, ".codeagent", "agents")
|
|
||||||
if err := os.MkdirAll(agentDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
if err := os.WriteFile(filepath.Join(agentDir, "sarsh.md"), []byte("prompt\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
backend, model, promptFile, _, _, _, _ := resolveAgentConfig("sarsh")
|
|
||||||
if backend != "opencode" {
|
|
||||||
t.Errorf("backend = %q, want %q", backend, "opencode")
|
|
||||||
}
|
|
||||||
if model != "opencode/grok-code" {
|
|
||||||
t.Errorf("model = %q, want %q", model, "opencode/grok-code")
|
|
||||||
}
|
|
||||||
if promptFile != "~/.codeagent/agents/sarsh.md" {
|
|
||||||
t.Errorf("promptFile = %q, want %q", promptFile, "~/.codeagent/agents/sarsh.md")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoadModelsConfig_InvalidJSON(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
configDir := filepath.Join(tmpDir, ".codeagent")
|
|
||||||
if err := os.MkdirAll(configDir, 0755); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write invalid JSON
|
|
||||||
configPath := filepath.Join(configDir, "models.json")
|
|
||||||
if err := os.WriteFile(configPath, []byte("invalid json {"), 0644); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Setenv("HOME", tmpDir)
|
|
||||||
t.Setenv("USERPROFILE", tmpDir)
|
|
||||||
t.Cleanup(ResetModelsConfigCacheForTest)
|
|
||||||
ResetModelsConfigCacheForTest()
|
|
||||||
|
|
||||||
cfg := loadModelsConfig()
|
|
||||||
// Should fall back to defaults
|
|
||||||
if cfg.DefaultBackend != "opencode" {
|
|
||||||
t.Errorf("invalid JSON should fallback, got DefaultBackend = %q", cfg.DefaultBackend)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Config holds CLI configuration.
|
|
||||||
type Config struct {
|
|
||||||
Mode string // "new" or "resume"
|
|
||||||
Task string
|
|
||||||
SessionID string
|
|
||||||
WorkDir string
|
|
||||||
Model string
|
|
||||||
ReasoningEffort string
|
|
||||||
ExplicitStdin bool
|
|
||||||
Timeout int
|
|
||||||
Backend string
|
|
||||||
Agent string
|
|
||||||
PromptFile string
|
|
||||||
PromptFileExplicit bool
|
|
||||||
SkipPermissions bool
|
|
||||||
Yolo bool
|
|
||||||
MaxParallelWorkers int
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnvFlagEnabled returns true when the environment variable exists and is not
|
|
||||||
// explicitly set to a falsey value ("0/false/no/off").
|
|
||||||
func EnvFlagEnabled(key string) bool {
|
|
||||||
val, ok := os.LookupEnv(key)
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
val = strings.TrimSpace(strings.ToLower(val))
|
|
||||||
switch val {
|
|
||||||
case "", "0", "false", "no", "off":
|
|
||||||
return false
|
|
||||||
default:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func ParseBoolFlag(val string, defaultValue bool) bool {
|
|
||||||
val = strings.TrimSpace(strings.ToLower(val))
|
|
||||||
switch val {
|
|
||||||
case "1", "true", "yes", "on":
|
|
||||||
return true
|
|
||||||
case "0", "false", "no", "off":
|
|
||||||
return false
|
|
||||||
default:
|
|
||||||
return defaultValue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnvFlagDefaultTrue returns true unless the env var is explicitly set to
|
|
||||||
// false/0/no/off.
|
|
||||||
func EnvFlagDefaultTrue(key string) bool {
|
|
||||||
val, ok := os.LookupEnv(key)
|
|
||||||
if !ok {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return ParseBoolFlag(val, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
func ValidateAgentName(name string) error {
|
|
||||||
if strings.TrimSpace(name) == "" {
|
|
||||||
return fmt.Errorf("agent name is empty")
|
|
||||||
}
|
|
||||||
for _, r := range name {
|
|
||||||
switch {
|
|
||||||
case r >= 'a' && r <= 'z':
|
|
||||||
case r >= 'A' && r <= 'Z':
|
|
||||||
case r >= '0' && r <= '9':
|
|
||||||
case r == '-', r == '_':
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("agent name %q contains invalid character %q", name, r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const maxParallelWorkersLimit = 100
|
|
||||||
|
|
||||||
// ResolveMaxParallelWorkers reads CODEAGENT_MAX_PARALLEL_WORKERS. It returns 0
|
|
||||||
// for "unlimited".
|
|
||||||
func ResolveMaxParallelWorkers() int {
|
|
||||||
raw := strings.TrimSpace(os.Getenv("CODEAGENT_MAX_PARALLEL_WORKERS"))
|
|
||||||
if raw == "" {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
value, err := strconv.Atoi(raw)
|
|
||||||
if err != nil || value < 0 {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
if value > maxParallelWorkersLimit {
|
|
||||||
return maxParallelWorkersLimit
|
|
||||||
}
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/spf13/viper"
|
|
||||||
)
|
|
||||||
|
|
||||||
// NewViper returns a viper instance configured for CODEAGENT_* environment
|
|
||||||
// variables and an optional config file.
|
|
||||||
//
|
|
||||||
// Search order when configFile is empty:
|
|
||||||
// - $HOME/.codeagent/config.(yaml|yml|json|toml|...)
|
|
||||||
func NewViper(configFile string) (*viper.Viper, error) {
|
|
||||||
v := viper.New()
|
|
||||||
v.SetEnvPrefix("CODEAGENT")
|
|
||||||
v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
|
|
||||||
v.AutomaticEnv()
|
|
||||||
|
|
||||||
if strings.TrimSpace(configFile) != "" {
|
|
||||||
v.SetConfigFile(configFile)
|
|
||||||
if err := v.ReadInConfig(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || strings.TrimSpace(home) == "" {
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
v.SetConfigName("config")
|
|
||||||
v.AddConfigPath(filepath.Join(home, ".codeagent"))
|
|
||||||
if err := v.ReadInConfig(); err != nil {
|
|
||||||
var notFound viper.ConfigFileNotFoundError
|
|
||||||
if errors.As(err, ¬Found) {
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
config "codeagent-wrapper/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func ParseParallelConfig(data []byte) (*ParallelConfig, error) {
|
|
||||||
trimmed := bytes.TrimSpace(data)
|
|
||||||
if len(trimmed) == 0 {
|
|
||||||
return nil, fmt.Errorf("parallel config is empty")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks := strings.Split(string(trimmed), "---TASK---")
|
|
||||||
var cfg ParallelConfig
|
|
||||||
seen := make(map[string]struct{})
|
|
||||||
|
|
||||||
taskIndex := 0
|
|
||||||
for _, taskBlock := range tasks {
|
|
||||||
taskBlock = strings.TrimSpace(taskBlock)
|
|
||||||
if taskBlock == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
taskIndex++
|
|
||||||
|
|
||||||
parts := strings.SplitN(taskBlock, "---CONTENT---", 2)
|
|
||||||
if len(parts) != 2 {
|
|
||||||
return nil, fmt.Errorf("task block #%d missing ---CONTENT--- separator", taskIndex)
|
|
||||||
}
|
|
||||||
|
|
||||||
meta := strings.TrimSpace(parts[0])
|
|
||||||
content := strings.TrimSpace(parts[1])
|
|
||||||
|
|
||||||
task := TaskSpec{WorkDir: defaultWorkdir}
|
|
||||||
agentSpecified := false
|
|
||||||
for _, line := range strings.Split(meta, "\n") {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
kv := strings.SplitN(line, ":", 2)
|
|
||||||
if len(kv) != 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
key := strings.TrimSpace(kv[0])
|
|
||||||
value := strings.TrimSpace(kv[1])
|
|
||||||
|
|
||||||
switch key {
|
|
||||||
case "id":
|
|
||||||
task.ID = value
|
|
||||||
case "workdir":
|
|
||||||
// Validate workdir: "-" is not a valid directory
|
|
||||||
if value == "-" {
|
|
||||||
return nil, fmt.Errorf("task block #%d has invalid workdir: '-' is not a valid directory path", taskIndex)
|
|
||||||
}
|
|
||||||
task.WorkDir = value
|
|
||||||
case "session_id":
|
|
||||||
task.SessionID = value
|
|
||||||
task.Mode = "resume"
|
|
||||||
case "backend":
|
|
||||||
task.Backend = value
|
|
||||||
case "model":
|
|
||||||
task.Model = value
|
|
||||||
case "reasoning_effort":
|
|
||||||
task.ReasoningEffort = value
|
|
||||||
case "agent":
|
|
||||||
agentSpecified = true
|
|
||||||
task.Agent = value
|
|
||||||
case "skip_permissions", "skip-permissions":
|
|
||||||
if value == "" {
|
|
||||||
task.SkipPermissions = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
task.SkipPermissions = config.ParseBoolFlag(value, false)
|
|
||||||
case "dependencies":
|
|
||||||
for _, dep := range strings.Split(value, ",") {
|
|
||||||
dep = strings.TrimSpace(dep)
|
|
||||||
if dep != "" {
|
|
||||||
task.Dependencies = append(task.Dependencies, dep)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if task.Mode == "" {
|
|
||||||
task.Mode = "new"
|
|
||||||
}
|
|
||||||
|
|
||||||
if agentSpecified {
|
|
||||||
if strings.TrimSpace(task.Agent) == "" {
|
|
||||||
return nil, fmt.Errorf("task block #%d has empty agent field", taskIndex)
|
|
||||||
}
|
|
||||||
if err := config.ValidateAgentName(task.Agent); err != nil {
|
|
||||||
return nil, fmt.Errorf("task block #%d invalid agent name: %w", taskIndex, err)
|
|
||||||
}
|
|
||||||
backend, model, promptFile, reasoning, _, _, _ := config.ResolveAgentConfig(task.Agent)
|
|
||||||
if task.Backend == "" {
|
|
||||||
task.Backend = backend
|
|
||||||
}
|
|
||||||
if task.Model == "" {
|
|
||||||
task.Model = model
|
|
||||||
}
|
|
||||||
if task.ReasoningEffort == "" {
|
|
||||||
task.ReasoningEffort = reasoning
|
|
||||||
}
|
|
||||||
task.PromptFile = promptFile
|
|
||||||
}
|
|
||||||
|
|
||||||
if task.ID == "" {
|
|
||||||
return nil, fmt.Errorf("task block #%d missing id field", taskIndex)
|
|
||||||
}
|
|
||||||
if content == "" {
|
|
||||||
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 {
|
|
||||||
return nil, fmt.Errorf("task block #%d has duplicate id: %s", taskIndex, task.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
task.Task = content
|
|
||||||
cfg.Tasks = append(cfg.Tasks, task)
|
|
||||||
seen[task.ID] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(cfg.Tasks) == 0 {
|
|
||||||
return nil, fmt.Errorf("no tasks found")
|
|
||||||
}
|
|
||||||
|
|
||||||
return &cfg, nil
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
func ReadAgentPromptFile(path string, allowOutsideClaudeDir bool) (string, error) {
|
|
||||||
raw := strings.TrimSpace(path)
|
|
||||||
if raw == "" {
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
expanded := raw
|
|
||||||
if raw == "~" || strings.HasPrefix(raw, "~/") || strings.HasPrefix(raw, "~\\") {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if raw == "~" {
|
|
||||||
expanded = home
|
|
||||||
} else {
|
|
||||||
expanded = home + raw[1:]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
absPath, err := filepath.Abs(expanded)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
absPath = filepath.Clean(absPath)
|
|
||||||
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
if !allowOutsideClaudeDir {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
logWarn(fmt.Sprintf("Failed to resolve home directory for prompt file validation: %v; proceeding without restriction", err))
|
|
||||||
} else {
|
|
||||||
allowedDirs := []string{
|
|
||||||
filepath.Clean(filepath.Join(home, ".claude")),
|
|
||||||
filepath.Clean(filepath.Join(home, ".codeagent", "agents")),
|
|
||||||
}
|
|
||||||
for i := range allowedDirs {
|
|
||||||
allowedAbs, err := filepath.Abs(allowedDirs[i])
|
|
||||||
if err == nil {
|
|
||||||
allowedDirs[i] = filepath.Clean(allowedAbs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isWithinDir := func(path, dir string) bool {
|
|
||||||
rel, err := filepath.Rel(dir, path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
rel = filepath.Clean(rel)
|
|
||||||
if rel == "." {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if rel == ".." {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
prefix := ".." + string(os.PathSeparator)
|
|
||||||
return !strings.HasPrefix(rel, prefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !allowOutsideClaudeDir {
|
|
||||||
withinAllowed := false
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
if isWithinDir(absPath, dir) {
|
|
||||||
withinAllowed = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinAllowed {
|
|
||||||
logWarn(fmt.Sprintf("Refusing to read prompt file outside allowed dirs (%s): %s", strings.Join(allowedDirs, ", "), absPath))
|
|
||||||
return "", fmt.Errorf("prompt file must be under ~/.claude or ~/.codeagent/agents")
|
|
||||||
}
|
|
||||||
|
|
||||||
resolvedPath, errPath := filepath.EvalSymlinks(absPath)
|
|
||||||
if errPath == nil {
|
|
||||||
resolvedPath = filepath.Clean(resolvedPath)
|
|
||||||
resolvedAllowed := make([]string, 0, len(allowedDirs))
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
resolvedBase, errBase := filepath.EvalSymlinks(dir)
|
|
||||||
if errBase != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resolvedAllowed = append(resolvedAllowed, filepath.Clean(resolvedBase))
|
|
||||||
}
|
|
||||||
if len(resolvedAllowed) > 0 {
|
|
||||||
withinResolved := false
|
|
||||||
for _, dir := range resolvedAllowed {
|
|
||||||
if isWithinDir(resolvedPath, dir) {
|
|
||||||
withinResolved = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinResolved {
|
|
||||||
logWarn(fmt.Sprintf("Refusing to read prompt file outside allowed dirs (%s) (resolved): %s", strings.Join(resolvedAllowed, ", "), resolvedPath))
|
|
||||||
return "", fmt.Errorf("prompt file must be under ~/.claude or ~/.codeagent/agents")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
withinAllowed := false
|
|
||||||
for _, dir := range allowedDirs {
|
|
||||||
if isWithinDir(absPath, dir) {
|
|
||||||
withinAllowed = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !withinAllowed {
|
|
||||||
logWarn(fmt.Sprintf("Reading prompt file outside allowed dirs (%s): %s", strings.Join(allowedDirs, ", "), absPath))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(absPath)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return strings.TrimRight(string(data), "\r\n"), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func WrapTaskWithAgentPrompt(prompt string, task string) string {
|
|
||||||
return "<agent-prompt>\n" + prompt + "\n</agent-prompt>\n\n" + task
|
|
||||||
}
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestWrapTaskWithAgentPrompt(t *testing.T) {
|
|
||||||
got := WrapTaskWithAgentPrompt("P", "do")
|
|
||||||
want := "<agent-prompt>\nP\n</agent-prompt>\n\ndo"
|
|
||||||
if got != want {
|
|
||||||
t.Fatalf("wrapTaskWithAgentPrompt mismatch:\n got=%q\nwant=%q", got, want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_EmptyPath(t *testing.T) {
|
|
||||||
for _, allowOutside := range []bool{false, true} {
|
|
||||||
got, err := ReadAgentPromptFile(" ", allowOutside)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unexpected error (allowOutside=%v): %v", allowOutside, err)
|
|
||||||
}
|
|
||||||
if got != "" {
|
|
||||||
t.Fatalf("expected empty result (allowOutside=%v), got %q", allowOutside, got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_ExplicitAbsolutePath(t *testing.T) {
|
|
||||||
dir := t.TempDir()
|
|
||||||
path := filepath.Join(dir, "prompt.md")
|
|
||||||
if err := os.WriteFile(path, []byte("LINE1\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := ReadAgentPromptFile(path, true)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("readAgentPromptFile error: %v", err)
|
|
||||||
}
|
|
||||||
if got != "LINE1" {
|
|
||||||
t.Fatalf("got %q, want %q", got, "LINE1")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_ExplicitTildeExpansion(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
path := filepath.Join(home, "prompt.md")
|
|
||||||
if err := os.WriteFile(path, []byte("P\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := ReadAgentPromptFile("~/prompt.md", true)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("readAgentPromptFile error: %v", err)
|
|
||||||
}
|
|
||||||
if got != "P" {
|
|
||||||
t.Fatalf("got %q, want %q", got, "P")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_RestrictedAllowsClaudeDir(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
claudeDir := filepath.Join(home, ".claude")
|
|
||||||
if err := os.MkdirAll(claudeDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
path := filepath.Join(claudeDir, "prompt.md")
|
|
||||||
if err := os.WriteFile(path, []byte("OK\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := ReadAgentPromptFile("~/.claude/prompt.md", false)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("readAgentPromptFile error: %v", err)
|
|
||||||
}
|
|
||||||
if got != "OK" {
|
|
||||||
t.Fatalf("got %q, want %q", got, "OK")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_RestrictedAllowsCodeagentAgentsDir(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
agentDir := filepath.Join(home, ".codeagent", "agents")
|
|
||||||
if err := os.MkdirAll(agentDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
path := filepath.Join(agentDir, "sarsh.md")
|
|
||||||
if err := os.WriteFile(path, []byte("OK\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := ReadAgentPromptFile("~/.codeagent/agents/sarsh.md", false)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("readAgentPromptFile error: %v", err)
|
|
||||||
}
|
|
||||||
if got != "OK" {
|
|
||||||
t.Fatalf("got %q, want %q", got, "OK")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_RestrictedRejectsOutsideClaudeDir(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
path := filepath.Join(home, "prompt.md")
|
|
||||||
if err := os.WriteFile(path, []byte("NO\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := ReadAgentPromptFile("~/prompt.md", false); err == nil {
|
|
||||||
t.Fatalf("expected error for prompt file outside ~/.claude, got nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_RestrictedRejectsTraversal(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
path := filepath.Join(home, "secret.md")
|
|
||||||
if err := os.WriteFile(path, []byte("SECRET\n"), 0o644); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := ReadAgentPromptFile("~/.claude/../secret.md", false); err == nil {
|
|
||||||
t.Fatalf("expected traversal to be rejected, got nil")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_NotFound(t *testing.T) {
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
claudeDir := filepath.Join(home, ".claude")
|
|
||||||
if err := os.MkdirAll(claudeDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := ReadAgentPromptFile("~/.claude/missing.md", false)
|
|
||||||
if err == nil || !os.IsNotExist(err) {
|
|
||||||
t.Fatalf("expected not-exist error, got %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadAgentPromptFile_PermissionDenied(t *testing.T) {
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
t.Skip("chmod-based permission test is not reliable on Windows")
|
|
||||||
}
|
|
||||||
|
|
||||||
home := t.TempDir()
|
|
||||||
t.Setenv("HOME", home)
|
|
||||||
t.Setenv("USERPROFILE", home)
|
|
||||||
|
|
||||||
claudeDir := filepath.Join(home, ".claude")
|
|
||||||
if err := os.MkdirAll(claudeDir, 0o755); err != nil {
|
|
||||||
t.Fatalf("MkdirAll: %v", err)
|
|
||||||
}
|
|
||||||
path := filepath.Join(claudeDir, "private.md")
|
|
||||||
if err := os.WriteFile(path, []byte("PRIVATE\n"), 0o600); err != nil {
|
|
||||||
t.Fatalf("WriteFile: %v", err)
|
|
||||||
}
|
|
||||||
if err := os.Chmod(path, 0o000); err != nil {
|
|
||||||
t.Fatalf("Chmod: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := ReadAgentPromptFile("~/.claude/private.md", false)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatalf("expected permission error, got nil")
|
|
||||||
}
|
|
||||||
if !os.IsPermission(err) && !strings.Contains(strings.ToLower(err.Error()), "permission") {
|
|
||||||
t.Fatalf("expected permission denied, got: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import "strings"
|
|
||||||
|
|
||||||
// extractCoverageGap extracts what's missing from coverage reports.
|
|
||||||
func extractCoverageGap(message string) string {
|
|
||||||
if message == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
lower := strings.ToLower(message)
|
|
||||||
lines := strings.Split(message, "\n")
|
|
||||||
|
|
||||||
for _, line := range lines {
|
|
||||||
lineLower := strings.ToLower(line)
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.Contains(lineLower, "branch") && strings.Contains(lineLower, "not taken") {
|
|
||||||
if len(line) > 100 {
|
|
||||||
return line[:97] + "..."
|
|
||||||
}
|
|
||||||
return line
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
|
||||||
func extractErrorDetail(message string, maxLen int) string {
|
|
||||||
if message == "" || maxLen <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
lines := strings.Split(message, "\n")
|
|
||||||
var errorLines []string
|
|
||||||
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
lower := strings.ToLower(line)
|
|
||||||
|
|
||||||
if strings.HasPrefix(line, "at ") && strings.Contains(line, "(") {
|
|
||||||
if len(errorLines) > 0 && strings.HasPrefix(strings.ToLower(errorLines[len(errorLines)-1]), "at ") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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 {
|
|
||||||
start := len(lines) - 5
|
|
||||||
if start < 0 {
|
|
||||||
start = 0
|
|
||||||
}
|
|
||||||
for _, line := range lines[start:] {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if line != "" {
|
|
||||||
errorLines = append(errorLines, line)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result := strings.Join(errorLines, " | ")
|
|
||||||
return safeTruncate(result, maxLen)
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
//go:build unix || darwin || linux
|
|
||||||
// +build unix darwin linux
|
|
||||||
|
|
||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"syscall"
|
|
||||||
)
|
|
||||||
|
|
||||||
// sendTermSignal sends SIGTERM for graceful shutdown on Unix.
|
|
||||||
func sendTermSignal(proc processHandle) error {
|
|
||||||
if proc == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return proc.Signal(syscall.SIGTERM)
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
//go:build windows
|
|
||||||
// +build windows
|
|
||||||
|
|
||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// sendTermSignal on Windows directly kills the process.
|
|
||||||
// SIGTERM is not supported on Windows.
|
|
||||||
func sendTermSignal(proc processHandle) error {
|
|
||||||
if proc == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
pid := proc.Pid()
|
|
||||||
if pid > 0 {
|
|
||||||
// Kill the whole process tree to avoid leaving inheriting child processes around.
|
|
||||||
// This also helps prevent exec.Cmd.Wait() from blocking on stderr/stdout pipes held open by children.
|
|
||||||
taskkill := "taskkill"
|
|
||||||
if root := os.Getenv("SystemRoot"); root != "" {
|
|
||||||
taskkill = filepath.Join(root, "System32", "taskkill.exe")
|
|
||||||
}
|
|
||||||
cmd := exec.Command(taskkill, "/PID", strconv.Itoa(pid), "/T", "/F")
|
|
||||||
cmd.Stdout = io.Discard
|
|
||||||
cmd.Stderr = io.Discard
|
|
||||||
if err := cmd.Run(); err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if err := killProcessTree(pid); err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return proc.Kill()
|
|
||||||
}
|
|
||||||
|
|
||||||
func killProcessTree(pid int) error {
|
|
||||||
if pid <= 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
wmic := "wmic"
|
|
||||||
if root := os.Getenv("SystemRoot"); root != "" {
|
|
||||||
wmic = filepath.Join(root, "System32", "wbem", "WMIC.exe")
|
|
||||||
}
|
|
||||||
|
|
||||||
queryChildren := "(ParentProcessId=" + strconv.Itoa(pid) + ")"
|
|
||||||
listCmd := exec.Command(wmic, "process", "where", queryChildren, "get", "ProcessId", "/VALUE")
|
|
||||||
listCmd.Stderr = io.Discard
|
|
||||||
out, err := listCmd.Output()
|
|
||||||
if err == nil {
|
|
||||||
for _, childPID := range parseWMICPIDs(out) {
|
|
||||||
_ = killProcessTree(childPID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
querySelf := "(ProcessId=" + strconv.Itoa(pid) + ")"
|
|
||||||
termCmd := exec.Command(wmic, "process", "where", querySelf, "call", "terminate")
|
|
||||||
termCmd.Stdout = io.Discard
|
|
||||||
termCmd.Stderr = io.Discard
|
|
||||||
if termErr := termCmd.Run(); termErr != nil && err == nil {
|
|
||||||
err = termErr
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseWMICPIDs(out []byte) []int {
|
|
||||||
const prefix = "ProcessId="
|
|
||||||
var pids []int
|
|
||||||
for _, line := range strings.Split(string(out), "\n") {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if !strings.HasPrefix(line, prefix) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
n, err := strconv.Atoi(strings.TrimSpace(strings.TrimPrefix(line, prefix)))
|
|
||||||
if err != nil || n <= 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
pids = append(pids, n)
|
|
||||||
}
|
|
||||||
return pids
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import "strings"
|
|
||||||
|
|
||||||
const stdinSpecialChars = "\n\\\"'`$"
|
|
||||||
|
|
||||||
func ShouldUseStdin(taskText string, piped bool) bool {
|
|
||||||
if piped {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if len(taskText) > 800 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return strings.ContainsAny(taskText, stdinSpecialChars)
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import "context"
|
|
||||||
|
|
||||||
// ParallelConfig defines the JSON schema for parallel execution.
|
|
||||||
type ParallelConfig struct {
|
|
||||||
Tasks []TaskSpec `json:"tasks"`
|
|
||||||
GlobalBackend string `json:"backend,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskSpec describes an individual task entry in the parallel config.
|
|
||||||
type TaskSpec struct {
|
|
||||||
ID string `json:"id"`
|
|
||||||
Task string `json:"task"`
|
|
||||||
WorkDir string `json:"workdir,omitempty"`
|
|
||||||
Dependencies []string `json:"dependencies,omitempty"`
|
|
||||||
SessionID string `json:"session_id,omitempty"`
|
|
||||||
Backend string `json:"backend,omitempty"`
|
|
||||||
Model string `json:"model,omitempty"`
|
|
||||||
ReasoningEffort string `json:"reasoning_effort,omitempty"`
|
|
||||||
Agent string `json:"agent,omitempty"`
|
|
||||||
PromptFile string `json:"prompt_file,omitempty"`
|
|
||||||
SkipPermissions bool `json:"skip_permissions,omitempty"`
|
|
||||||
Mode string `json:"-"`
|
|
||||||
UseStdin bool `json:"-"`
|
|
||||||
Context context.Context `json:"-"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TaskResult captures the execution outcome of a task.
|
|
||||||
type TaskResult struct {
|
|
||||||
TaskID string `json:"task_id"`
|
|
||||||
ExitCode int `json:"exit_code"`
|
|
||||||
Message string `json:"message"`
|
|
||||||
SessionID string `json:"session_id"`
|
|
||||||
Error string `json:"error"`
|
|
||||||
LogPath string `json:"log_path"`
|
|
||||||
// Structured report fields
|
|
||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package executor
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os/exec"
|
|
||||||
|
|
||||||
backend "codeagent-wrapper/internal/backend"
|
|
||||||
)
|
|
||||||
|
|
||||||
type CommandRunner = commandRunner
|
|
||||||
type ProcessHandle = processHandle
|
|
||||||
|
|
||||||
func SetForceKillDelay(seconds int32) (restore func()) {
|
|
||||||
prev := forceKillDelay.Load()
|
|
||||||
forceKillDelay.Store(seconds)
|
|
||||||
return func() { forceKillDelay.Store(prev) }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetSelectBackendFn(fn func(string) (Backend, error)) (restore func()) {
|
|
||||||
prev := selectBackendFn
|
|
||||||
if fn != nil {
|
|
||||||
selectBackendFn = fn
|
|
||||||
} else {
|
|
||||||
selectBackendFn = backend.Select
|
|
||||||
}
|
|
||||||
return func() { selectBackendFn = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetCommandContextFn(fn func(context.Context, string, ...string) *exec.Cmd) (restore func()) {
|
|
||||||
prev := commandContext
|
|
||||||
if fn != nil {
|
|
||||||
commandContext = fn
|
|
||||||
} else {
|
|
||||||
commandContext = exec.CommandContext
|
|
||||||
}
|
|
||||||
return func() { commandContext = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetNewCommandRunner(fn func(context.Context, string, ...string) CommandRunner) (restore func()) {
|
|
||||||
prev := newCommandRunner
|
|
||||||
if fn != nil {
|
|
||||||
newCommandRunner = fn
|
|
||||||
} else {
|
|
||||||
newCommandRunner = func(ctx context.Context, name string, args ...string) commandRunner {
|
|
||||||
return &realCmd{cmd: commandContext(ctx, name, args...)}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return func() { newCommandRunner = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func WithTaskLogger(ctx context.Context, logger *Logger) context.Context {
|
|
||||||
return withTaskLogger(ctx, logger)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TaskLoggerFromContext(ctx context.Context) *Logger {
|
|
||||||
return taskLoggerFromContext(ctx)
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
import "sync/atomic"
|
|
||||||
|
|
||||||
var loggerPtr atomic.Pointer[Logger]
|
|
||||||
|
|
||||||
func setLogger(l *Logger) {
|
|
||||||
loggerPtr.Store(l)
|
|
||||||
}
|
|
||||||
|
|
||||||
func closeLogger() error {
|
|
||||||
logger := loggerPtr.Swap(nil)
|
|
||||||
if logger == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return logger.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func activeLogger() *Logger {
|
|
||||||
return loggerPtr.Load()
|
|
||||||
}
|
|
||||||
|
|
||||||
func logDebug(msg string) {
|
|
||||||
if logger := activeLogger(); logger != nil {
|
|
||||||
logger.Debug(msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func logInfo(msg string) {
|
|
||||||
if logger := activeLogger(); logger != nil {
|
|
||||||
logger.Info(msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func logWarn(msg string) {
|
|
||||||
if logger := activeLogger(); logger != nil {
|
|
||||||
logger.Warn(msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func logError(msg string) {
|
|
||||||
if logger := activeLogger(); logger != nil {
|
|
||||||
logger.Error(msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetLogger(l *Logger) { setLogger(l) }
|
|
||||||
|
|
||||||
func CloseLogger() error { return closeLogger() }
|
|
||||||
|
|
||||||
func ActiveLogger() *Logger { return activeLogger() }
|
|
||||||
|
|
||||||
func LogInfo(msg string) { logInfo(msg) }
|
|
||||||
|
|
||||||
func LogDebug(msg string) { logDebug(msg) }
|
|
||||||
|
|
||||||
func LogWarn(msg string) { logWarn(msg) }
|
|
||||||
|
|
||||||
func LogError(msg string) { logError(msg) }
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"math"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/shirou/gopsutil/v3/process"
|
|
||||||
)
|
|
||||||
|
|
||||||
func pidToInt32(pid int) (int32, bool) {
|
|
||||||
if pid <= 0 || pid > math.MaxInt32 {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
return int32(pid), true
|
|
||||||
}
|
|
||||||
|
|
||||||
// isProcessRunning reports whether a process with the given pid appears to be running.
|
|
||||||
// It is intentionally conservative on errors to avoid deleting logs for live processes.
|
|
||||||
func isProcessRunning(pid int) bool {
|
|
||||||
pid32, ok := pidToInt32(pid)
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
exists, err := process.PidExists(pid32)
|
|
||||||
if err == nil {
|
|
||||||
return exists
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we can positively identify that the process doesn't exist, report false.
|
|
||||||
if errors.Is(err, process.ErrorProcessNotRunning) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// Permission/inspection failures: assume it's running to be safe.
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// getProcessStartTime returns the start time of a process.
|
|
||||||
// Returns zero time if the start time cannot be determined.
|
|
||||||
func getProcessStartTime(pid int) time.Time {
|
|
||||||
pid32, ok := pidToInt32(pid)
|
|
||||||
if !ok {
|
|
||||||
return time.Time{}
|
|
||||||
}
|
|
||||||
|
|
||||||
proc, err := process.NewProcess(pid32)
|
|
||||||
if err != nil {
|
|
||||||
return time.Time{}
|
|
||||||
}
|
|
||||||
|
|
||||||
ms, err := proc.CreateTime()
|
|
||||||
if err != nil || ms <= 0 {
|
|
||||||
return time.Time{}
|
|
||||||
}
|
|
||||||
|
|
||||||
return time.UnixMilli(ms)
|
|
||||||
}
|
|
||||||
|
|
||||||
func IsProcessRunning(pid int) bool { return isProcessRunning(pid) }
|
|
||||||
|
|
||||||
func GetProcessStartTime(pid int) time.Time { return getProcessStartTime(pid) }
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
import (
|
|
||||||
"math"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"runtime"
|
|
||||||
"strconv"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestIsProcessRunning(t *testing.T) {
|
|
||||||
t.Run("boundary values", func(t *testing.T) {
|
|
||||||
if isProcessRunning(0) {
|
|
||||||
t.Fatalf("pid 0 should never be treated as running")
|
|
||||||
}
|
|
||||||
if isProcessRunning(-1) {
|
|
||||||
t.Fatalf("negative pid should never be treated as running")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("pid out of int32 range", func(t *testing.T) {
|
|
||||||
if strconv.IntSize <= 32 {
|
|
||||||
t.Skip("int cannot represent values above int32 range")
|
|
||||||
}
|
|
||||||
|
|
||||||
pid := int(int64(math.MaxInt32) + 1)
|
|
||||||
if isProcessRunning(pid) {
|
|
||||||
t.Fatalf("expected pid %d (out of int32 range) to be treated as not running", pid)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("current process", func(t *testing.T) {
|
|
||||||
if !isProcessRunning(os.Getpid()) {
|
|
||||||
t.Fatalf("expected current process (pid=%d) to be running", os.Getpid())
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("fake pid", func(t *testing.T) {
|
|
||||||
const nonexistentPID = 1 << 30
|
|
||||||
if isProcessRunning(nonexistentPID) {
|
|
||||||
t.Fatalf("expected pid %d to be reported as not running", nonexistentPID)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("terminated process", func(t *testing.T) {
|
|
||||||
pid := exitedProcessPID(t)
|
|
||||||
if isProcessRunning(pid) {
|
|
||||||
t.Fatalf("expected exited child process (pid=%d) to be reported as not running", pid)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func exitedProcessPID(t *testing.T) int {
|
|
||||||
t.Helper()
|
|
||||||
|
|
||||||
var cmd *exec.Cmd
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
cmd = exec.Command("cmd", "/c", "exit 0")
|
|
||||||
} else {
|
|
||||||
cmd = exec.Command("sh", "-c", "exit 0")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := cmd.Start(); err != nil {
|
|
||||||
t.Fatalf("failed to start helper process: %v", err)
|
|
||||||
}
|
|
||||||
pid := cmd.Process.Pid
|
|
||||||
|
|
||||||
if err := cmd.Wait(); err != nil {
|
|
||||||
t.Fatalf("helper process did not exit cleanly: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
time.Sleep(50 * time.Millisecond)
|
|
||||||
return pid
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetProcessStartTimeReadsProcStat(t *testing.T) {
|
|
||||||
start := getProcessStartTime(os.Getpid())
|
|
||||||
if start.IsZero() {
|
|
||||||
t.Fatalf("expected non-zero start time for current process")
|
|
||||||
}
|
|
||||||
if start.After(time.Now().Add(5 * time.Second)) {
|
|
||||||
t.Fatalf("start time is unexpectedly in the future: %v", start)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetProcessStartTimeInvalidData(t *testing.T) {
|
|
||||||
if !getProcessStartTime(0).IsZero() {
|
|
||||||
t.Fatalf("expected zero time for pid 0")
|
|
||||||
}
|
|
||||||
if !getProcessStartTime(-1).IsZero() {
|
|
||||||
t.Fatalf("expected zero time for negative pid")
|
|
||||||
}
|
|
||||||
if !getProcessStartTime(1 << 30).IsZero() {
|
|
||||||
t.Fatalf("expected zero time for non-existent pid")
|
|
||||||
}
|
|
||||||
if strconv.IntSize > 32 {
|
|
||||||
pid := int(int64(math.MaxInt32) + 1)
|
|
||||||
if !getProcessStartTime(pid).IsZero() {
|
|
||||||
t.Fatalf("expected zero time for pid %d (out of int32 range)", pid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetBootTimeParsesBtime(t *testing.T) {
|
|
||||||
t.Skip("legacy boot-time probing removed; start time now uses gopsutil")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetBootTimeInvalidData(t *testing.T) {
|
|
||||||
t.Skip("legacy boot-time probing removed; start time now uses gopsutil")
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func SetProcessRunningCheck(fn func(int) bool) (restore func()) {
|
|
||||||
prev := processRunningCheck
|
|
||||||
if fn != nil {
|
|
||||||
processRunningCheck = fn
|
|
||||||
} else {
|
|
||||||
processRunningCheck = isProcessRunning
|
|
||||||
}
|
|
||||||
return func() { processRunningCheck = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetProcessStartTimeFn(fn func(int) time.Time) (restore func()) {
|
|
||||||
prev := processStartTimeFn
|
|
||||||
if fn != nil {
|
|
||||||
processStartTimeFn = fn
|
|
||||||
} else {
|
|
||||||
processStartTimeFn = getProcessStartTime
|
|
||||||
}
|
|
||||||
return func() { processStartTimeFn = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetRemoveLogFileFn(fn func(string) error) (restore func()) {
|
|
||||||
prev := removeLogFileFn
|
|
||||||
if fn != nil {
|
|
||||||
removeLogFileFn = fn
|
|
||||||
} else {
|
|
||||||
removeLogFileFn = os.Remove
|
|
||||||
}
|
|
||||||
return func() { removeLogFileFn = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetGlobLogFilesFn(fn func(string) ([]string, error)) (restore func()) {
|
|
||||||
prev := globLogFiles
|
|
||||||
if fn != nil {
|
|
||||||
globLogFiles = fn
|
|
||||||
} else {
|
|
||||||
globLogFiles = filepath.Glob
|
|
||||||
}
|
|
||||||
return func() { globLogFiles = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetFileStatFn(fn func(string) (os.FileInfo, error)) (restore func()) {
|
|
||||||
prev := fileStatFn
|
|
||||||
if fn != nil {
|
|
||||||
fileStatFn = fn
|
|
||||||
} else {
|
|
||||||
fileStatFn = os.Lstat
|
|
||||||
}
|
|
||||||
return func() { fileStatFn = prev }
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetEvalSymlinksFn(fn func(string) (string, error)) (restore func()) {
|
|
||||||
prev := evalSymlinksFn
|
|
||||||
if fn != nil {
|
|
||||||
evalSymlinksFn = fn
|
|
||||||
} else {
|
|
||||||
evalSymlinksFn = filepath.EvalSymlinks
|
|
||||||
}
|
|
||||||
return func() { evalSymlinksFn = prev }
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
// WrapperName is the fixed name for this tool.
|
|
||||||
const WrapperName = "codeagent-wrapper"
|
|
||||||
|
|
||||||
// CurrentWrapperName returns the wrapper name (always "codeagent-wrapper").
|
|
||||||
func CurrentWrapperName() string { return WrapperName }
|
|
||||||
|
|
||||||
// LogPrefixes returns the log file name prefixes to look for.
|
|
||||||
func LogPrefixes() []string { return []string{WrapperName} }
|
|
||||||
|
|
||||||
// PrimaryLogPrefix returns the preferred filename prefix for log files.
|
|
||||||
func PrimaryLogPrefix() string { return WrapperName }
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package parser
|
|
||||||
|
|
||||||
import "github.com/goccy/go-json"
|
|
||||||
|
|
||||||
// JSONEvent represents a Codex JSON output event.
|
|
||||||
type JSONEvent struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
ThreadID string `json:"thread_id,omitempty"`
|
|
||||||
Item *EventItem `json:"item,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// EventItem represents the item field in a JSON event.
|
|
||||||
type EventItem struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
Text interface{} `json:"text"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ClaudeEvent for Claude stream-json format.
|
|
||||||
type ClaudeEvent struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
Subtype string `json:"subtype,omitempty"`
|
|
||||||
SessionID string `json:"session_id,omitempty"`
|
|
||||||
Result string `json:"result,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GeminiEvent for Gemini stream-json format.
|
|
||||||
type GeminiEvent struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
SessionID string `json:"session_id,omitempty"`
|
|
||||||
Role string `json:"role,omitempty"`
|
|
||||||
Content string `json:"content,omitempty"`
|
|
||||||
Delta bool `json:"delta,omitempty"`
|
|
||||||
Status string `json:"status,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnifiedEvent combines all backend event formats into a single structure
|
|
||||||
// to avoid multiple JSON unmarshal operations per event.
|
|
||||||
type UnifiedEvent struct {
|
|
||||||
// Common fields
|
|
||||||
Type string `json:"type"`
|
|
||||||
|
|
||||||
// Codex-specific fields
|
|
||||||
ThreadID string `json:"thread_id,omitempty"`
|
|
||||||
Item json.RawMessage `json:"item,omitempty"` // Lazy parse
|
|
||||||
|
|
||||||
// Claude-specific fields
|
|
||||||
Subtype string `json:"subtype,omitempty"`
|
|
||||||
SessionID string `json:"session_id,omitempty"`
|
|
||||||
Result string `json:"result,omitempty"`
|
|
||||||
|
|
||||||
// Gemini-specific fields
|
|
||||||
Role string `json:"role,omitempty"`
|
|
||||||
Content string `json:"content,omitempty"`
|
|
||||||
Delta *bool `json:"delta,omitempty"`
|
|
||||||
Status string `json:"status,omitempty"`
|
|
||||||
|
|
||||||
// Opencode-specific fields (camelCase sessionID)
|
|
||||||
OpencodeSessionID string `json:"sessionID,omitempty"`
|
|
||||||
Part json.RawMessage `json:"part,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// OpencodePart represents the part field in opencode events.
|
|
||||||
type OpencodePart struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
Text string `json:"text,omitempty"`
|
|
||||||
Reason string `json:"reason,omitempty"`
|
|
||||||
SessionID string `json:"sessionID,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ItemContent represents the parsed item.text field for Codex events.
|
|
||||||
type ItemContent struct {
|
|
||||||
Type string `json:"type"`
|
|
||||||
Text interface{} `json:"text"`
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package parser
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestParseJSONStream_Opencode(t *testing.T) {
|
|
||||||
input := `{"type":"step_start","timestamp":1768187730683,"sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","part":{"id":"prt_bb0339afa001NTqoJ2NS8x91zP","sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","messageID":"msg_bb033866f0011oZxTqvfy0TKtS","type":"step-start","snapshot":"904f0fd58c125b79e60f0993e38f9d9f6200bf47"}}
|
|
||||||
{"type":"text","timestamp":1768187744432,"sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","part":{"id":"prt_bb0339cb5001QDd0Lh0PzFZpa3","sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","messageID":"msg_bb033866f0011oZxTqvfy0TKtS","type":"text","text":"Hello from opencode"}}
|
|
||||||
{"type":"step_finish","timestamp":1768187744471,"sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","part":{"id":"prt_bb033d0af0019VRZzpO2OVW1na","sessionID":"ses_44fced3c7ffe83sZpzY1rlQka3","messageID":"msg_bb033866f0011oZxTqvfy0TKtS","type":"step-finish","reason":"stop","snapshot":"904f0fd58c125b79e60f0993e38f9d9f6200bf47","cost":0}}`
|
|
||||||
|
|
||||||
message, threadID := ParseJSONStreamInternal(strings.NewReader(input), nil, nil, nil, nil)
|
|
||||||
|
|
||||||
if threadID != "ses_44fced3c7ffe83sZpzY1rlQka3" {
|
|
||||||
t.Errorf("threadID = %q, want %q", threadID, "ses_44fced3c7ffe83sZpzY1rlQka3")
|
|
||||||
}
|
|
||||||
if message != "Hello from opencode" {
|
|
||||||
t.Errorf("message = %q, want %q", message, "Hello from opencode")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseJSONStream_Opencode_MultipleTextEvents(t *testing.T) {
|
|
||||||
input := `{"type":"text","sessionID":"ses_123","part":{"type":"text","text":"Part 1"}}
|
|
||||||
{"type":"text","sessionID":"ses_123","part":{"type":"text","text":" Part 2"}}
|
|
||||||
{"type":"step_finish","sessionID":"ses_123","part":{"type":"step-finish","reason":"stop"}}`
|
|
||||||
|
|
||||||
message, threadID := ParseJSONStreamInternal(strings.NewReader(input), nil, nil, nil, nil)
|
|
||||||
|
|
||||||
if threadID != "ses_123" {
|
|
||||||
t.Errorf("threadID = %q, want %q", threadID, "ses_123")
|
|
||||||
}
|
|
||||||
if message != "Part 1 Part 2" {
|
|
||||||
t.Errorf("message = %q, want %q", message, "Part 1 Part 2")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseJSONStream_Opencode_NoStopReason(t *testing.T) {
|
|
||||||
input := `{"type":"text","sessionID":"ses_456","part":{"type":"text","text":"Content"}}
|
|
||||||
{"type":"step_finish","sessionID":"ses_456","part":{"type":"step-finish","reason":"tool-calls"}}`
|
|
||||||
|
|
||||||
message, threadID := ParseJSONStreamInternal(strings.NewReader(input), nil, nil, nil, nil)
|
|
||||||
|
|
||||||
if threadID != "ses_456" {
|
|
||||||
t.Errorf("threadID = %q, want %q", threadID, "ses_456")
|
|
||||||
}
|
|
||||||
if message != "Content" {
|
|
||||||
t.Errorf("message = %q, want %q", message, "Content")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package parser
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestBackendParseJSONStream_UnknownEventsAreSilent(t *testing.T) {
|
|
||||||
input := strings.Join([]string{
|
|
||||||
`{"type":"turn.started"}`,
|
|
||||||
`{"type":"assistant","text":"hi"}`,
|
|
||||||
`{"type":"user","text":"yo"}`,
|
|
||||||
`{"type":"item.completed","item":{"type":"agent_message","text":"ok"}}`,
|
|
||||||
}, "\n")
|
|
||||||
|
|
||||||
var infos []string
|
|
||||||
infoFn := func(msg string) { infos = append(infos, msg) }
|
|
||||||
|
|
||||||
message, threadID := ParseJSONStreamInternal(strings.NewReader(input), nil, infoFn, nil, nil)
|
|
||||||
if message != "ok" {
|
|
||||||
t.Fatalf("message=%q, want %q (infos=%v)", message, "ok", infos)
|
|
||||||
}
|
|
||||||
if threadID != "" {
|
|
||||||
t.Fatalf("threadID=%q, want empty (infos=%v)", threadID, infos)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, msg := range infos {
|
|
||||||
if strings.Contains(msg, "Agent event:") {
|
|
||||||
t.Fatalf("unexpected log for unknown event: %q", msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package parser
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestTruncateBytes(t *testing.T) {
|
|
||||||
if got := TruncateBytes([]byte("abc"), 3); got != "abc" {
|
|
||||||
t.Fatalf("TruncateBytes() = %q, want %q", got, "abc")
|
|
||||||
}
|
|
||||||
if got := TruncateBytes([]byte("abcd"), 3); got != "abc..." {
|
|
||||||
t.Fatalf("TruncateBytes() = %q, want %q", got, "abc...")
|
|
||||||
}
|
|
||||||
if got := TruncateBytes([]byte("abcd"), -1); got != "" {
|
|
||||||
t.Fatalf("TruncateBytes() = %q, want empty string", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
func Min(a, b int) int {
|
|
||||||
if a < b {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestMin(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
a, b int
|
|
||||||
want int
|
|
||||||
}{
|
|
||||||
{"a less than b", 1, 2, 1},
|
|
||||||
{"b less than a", 5, 3, 3},
|
|
||||||
{"equal values", 7, 7, 7},
|
|
||||||
{"negative a", -5, 3, -5},
|
|
||||||
{"negative b", 5, -3, -3},
|
|
||||||
{"both negative", -5, -3, -5},
|
|
||||||
{"zero and positive", 0, 5, 0},
|
|
||||||
{"zero and negative", 0, -5, -5},
|
|
||||||
{"large values", 1000000, 999999, 999999},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := Min(tt.a, tt.b)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("Min(%d, %d) = %d, want %d", tt.a, tt.b, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkMin(b *testing.B) {
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
Min(i, i+1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import "strings"
|
|
||||||
|
|
||||||
func Truncate(s string, maxLen int) string {
|
|
||||||
if len(s) <= maxLen {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
if maxLen < 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
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()
|
|
||||||
}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestTruncate(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
s string
|
|
||||||
maxLen int
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"empty string", "", 10, ""},
|
|
||||||
{"short string", "hello", 10, "hello"},
|
|
||||||
{"exact length", "hello", 5, "hello"},
|
|
||||||
{"needs truncation", "hello world", 5, "hello..."},
|
|
||||||
{"zero maxLen", "hello", 0, "..."},
|
|
||||||
{"negative maxLen", "hello", -1, ""},
|
|
||||||
{"maxLen 1", "hello", 1, "h..."},
|
|
||||||
{"unicode bytes truncate", "你好世界", 10, "你好世\xe7..."}, // Truncate works on bytes, not runes
|
|
||||||
{"mixed truncate", "hello世界abc", 7, "hello\xe4\xb8..."}, // byte-based truncation
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := Truncate(tt.s, tt.maxLen)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("Truncate(%q, %d) = %q, want %q", tt.s, tt.maxLen, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSafeTruncate(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
s string
|
|
||||||
maxLen int
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"empty string", "", 10, ""},
|
|
||||||
{"zero maxLen", "hello", 0, ""},
|
|
||||||
{"negative maxLen", "hello", -1, ""},
|
|
||||||
{"short string", "hello", 10, "hello"},
|
|
||||||
{"exact length", "hello", 5, "hello"},
|
|
||||||
{"needs truncation", "hello world", 8, "hello..."},
|
|
||||||
{"maxLen 1", "hello", 1, "h"},
|
|
||||||
{"maxLen 2", "hello", 2, "h"},
|
|
||||||
{"maxLen 3", "hello", 3, "h"},
|
|
||||||
{"maxLen 4", "hello", 4, "h..."},
|
|
||||||
{"unicode preserved", "你好世界", 10, "你好世界"},
|
|
||||||
{"unicode exact", "你好世界", 4, "你好世界"},
|
|
||||||
{"unicode truncate", "你好世界test", 6, "你好世..."},
|
|
||||||
{"mixed unicode", "ab你好cd", 5, "ab..."},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := SafeTruncate(tt.s, tt.maxLen)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("SafeTruncate(%q, %d) = %q, want %q", tt.s, tt.maxLen, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSanitizeOutput(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
s string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"empty string", "", ""},
|
|
||||||
{"plain text", "hello world", "hello world"},
|
|
||||||
{"with newline", "hello\nworld", "hello\nworld"},
|
|
||||||
{"with tab", "hello\tworld", "hello\tworld"},
|
|
||||||
{"ANSI color red", "\x1b[31mred\x1b[0m", "red"},
|
|
||||||
{"ANSI bold", "\x1b[1mbold\x1b[0m", "bold"},
|
|
||||||
{"ANSI complex", "\x1b[1;31;40mtext\x1b[0m", "text"},
|
|
||||||
{"control chars", "hello\x00\x01\x02world", "helloworld"},
|
|
||||||
{"mixed ANSI and control", "\x1b[32m\x00ok\x1b[0m", "ok"},
|
|
||||||
{"multiple ANSI sequences", "\x1b[31mred\x1b[0m \x1b[32mgreen\x1b[0m", "red green"},
|
|
||||||
{"incomplete escape", "\x1b[", ""},
|
|
||||||
{"escape without bracket", "\x1bA", "A"},
|
|
||||||
{"cursor movement", "\x1b[2Aup\x1b[2Bdown", "updown"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got := SanitizeOutput(tt.s)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("SanitizeOutput(%q) = %q, want %q", tt.s, got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkTruncate(b *testing.B) {
|
|
||||||
s := strings.Repeat("hello world ", 100)
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
Truncate(s, 50)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkSafeTruncate(b *testing.B) {
|
|
||||||
s := strings.Repeat("你好世界", 100)
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
SafeTruncate(s, 50)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkSanitizeOutput(b *testing.B) {
|
|
||||||
s := strings.Repeat("\x1b[31mred\x1b[0m text ", 50)
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
SanitizeOutput(s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package executor
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
@@ -7,12 +7,14 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestLogWriterWriteLimitsBuffer(t *testing.T) {
|
func TestLogWriterWriteLimitsBuffer(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
logger, err := NewLogger()
|
logger, err := NewLogger()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("NewLogger error: %v", err)
|
t.Fatalf("NewLogger error: %v", err)
|
||||||
}
|
}
|
||||||
setLogger(logger)
|
setLogger(logger)
|
||||||
t.Cleanup(func() { _ = closeLogger() })
|
defer closeLogger()
|
||||||
|
|
||||||
lw := newLogWriter("P:", 10)
|
lw := newLogWriter("P:", 10)
|
||||||
_, _ = lw.Write([]byte(strings.Repeat("a", 100)))
|
_, _ = lw.Write([]byte(strings.Repeat("a", 100)))
|
||||||
@@ -34,3 +36,4 @@ func TestLogWriterWriteLimitsBuffer(t *testing.T) {
|
|||||||
t.Fatalf("log output missing truncated entry, got %q", string(data))
|
t.Fatalf("log output missing truncated entry, got %q", string(data))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package logger
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
@@ -13,8 +13,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Logger writes log messages asynchronously to a temp file.
|
// Logger writes log messages asynchronously to a temp file.
|
||||||
@@ -24,7 +22,6 @@ type Logger struct {
|
|||||||
path string
|
path string
|
||||||
file *os.File
|
file *os.File
|
||||||
writer *bufio.Writer
|
writer *bufio.Writer
|
||||||
zlogger zerolog.Logger
|
|
||||||
ch chan logEntry
|
ch chan logEntry
|
||||||
flushReq chan chan struct{}
|
flushReq chan chan struct{}
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
@@ -40,7 +37,6 @@ type Logger struct {
|
|||||||
|
|
||||||
type logEntry struct {
|
type logEntry struct {
|
||||||
msg string
|
msg string
|
||||||
level zerolog.Level
|
|
||||||
isError bool // true for ERROR or WARN levels
|
isError bool // true for ERROR or WARN levels
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,7 +73,7 @@ func NewLogger() (*Logger, error) {
|
|||||||
// Useful for tests that need isolated log files within the same process.
|
// Useful for tests that need isolated log files within the same process.
|
||||||
func NewLoggerWithSuffix(suffix string) (*Logger, error) {
|
func NewLoggerWithSuffix(suffix string) (*Logger, error) {
|
||||||
pid := os.Getpid()
|
pid := os.Getpid()
|
||||||
filename := fmt.Sprintf("%s-%d", PrimaryLogPrefix(), pid)
|
filename := fmt.Sprintf("%s-%d", primaryLogPrefix(), pid)
|
||||||
var safeSuffix string
|
var safeSuffix string
|
||||||
if suffix != "" {
|
if suffix != "" {
|
||||||
safeSuffix = sanitizeLogSuffix(suffix)
|
safeSuffix = sanitizeLogSuffix(suffix)
|
||||||
@@ -107,8 +103,6 @@ func NewLoggerWithSuffix(suffix string) (*Logger, error) {
|
|||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
}
|
}
|
||||||
|
|
||||||
l.zlogger = zerolog.New(l.writer).With().Timestamp().Logger()
|
|
||||||
|
|
||||||
l.workerWG.Add(1)
|
l.workerWG.Add(1)
|
||||||
go l.run()
|
go l.run()
|
||||||
|
|
||||||
@@ -190,24 +184,17 @@ func (l *Logger) Path() string {
|
|||||||
return l.path
|
return l.path
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *Logger) IsClosed() bool {
|
|
||||||
if l == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return l.closed.Load()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Info logs at INFO level.
|
// Info logs at INFO level.
|
||||||
func (l *Logger) Info(msg string) { l.logWithLevel(zerolog.InfoLevel, msg) }
|
func (l *Logger) Info(msg string) { l.log("INFO", msg) }
|
||||||
|
|
||||||
// Warn logs at WARN level.
|
// Warn logs at WARN level.
|
||||||
func (l *Logger) Warn(msg string) { l.logWithLevel(zerolog.WarnLevel, msg) }
|
func (l *Logger) Warn(msg string) { l.log("WARN", msg) }
|
||||||
|
|
||||||
// Debug logs at DEBUG level.
|
// Debug logs at DEBUG level.
|
||||||
func (l *Logger) Debug(msg string) { l.logWithLevel(zerolog.DebugLevel, msg) }
|
func (l *Logger) Debug(msg string) { l.log("DEBUG", msg) }
|
||||||
|
|
||||||
// Error logs at ERROR level.
|
// Error logs at ERROR level.
|
||||||
func (l *Logger) Error(msg string) { l.logWithLevel(zerolog.ErrorLevel, msg) }
|
func (l *Logger) Error(msg string) { l.log("ERROR", msg) }
|
||||||
|
|
||||||
// Close signals the worker to flush and close the log file.
|
// Close signals the worker to flush and close the log file.
|
||||||
// The log file is NOT removed, allowing inspection after program exit.
|
// The log file is NOT removed, allowing inspection after program exit.
|
||||||
@@ -348,7 +335,7 @@ func (l *Logger) Flush() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *Logger) logWithLevel(entryLevel zerolog.Level, msg string) {
|
func (l *Logger) log(level, msg string) {
|
||||||
if l == nil {
|
if l == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -356,8 +343,8 @@ func (l *Logger) logWithLevel(entryLevel zerolog.Level, msg string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
isError := entryLevel == zerolog.WarnLevel || entryLevel == zerolog.ErrorLevel
|
isError := level == "WARN" || level == "ERROR"
|
||||||
entry := logEntry{msg: msg, level: entryLevel, isError: isError}
|
entry := logEntry{msg: msg, isError: isError}
|
||||||
l.flushMu.Lock()
|
l.flushMu.Lock()
|
||||||
l.pendingWG.Add(1)
|
l.pendingWG.Add(1)
|
||||||
l.flushMu.Unlock()
|
l.flushMu.Unlock()
|
||||||
@@ -379,7 +366,7 @@ func (l *Logger) run() {
|
|||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
writeEntry := func(entry logEntry) {
|
writeEntry := func(entry logEntry) {
|
||||||
l.zlogger.WithLevel(entry.level).Msg(entry.msg)
|
fmt.Fprintf(l.writer, "%s\n", 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 {
|
||||||
@@ -451,7 +438,10 @@ func cleanupOldLogs() (CleanupStats, error) {
|
|||||||
var stats CleanupStats
|
var stats CleanupStats
|
||||||
tempDir := os.TempDir()
|
tempDir := os.TempDir()
|
||||||
|
|
||||||
prefixes := LogPrefixes()
|
prefixes := logPrefixes()
|
||||||
|
if len(prefixes) == 0 {
|
||||||
|
prefixes = []string{defaultWrapperName}
|
||||||
|
}
|
||||||
|
|
||||||
seen := make(map[string]struct{})
|
seen := make(map[string]struct{})
|
||||||
var matches []string
|
var matches []string
|
||||||
@@ -482,8 +472,7 @@ func cleanupOldLogs() (CleanupStats, error) {
|
|||||||
stats.Kept++
|
stats.Kept++
|
||||||
stats.KeptFiles = append(stats.KeptFiles, filename)
|
stats.KeptFiles = append(stats.KeptFiles, filename)
|
||||||
if reason != "" {
|
if reason != "" {
|
||||||
// Use Debug level to avoid polluting Recent Errors with cleanup noise
|
logWarn(fmt.Sprintf("cleanupOldLogs: skipping %s: %s", filename, reason))
|
||||||
logDebug(fmt.Sprintf("cleanupOldLogs: skipping %s: %s", filename, reason))
|
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -601,7 +590,10 @@ func isPIDReused(logPath string, pid int) bool {
|
|||||||
if procStartTime.IsZero() {
|
if procStartTime.IsZero() {
|
||||||
// Can't determine process start time
|
// Can't determine process start time
|
||||||
// Check if file is very old (>7 days), likely from a dead process
|
// Check if file is very old (>7 days), likely from a dead process
|
||||||
return time.Since(fileModTime) > 7*24*time.Hour
|
if time.Since(fileModTime) > 7*24*time.Hour {
|
||||||
|
return true // File is old enough to be from a different process
|
||||||
|
}
|
||||||
|
return false // Be conservative for recent files
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the log file was modified before the process started, PID was reused
|
// If the log file was modified before the process started, PID was reused
|
||||||
@@ -611,7 +603,10 @@ func isPIDReused(logPath string, pid int) bool {
|
|||||||
|
|
||||||
func parsePIDFromLog(path string) (int, bool) {
|
func parsePIDFromLog(path string) (int, bool) {
|
||||||
name := filepath.Base(path)
|
name := filepath.Base(path)
|
||||||
prefixes := LogPrefixes()
|
prefixes := logPrefixes()
|
||||||
|
if len(prefixes) == 0 {
|
||||||
|
prefixes = []string{defaultWrapperName}
|
||||||
|
}
|
||||||
|
|
||||||
for _, prefix := range prefixes {
|
for _, prefix := range prefixes {
|
||||||
prefixWithDash := fmt.Sprintf("%s-", prefix)
|
prefixWithDash := fmt.Sprintf("%s-", prefix)
|
||||||
@@ -665,19 +660,3 @@ func renderWorkerLimit(limit int) string {
|
|||||||
}
|
}
|
||||||
return strconv.Itoa(limit)
|
return strconv.Itoa(limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CleanupOldLogs() (CleanupStats, error) { return cleanupOldLogs() }
|
|
||||||
|
|
||||||
func IsUnsafeFile(path string, tempDir string) (bool, string) { return isUnsafeFile(path, tempDir) }
|
|
||||||
|
|
||||||
func IsPIDReused(logPath string, pid int) bool { return isPIDReused(logPath, pid) }
|
|
||||||
|
|
||||||
func ParsePIDFromLog(path string) (int, bool) { return parsePIDFromLog(path) }
|
|
||||||
|
|
||||||
func LogConcurrencyPlanning(limit, total int) { logConcurrencyPlanning(limit, total) }
|
|
||||||
|
|
||||||
func LogConcurrencyState(event, taskID string, active, limit int) {
|
|
||||||
logConcurrencyState(event, taskID, active, limit)
|
|
||||||
}
|
|
||||||
|
|
||||||
func SanitizeLogSuffix(raw string) string { return sanitizeLogSuffix(raw) }
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package logger
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -28,7 +28,7 @@ func TestLoggerConcurrencyLogHelpers(t *testing.T) {
|
|||||||
t.Fatalf("NewLoggerWithSuffix error: %v", err)
|
t.Fatalf("NewLoggerWithSuffix error: %v", err)
|
||||||
}
|
}
|
||||||
setLogger(logger)
|
setLogger(logger)
|
||||||
defer func() { _ = closeLogger() }()
|
defer closeLogger()
|
||||||
|
|
||||||
logConcurrencyPlanning(0, 2)
|
logConcurrencyPlanning(0, 2)
|
||||||
logConcurrencyPlanning(3, 2)
|
logConcurrencyPlanning(3, 2)
|
||||||
@@ -64,8 +64,8 @@ func TestLoggerConcurrencyLogHelpersNoopWithoutActiveLogger(t *testing.T) {
|
|||||||
func TestLoggerCleanupOldLogsSkipsUnsafeAndHandlesAlreadyDeleted(t *testing.T) {
|
func TestLoggerCleanupOldLogsSkipsUnsafeAndHandlesAlreadyDeleted(t *testing.T) {
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
unsafePath := createTempLog(t, tempDir, fmt.Sprintf("%s-%d.log", PrimaryLogPrefix(), 222))
|
unsafePath := createTempLog(t, tempDir, fmt.Sprintf("%s-%d.log", primaryLogPrefix(), 222))
|
||||||
orphanPath := createTempLog(t, tempDir, fmt.Sprintf("%s-%d.log", PrimaryLogPrefix(), 111))
|
orphanPath := createTempLog(t, tempDir, fmt.Sprintf("%s-%d.log", primaryLogPrefix(), 111))
|
||||||
|
|
||||||
stubFileStat(t, func(path string) (os.FileInfo, error) {
|
stubFileStat(t, func(path string) (os.FileInfo, error) {
|
||||||
if path == unsafePath {
|
if path == unsafePath {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package logger
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -26,12 +26,12 @@ func TestLoggerWithSuffixNamingAndIsolation(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer loggerB.Close()
|
defer loggerB.Close()
|
||||||
|
|
||||||
wantA := filepath.Join(tempDir, fmt.Sprintf("%s-%d-%s.log", PrimaryLogPrefix(), os.Getpid(), taskA))
|
wantA := filepath.Join(tempDir, fmt.Sprintf("%s-%d-%s.log", primaryLogPrefix(), os.Getpid(), taskA))
|
||||||
if loggerA.Path() != wantA {
|
if loggerA.Path() != wantA {
|
||||||
t.Fatalf("loggerA path = %q, want %q", loggerA.Path(), wantA)
|
t.Fatalf("loggerA path = %q, want %q", loggerA.Path(), wantA)
|
||||||
}
|
}
|
||||||
|
|
||||||
wantB := filepath.Join(tempDir, fmt.Sprintf("%s-%d-%s.log", PrimaryLogPrefix(), os.Getpid(), taskB))
|
wantB := filepath.Join(tempDir, fmt.Sprintf("%s-%d-%s.log", primaryLogPrefix(), os.Getpid(), taskB))
|
||||||
if loggerB.Path() != wantB {
|
if loggerB.Path() != wantB {
|
||||||
t.Fatalf("loggerB path = %q, want %q", loggerB.Path(), wantB)
|
t.Fatalf("loggerB path = %q, want %q", loggerB.Path(), wantB)
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ func TestLoggerWithSuffixSanitizesUnsafeSuffix(t *testing.T) {
|
|||||||
_ = os.Remove(logger.Path())
|
_ = os.Remove(logger.Path())
|
||||||
})
|
})
|
||||||
|
|
||||||
wantBase := fmt.Sprintf("%s-%d-%s.log", PrimaryLogPrefix(), os.Getpid(), safe)
|
wantBase := fmt.Sprintf("%s-%d-%s.log", primaryLogPrefix(), os.Getpid(), safe)
|
||||||
if gotBase := filepath.Base(logger.Path()); gotBase != wantBase {
|
if gotBase := filepath.Base(logger.Path()); gotBase != wantBase {
|
||||||
t.Fatalf("log filename = %q, want %q", gotBase, wantBase)
|
t.Fatalf("log filename = %q, want %q", gotBase, wantBase)
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package logger
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -76,6 +77,30 @@ func TestLoggerWritesLevels(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLoggerDefaultIsTerminalCoverage(t *testing.T) {
|
||||||
|
oldStdin := os.Stdin
|
||||||
|
t.Cleanup(func() { os.Stdin = oldStdin })
|
||||||
|
|
||||||
|
f, err := os.CreateTemp(t.TempDir(), "stdin-*")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("os.CreateTemp() error = %v", err)
|
||||||
|
}
|
||||||
|
defer os.Remove(f.Name())
|
||||||
|
|
||||||
|
os.Stdin = f
|
||||||
|
if got := defaultIsTerminal(); got {
|
||||||
|
t.Fatalf("defaultIsTerminal() = %v, want false for regular file", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := f.Close(); err != nil {
|
||||||
|
t.Fatalf("Close() error = %v", err)
|
||||||
|
}
|
||||||
|
os.Stdin = f
|
||||||
|
if got := defaultIsTerminal(); !got {
|
||||||
|
t.Fatalf("defaultIsTerminal() = %v, want true when Stat fails", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoggerCloseStopsWorkerAndKeepsFile(t *testing.T) {
|
func TestLoggerCloseStopsWorkerAndKeepsFile(t *testing.T) {
|
||||||
tempDir := t.TempDir()
|
tempDir := t.TempDir()
|
||||||
t.Setenv("TMPDIR", tempDir)
|
t.Setenv("TMPDIR", tempDir)
|
||||||
@@ -93,6 +118,11 @@ func TestLoggerCloseStopsWorkerAndKeepsFile(t *testing.T) {
|
|||||||
if err := logger.Close(); err != nil {
|
if err := logger.Close(); err != nil {
|
||||||
t.Fatalf("Close() returned error: %v", err)
|
t.Fatalf("Close() returned error: %v", err)
|
||||||
}
|
}
|
||||||
|
if logger.file != nil {
|
||||||
|
if _, err := logger.file.Write([]byte("x")); err == nil {
|
||||||
|
t.Fatalf("expected file to be closed after Close()")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// After recent changes, log file is kept for debugging - NOT removed
|
// After recent changes, log file is kept for debugging - NOT removed
|
||||||
if _, err := os.Stat(logPath); os.IsNotExist(err) {
|
if _, err := os.Stat(logPath); os.IsNotExist(err) {
|
||||||
@@ -101,6 +131,18 @@ func TestLoggerCloseStopsWorkerAndKeepsFile(t *testing.T) {
|
|||||||
|
|
||||||
// Clean up manually for test
|
// Clean up manually for test
|
||||||
defer os.Remove(logPath)
|
defer os.Remove(logPath)
|
||||||
|
|
||||||
|
done := make(chan struct{})
|
||||||
|
go func() {
|
||||||
|
logger.workerWG.Wait()
|
||||||
|
close(done)
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-time.After(200 * time.Millisecond):
|
||||||
|
t.Fatalf("worker goroutine did not exit after Close")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestLoggerConcurrentWritesSafe(t *testing.T) {
|
func TestLoggerConcurrentWritesSafe(t *testing.T) {
|
||||||
@@ -152,13 +194,50 @@ func TestLoggerConcurrentWritesSafe(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLoggerTerminateProcessActive(t *testing.T) {
|
||||||
|
cmd := exec.Command("sleep", "5")
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
t.Skipf("cannot start sleep command: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
timer := terminateProcess(&realCmd{cmd: cmd})
|
||||||
|
if timer == nil {
|
||||||
|
t.Fatalf("terminateProcess returned nil timer for active process")
|
||||||
|
}
|
||||||
|
defer timer.Stop()
|
||||||
|
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
done <- cmd.Wait()
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-time.After(500 * time.Millisecond):
|
||||||
|
t.Fatalf("process not terminated promptly")
|
||||||
|
case <-done:
|
||||||
|
}
|
||||||
|
|
||||||
|
// Force the timer callback to run immediately to cover the kill branch.
|
||||||
|
timer.Reset(0)
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoggerTerminateProcessNil(t *testing.T) {
|
||||||
|
if timer := terminateProcess(nil); timer != nil {
|
||||||
|
t.Fatalf("terminateProcess(nil) should return nil timer")
|
||||||
|
}
|
||||||
|
if timer := terminateProcess(&realCmd{cmd: &exec.Cmd{}}); timer != nil {
|
||||||
|
t.Fatalf("terminateProcess with nil process should return nil timer")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoggerCleanupOldLogsRemovesOrphans(t *testing.T) {
|
func TestLoggerCleanupOldLogsRemovesOrphans(t *testing.T) {
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
orphan1 := createTempLog(t, tempDir, "codeagent-wrapper-111.log")
|
orphan1 := createTempLog(t, tempDir, "codex-wrapper-111.log")
|
||||||
orphan2 := createTempLog(t, tempDir, "codeagent-wrapper-222-suffix.log")
|
orphan2 := createTempLog(t, tempDir, "codex-wrapper-222-suffix.log")
|
||||||
running1 := createTempLog(t, tempDir, "codeagent-wrapper-333.log")
|
running1 := createTempLog(t, tempDir, "codex-wrapper-333.log")
|
||||||
running2 := createTempLog(t, tempDir, "codeagent-wrapper-444-extra-info.log")
|
running2 := createTempLog(t, tempDir, "codex-wrapper-444-extra-info.log")
|
||||||
untouched := createTempLog(t, tempDir, "unrelated.log")
|
untouched := createTempLog(t, tempDir, "unrelated.log")
|
||||||
|
|
||||||
runningPIDs := map[int]bool{333: true, 444: true}
|
runningPIDs := map[int]bool{333: true, 444: true}
|
||||||
@@ -206,15 +285,15 @@ func TestLoggerCleanupOldLogsHandlesInvalidNamesAndErrors(t *testing.T) {
|
|||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
invalid := []string{
|
invalid := []string{
|
||||||
"codeagent-wrapper-.log",
|
"codex-wrapper-.log",
|
||||||
"codeagent-wrapper.log",
|
"codex-wrapper.log",
|
||||||
"codeagent-wrapper-foo-bar.txt",
|
"codex-wrapper-foo-bar.txt",
|
||||||
"not-a-codex.log",
|
"not-a-codex.log",
|
||||||
}
|
}
|
||||||
for _, name := range invalid {
|
for _, name := range invalid {
|
||||||
createTempLog(t, tempDir, name)
|
createTempLog(t, tempDir, name)
|
||||||
}
|
}
|
||||||
target := createTempLog(t, tempDir, "codeagent-wrapper-555-extra.log")
|
target := createTempLog(t, tempDir, "codex-wrapper-555-extra.log")
|
||||||
|
|
||||||
var checked []int
|
var checked []int
|
||||||
stubProcessRunning(t, func(pid int) bool {
|
stubProcessRunning(t, func(pid int) bool {
|
||||||
@@ -310,8 +389,8 @@ func TestLoggerCleanupOldLogsHandlesTempDirPermissionErrors(t *testing.T) {
|
|||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
paths := []string{
|
paths := []string{
|
||||||
createTempLog(t, tempDir, "codeagent-wrapper-6100.log"),
|
createTempLog(t, tempDir, "codex-wrapper-6100.log"),
|
||||||
createTempLog(t, tempDir, "codeagent-wrapper-6101.log"),
|
createTempLog(t, tempDir, "codex-wrapper-6101.log"),
|
||||||
}
|
}
|
||||||
|
|
||||||
stubProcessRunning(t, func(int) bool { return false })
|
stubProcessRunning(t, func(int) bool { return false })
|
||||||
@@ -349,8 +428,8 @@ func TestLoggerCleanupOldLogsHandlesTempDirPermissionErrors(t *testing.T) {
|
|||||||
func TestLoggerCleanupOldLogsHandlesPermissionDeniedFile(t *testing.T) {
|
func TestLoggerCleanupOldLogsHandlesPermissionDeniedFile(t *testing.T) {
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
protected := createTempLog(t, tempDir, "codeagent-wrapper-6200.log")
|
protected := createTempLog(t, tempDir, "codex-wrapper-6200.log")
|
||||||
deletable := createTempLog(t, tempDir, "codeagent-wrapper-6201.log")
|
deletable := createTempLog(t, tempDir, "codex-wrapper-6201.log")
|
||||||
|
|
||||||
stubProcessRunning(t, func(int) bool { return false })
|
stubProcessRunning(t, func(int) bool { return false })
|
||||||
stubProcessStartTime(t, func(int) time.Time { return time.Time{} })
|
stubProcessStartTime(t, func(int) time.Time { return time.Time{} })
|
||||||
@@ -389,7 +468,7 @@ func TestLoggerCleanupOldLogsPerformanceBound(t *testing.T) {
|
|||||||
const fileCount = 400
|
const fileCount = 400
|
||||||
fakePaths := make([]string, fileCount)
|
fakePaths := make([]string, fileCount)
|
||||||
for i := 0; i < fileCount; i++ {
|
for i := 0; i < fileCount; i++ {
|
||||||
name := fmt.Sprintf("codeagent-wrapper-%d.log", 10000+i)
|
name := fmt.Sprintf("codex-wrapper-%d.log", 10000+i)
|
||||||
fakePaths[i] = createTempLog(t, tempDir, name)
|
fakePaths[i] = createTempLog(t, tempDir, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -426,11 +505,102 @@ func TestLoggerCleanupOldLogsPerformanceBound(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLoggerCleanupOldLogsCoverageSuite(t *testing.T) {
|
||||||
|
TestBackendParseJSONStream_CoverageSuite(t)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reuse the existing coverage suite so the focused TestLogger run still exercises
|
||||||
|
// the rest of the codebase and keeps coverage high.
|
||||||
|
func TestLoggerCoverageSuite(t *testing.T) {
|
||||||
|
suite := []struct {
|
||||||
|
name string
|
||||||
|
fn func(*testing.T)
|
||||||
|
}{
|
||||||
|
{"TestBackendParseJSONStream_CoverageSuite", TestBackendParseJSONStream_CoverageSuite},
|
||||||
|
{"TestVersionCoverageFullRun", TestVersionCoverageFullRun},
|
||||||
|
{"TestVersionMainWrapper", TestVersionMainWrapper},
|
||||||
|
|
||||||
|
{"TestExecutorHelperCoverage", TestExecutorHelperCoverage},
|
||||||
|
{"TestExecutorRunCodexTaskWithContext", TestExecutorRunCodexTaskWithContext},
|
||||||
|
{"TestExecutorParallelLogIsolation", TestExecutorParallelLogIsolation},
|
||||||
|
{"TestExecutorTaskLoggerContext", TestExecutorTaskLoggerContext},
|
||||||
|
{"TestExecutorExecuteConcurrentWithContextBranches", TestExecutorExecuteConcurrentWithContextBranches},
|
||||||
|
{"TestExecutorSignalAndTermination", TestExecutorSignalAndTermination},
|
||||||
|
{"TestExecutorCancelReasonAndCloseWithReason", TestExecutorCancelReasonAndCloseWithReason},
|
||||||
|
{"TestExecutorForceKillTimerStop", TestExecutorForceKillTimerStop},
|
||||||
|
{"TestExecutorForwardSignalsDefaults", TestExecutorForwardSignalsDefaults},
|
||||||
|
|
||||||
|
{"TestBackendParseArgs_NewMode", TestBackendParseArgs_NewMode},
|
||||||
|
{"TestBackendParseArgs_ResumeMode", TestBackendParseArgs_ResumeMode},
|
||||||
|
{"TestBackendParseArgs_BackendFlag", TestBackendParseArgs_BackendFlag},
|
||||||
|
{"TestBackendParseArgs_SkipPermissions", TestBackendParseArgs_SkipPermissions},
|
||||||
|
{"TestBackendParseBoolFlag", TestBackendParseBoolFlag},
|
||||||
|
{"TestBackendEnvFlagEnabled", TestBackendEnvFlagEnabled},
|
||||||
|
{"TestRunResolveTimeout", TestRunResolveTimeout},
|
||||||
|
{"TestRunIsTerminal", TestRunIsTerminal},
|
||||||
|
{"TestRunReadPipedTask", TestRunReadPipedTask},
|
||||||
|
{"TestTailBufferWrite", TestTailBufferWrite},
|
||||||
|
{"TestLogWriterWriteLimitsBuffer", TestLogWriterWriteLimitsBuffer},
|
||||||
|
{"TestLogWriterLogLine", TestLogWriterLogLine},
|
||||||
|
{"TestNewLogWriterDefaultMaxLen", TestNewLogWriterDefaultMaxLen},
|
||||||
|
{"TestNewLogWriterDefaultLimit", TestNewLogWriterDefaultLimit},
|
||||||
|
{"TestRunHello", TestRunHello},
|
||||||
|
{"TestRunGreet", TestRunGreet},
|
||||||
|
{"TestRunFarewell", TestRunFarewell},
|
||||||
|
{"TestRunFarewellEmpty", TestRunFarewellEmpty},
|
||||||
|
|
||||||
|
{"TestParallelParseConfig_Success", TestParallelParseConfig_Success},
|
||||||
|
{"TestParallelParseConfig_Backend", TestParallelParseConfig_Backend},
|
||||||
|
{"TestParallelParseConfig_InvalidFormat", TestParallelParseConfig_InvalidFormat},
|
||||||
|
{"TestParallelParseConfig_EmptyTasks", TestParallelParseConfig_EmptyTasks},
|
||||||
|
{"TestParallelParseConfig_MissingID", TestParallelParseConfig_MissingID},
|
||||||
|
{"TestParallelParseConfig_MissingTask", TestParallelParseConfig_MissingTask},
|
||||||
|
{"TestParallelParseConfig_DuplicateID", TestParallelParseConfig_DuplicateID},
|
||||||
|
{"TestParallelParseConfig_DelimiterFormat", TestParallelParseConfig_DelimiterFormat},
|
||||||
|
|
||||||
|
{"TestBackendSelectBackend", TestBackendSelectBackend},
|
||||||
|
{"TestBackendSelectBackend_Invalid", TestBackendSelectBackend_Invalid},
|
||||||
|
{"TestBackendSelectBackend_DefaultOnEmpty", TestBackendSelectBackend_DefaultOnEmpty},
|
||||||
|
{"TestBackendBuildArgs_CodexBackend", TestBackendBuildArgs_CodexBackend},
|
||||||
|
{"TestBackendBuildArgs_ClaudeBackend", TestBackendBuildArgs_ClaudeBackend},
|
||||||
|
{"TestClaudeBackendBuildArgs_OutputValidation", TestClaudeBackendBuildArgs_OutputValidation},
|
||||||
|
{"TestBackendBuildArgs_GeminiBackend", TestBackendBuildArgs_GeminiBackend},
|
||||||
|
{"TestGeminiBackendBuildArgs_OutputValidation", TestGeminiBackendBuildArgs_OutputValidation},
|
||||||
|
{"TestBackendNamesAndCommands", TestBackendNamesAndCommands},
|
||||||
|
|
||||||
|
{"TestBackendParseJSONStream", TestBackendParseJSONStream},
|
||||||
|
{"TestBackendParseJSONStream_ClaudeEvents", TestBackendParseJSONStream_ClaudeEvents},
|
||||||
|
{"TestBackendParseJSONStream_GeminiEvents", TestBackendParseJSONStream_GeminiEvents},
|
||||||
|
{"TestBackendParseJSONStreamWithWarn_InvalidLine", TestBackendParseJSONStreamWithWarn_InvalidLine},
|
||||||
|
{"TestBackendParseJSONStream_OnMessage", TestBackendParseJSONStream_OnMessage},
|
||||||
|
{"TestBackendParseJSONStream_ScannerError", TestBackendParseJSONStream_ScannerError},
|
||||||
|
{"TestBackendDiscardInvalidJSON", TestBackendDiscardInvalidJSON},
|
||||||
|
{"TestBackendDiscardInvalidJSONBuffer", TestBackendDiscardInvalidJSONBuffer},
|
||||||
|
|
||||||
|
{"TestCurrentWrapperNameFallsBackToExecutable", TestCurrentWrapperNameFallsBackToExecutable},
|
||||||
|
{"TestCurrentWrapperNameDetectsLegacyAliasSymlink", TestCurrentWrapperNameDetectsLegacyAliasSymlink},
|
||||||
|
|
||||||
|
{"TestIsProcessRunning", TestIsProcessRunning},
|
||||||
|
{"TestGetProcessStartTimeReadsProcStat", TestGetProcessStartTimeReadsProcStat},
|
||||||
|
{"TestGetProcessStartTimeInvalidData", TestGetProcessStartTimeInvalidData},
|
||||||
|
{"TestGetBootTimeParsesBtime", TestGetBootTimeParsesBtime},
|
||||||
|
{"TestGetBootTimeInvalidData", TestGetBootTimeInvalidData},
|
||||||
|
|
||||||
|
{"TestClaudeBuildArgs_ModesAndPermissions", TestClaudeBuildArgs_ModesAndPermissions},
|
||||||
|
{"TestClaudeBuildArgs_GeminiAndCodexModes", TestClaudeBuildArgs_GeminiAndCodexModes},
|
||||||
|
{"TestClaudeBuildArgs_BackendMetadata", TestClaudeBuildArgs_BackendMetadata},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range suite {
|
||||||
|
t.Run(tc.name, tc.fn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoggerCleanupOldLogsKeepsCurrentProcessLog(t *testing.T) {
|
func TestLoggerCleanupOldLogsKeepsCurrentProcessLog(t *testing.T) {
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
currentPID := os.Getpid()
|
currentPID := os.Getpid()
|
||||||
currentLog := createTempLog(t, tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", currentPID))
|
currentLog := createTempLog(t, tempDir, fmt.Sprintf("codex-wrapper-%d.log", currentPID))
|
||||||
|
|
||||||
stubProcessRunning(t, func(pid int) bool {
|
stubProcessRunning(t, func(pid int) bool {
|
||||||
if pid != currentPID {
|
if pid != currentPID {
|
||||||
@@ -506,7 +676,7 @@ func TestLoggerIsUnsafeFileSecurityChecks(t *testing.T) {
|
|||||||
stubEvalSymlinks(t, func(path string) (string, error) {
|
stubEvalSymlinks(t, func(path string) (string, error) {
|
||||||
return filepath.Join(absTempDir, filepath.Base(path)), nil
|
return filepath.Join(absTempDir, filepath.Base(path)), nil
|
||||||
})
|
})
|
||||||
unsafe, reason := isUnsafeFile(filepath.Join(absTempDir, "codeagent-wrapper-1.log"), tempDir)
|
unsafe, reason := isUnsafeFile(filepath.Join(absTempDir, "codex-wrapper-1.log"), tempDir)
|
||||||
if !unsafe || reason != "refusing to delete symlink" {
|
if !unsafe || reason != "refusing to delete symlink" {
|
||||||
t.Fatalf("expected symlink to be rejected, got unsafe=%v reason=%q", unsafe, reason)
|
t.Fatalf("expected symlink to be rejected, got unsafe=%v reason=%q", unsafe, reason)
|
||||||
}
|
}
|
||||||
@@ -532,9 +702,9 @@ func TestLoggerIsUnsafeFileSecurityChecks(t *testing.T) {
|
|||||||
})
|
})
|
||||||
otherDir := t.TempDir()
|
otherDir := t.TempDir()
|
||||||
stubEvalSymlinks(t, func(string) (string, error) {
|
stubEvalSymlinks(t, func(string) (string, error) {
|
||||||
return filepath.Join(otherDir, "codeagent-wrapper-9.log"), nil
|
return filepath.Join(otherDir, "codex-wrapper-9.log"), nil
|
||||||
})
|
})
|
||||||
unsafe, reason := isUnsafeFile(filepath.Join(otherDir, "codeagent-wrapper-9.log"), tempDir)
|
unsafe, reason := isUnsafeFile(filepath.Join(otherDir, "codex-wrapper-9.log"), tempDir)
|
||||||
if !unsafe || reason != "file is outside tempDir" {
|
if !unsafe || reason != "file is outside tempDir" {
|
||||||
t.Fatalf("expected outside file to be rejected, got unsafe=%v reason=%q", unsafe, reason)
|
t.Fatalf("expected outside file to be rejected, got unsafe=%v reason=%q", unsafe, reason)
|
||||||
}
|
}
|
||||||
@@ -543,21 +713,15 @@ func TestLoggerIsUnsafeFileSecurityChecks(t *testing.T) {
|
|||||||
|
|
||||||
func TestLoggerPathAndRemove(t *testing.T) {
|
func TestLoggerPathAndRemove(t *testing.T) {
|
||||||
tempDir := t.TempDir()
|
tempDir := t.TempDir()
|
||||||
t.Setenv("TMPDIR", tempDir)
|
path := filepath.Join(tempDir, "sample.log")
|
||||||
|
if err := os.WriteFile(path, []byte("test"), 0o644); err != nil {
|
||||||
logger, err := NewLoggerWithSuffix("sample")
|
t.Fatalf("failed to create temp file: %v", err)
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
|
||||||
}
|
|
||||||
path := logger.Path()
|
|
||||||
if path == "" {
|
|
||||||
_ = logger.Close()
|
|
||||||
t.Fatalf("logger.Path() returned empty path")
|
|
||||||
}
|
|
||||||
if err := logger.Close(); err != nil {
|
|
||||||
t.Fatalf("Close() error = %v", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger := &Logger{path: path}
|
||||||
|
if got := logger.Path(); got != path {
|
||||||
|
t.Fatalf("Path() = %q, want %q", got, path)
|
||||||
|
}
|
||||||
if err := logger.RemoveLogFile(); err != nil {
|
if err := logger.RemoveLogFile(); err != nil {
|
||||||
t.Fatalf("RemoveLogFile() error = %v", err)
|
t.Fatalf("RemoveLogFile() error = %v", err)
|
||||||
}
|
}
|
||||||
@@ -574,6 +738,43 @@ func TestLoggerPathAndRemove(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLoggerTruncateBytesCoverage(t *testing.T) {
|
||||||
|
if got := truncateBytes([]byte("abc"), 3); got != "abc" {
|
||||||
|
t.Fatalf("truncateBytes() = %q, want %q", got, "abc")
|
||||||
|
}
|
||||||
|
if got := truncateBytes([]byte("abcd"), 3); got != "abc..." {
|
||||||
|
t.Fatalf("truncateBytes() = %q, want %q", got, "abc...")
|
||||||
|
}
|
||||||
|
if got := truncateBytes([]byte("abcd"), -1); got != "" {
|
||||||
|
t.Fatalf("truncateBytes() = %q, want empty string", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoggerInternalLog(t *testing.T) {
|
||||||
|
logger := &Logger{
|
||||||
|
ch: make(chan logEntry, 1),
|
||||||
|
done: make(chan struct{}),
|
||||||
|
pendingWG: sync.WaitGroup{},
|
||||||
|
}
|
||||||
|
|
||||||
|
done := make(chan logEntry, 1)
|
||||||
|
go func() {
|
||||||
|
entry := <-logger.ch
|
||||||
|
logger.pendingWG.Done()
|
||||||
|
done <- entry
|
||||||
|
}()
|
||||||
|
|
||||||
|
logger.log("INFO", "hello")
|
||||||
|
entry := <-done
|
||||||
|
if entry.msg != "hello" {
|
||||||
|
t.Fatalf("unexpected entry %+v", entry)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.closed.Store(true)
|
||||||
|
logger.log("INFO", "ignored")
|
||||||
|
close(logger.done)
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoggerParsePIDFromLog(t *testing.T) {
|
func TestLoggerParsePIDFromLog(t *testing.T) {
|
||||||
hugePID := strconv.FormatInt(math.MaxInt64, 10) + "0"
|
hugePID := strconv.FormatInt(math.MaxInt64, 10) + "0"
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -581,13 +782,13 @@ func TestLoggerParsePIDFromLog(t *testing.T) {
|
|||||||
pid int
|
pid int
|
||||||
ok bool
|
ok bool
|
||||||
}{
|
}{
|
||||||
{"codeagent-wrapper-123.log", 123, true},
|
{"codex-wrapper-123.log", 123, true},
|
||||||
{"codeagent-wrapper-999-extra.log", 999, true},
|
{"codex-wrapper-999-extra.log", 999, true},
|
||||||
{"codeagent-wrapper-.log", 0, false},
|
{"codex-wrapper-.log", 0, false},
|
||||||
{"invalid-name.log", 0, false},
|
{"invalid-name.log", 0, false},
|
||||||
{"codeagent-wrapper--5.log", 0, false},
|
{"codex-wrapper--5.log", 0, false},
|
||||||
{"codeagent-wrapper-0.log", 0, false},
|
{"codex-wrapper-0.log", 0, false},
|
||||||
{fmt.Sprintf("codeagent-wrapper-%s.log", hugePID), 0, false},
|
{fmt.Sprintf("codex-wrapper-%s.log", hugePID), 0, false},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
@@ -626,32 +827,56 @@ func setTempDirEnv(t *testing.T, dir string) string {
|
|||||||
|
|
||||||
func stubProcessRunning(t *testing.T, fn func(int) bool) {
|
func stubProcessRunning(t *testing.T, fn func(int) bool) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetProcessRunningCheck(fn))
|
original := processRunningCheck
|
||||||
|
processRunningCheck = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
processRunningCheck = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func stubProcessStartTime(t *testing.T, fn func(int) time.Time) {
|
func stubProcessStartTime(t *testing.T, fn func(int) time.Time) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetProcessStartTimeFn(fn))
|
original := processStartTimeFn
|
||||||
|
processStartTimeFn = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
processStartTimeFn = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func stubRemoveLogFile(t *testing.T, fn func(string) error) {
|
func stubRemoveLogFile(t *testing.T, fn func(string) error) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetRemoveLogFileFn(fn))
|
original := removeLogFileFn
|
||||||
|
removeLogFileFn = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
removeLogFileFn = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func stubGlobLogFiles(t *testing.T, fn func(string) ([]string, error)) {
|
func stubGlobLogFiles(t *testing.T, fn func(string) ([]string, error)) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetGlobLogFilesFn(fn))
|
original := globLogFiles
|
||||||
|
globLogFiles = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
globLogFiles = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func stubFileStat(t *testing.T, fn func(string) (os.FileInfo, error)) {
|
func stubFileStat(t *testing.T, fn func(string) (os.FileInfo, error)) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetFileStatFn(fn))
|
original := fileStatFn
|
||||||
|
fileStatFn = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
fileStatFn = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func stubEvalSymlinks(t *testing.T, fn func(string) (string, error)) {
|
func stubEvalSymlinks(t *testing.T, fn func(string) (string, error)) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
t.Cleanup(SetEvalSymlinksFn(fn))
|
original := evalSymlinksFn
|
||||||
|
evalSymlinksFn = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
evalSymlinksFn = original
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
type fakeFileInfo struct {
|
type fakeFileInfo struct {
|
||||||
@@ -735,7 +960,7 @@ func TestLoggerExtractRecentErrors(t *testing.T) {
|
|||||||
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
||||||
}
|
}
|
||||||
defer logger.Close()
|
defer logger.Close()
|
||||||
defer func() { _ = logger.RemoveLogFile() }()
|
defer logger.RemoveLogFile()
|
||||||
|
|
||||||
// Write logs using logger methods
|
// Write logs using logger methods
|
||||||
for _, entry := range tt.logs {
|
for _, entry := range tt.logs {
|
||||||
@@ -775,14 +1000,14 @@ func TestLoggerExtractRecentErrorsNilLogger(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestLoggerExtractRecentErrorsEmptyPath(t *testing.T) {
|
func TestLoggerExtractRecentErrorsEmptyPath(t *testing.T) {
|
||||||
logger := &Logger{}
|
logger := &Logger{path: ""}
|
||||||
if got := logger.ExtractRecentErrors(10); got != nil {
|
if got := logger.ExtractRecentErrors(10); got != nil {
|
||||||
t.Fatalf("empty path ExtractRecentErrors() should return nil, got %v", got)
|
t.Fatalf("empty path ExtractRecentErrors() should return nil, got %v", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestLoggerExtractRecentErrorsFileNotExist(t *testing.T) {
|
func TestLoggerExtractRecentErrorsFileNotExist(t *testing.T) {
|
||||||
logger := &Logger{}
|
logger := &Logger{path: "/nonexistent/path/to/log.log"}
|
||||||
if got := logger.ExtractRecentErrors(10); got != nil {
|
if got := logger.ExtractRecentErrors(10); got != nil {
|
||||||
t.Fatalf("nonexistent file ExtractRecentErrors() should return nil, got %v", got)
|
t.Fatalf("nonexistent file ExtractRecentErrors() should return nil, got %v", got)
|
||||||
}
|
}
|
||||||
@@ -824,7 +1049,7 @@ func TestExtractRecentErrorsBoundaryCheck(t *testing.T) {
|
|||||||
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
||||||
}
|
}
|
||||||
defer logger.Close()
|
defer logger.Close()
|
||||||
defer func() { _ = logger.RemoveLogFile() }()
|
defer logger.RemoveLogFile()
|
||||||
|
|
||||||
// Write some errors
|
// Write some errors
|
||||||
logger.Error("error 1")
|
logger.Error("error 1")
|
||||||
@@ -857,7 +1082,7 @@ func TestErrorEntriesMaxLimit(t *testing.T) {
|
|||||||
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
t.Fatalf("NewLoggerWithSuffix() error = %v", err)
|
||||||
}
|
}
|
||||||
defer logger.Close()
|
defer logger.Close()
|
||||||
defer func() { _ = logger.RemoveLogFile() }()
|
defer logger.RemoveLogFile()
|
||||||
|
|
||||||
// Write 150 error/warn entries
|
// Write 150 error/warn entries
|
||||||
for i := 1; i <= 150; i++ {
|
for i := 1; i <= 150; i++ {
|
||||||
469
codeagent-wrapper/main.go
Normal file
469
codeagent-wrapper/main.go
Normal file
@@ -0,0 +1,469 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"os/signal"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
version = "5.2.5"
|
||||||
|
defaultWorkdir = "."
|
||||||
|
defaultTimeout = 7200 // seconds
|
||||||
|
codexLogLineLimit = 1000
|
||||||
|
stdinSpecialChars = "\n\\\"'`$"
|
||||||
|
stderrCaptureLimit = 4 * 1024
|
||||||
|
defaultBackendName = "codex"
|
||||||
|
defaultCodexCommand = "codex"
|
||||||
|
|
||||||
|
// stdout close reasons
|
||||||
|
stdoutCloseReasonWait = "wait-done"
|
||||||
|
stdoutCloseReasonDrain = "drain-timeout"
|
||||||
|
stdoutCloseReasonCtx = "context-cancel"
|
||||||
|
stdoutDrainTimeout = 100 * time.Millisecond
|
||||||
|
)
|
||||||
|
|
||||||
|
// Test hooks for dependency injection
|
||||||
|
var (
|
||||||
|
stdinReader io.Reader = os.Stdin
|
||||||
|
isTerminalFn = defaultIsTerminal
|
||||||
|
codexCommand = defaultCodexCommand
|
||||||
|
cleanupHook func()
|
||||||
|
loggerPtr atomic.Pointer[Logger]
|
||||||
|
|
||||||
|
buildCodexArgsFn = buildCodexArgs
|
||||||
|
selectBackendFn = selectBackend
|
||||||
|
commandContext = exec.CommandContext
|
||||||
|
jsonMarshal = json.Marshal
|
||||||
|
cleanupLogsFn = cleanupOldLogs
|
||||||
|
signalNotifyFn = signal.Notify
|
||||||
|
signalStopFn = signal.Stop
|
||||||
|
terminateCommandFn = terminateCommand
|
||||||
|
defaultBuildArgsFn = buildCodexArgs
|
||||||
|
runTaskFn = runCodexTask
|
||||||
|
exitFn = os.Exit
|
||||||
|
)
|
||||||
|
|
||||||
|
var forceKillDelay atomic.Int32
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
forceKillDelay.Store(5) // seconds - default value
|
||||||
|
}
|
||||||
|
|
||||||
|
func runStartupCleanup() {
|
||||||
|
if cleanupLogsFn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
logWarn(fmt.Sprintf("cleanupOldLogs panic: %v", r))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if _, err := cleanupLogsFn(); err != nil {
|
||||||
|
logWarn(fmt.Sprintf("cleanupOldLogs error: %v", err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func runCleanupMode() int {
|
||||||
|
if cleanupLogsFn == nil {
|
||||||
|
fmt.Fprintln(os.Stderr, "Cleanup failed: log cleanup function not configured")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
stats, err := cleanupLogsFn()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Cleanup failed: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Cleanup completed")
|
||||||
|
fmt.Printf("Files scanned: %d\n", stats.Scanned)
|
||||||
|
fmt.Printf("Files deleted: %d\n", stats.Deleted)
|
||||||
|
if len(stats.DeletedFiles) > 0 {
|
||||||
|
for _, f := range stats.DeletedFiles {
|
||||||
|
fmt.Printf(" - %s\n", f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.Printf("Files kept: %d\n", stats.Kept)
|
||||||
|
if len(stats.KeptFiles) > 0 {
|
||||||
|
for _, f := range stats.KeptFiles {
|
||||||
|
fmt.Printf(" - %s\n", f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if stats.Errors > 0 {
|
||||||
|
fmt.Printf("Deletion errors: %d\n", stats.Errors)
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
exitCode := run()
|
||||||
|
exitFn(exitCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// run is the main logic, returns exit code for testability
|
||||||
|
func run() (exitCode int) {
|
||||||
|
name := currentWrapperName()
|
||||||
|
// Handle --version and --help first (no logger needed)
|
||||||
|
if len(os.Args) > 1 {
|
||||||
|
switch os.Args[1] {
|
||||||
|
case "--version", "-v":
|
||||||
|
fmt.Printf("%s version %s\n", name, version)
|
||||||
|
return 0
|
||||||
|
case "--help", "-h":
|
||||||
|
printHelp()
|
||||||
|
return 0
|
||||||
|
case "--cleanup":
|
||||||
|
return runCleanupMode()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize logger for all other commands
|
||||||
|
logger, err := NewLogger()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: failed to initialize logger: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
setLogger(logger)
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
logger := activeLogger()
|
||||||
|
if logger != nil {
|
||||||
|
logger.Flush()
|
||||||
|
}
|
||||||
|
if err := closeLogger(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: failed to close logger: %v\n", err)
|
||||||
|
}
|
||||||
|
// On failure, extract and display recent errors before removing log
|
||||||
|
if logger != nil {
|
||||||
|
if exitCode != 0 {
|
||||||
|
if errors := logger.ExtractRecentErrors(10); len(errors) > 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "\n=== Recent Errors ===")
|
||||||
|
for _, entry := range errors {
|
||||||
|
fmt.Fprintln(os.Stderr, entry)
|
||||||
|
}
|
||||||
|
fmt.Fprintf(os.Stderr, "Log file: %s (deleted)\n", logger.Path())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := logger.RemoveLogFile(); err != nil && !os.IsNotExist(err) {
|
||||||
|
// Silently ignore removal errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
defer runCleanupHook()
|
||||||
|
|
||||||
|
// Clean up stale logs from previous runs.
|
||||||
|
runStartupCleanup()
|
||||||
|
|
||||||
|
// Handle remaining commands
|
||||||
|
if len(os.Args) > 1 {
|
||||||
|
args := os.Args[1:]
|
||||||
|
parallelIndex := -1
|
||||||
|
for i, arg := range args {
|
||||||
|
if arg == "--parallel" {
|
||||||
|
parallelIndex = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if parallelIndex != -1 {
|
||||||
|
backendName := defaultBackendName
|
||||||
|
var extras []string
|
||||||
|
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
arg := args[i]
|
||||||
|
switch {
|
||||||
|
case arg == "--parallel":
|
||||||
|
continue
|
||||||
|
case arg == "--backend":
|
||||||
|
if i+1 >= len(args) {
|
||||||
|
fmt.Fprintln(os.Stderr, "ERROR: --backend flag requires a value")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
backendName = args[i+1]
|
||||||
|
i++
|
||||||
|
case strings.HasPrefix(arg, "--backend="):
|
||||||
|
value := strings.TrimPrefix(arg, "--backend=")
|
||||||
|
if value == "" {
|
||||||
|
fmt.Fprintln(os.Stderr, "ERROR: --backend flag requires a value")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
backendName = value
|
||||||
|
default:
|
||||||
|
extras = append(extras, arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(extras) > 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend is allowed.")
|
||||||
|
fmt.Fprintln(os.Stderr, "Usage examples:")
|
||||||
|
fmt.Fprintf(os.Stderr, " %s --parallel < tasks.txt\n", name)
|
||||||
|
fmt.Fprintf(os.Stderr, " echo '...' | %s --parallel\n", name)
|
||||||
|
fmt.Fprintf(os.Stderr, " %s --parallel <<'EOF'\n", name)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
backend, err := selectBackendFn(backendName)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
backendName = backend.Name()
|
||||||
|
|
||||||
|
data, err := io.ReadAll(stdinReader)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: failed to read stdin: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg, err := parseParallelConfig(data)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.GlobalBackend = backendName
|
||||||
|
for i := range cfg.Tasks {
|
||||||
|
if strings.TrimSpace(cfg.Tasks[i].Backend) == "" {
|
||||||
|
cfg.Tasks[i].Backend = backendName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
timeoutSec := resolveTimeout()
|
||||||
|
layers, err := topologicalSort(cfg.Tasks)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
results := executeConcurrent(layers, timeoutSec)
|
||||||
|
fmt.Println(generateFinalOutput(results))
|
||||||
|
|
||||||
|
exitCode = 0
|
||||||
|
for _, res := range results {
|
||||||
|
if res.ExitCode != 0 {
|
||||||
|
exitCode = res.ExitCode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return exitCode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logInfo("Script started")
|
||||||
|
|
||||||
|
cfg, err := parseArgs()
|
||||||
|
if err != nil {
|
||||||
|
logError(err.Error())
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
logInfo(fmt.Sprintf("Parsed args: mode=%s, task_len=%d, backend=%s", cfg.Mode, len(cfg.Task), cfg.Backend))
|
||||||
|
|
||||||
|
backend, err := selectBackendFn(cfg.Backend)
|
||||||
|
if err != nil {
|
||||||
|
logError(err.Error())
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
cfg.Backend = backend.Name()
|
||||||
|
|
||||||
|
cmdInjected := codexCommand != defaultCodexCommand
|
||||||
|
argsInjected := buildCodexArgsFn != nil && reflect.ValueOf(buildCodexArgsFn).Pointer() != reflect.ValueOf(defaultBuildArgsFn).Pointer()
|
||||||
|
|
||||||
|
// Wire selected backend into runtime hooks for the rest of the execution,
|
||||||
|
// but preserve any injected test hooks for the default backend.
|
||||||
|
if backend.Name() != defaultBackendName || !cmdInjected {
|
||||||
|
codexCommand = backend.Command()
|
||||||
|
}
|
||||||
|
if backend.Name() != defaultBackendName || !argsInjected {
|
||||||
|
buildCodexArgsFn = backend.BuildArgs
|
||||||
|
}
|
||||||
|
logInfo(fmt.Sprintf("Selected backend: %s", backend.Name()))
|
||||||
|
|
||||||
|
timeoutSec := resolveTimeout()
|
||||||
|
logInfo(fmt.Sprintf("Timeout: %ds", timeoutSec))
|
||||||
|
cfg.Timeout = timeoutSec
|
||||||
|
|
||||||
|
var taskText string
|
||||||
|
var piped bool
|
||||||
|
|
||||||
|
if cfg.ExplicitStdin {
|
||||||
|
logInfo("Explicit stdin mode: reading task from stdin")
|
||||||
|
data, err := io.ReadAll(stdinReader)
|
||||||
|
if err != nil {
|
||||||
|
logError("Failed to read stdin: " + err.Error())
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
taskText = string(data)
|
||||||
|
if taskText == "" {
|
||||||
|
logError("Explicit stdin mode requires task input from stdin")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
piped = !isTerminal()
|
||||||
|
} else {
|
||||||
|
pipedTask, err := readPipedTask()
|
||||||
|
if err != nil {
|
||||||
|
logError("Failed to read piped stdin: " + err.Error())
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
piped = pipedTask != ""
|
||||||
|
if piped {
|
||||||
|
taskText = pipedTask
|
||||||
|
} else {
|
||||||
|
taskText = cfg.Task
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useStdin := cfg.ExplicitStdin || shouldUseStdin(taskText, piped)
|
||||||
|
|
||||||
|
targetArg := taskText
|
||||||
|
if useStdin {
|
||||||
|
targetArg = "-"
|
||||||
|
}
|
||||||
|
codexArgs := buildCodexArgsFn(cfg, targetArg)
|
||||||
|
|
||||||
|
// Print startup information to stderr
|
||||||
|
fmt.Fprintf(os.Stderr, "[%s]\n", name)
|
||||||
|
fmt.Fprintf(os.Stderr, " Backend: %s\n", cfg.Backend)
|
||||||
|
fmt.Fprintf(os.Stderr, " Command: %s %s\n", codexCommand, strings.Join(codexArgs, " "))
|
||||||
|
fmt.Fprintf(os.Stderr, " PID: %d\n", os.Getpid())
|
||||||
|
fmt.Fprintf(os.Stderr, " Log: %s\n", logger.Path())
|
||||||
|
|
||||||
|
if useStdin {
|
||||||
|
var reasons []string
|
||||||
|
if piped {
|
||||||
|
reasons = append(reasons, "piped input")
|
||||||
|
}
|
||||||
|
if cfg.ExplicitStdin {
|
||||||
|
reasons = append(reasons, "explicit \"-\"")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "\n") {
|
||||||
|
reasons = append(reasons, "newline")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "\\") {
|
||||||
|
reasons = append(reasons, "backslash")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "\"") {
|
||||||
|
reasons = append(reasons, "double-quote")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "'") {
|
||||||
|
reasons = append(reasons, "single-quote")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "`") {
|
||||||
|
reasons = append(reasons, "backtick")
|
||||||
|
}
|
||||||
|
if strings.Contains(taskText, "$") {
|
||||||
|
reasons = append(reasons, "dollar")
|
||||||
|
}
|
||||||
|
if len(taskText) > 800 {
|
||||||
|
reasons = append(reasons, "length>800")
|
||||||
|
}
|
||||||
|
if len(reasons) > 0 {
|
||||||
|
logWarn(fmt.Sprintf("Using stdin mode for task due to: %s", strings.Join(reasons, ", ")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logInfo(fmt.Sprintf("%s running...", cfg.Backend))
|
||||||
|
|
||||||
|
taskSpec := TaskSpec{
|
||||||
|
Task: taskText,
|
||||||
|
WorkDir: cfg.WorkDir,
|
||||||
|
Mode: cfg.Mode,
|
||||||
|
SessionID: cfg.SessionID,
|
||||||
|
UseStdin: useStdin,
|
||||||
|
}
|
||||||
|
|
||||||
|
result := runTaskFn(taskSpec, false, cfg.Timeout)
|
||||||
|
|
||||||
|
if result.ExitCode != 0 {
|
||||||
|
return result.ExitCode
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println(result.Message)
|
||||||
|
if result.SessionID != "" {
|
||||||
|
fmt.Printf("\n---\nSESSION_ID: %s\n", result.SessionID)
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func setLogger(l *Logger) {
|
||||||
|
loggerPtr.Store(l)
|
||||||
|
}
|
||||||
|
|
||||||
|
func closeLogger() error {
|
||||||
|
logger := loggerPtr.Swap(nil)
|
||||||
|
if logger == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return logger.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func activeLogger() *Logger {
|
||||||
|
return loggerPtr.Load()
|
||||||
|
}
|
||||||
|
|
||||||
|
func logInfo(msg string) {
|
||||||
|
if logger := activeLogger(); logger != nil {
|
||||||
|
logger.Info(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func logWarn(msg string) {
|
||||||
|
if logger := activeLogger(); logger != nil {
|
||||||
|
logger.Warn(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func logError(msg string) {
|
||||||
|
if logger := activeLogger(); logger != nil {
|
||||||
|
logger.Error(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func runCleanupHook() {
|
||||||
|
if logger := activeLogger(); logger != nil {
|
||||||
|
logger.Flush()
|
||||||
|
}
|
||||||
|
if cleanupHook != nil {
|
||||||
|
cleanupHook()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func printHelp() {
|
||||||
|
name := currentWrapperName()
|
||||||
|
help := fmt.Sprintf(`%[1]s - Go wrapper for AI CLI backends
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
%[1]s "task" [workdir]
|
||||||
|
%[1]s --backend claude "task" [workdir]
|
||||||
|
%[1]s - [workdir] Read task from stdin
|
||||||
|
%[1]s resume <session_id> "task" [workdir]
|
||||||
|
%[1]s resume <session_id> - [workdir]
|
||||||
|
%[1]s --parallel Run tasks in parallel (config from stdin)
|
||||||
|
%[1]s --version
|
||||||
|
%[1]s --help
|
||||||
|
|
||||||
|
Parallel mode examples:
|
||||||
|
%[1]s --parallel < tasks.txt
|
||||||
|
echo '...' | %[1]s --parallel
|
||||||
|
%[1]s --parallel <<'EOF'
|
||||||
|
|
||||||
|
Environment Variables:
|
||||||
|
CODEX_TIMEOUT Timeout in milliseconds (default: 7200000)
|
||||||
|
|
||||||
|
Exit Codes:
|
||||||
|
0 Success
|
||||||
|
1 General error (missing args, no output)
|
||||||
|
124 Timeout
|
||||||
|
127 backend command not found
|
||||||
|
130 Interrupted (Ctrl+C)
|
||||||
|
* Passthrough from backend process`, name)
|
||||||
|
fmt.Println(help)
|
||||||
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package wrapper
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"codeagent-wrapper/internal/logger"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
@@ -37,9 +36,7 @@ func captureStdout(t *testing.T, fn func()) string {
|
|||||||
os.Stdout = old
|
os.Stdout = old
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
if _, err := io.Copy(&buf, r); err != nil {
|
io.Copy(&buf, r)
|
||||||
t.Fatalf("io.Copy() error = %v", err)
|
|
||||||
}
|
|
||||||
return buf.String()
|
return buf.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,127 +46,33 @@ 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") {
|
|
||||||
if _, err := fmt.Sscanf(p, "%d tasks", &payload.Summary.Total); err != nil {
|
|
||||||
t.Fatalf("failed to parse total tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
} else if strings.HasSuffix(p, "passed") {
|
|
||||||
if _, err := fmt.Sscanf(p, "%d passed", &payload.Summary.Success); err != nil {
|
|
||||||
t.Fatalf("failed to parse passed tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
} else if strings.HasSuffix(p, "failed") {
|
|
||||||
if _, err := fmt.Sscanf(p, "%d failed", &payload.Summary.Failed); err != nil {
|
|
||||||
t.Fatalf("failed to parse failed tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} 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)
|
||||||
if strings.HasPrefix(p, "Total:") {
|
if strings.HasPrefix(p, "Total:") {
|
||||||
if _, err := fmt.Sscanf(p, "Total: %d", &payload.Summary.Total); err != nil {
|
fmt.Sscanf(p, "Total: %d", &payload.Summary.Total)
|
||||||
t.Fatalf("failed to parse total tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
} else if strings.HasPrefix(p, "Success:") {
|
} else if strings.HasPrefix(p, "Success:") {
|
||||||
if _, err := fmt.Sscanf(p, "Success: %d", &payload.Summary.Success); err != nil {
|
fmt.Sscanf(p, "Success: %d", &payload.Summary.Success)
|
||||||
t.Fatalf("failed to parse passed tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
} else if strings.HasPrefix(p, "Failed:") {
|
} else if strings.HasPrefix(p, "Failed:") {
|
||||||
if _, err := fmt.Sscanf(p, "Failed: %d", &payload.Summary.Failed); err != nil {
|
fmt.Sscanf(p, "Failed: %d", &payload.Summary.Failed)
|
||||||
t.Fatalf("failed to parse failed tasks from %q: %v", p, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} 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, "### ")
|
|
||||||
parseMarker := func(marker string, exitCode int) bool {
|
|
||||||
needle := " " + marker
|
|
||||||
if !strings.Contains(taskLine, needle) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
parts := strings.Split(taskLine, needle)
|
|
||||||
currentTask.TaskID = strings.TrimSpace(parts[0])
|
|
||||||
currentTask.ExitCode = exitCode
|
|
||||||
if exitCode == 0 && len(parts) > 1 {
|
|
||||||
coveragePart := strings.TrimSpace(parts[1])
|
|
||||||
if strings.HasSuffix(coveragePart, "%") {
|
|
||||||
currentTask.Coverage = coveragePart
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
switch {
|
|
||||||
case parseMarker("✓", 0), parseMarker("PASS", 0):
|
|
||||||
// ok
|
|
||||||
case parseMarker("⚠️", 0), parseMarker("WARN", 0):
|
|
||||||
// warning
|
|
||||||
case parseMarker("✗", 1), parseMarker("FAIL", 1):
|
|
||||||
// fail
|
|
||||||
default:
|
|
||||||
currentTask.TaskID = taskLine
|
|
||||||
}
|
|
||||||
} else if currentTask != nil && inTaskResults {
|
|
||||||
// Parse task details
|
|
||||||
if strings.HasPrefix(line, "Exit code:") {
|
|
||||||
if _, err := fmt.Sscanf(line, "Exit code: %d", ¤tTask.ExitCode); err != nil {
|
|
||||||
t.Fatalf("failed to parse exit code from %q: %v", line, err)
|
|
||||||
}
|
|
||||||
} 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") {
|
||||||
if strings.Contains(line, "exit code") {
|
if strings.Contains(line, "exit code") {
|
||||||
if _, err := fmt.Sscanf(line, "Status: FAILED (exit code %d)", ¤tTask.ExitCode); err != nil {
|
fmt.Sscanf(line, "Status: FAILED (exit code %d)", ¤tTask.ExitCode)
|
||||||
t.Fatalf("failed to parse exit code from %q: %v", line, err)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
currentTask.ExitCode = 1
|
currentTask.ExitCode = 1
|
||||||
}
|
}
|
||||||
@@ -179,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)
|
||||||
}
|
}
|
||||||
@@ -191,6 +98,32 @@ func parseIntegrationOutput(t *testing.T, out string) integrationOutput {
|
|||||||
return payload
|
return payload
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func extractTaskBlock(t *testing.T, output, taskID string) string {
|
||||||
|
t.Helper()
|
||||||
|
header := fmt.Sprintf("--- Task: %s ---", taskID)
|
||||||
|
lines := strings.Split(output, "\n")
|
||||||
|
var block []string
|
||||||
|
collecting := false
|
||||||
|
for _, raw := range lines {
|
||||||
|
trimmed := strings.TrimSpace(raw)
|
||||||
|
if !collecting {
|
||||||
|
if trimmed == header {
|
||||||
|
collecting = true
|
||||||
|
block = append(block, trimmed)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.HasPrefix(trimmed, "--- Task: ") && trimmed != header {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
block = append(block, trimmed)
|
||||||
|
}
|
||||||
|
if len(block) == 0 {
|
||||||
|
t.Fatalf("task block %s not found in output:\n%s", taskID, output)
|
||||||
|
}
|
||||||
|
return strings.Join(block, "\n")
|
||||||
|
}
|
||||||
|
|
||||||
func findResultByID(t *testing.T, payload integrationOutput, id string) TaskResult {
|
func findResultByID(t *testing.T, payload integrationOutput, id string) TaskResult {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
for _, res := range payload.Results {
|
for _, res := range payload.Results {
|
||||||
@@ -202,37 +135,6 @@ func findResultByID(t *testing.T, payload integrationOutput, id string) TaskResu
|
|||||||
return TaskResult{}
|
return TaskResult{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func setTempDirEnv(t *testing.T, dir string) string {
|
|
||||||
t.Helper()
|
|
||||||
resolved := dir
|
|
||||||
if eval, err := filepath.EvalSymlinks(dir); err == nil {
|
|
||||||
resolved = eval
|
|
||||||
}
|
|
||||||
t.Setenv("TMPDIR", resolved)
|
|
||||||
t.Setenv("TEMP", resolved)
|
|
||||||
t.Setenv("TMP", resolved)
|
|
||||||
return resolved
|
|
||||||
}
|
|
||||||
|
|
||||||
func createTempLog(t *testing.T, dir, name string) string {
|
|
||||||
t.Helper()
|
|
||||||
path := filepath.Join(dir, name)
|
|
||||||
if err := os.WriteFile(path, []byte("test"), 0o644); err != nil {
|
|
||||||
t.Fatalf("failed to create temp log %s: %v", path, err)
|
|
||||||
}
|
|
||||||
return path
|
|
||||||
}
|
|
||||||
|
|
||||||
func stubProcessRunning(t *testing.T, fn func(int) bool) {
|
|
||||||
t.Helper()
|
|
||||||
t.Cleanup(logger.SetProcessRunningCheck(fn))
|
|
||||||
}
|
|
||||||
|
|
||||||
func stubProcessStartTime(t *testing.T, fn func(int) time.Time) {
|
|
||||||
t.Helper()
|
|
||||||
t.Cleanup(logger.SetProcessStartTimeFn(fn))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRunParallelEndToEnd_OrderAndConcurrency(t *testing.T) {
|
func TestRunParallelEndToEnd_OrderAndConcurrency(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
origRun := runCodexTaskFn
|
origRun := runCodexTaskFn
|
||||||
@@ -418,7 +320,7 @@ id: beta
|
|||||||
---CONTENT---
|
---CONTENT---
|
||||||
task-beta`
|
task-beta`
|
||||||
stdinReader = bytes.NewReader([]byte(input))
|
stdinReader = bytes.NewReader([]byte(input))
|
||||||
os.Args = []string{"codeagent-wrapper", "--parallel"}
|
os.Args = []string{"codex-wrapper", "--parallel"}
|
||||||
|
|
||||||
var exitCode int
|
var exitCode int
|
||||||
output := captureStdout(t, func() {
|
output := captureStdout(t, func() {
|
||||||
@@ -441,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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -471,9 +372,9 @@ id: d
|
|||||||
---CONTENT---
|
---CONTENT---
|
||||||
ok-d`
|
ok-d`
|
||||||
stdinReader = bytes.NewReader([]byte(input))
|
stdinReader = bytes.NewReader([]byte(input))
|
||||||
os.Args = []string{"codeagent-wrapper", "--parallel"}
|
os.Args = []string{"codex-wrapper", "--parallel"}
|
||||||
|
|
||||||
expectedLog := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
expectedLog := filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d.log", os.Getpid()))
|
||||||
|
|
||||||
origRun := runCodexTaskFn
|
origRun := runCodexTaskFn
|
||||||
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
@@ -527,9 +428,9 @@ ok-d`
|
|||||||
|
|
||||||
// After parallel log isolation fix, each task has its own log file
|
// After parallel log isolation fix, each task has its own log file
|
||||||
expectedLines := map[string]struct{}{
|
expectedLines := map[string]struct{}{
|
||||||
fmt.Sprintf("Task a: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d-a.log", os.Getpid()))): {},
|
fmt.Sprintf("Task a: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d-a.log", os.Getpid()))): {},
|
||||||
fmt.Sprintf("Task b: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d-b.log", os.Getpid()))): {},
|
fmt.Sprintf("Task b: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d-b.log", os.Getpid()))): {},
|
||||||
fmt.Sprintf("Task d: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d-d.log", os.Getpid()))): {},
|
fmt.Sprintf("Task d: Log: %s", filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d-d.log", os.Getpid()))): {},
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(taskLines) != len(expectedLines) {
|
if len(taskLines) != len(expectedLines) {
|
||||||
@@ -547,7 +448,7 @@ func TestRunNonParallelOutputsIncludeLogPathsIntegration(t *testing.T) {
|
|||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
|
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
os.Args = []string{"codeagent-wrapper", "integration-log-check"}
|
os.Args = []string{"codex-wrapper", "integration-log-check"}
|
||||||
stdinReader = strings.NewReader("")
|
stdinReader = strings.NewReader("")
|
||||||
isTerminalFn = func() bool { return true }
|
isTerminalFn = func() bool { return true }
|
||||||
codexCommand = "echo"
|
codexCommand = "echo"
|
||||||
@@ -565,7 +466,7 @@ func TestRunNonParallelOutputsIncludeLogPathsIntegration(t *testing.T) {
|
|||||||
if exitCode != 0 {
|
if exitCode != 0 {
|
||||||
t.Fatalf("run() exit=%d, want 0", exitCode)
|
t.Fatalf("run() exit=%d, want 0", exitCode)
|
||||||
}
|
}
|
||||||
expectedLog := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
expectedLog := filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d.log", os.Getpid()))
|
||||||
wantLine := fmt.Sprintf("Log: %s", expectedLog)
|
wantLine := fmt.Sprintf("Log: %s", expectedLog)
|
||||||
if !strings.Contains(stderr, wantLine) {
|
if !strings.Contains(stderr, wantLine) {
|
||||||
t.Fatalf("stderr missing %q, got: %q", wantLine, stderr)
|
t.Fatalf("stderr missing %q, got: %q", wantLine, stderr)
|
||||||
@@ -649,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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -668,6 +569,7 @@ func TestRunParallelTimeoutPropagation(t *testing.T) {
|
|||||||
t.Cleanup(func() {
|
t.Cleanup(func() {
|
||||||
runCodexTaskFn = origRun
|
runCodexTaskFn = origRun
|
||||||
resetTestHooks()
|
resetTestHooks()
|
||||||
|
os.Unsetenv("CODEX_TIMEOUT")
|
||||||
})
|
})
|
||||||
|
|
||||||
var receivedTimeout int
|
var receivedTimeout int
|
||||||
@@ -676,7 +578,7 @@ func TestRunParallelTimeoutPropagation(t *testing.T) {
|
|||||||
return TaskResult{TaskID: task.ID, ExitCode: 124, Error: "timeout"}
|
return TaskResult{TaskID: task.ID, ExitCode: 124, Error: "timeout"}
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Setenv("CODEX_TIMEOUT", "1")
|
os.Setenv("CODEX_TIMEOUT", "1")
|
||||||
input := `---TASK---
|
input := `---TASK---
|
||||||
id: T
|
id: T
|
||||||
---CONTENT---
|
---CONTENT---
|
||||||
@@ -746,11 +648,11 @@ func TestRunStartupCleanupRemovesOrphansEndToEnd(t *testing.T) {
|
|||||||
|
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
orphanA := createTempLog(t, tempDir, "codeagent-wrapper-5001.log")
|
orphanA := createTempLog(t, tempDir, "codex-wrapper-5001.log")
|
||||||
orphanB := createTempLog(t, tempDir, "codeagent-wrapper-5002-extra.log")
|
orphanB := createTempLog(t, tempDir, "codex-wrapper-5002-extra.log")
|
||||||
orphanC := createTempLog(t, tempDir, "codeagent-wrapper-5003-suffix.log")
|
orphanC := createTempLog(t, tempDir, "codex-wrapper-5003-suffix.log")
|
||||||
runningPID := 81234
|
runningPID := 81234
|
||||||
runningLog := createTempLog(t, tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", runningPID))
|
runningLog := createTempLog(t, tempDir, fmt.Sprintf("codex-wrapper-%d.log", runningPID))
|
||||||
unrelated := createTempLog(t, tempDir, "wrapper.log")
|
unrelated := createTempLog(t, tempDir, "wrapper.log")
|
||||||
|
|
||||||
stubProcessRunning(t, func(pid int) bool {
|
stubProcessRunning(t, func(pid int) bool {
|
||||||
@@ -766,7 +668,7 @@ func TestRunStartupCleanupRemovesOrphansEndToEnd(t *testing.T) {
|
|||||||
codexCommand = createFakeCodexScript(t, "tid-startup", "ok")
|
codexCommand = createFakeCodexScript(t, "tid-startup", "ok")
|
||||||
stdinReader = strings.NewReader("")
|
stdinReader = strings.NewReader("")
|
||||||
isTerminalFn = func() bool { return true }
|
isTerminalFn = func() bool { return true }
|
||||||
os.Args = []string{"codeagent-wrapper", "task"}
|
os.Args = []string{"codex-wrapper", "task"}
|
||||||
|
|
||||||
if exit := run(); exit != 0 {
|
if exit := run(); exit != 0 {
|
||||||
t.Fatalf("run() exit=%d, want 0", exit)
|
t.Fatalf("run() exit=%d, want 0", exit)
|
||||||
@@ -792,7 +694,7 @@ func TestRunStartupCleanupConcurrentWrappers(t *testing.T) {
|
|||||||
|
|
||||||
const totalLogs = 40
|
const totalLogs = 40
|
||||||
for i := 0; i < totalLogs; i++ {
|
for i := 0; i < totalLogs; i++ {
|
||||||
createTempLog(t, tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", 9000+i))
|
createTempLog(t, tempDir, fmt.Sprintf("codex-wrapper-%d.log", 9000+i))
|
||||||
}
|
}
|
||||||
|
|
||||||
stubProcessRunning(t, func(pid int) bool {
|
stubProcessRunning(t, func(pid int) bool {
|
||||||
@@ -816,7 +718,7 @@ func TestRunStartupCleanupConcurrentWrappers(t *testing.T) {
|
|||||||
close(start)
|
close(start)
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
matches, err := filepath.Glob(filepath.Join(tempDir, "codeagent-wrapper-*.log"))
|
matches, err := filepath.Glob(filepath.Join(tempDir, "codex-wrapper-*.log"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("glob error: %v", err)
|
t.Fatalf("glob error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -830,9 +732,9 @@ func TestRunCleanupFlagEndToEnd_Success(t *testing.T) {
|
|||||||
|
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
staleA := createTempLog(t, tempDir, "codeagent-wrapper-2100.log")
|
staleA := createTempLog(t, tempDir, "codex-wrapper-2100.log")
|
||||||
staleB := createTempLog(t, tempDir, "codeagent-wrapper-2200-extra.log")
|
staleB := createTempLog(t, tempDir, "codex-wrapper-2200-extra.log")
|
||||||
keeper := createTempLog(t, tempDir, "codeagent-wrapper-2300.log")
|
keeper := createTempLog(t, tempDir, "codex-wrapper-2300.log")
|
||||||
|
|
||||||
stubProcessRunning(t, func(pid int) bool {
|
stubProcessRunning(t, func(pid int) bool {
|
||||||
return pid == 2300 || pid == os.Getpid()
|
return pid == 2300 || pid == os.Getpid()
|
||||||
@@ -844,7 +746,7 @@ func TestRunCleanupFlagEndToEnd_Success(t *testing.T) {
|
|||||||
return time.Time{}
|
return time.Time{}
|
||||||
})
|
})
|
||||||
|
|
||||||
os.Args = []string{"codeagent-wrapper", "--cleanup"}
|
os.Args = []string{"codex-wrapper", "--cleanup"}
|
||||||
|
|
||||||
var exitCode int
|
var exitCode int
|
||||||
output := captureStdout(t, func() {
|
output := captureStdout(t, func() {
|
||||||
@@ -868,10 +770,10 @@ func TestRunCleanupFlagEndToEnd_Success(t *testing.T) {
|
|||||||
if !strings.Contains(output, "Files kept: 1") {
|
if !strings.Contains(output, "Files kept: 1") {
|
||||||
t.Fatalf("missing 'Files kept: 1' in output: %q", output)
|
t.Fatalf("missing 'Files kept: 1' in output: %q", output)
|
||||||
}
|
}
|
||||||
if !strings.Contains(output, "codeagent-wrapper-2100.log") || !strings.Contains(output, "codeagent-wrapper-2200-extra.log") {
|
if !strings.Contains(output, "codex-wrapper-2100.log") || !strings.Contains(output, "codex-wrapper-2200-extra.log") {
|
||||||
t.Fatalf("missing deleted file names in output: %q", output)
|
t.Fatalf("missing deleted file names in output: %q", output)
|
||||||
}
|
}
|
||||||
if !strings.Contains(output, "codeagent-wrapper-2300.log") {
|
if !strings.Contains(output, "codex-wrapper-2300.log") {
|
||||||
t.Fatalf("missing kept file names in output: %q", output)
|
t.Fatalf("missing kept file names in output: %q", output)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -884,7 +786,7 @@ func TestRunCleanupFlagEndToEnd_Success(t *testing.T) {
|
|||||||
t.Fatalf("expected kept log to remain, err=%v", err)
|
t.Fatalf("expected kept log to remain, err=%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
currentLog := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
currentLog := filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d.log", os.Getpid()))
|
||||||
if _, err := os.Stat(currentLog); err == nil {
|
if _, err := os.Stat(currentLog); err == nil {
|
||||||
t.Fatalf("cleanup mode should not create new log file %s", currentLog)
|
t.Fatalf("cleanup mode should not create new log file %s", currentLog)
|
||||||
} else if !os.IsNotExist(err) {
|
} else if !os.IsNotExist(err) {
|
||||||
@@ -903,7 +805,7 @@ func TestRunCleanupFlagEndToEnd_FailureDoesNotAffectStartup(t *testing.T) {
|
|||||||
return CleanupStats{Scanned: 1}, fmt.Errorf("permission denied")
|
return CleanupStats{Scanned: 1}, fmt.Errorf("permission denied")
|
||||||
}
|
}
|
||||||
|
|
||||||
os.Args = []string{"codeagent-wrapper", "--cleanup"}
|
os.Args = []string{"codex-wrapper", "--cleanup"}
|
||||||
|
|
||||||
var exitCode int
|
var exitCode int
|
||||||
errOutput := captureStderr(t, func() {
|
errOutput := captureStderr(t, func() {
|
||||||
@@ -920,7 +822,7 @@ func TestRunCleanupFlagEndToEnd_FailureDoesNotAffectStartup(t *testing.T) {
|
|||||||
t.Fatalf("cleanup called %d times, want 1", calls)
|
t.Fatalf("cleanup called %d times, want 1", calls)
|
||||||
}
|
}
|
||||||
|
|
||||||
currentLog := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
currentLog := filepath.Join(tempDir, fmt.Sprintf("codex-wrapper-%d.log", os.Getpid()))
|
||||||
if _, err := os.Stat(currentLog); err == nil {
|
if _, err := os.Stat(currentLog); err == nil {
|
||||||
t.Fatalf("cleanup failure should not create new log file %s", currentLog)
|
t.Fatalf("cleanup failure should not create new log file %s", currentLog)
|
||||||
} else if !os.IsNotExist(err) {
|
} else if !os.IsNotExist(err) {
|
||||||
@@ -933,7 +835,7 @@ func TestRunCleanupFlagEndToEnd_FailureDoesNotAffectStartup(t *testing.T) {
|
|||||||
codexCommand = createFakeCodexScript(t, "tid-cleanup-e2e", "ok")
|
codexCommand = createFakeCodexScript(t, "tid-cleanup-e2e", "ok")
|
||||||
stdinReader = strings.NewReader("")
|
stdinReader = strings.NewReader("")
|
||||||
isTerminalFn = func() bool { return true }
|
isTerminalFn = func() bool { return true }
|
||||||
os.Args = []string{"codeagent-wrapper", "post-cleanup task"}
|
os.Args = []string{"codex-wrapper", "post-cleanup task"}
|
||||||
|
|
||||||
var normalExit int
|
var normalExit int
|
||||||
normalOutput := captureStdout(t, func() {
|
normalOutput := captureStdout(t, func() {
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,65 +1,102 @@
|
|||||||
package parser
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// JSONEvent represents a Codex JSON output event
|
||||||
|
type JSONEvent struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
ThreadID string `json:"thread_id,omitempty"`
|
||||||
|
Item *EventItem `json:"item,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// EventItem represents the item field in a JSON event
|
||||||
|
type EventItem struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Text interface{} `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClaudeEvent for Claude stream-json format
|
||||||
|
type ClaudeEvent struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Subtype string `json:"subtype,omitempty"`
|
||||||
|
SessionID string `json:"session_id,omitempty"`
|
||||||
|
Result string `json:"result,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GeminiEvent for Gemini stream-json format
|
||||||
|
type GeminiEvent struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
SessionID string `json:"session_id,omitempty"`
|
||||||
|
Role string `json:"role,omitempty"`
|
||||||
|
Content string `json:"content,omitempty"`
|
||||||
|
Delta bool `json:"delta,omitempty"`
|
||||||
|
Status string `json:"status,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseJSONStream(r io.Reader) (message, threadID string) {
|
||||||
|
return parseJSONStreamWithLog(r, logWarn, logInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseJSONStreamWithWarn(r io.Reader, warnFn func(string)) (message, threadID string) {
|
||||||
|
return parseJSONStreamWithLog(r, warnFn, logInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseJSONStreamWithLog(r io.Reader, warnFn func(string), infoFn func(string)) (message, threadID string) {
|
||||||
|
return parseJSONStreamInternal(r, warnFn, infoFn, nil)
|
||||||
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
jsonLineReaderSize = 64 * 1024
|
jsonLineReaderSize = 64 * 1024
|
||||||
jsonLineMaxBytes = 10 * 1024 * 1024
|
jsonLineMaxBytes = 10 * 1024 * 1024
|
||||||
jsonLinePreviewBytes = 256
|
jsonLinePreviewBytes = 256
|
||||||
)
|
)
|
||||||
|
|
||||||
type lineScratch struct {
|
type codexHeader struct {
|
||||||
buf []byte
|
Type string `json:"type"`
|
||||||
preview []byte
|
ThreadID string `json:"thread_id,omitempty"`
|
||||||
|
Item *struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
} `json:"item,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
const maxPooledLineScratchCap = 1 << 20 // 1 MiB
|
// UnifiedEvent combines all backend event formats into a single structure
|
||||||
|
// to avoid multiple JSON unmarshal operations per event
|
||||||
|
type UnifiedEvent struct {
|
||||||
|
// Common fields
|
||||||
|
Type string `json:"type"`
|
||||||
|
|
||||||
var lineScratchPool = sync.Pool{
|
// Codex-specific fields
|
||||||
New: func() any {
|
ThreadID string `json:"thread_id,omitempty"`
|
||||||
return &lineScratch{
|
Item json.RawMessage `json:"item,omitempty"` // Lazy parse
|
||||||
buf: make([]byte, 0, jsonLineReaderSize),
|
|
||||||
preview: make([]byte, 0, jsonLinePreviewBytes),
|
// Claude-specific fields
|
||||||
}
|
Subtype string `json:"subtype,omitempty"`
|
||||||
},
|
SessionID string `json:"session_id,omitempty"`
|
||||||
|
Result string `json:"result,omitempty"`
|
||||||
|
|
||||||
|
// Gemini-specific fields
|
||||||
|
Role string `json:"role,omitempty"`
|
||||||
|
Content string `json:"content,omitempty"`
|
||||||
|
Delta *bool `json:"delta,omitempty"`
|
||||||
|
Status string `json:"status,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(string), onMessage func(), onComplete func()) (message, threadID string) {
|
// ItemContent represents the parsed item.text field for Codex events
|
||||||
|
type ItemContent struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Text interface{} `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
scratch := lineScratchPool.Get().(*lineScratch)
|
|
||||||
if scratch.buf == nil {
|
|
||||||
scratch.buf = make([]byte, 0, jsonLineReaderSize)
|
|
||||||
} else {
|
|
||||||
scratch.buf = scratch.buf[:0]
|
|
||||||
}
|
|
||||||
if scratch.preview == nil {
|
|
||||||
scratch.preview = make([]byte, 0, jsonLinePreviewBytes)
|
|
||||||
} else {
|
|
||||||
scratch.preview = scratch.preview[:0]
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if cap(scratch.buf) > maxPooledLineScratchCap {
|
|
||||||
scratch.buf = nil
|
|
||||||
} else if scratch.buf != nil {
|
|
||||||
scratch.buf = scratch.buf[:0]
|
|
||||||
}
|
|
||||||
if cap(scratch.preview) > jsonLinePreviewBytes*4 {
|
|
||||||
scratch.preview = nil
|
|
||||||
} else if scratch.preview != nil {
|
|
||||||
scratch.preview = scratch.preview[:0]
|
|
||||||
}
|
|
||||||
lineScratchPool.Put(scratch)
|
|
||||||
}()
|
|
||||||
|
|
||||||
if warnFn == nil {
|
if warnFn == nil {
|
||||||
warnFn = func(string) {}
|
warnFn = func(string) {}
|
||||||
@@ -74,23 +111,16 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notifyComplete := func() {
|
|
||||||
if onComplete != nil {
|
|
||||||
onComplete()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
totalEvents := 0
|
totalEvents := 0
|
||||||
|
|
||||||
var (
|
var (
|
||||||
codexMessage string
|
codexMessage string
|
||||||
claudeMessage string
|
claudeMessage string
|
||||||
geminiBuffer strings.Builder
|
geminiBuffer strings.Builder
|
||||||
opencodeMessage strings.Builder
|
|
||||||
)
|
)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
line, tooLong, err := readLineWithLimit(reader, jsonLineMaxBytes, jsonLinePreviewBytes, scratch)
|
line, tooLong, err := readLineWithLimit(reader, jsonLineMaxBytes, jsonLinePreviewBytes)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, io.EOF) {
|
if errors.Is(err, io.EOF) {
|
||||||
break
|
break
|
||||||
@@ -106,14 +136,14 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
totalEvents++
|
totalEvents++
|
||||||
|
|
||||||
if tooLong {
|
if tooLong {
|
||||||
warnFn(fmt.Sprintf("Skipped overlong JSON line (> %d bytes): %s", jsonLineMaxBytes, TruncateBytes(line, 100)))
|
warnFn(fmt.Sprintf("Skipped overlong JSON line (> %d bytes): %s", jsonLineMaxBytes, truncateBytes(line, 100)))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Single unmarshal for all backend types
|
// Single unmarshal for all backend types
|
||||||
var event UnifiedEvent
|
var event UnifiedEvent
|
||||||
if err := json.Unmarshal(line, &event); err != nil {
|
if err := json.Unmarshal(line, &event); err != nil {
|
||||||
warnFn(fmt.Sprintf("Failed to parse event: %s", TruncateBytes(line, 100)))
|
warnFn(fmt.Sprintf("Failed to parse event: %s", truncateBytes(line, 100)))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,46 +157,8 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
isCodex = true
|
isCodex = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Codex-specific event types without thread_id or item
|
|
||||||
if !isCodex && (event.Type == "turn.started" || event.Type == "turn.completed") {
|
|
||||||
isCodex = true
|
|
||||||
}
|
|
||||||
isClaude := event.Subtype != "" || event.Result != ""
|
isClaude := event.Subtype != "" || event.Result != ""
|
||||||
if !isClaude && event.Type == "result" && event.SessionID != "" && event.Status == "" {
|
isGemini := event.Role != "" || event.Delta != nil || event.Status != ""
|
||||||
isClaude = true
|
|
||||||
}
|
|
||||||
isGemini := (event.Type == "init" && event.SessionID != "") || event.Role != "" || event.Delta != nil || event.Status != ""
|
|
||||||
isOpencode := event.OpencodeSessionID != "" && len(event.Part) > 0
|
|
||||||
|
|
||||||
// Handle Opencode events first (most specific detection)
|
|
||||||
if isOpencode {
|
|
||||||
if threadID == "" {
|
|
||||||
threadID = event.OpencodeSessionID
|
|
||||||
}
|
|
||||||
|
|
||||||
var part OpencodePart
|
|
||||||
if err := json.Unmarshal(event.Part, &part); err != nil {
|
|
||||||
warnFn(fmt.Sprintf("Failed to parse opencode part: %s", err.Error()))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract sessionID from part if available
|
|
||||||
if part.SessionID != "" && threadID == "" {
|
|
||||||
threadID = part.SessionID
|
|
||||||
}
|
|
||||||
|
|
||||||
infoFn(fmt.Sprintf("Parsed Opencode event #%d type=%s part_type=%s", totalEvents, event.Type, part.Type))
|
|
||||||
|
|
||||||
if event.Type == "text" && part.Text != "" {
|
|
||||||
opencodeMessage.WriteString(part.Text)
|
|
||||||
notifyMessage()
|
|
||||||
}
|
|
||||||
|
|
||||||
if part.Type == "step-finish" && part.Reason == "stop" {
|
|
||||||
notifyComplete()
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle Codex events
|
// Handle Codex events
|
||||||
if isCodex {
|
if isCodex {
|
||||||
@@ -186,17 +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 "turn.completed":
|
|
||||||
infoFn("turn.completed event")
|
|
||||||
notifyComplete()
|
|
||||||
|
|
||||||
case "item.completed":
|
case "item.completed":
|
||||||
var itemType string
|
var itemType string
|
||||||
if len(event.Item) > 0 {
|
if len(event.Item) > 0 {
|
||||||
@@ -212,7 +193,7 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
// Lazy parse: only parse item content when needed
|
// Lazy parse: only parse item content when needed
|
||||||
var item ItemContent
|
var item ItemContent
|
||||||
if err := json.Unmarshal(event.Item, &item); err == nil {
|
if err := json.Unmarshal(event.Item, &item); err == nil {
|
||||||
normalized := NormalizeText(item.Text)
|
normalized := normalizeText(item.Text)
|
||||||
infoFn(fmt.Sprintf("item.completed event item_type=%s message_len=%d", itemType, len(normalized)))
|
infoFn(fmt.Sprintf("item.completed event item_type=%s message_len=%d", itemType, len(normalized)))
|
||||||
if normalized != "" {
|
if normalized != "" {
|
||||||
codexMessage = normalized
|
codexMessage = normalized
|
||||||
@@ -240,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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,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
|
||||||
@@ -274,13 +247,11 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unknown event format from other backends (turn.started/assistant/user); ignore.
|
// Unknown event format
|
||||||
continue
|
warnFn(fmt.Sprintf("Unknown event format: %s", truncateBytes(line, 100)))
|
||||||
}
|
}
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case opencodeMessage.Len() > 0:
|
|
||||||
message = opencodeMessage.String()
|
|
||||||
case geminiBuffer.Len() > 0:
|
case geminiBuffer.Len() > 0:
|
||||||
message = geminiBuffer.String()
|
message = geminiBuffer.String()
|
||||||
case claudeMessage != "":
|
case claudeMessage != "":
|
||||||
@@ -293,12 +264,12 @@ func ParseJSONStreamInternal(r io.Reader, warnFn func(string), infoFn func(strin
|
|||||||
return message, threadID
|
return message, threadID
|
||||||
}
|
}
|
||||||
|
|
||||||
func HasKey(m map[string]json.RawMessage, key string) bool {
|
func hasKey(m map[string]json.RawMessage, key string) bool {
|
||||||
_, ok := m[key]
|
_, ok := m[key]
|
||||||
return ok
|
return ok
|
||||||
}
|
}
|
||||||
|
|
||||||
func DiscardInvalidJSON(decoder *json.Decoder, reader *bufio.Reader) (*bufio.Reader, error) {
|
func discardInvalidJSON(decoder *json.Decoder, reader *bufio.Reader) (*bufio.Reader, error) {
|
||||||
var buffered bytes.Buffer
|
var buffered bytes.Buffer
|
||||||
|
|
||||||
if decoder != nil {
|
if decoder != nil {
|
||||||
@@ -324,7 +295,7 @@ func DiscardInvalidJSON(decoder *json.Decoder, reader *bufio.Reader) (*bufio.Rea
|
|||||||
return bufio.NewReader(io.MultiReader(bytes.NewReader(remaining), reader)), err
|
return bufio.NewReader(io.MultiReader(bytes.NewReader(remaining), reader)), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func readLineWithLimit(r *bufio.Reader, maxBytes int, previewBytes int, scratch *lineScratch) (line []byte, tooLong bool, err error) {
|
func readLineWithLimit(r *bufio.Reader, maxBytes int, previewBytes int) (line []byte, tooLong bool, err error) {
|
||||||
if r == nil {
|
if r == nil {
|
||||||
return nil, false, errors.New("reader is nil")
|
return nil, false, errors.New("reader is nil")
|
||||||
}
|
}
|
||||||
@@ -347,22 +318,12 @@ func readLineWithLimit(r *bufio.Reader, maxBytes int, previewBytes int, scratch
|
|||||||
return part, false, nil
|
return part, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if scratch == nil {
|
preview := make([]byte, 0, min(previewBytes, len(part)))
|
||||||
scratch = &lineScratch{}
|
|
||||||
}
|
|
||||||
if scratch.preview == nil {
|
|
||||||
scratch.preview = make([]byte, 0, min(previewBytes, len(part)))
|
|
||||||
}
|
|
||||||
if scratch.buf == nil {
|
|
||||||
scratch.buf = make([]byte, 0, min(maxBytes, len(part)*2))
|
|
||||||
}
|
|
||||||
|
|
||||||
preview := scratch.preview[:0]
|
|
||||||
if previewBytes > 0 {
|
if previewBytes > 0 {
|
||||||
preview = append(preview, part[:min(previewBytes, len(part))]...)
|
preview = append(preview, part[:min(previewBytes, len(part))]...)
|
||||||
}
|
}
|
||||||
|
|
||||||
buf := scratch.buf[:0]
|
buf := make([]byte, 0, min(maxBytes, len(part)*2))
|
||||||
total := 0
|
total := 0
|
||||||
if len(part) > maxBytes {
|
if len(part) > maxBytes {
|
||||||
tooLong = true
|
tooLong = true
|
||||||
@@ -392,16 +353,12 @@ func readLineWithLimit(r *bufio.Reader, maxBytes int, previewBytes int, scratch
|
|||||||
}
|
}
|
||||||
|
|
||||||
if tooLong {
|
if tooLong {
|
||||||
scratch.preview = preview
|
|
||||||
scratch.buf = buf
|
|
||||||
return preview, true, nil
|
return preview, true, nil
|
||||||
}
|
}
|
||||||
scratch.preview = preview
|
|
||||||
scratch.buf = buf
|
|
||||||
return buf, false, nil
|
return buf, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func TruncateBytes(b []byte, maxLen int) string {
|
func truncateBytes(b []byte, maxLen int) string {
|
||||||
if len(b) <= maxLen {
|
if len(b) <= maxLen {
|
||||||
return string(b)
|
return string(b)
|
||||||
}
|
}
|
||||||
@@ -411,7 +368,7 @@ func TruncateBytes(b []byte, maxLen int) string {
|
|||||||
return string(b[:maxLen]) + "..."
|
return string(b[:maxLen]) + "..."
|
||||||
}
|
}
|
||||||
|
|
||||||
func NormalizeText(text interface{}) string {
|
func normalizeText(text interface{}) string {
|
||||||
switch v := text.(type) {
|
switch v := text.(type) {
|
||||||
case string:
|
case string:
|
||||||
return v
|
return v
|
||||||
@@ -427,10 +384,3 @@ func NormalizeText(text interface{}) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func min(a, b int) int {
|
|
||||||
if a < b {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package parser
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
||||||
@@ -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)
|
||||||
}
|
}
|
||||||
217
codeagent-wrapper/process_check_test.go
Normal file
217
codeagent-wrapper/process_check_test.go
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
//go:build unix || darwin || linux
|
||||||
|
// +build unix darwin linux
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIsProcessRunning(t *testing.T) {
|
||||||
|
t.Run("current process", func(t *testing.T) {
|
||||||
|
if !isProcessRunning(os.Getpid()) {
|
||||||
|
t.Fatalf("expected current process (pid=%d) to be running", os.Getpid())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("fake pid", func(t *testing.T) {
|
||||||
|
const nonexistentPID = 1 << 30
|
||||||
|
if isProcessRunning(nonexistentPID) {
|
||||||
|
t.Fatalf("expected pid %d to be reported as not running", nonexistentPID)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("terminated process", func(t *testing.T) {
|
||||||
|
pid := exitedProcessPID(t)
|
||||||
|
if isProcessRunning(pid) {
|
||||||
|
t.Fatalf("expected exited child process (pid=%d) to be reported as not running", pid)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("boundary values", func(t *testing.T) {
|
||||||
|
if isProcessRunning(0) {
|
||||||
|
t.Fatalf("pid 0 should never be treated as running")
|
||||||
|
}
|
||||||
|
if isProcessRunning(-42) {
|
||||||
|
t.Fatalf("negative pid should never be treated as running")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("find process error", func(t *testing.T) {
|
||||||
|
original := findProcess
|
||||||
|
defer func() { findProcess = original }()
|
||||||
|
|
||||||
|
mockErr := errors.New("findProcess failure")
|
||||||
|
findProcess = func(pid int) (*os.Process, error) {
|
||||||
|
return nil, mockErr
|
||||||
|
}
|
||||||
|
|
||||||
|
if isProcessRunning(1234) {
|
||||||
|
t.Fatalf("expected false when os.FindProcess fails")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func exitedProcessPID(t *testing.T) int {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
var cmd *exec.Cmd
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
cmd = exec.Command("cmd", "/c", "exit 0")
|
||||||
|
} else {
|
||||||
|
cmd = exec.Command("sh", "-c", "exit 0")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
t.Fatalf("failed to start helper process: %v", err)
|
||||||
|
}
|
||||||
|
pid := cmd.Process.Pid
|
||||||
|
|
||||||
|
if err := cmd.Wait(); err != nil {
|
||||||
|
t.Fatalf("helper process did not exit cleanly: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
return pid
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunProcessCheckSmoke(t *testing.T) {
|
||||||
|
t.Run("current process", func(t *testing.T) {
|
||||||
|
if !isProcessRunning(os.Getpid()) {
|
||||||
|
t.Fatalf("expected current process (pid=%d) to be running", os.Getpid())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("fake pid", func(t *testing.T) {
|
||||||
|
const nonexistentPID = 1 << 30
|
||||||
|
if isProcessRunning(nonexistentPID) {
|
||||||
|
t.Fatalf("expected pid %d to be reported as not running", nonexistentPID)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("boundary values", func(t *testing.T) {
|
||||||
|
if isProcessRunning(0) {
|
||||||
|
t.Fatalf("pid 0 should never be treated as running")
|
||||||
|
}
|
||||||
|
if isProcessRunning(-42) {
|
||||||
|
t.Fatalf("negative pid should never be treated as running")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("find process error", func(t *testing.T) {
|
||||||
|
original := findProcess
|
||||||
|
defer func() { findProcess = original }()
|
||||||
|
|
||||||
|
mockErr := errors.New("findProcess failure")
|
||||||
|
findProcess = func(pid int) (*os.Process, error) {
|
||||||
|
return nil, mockErr
|
||||||
|
}
|
||||||
|
|
||||||
|
if isProcessRunning(1234) {
|
||||||
|
t.Fatalf("expected false when os.FindProcess fails")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetProcessStartTimeReadsProcStat(t *testing.T) {
|
||||||
|
pid := 4321
|
||||||
|
boot := time.Unix(1_710_000_000, 0)
|
||||||
|
startTicks := uint64(4500)
|
||||||
|
|
||||||
|
statFields := make([]string, 25)
|
||||||
|
for i := range statFields {
|
||||||
|
statFields[i] = strconv.Itoa(i + 1)
|
||||||
|
}
|
||||||
|
statFields[19] = strconv.FormatUint(startTicks, 10)
|
||||||
|
statContent := fmt.Sprintf("%d (%s) %s", pid, "cmd with space", strings.Join(statFields, " "))
|
||||||
|
|
||||||
|
stubReadFile(t, func(path string) ([]byte, error) {
|
||||||
|
switch path {
|
||||||
|
case fmt.Sprintf("/proc/%d/stat", pid):
|
||||||
|
return []byte(statContent), nil
|
||||||
|
case "/proc/stat":
|
||||||
|
return []byte(fmt.Sprintf("cpu 0 0 0 0\nbtime %d\n", boot.Unix())), nil
|
||||||
|
default:
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
got := getProcessStartTime(pid)
|
||||||
|
want := boot.Add(time.Duration(startTicks/100) * time.Second)
|
||||||
|
if !got.Equal(want) {
|
||||||
|
t.Fatalf("getProcessStartTime() = %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetProcessStartTimeInvalidData(t *testing.T) {
|
||||||
|
pid := 99
|
||||||
|
stubReadFile(t, func(path string) ([]byte, error) {
|
||||||
|
switch path {
|
||||||
|
case fmt.Sprintf("/proc/%d/stat", pid):
|
||||||
|
return []byte("garbage"), nil
|
||||||
|
case "/proc/stat":
|
||||||
|
return []byte("btime not-a-number\n"), nil
|
||||||
|
default:
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
if got := getProcessStartTime(pid); !got.IsZero() {
|
||||||
|
t.Fatalf("invalid /proc data should return zero time, got %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetBootTimeParsesBtime(t *testing.T) {
|
||||||
|
const bootSec = 1_711_111_111
|
||||||
|
stubReadFile(t, func(path string) ([]byte, error) {
|
||||||
|
if path != "/proc/stat" {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
content := fmt.Sprintf("intr 0\nbtime %d\n", bootSec)
|
||||||
|
return []byte(content), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
got := getBootTime()
|
||||||
|
want := time.Unix(bootSec, 0)
|
||||||
|
if !got.Equal(want) {
|
||||||
|
t.Fatalf("getBootTime() = %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetBootTimeInvalidData(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
content string
|
||||||
|
}{
|
||||||
|
{"missing", "cpu 0 0 0 0"},
|
||||||
|
{"malformed", "btime abc"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range cases {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
stubReadFile(t, func(string) ([]byte, error) {
|
||||||
|
return []byte(tt.content), nil
|
||||||
|
})
|
||||||
|
if got := getBootTime(); !got.IsZero() {
|
||||||
|
t.Fatalf("getBootTime() unexpected value for %s: %v", tt.name, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func stubReadFile(t *testing.T, fn func(string) ([]byte, error)) {
|
||||||
|
t.Helper()
|
||||||
|
original := readFileFn
|
||||||
|
readFileFn = fn
|
||||||
|
t.Cleanup(func() {
|
||||||
|
readFileFn = original
|
||||||
|
})
|
||||||
|
}
|
||||||
104
codeagent-wrapper/process_check_unix.go
Normal file
104
codeagent-wrapper/process_check_unix.go
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
//go:build unix || darwin || linux
|
||||||
|
// +build unix darwin linux
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var findProcess = os.FindProcess
|
||||||
|
var readFileFn = os.ReadFile
|
||||||
|
|
||||||
|
// isProcessRunning returns true if a process with the given pid is running on Unix-like systems.
|
||||||
|
func isProcessRunning(pid int) bool {
|
||||||
|
if pid <= 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
proc, err := findProcess(pid)
|
||||||
|
if err != nil || proc == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
err = proc.Signal(syscall.Signal(0))
|
||||||
|
if err != nil && (errors.Is(err, syscall.ESRCH) || errors.Is(err, os.ErrProcessDone)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// getProcessStartTime returns the start time of a process on Unix-like systems.
|
||||||
|
// Returns zero time if the start time cannot be determined.
|
||||||
|
func getProcessStartTime(pid int) time.Time {
|
||||||
|
if pid <= 0 {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read /proc/<pid>/stat to get process start time
|
||||||
|
statPath := fmt.Sprintf("/proc/%d/stat", pid)
|
||||||
|
data, err := readFileFn(statPath)
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse stat file: fields are space-separated, but comm (field 2) can contain spaces
|
||||||
|
// Find the last ')' to skip comm field safely
|
||||||
|
content := string(data)
|
||||||
|
lastParen := strings.LastIndex(content, ")")
|
||||||
|
if lastParen == -1 {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
fields := strings.Fields(content[lastParen+1:])
|
||||||
|
if len(fields) < 20 {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Field 22 (index 19 after comm) is starttime in clock ticks since boot
|
||||||
|
startTicks, err := strconv.ParseUint(fields[19], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get system boot time
|
||||||
|
bootTime := getBootTime()
|
||||||
|
if bootTime.IsZero() {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert ticks to duration (typically 100 ticks/sec on most systems)
|
||||||
|
ticksPerSec := uint64(100) // sysconf(_SC_CLK_TCK), typically 100
|
||||||
|
startTime := bootTime.Add(time.Duration(startTicks/ticksPerSec) * time.Second)
|
||||||
|
|
||||||
|
return startTime
|
||||||
|
}
|
||||||
|
|
||||||
|
// getBootTime returns the system boot time by reading /proc/stat.
|
||||||
|
func getBootTime() time.Time {
|
||||||
|
data, err := readFileFn("/proc/stat")
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
lines := strings.Split(string(data), "\n")
|
||||||
|
for _, line := range lines {
|
||||||
|
if strings.HasPrefix(line, "btime ") {
|
||||||
|
fields := strings.Fields(line)
|
||||||
|
if len(fields) >= 2 {
|
||||||
|
bootSec, err := strconv.ParseInt(fields[1], 10, 64)
|
||||||
|
if err == nil {
|
||||||
|
return time.Unix(bootSec, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
87
codeagent-wrapper/process_check_windows.go
Normal file
87
codeagent-wrapper/process_check_windows.go
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
//go:build windows
|
||||||
|
// +build windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
processQueryLimitedInformation = 0x1000
|
||||||
|
stillActive = 259 // STILL_ACTIVE exit code
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
findProcess = os.FindProcess
|
||||||
|
kernel32 = syscall.NewLazyDLL("kernel32.dll")
|
||||||
|
getProcessTimes = kernel32.NewProc("GetProcessTimes")
|
||||||
|
fileTimeToUnixFn = fileTimeToUnix
|
||||||
|
)
|
||||||
|
|
||||||
|
// isProcessRunning returns true if a process with the given pid is running on Windows.
|
||||||
|
func isProcessRunning(pid int) bool {
|
||||||
|
if pid <= 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := findProcess(pid); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
handle, err := syscall.OpenProcess(processQueryLimitedInformation, false, uint32(pid))
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, syscall.ERROR_ACCESS_DENIED) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer syscall.CloseHandle(handle)
|
||||||
|
|
||||||
|
var exitCode uint32
|
||||||
|
if err := syscall.GetExitCodeProcess(handle, &exitCode); err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return exitCode == stillActive
|
||||||
|
}
|
||||||
|
|
||||||
|
// getProcessStartTime returns the start time of a process on Windows.
|
||||||
|
// Returns zero time if the start time cannot be determined.
|
||||||
|
func getProcessStartTime(pid int) time.Time {
|
||||||
|
if pid <= 0 {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
handle, err := syscall.OpenProcess(processQueryLimitedInformation, false, uint32(pid))
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
defer syscall.CloseHandle(handle)
|
||||||
|
|
||||||
|
var creationTime, exitTime, kernelTime, userTime syscall.Filetime
|
||||||
|
ret, _, _ := getProcessTimes.Call(
|
||||||
|
uintptr(handle),
|
||||||
|
uintptr(unsafe.Pointer(&creationTime)),
|
||||||
|
uintptr(unsafe.Pointer(&exitTime)),
|
||||||
|
uintptr(unsafe.Pointer(&kernelTime)),
|
||||||
|
uintptr(unsafe.Pointer(&userTime)),
|
||||||
|
)
|
||||||
|
|
||||||
|
if ret == 0 {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fileTimeToUnixFn(creationTime)
|
||||||
|
}
|
||||||
|
|
||||||
|
// fileTimeToUnix converts Windows FILETIME to Unix time.
|
||||||
|
func fileTimeToUnix(ft syscall.Filetime) time.Time {
|
||||||
|
// FILETIME is 100-nanosecond intervals since January 1, 1601 UTC
|
||||||
|
nsec := ft.Nanoseconds()
|
||||||
|
return time.Unix(0, nsec)
|
||||||
|
}
|
||||||
@@ -1,11 +1,83 @@
|
|||||||
package executor
|
package main
|
||||||
|
|
||||||
import "bytes"
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func resolveTimeout() int {
|
||||||
|
raw := os.Getenv("CODEX_TIMEOUT")
|
||||||
|
if raw == "" {
|
||||||
|
return defaultTimeout
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed, err := strconv.Atoi(raw)
|
||||||
|
if err != nil || parsed <= 0 {
|
||||||
|
logWarn(fmt.Sprintf("Invalid CODEX_TIMEOUT '%s', falling back to %ds", raw, defaultTimeout))
|
||||||
|
return defaultTimeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if parsed > 10000 {
|
||||||
|
return parsed / 1000
|
||||||
|
}
|
||||||
|
return parsed
|
||||||
|
}
|
||||||
|
|
||||||
|
func readPipedTask() (string, error) {
|
||||||
|
if isTerminal() {
|
||||||
|
logInfo("Stdin is tty, skipping pipe read")
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
logInfo("Reading from stdin pipe...")
|
||||||
|
data, err := io.ReadAll(stdinReader)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("read stdin: %w", err)
|
||||||
|
}
|
||||||
|
if len(data) == 0 {
|
||||||
|
logInfo("Stdin pipe returned empty data")
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
logInfo(fmt.Sprintf("Read %d bytes from stdin pipe", len(data)))
|
||||||
|
return string(data), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func shouldUseStdin(taskText string, piped bool) bool {
|
||||||
|
if piped {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if len(taskText) > 800 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return strings.IndexAny(taskText, stdinSpecialChars) >= 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func defaultIsTerminal() bool {
|
||||||
|
fi, err := os.Stdin.Stat()
|
||||||
|
if err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return (fi.Mode() & os.ModeCharDevice) != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func isTerminal() bool {
|
||||||
|
return isTerminalFn()
|
||||||
|
}
|
||||||
|
|
||||||
|
func getEnv(key, defaultValue string) string {
|
||||||
|
if val := os.Getenv(key); val != "" {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
type logWriter struct {
|
type logWriter struct {
|
||||||
prefix string
|
prefix string
|
||||||
maxLen int
|
maxLen int
|
||||||
buf bytes.Buffer
|
buf bytes.Buffer
|
||||||
dropped bool
|
dropped bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,3 +194,32 @@ func (b *tailBuffer) Write(p []byte) (int, error) {
|
|||||||
func (b *tailBuffer) String() string {
|
func (b *tailBuffer) String() string {
|
||||||
return string(b.data)
|
return string(b.data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func truncate(s string, maxLen int) string {
|
||||||
|
if len(s) <= maxLen {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
if maxLen < 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return s[:maxLen] + "..."
|
||||||
|
}
|
||||||
|
|
||||||
|
func min(a, b int) int {
|
||||||
|
if a < b {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
func hello() string {
|
||||||
|
return "hello world"
|
||||||
|
}
|
||||||
|
|
||||||
|
func greet(name string) string {
|
||||||
|
return "hello " + name
|
||||||
|
}
|
||||||
|
|
||||||
|
func farewell(name string) string {
|
||||||
|
return "goodbye " + name
|
||||||
|
}
|
||||||
126
codeagent-wrapper/wrapper_name.go
Normal file
126
codeagent-wrapper/wrapper_name.go
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultWrapperName = "codeagent-wrapper"
|
||||||
|
legacyWrapperName = "codex-wrapper"
|
||||||
|
)
|
||||||
|
|
||||||
|
var executablePathFn = os.Executable
|
||||||
|
|
||||||
|
func normalizeWrapperName(path string) string {
|
||||||
|
if path == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
base := filepath.Base(path)
|
||||||
|
base = strings.TrimSuffix(base, ".exe") // tolerate Windows executables
|
||||||
|
|
||||||
|
switch base {
|
||||||
|
case defaultWrapperName, legacyWrapperName:
|
||||||
|
return base
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// currentWrapperName resolves the wrapper name based on the invoked binary.
|
||||||
|
// Only known names are honored to avoid leaking build/test binary names into logs.
|
||||||
|
func currentWrapperName() string {
|
||||||
|
if len(os.Args) == 0 {
|
||||||
|
return defaultWrapperName
|
||||||
|
}
|
||||||
|
|
||||||
|
if name := normalizeWrapperName(os.Args[0]); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
execPath, err := executablePathFn()
|
||||||
|
if err == nil {
|
||||||
|
if name := normalizeWrapperName(execPath); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
if resolved, err := filepath.EvalSymlinks(execPath); err == nil {
|
||||||
|
if name := normalizeWrapperName(resolved); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
if alias := resolveAlias(execPath, resolved); alias != "" {
|
||||||
|
return alias
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if alias := resolveAlias(execPath, ""); alias != "" {
|
||||||
|
return alias
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultWrapperName
|
||||||
|
}
|
||||||
|
|
||||||
|
// logPrefixes returns the set of accepted log name prefixes, including the
|
||||||
|
// current wrapper name and legacy aliases.
|
||||||
|
func logPrefixes() []string {
|
||||||
|
prefixes := []string{currentWrapperName(), defaultWrapperName, legacyWrapperName}
|
||||||
|
seen := make(map[string]struct{}, len(prefixes))
|
||||||
|
var unique []string
|
||||||
|
for _, prefix := range prefixes {
|
||||||
|
if prefix == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[prefix]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[prefix] = struct{}{}
|
||||||
|
unique = append(unique, prefix)
|
||||||
|
}
|
||||||
|
return unique
|
||||||
|
}
|
||||||
|
|
||||||
|
// primaryLogPrefix returns the preferred filename prefix for log files.
|
||||||
|
// Defaults to the current wrapper name when available, otherwise falls back
|
||||||
|
// to the canonical default name.
|
||||||
|
func primaryLogPrefix() string {
|
||||||
|
prefixes := logPrefixes()
|
||||||
|
if len(prefixes) == 0 {
|
||||||
|
return defaultWrapperName
|
||||||
|
}
|
||||||
|
return prefixes[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveAlias(execPath string, target string) string {
|
||||||
|
if execPath == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
dir := filepath.Dir(execPath)
|
||||||
|
for _, candidate := range []string{defaultWrapperName, legacyWrapperName} {
|
||||||
|
aliasPath := filepath.Join(dir, candidate)
|
||||||
|
info, err := os.Lstat(aliasPath)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if info.Mode()&os.ModeSymlink == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
resolved, err := filepath.EvalSymlinks(aliasPath)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if target != "" && resolved != target {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if name := normalizeWrapperName(aliasPath); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ""
|
||||||
|
}
|
||||||
50
codeagent-wrapper/wrapper_name_test.go
Normal file
50
codeagent-wrapper/wrapper_name_test.go
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCurrentWrapperNameFallsBackToExecutable(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
execPath := filepath.Join(tempDir, "codeagent-wrapper")
|
||||||
|
if err := os.WriteFile(execPath, []byte("#!/bin/true\n"), 0o755); err != nil {
|
||||||
|
t.Fatalf("failed to write fake binary: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Args = []string{filepath.Join(tempDir, "custom-name")}
|
||||||
|
executablePathFn = func() (string, error) {
|
||||||
|
return execPath, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := currentWrapperName(); got != defaultWrapperName {
|
||||||
|
t.Fatalf("currentWrapperName() = %q, want %q", got, defaultWrapperName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCurrentWrapperNameDetectsLegacyAliasSymlink(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
execPath := filepath.Join(tempDir, "wrapper")
|
||||||
|
aliasPath := filepath.Join(tempDir, legacyWrapperName)
|
||||||
|
|
||||||
|
if err := os.WriteFile(execPath, []byte("#!/bin/true\n"), 0o755); err != nil {
|
||||||
|
t.Fatalf("failed to write fake binary: %v", err)
|
||||||
|
}
|
||||||
|
if err := os.Symlink(execPath, aliasPath); err != nil {
|
||||||
|
t.Fatalf("failed to create alias: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Args = []string{filepath.Join(tempDir, "unknown-runner")}
|
||||||
|
executablePathFn = func() (string, error) {
|
||||||
|
return execPath, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := currentWrapperName(); got != legacyWrapperName {
|
||||||
|
t.Fatalf("currentWrapperName() = %q, want %q", got, legacyWrapperName)
|
||||||
|
}
|
||||||
|
}
|
||||||
100
config.json
100
config.json
@@ -93,7 +93,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"essentials": {
|
"essentials": {
|
||||||
"enabled": false,
|
"enabled": true,
|
||||||
"description": "Core development commands and utilities",
|
"description": "Core development commands and utilities",
|
||||||
"operations": [
|
"operations": [
|
||||||
{
|
{
|
||||||
@@ -108,104 +108,6 @@
|
|||||||
"description": "Copy development commands documentation"
|
"description": "Copy development commands documentation"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
"omo": {
|
|
||||||
"enabled": false,
|
|
||||||
"description": "OmO multi-agent orchestration with Sisyphus coordinator",
|
|
||||||
"operations": [
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/SKILL.md",
|
|
||||||
"target": "skills/omo/SKILL.md",
|
|
||||||
"description": "Install omo skill"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/oracle.md",
|
|
||||||
"target": "skills/omo/references/oracle.md",
|
|
||||||
"description": "Install oracle agent prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/librarian.md",
|
|
||||||
"target": "skills/omo/references/librarian.md",
|
|
||||||
"description": "Install librarian agent prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/explore.md",
|
|
||||||
"target": "skills/omo/references/explore.md",
|
|
||||||
"description": "Install explore agent prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/frontend-ui-ux-engineer.md",
|
|
||||||
"target": "skills/omo/references/frontend-ui-ux-engineer.md",
|
|
||||||
"description": "Install frontend-ui-ux-engineer agent prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/document-writer.md",
|
|
||||||
"target": "skills/omo/references/document-writer.md",
|
|
||||||
"description": "Install document-writer agent prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/omo/references/develop.md",
|
|
||||||
"target": "skills/omo/references/develop.md",
|
|
||||||
"description": "Install develop agent prompt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"sparv": {
|
|
||||||
"enabled": false,
|
|
||||||
"description": "SPARV workflow (Specify→Plan→Act→Review→Vault) with 10-point gate",
|
|
||||||
"operations": [
|
|
||||||
{
|
|
||||||
"type": "copy_dir",
|
|
||||||
"source": "skills/sparv",
|
|
||||||
"target": "skills/sparv",
|
|
||||||
"description": "Install sparv skill with all scripts and hooks"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"course": {
|
|
||||||
"enabled": false,
|
|
||||||
"description": "课程开发工作流，包含 dev、产品需求和测试用例技能",
|
|
||||||
"operations": [
|
|
||||||
{
|
|
||||||
"type": "copy_dir",
|
|
||||||
"source": "skills/dev",
|
|
||||||
"target": "skills/dev",
|
|
||||||
"description": "Install dev skill with agents"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/product-requirements/SKILL.md",
|
|
||||||
"target": "skills/product-requirements/SKILL.md",
|
|
||||||
"description": "Install product-requirements skill"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_dir",
|
|
||||||
"source": "skills/test-cases",
|
|
||||||
"target": "skills/test-cases",
|
|
||||||
"description": "Install test-cases skill with references"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "copy_file",
|
|
||||||
"source": "skills/codeagent/SKILL.md",
|
|
||||||
"target": "skills/codeagent/SKILL.md",
|
|
||||||
"description": "Install codeagent skill"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "run_command",
|
|
||||||
"command": "bash install.sh",
|
|
||||||
"description": "Install codeagent-wrapper binary",
|
|
||||||
"env": {
|
|
||||||
"INSTALL_DIR": "${install_dir}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "dev",
|
|
||||||
"description": "Lightweight development workflow with requirements clarification, parallel codex execution, and mandatory 90% test coverage",
|
|
||||||
"version": "5.6.1",
|
|
||||||
"author": {
|
|
||||||
"name": "cexll",
|
|
||||||
"email": "cexll@cexll.com"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,56 +9,42 @@ A freshly designed lightweight development workflow with no legacy baggage, focu
|
|||||||
```
|
```
|
||||||
/dev trigger
|
/dev trigger
|
||||||
↓
|
↓
|
||||||
AskUserQuestion (backend selection)
|
|
||||||
↓
|
|
||||||
AskUserQuestion (requirements clarification)
|
AskUserQuestion (requirements clarification)
|
||||||
↓
|
↓
|
||||||
codeagent analysis (plan mode + task typing + UI auto-detection)
|
codeagent analysis (plan mode + UI auto-detection)
|
||||||
↓
|
↓
|
||||||
dev-plan-generator (create dev doc)
|
dev-plan-generator (create dev doc)
|
||||||
↓
|
↓
|
||||||
codeagent concurrent development (2–5 tasks, backend routing)
|
codeagent concurrent development (2–5 tasks, backend split)
|
||||||
↓
|
↓
|
||||||
codeagent testing & verification (≥90% coverage)
|
codeagent testing & verification (≥90% coverage)
|
||||||
↓
|
↓
|
||||||
Done (generate summary)
|
Done (generate summary)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Step 0 + The 6 Steps
|
## The 6 Steps
|
||||||
|
|
||||||
### 0. Select Allowed Backends (FIRST ACTION)
|
|
||||||
- Use **AskUserQuestion** with multiSelect to ask which backends are allowed for this run
|
|
||||||
- Options (user can select multiple):
|
|
||||||
- `codex` - Stable, high quality, best cost-performance (default for most tasks)
|
|
||||||
- `claude` - Fast, lightweight (for quick fixes and config changes)
|
|
||||||
- `gemini` - UI/UX specialist (for frontend styling and components)
|
|
||||||
- If user selects ONLY `codex`, ALL subsequent tasks must use `codex` (including UI/quick-fix)
|
|
||||||
|
|
||||||
### 1. Clarify Requirements
|
### 1. Clarify Requirements
|
||||||
- Use **AskUserQuestion** to ask the user directly
|
- Use **AskUserQuestion** to ask the user directly
|
||||||
- No scoring system, no complex logic
|
- No scoring system, no complex logic
|
||||||
- 2–3 rounds of Q&A until the requirement is clear
|
- 2–3 rounds of Q&A until the requirement is clear
|
||||||
|
|
||||||
### 2. codeagent Analysis + Task Typing + UI Detection
|
### 2. codeagent Analysis & UI Detection
|
||||||
- Call codeagent to analyze the request in plan mode style
|
- Call codeagent to analyze the request in plan mode style
|
||||||
- Extract: core functions, technical points, task list (2–5 items)
|
- Extract: core functions, technical points, task list (2–5 items)
|
||||||
- For each task, assign exactly one type: `default` / `ui` / `quick-fix`
|
|
||||||
- UI auto-detection: needs UI work when task involves style assets (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component files (.tsx, .jsx, .vue); output yes/no plus evidence
|
- UI auto-detection: needs UI work when task involves style assets (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component files (.tsx, .jsx, .vue); output yes/no plus evidence
|
||||||
|
|
||||||
### 3. Generate Dev Doc
|
### 3. Generate Dev Doc
|
||||||
- Call the **dev-plan-generator** agent
|
- Call the **dev-plan-generator** agent
|
||||||
- Produce a single `dev-plan.md`
|
- Produce a single `dev-plan.md`
|
||||||
- Append a dedicated UI task when Step 2 marks `needs_ui: true`
|
- Append a dedicated UI task when Step 2 marks `needs_ui: true`
|
||||||
- Include: task breakdown, `type`, file scope, dependencies, test commands
|
- Include: task breakdown, file scope, dependencies, test commands
|
||||||
|
|
||||||
### 4. Concurrent Development
|
### 4. Concurrent Development
|
||||||
- Work from the task list in dev-plan.md
|
- Work from the task list in dev-plan.md
|
||||||
- Route backend per task type (with user constraints + fallback):
|
- Use codeagent per task with explicit backend selection:
|
||||||
- `default` → `codex`
|
- Backend/API/DB tasks → `--backend codex` (default)
|
||||||
- `ui` → `gemini` (enforced when allowed)
|
- UI/style/component tasks → `--backend gemini` (enforced)
|
||||||
- `quick-fix` → `claude`
|
|
||||||
- Missing `type` → treat as `default`
|
|
||||||
- If the preferred backend is not allowed, fallback to an allowed backend by priority: `codex` → `claude` → `gemini`
|
|
||||||
- Independent tasks → run in parallel
|
- Independent tasks → run in parallel
|
||||||
- Conflicting tasks → run serially
|
- Conflicting tasks → run serially
|
||||||
|
|
||||||
@@ -79,7 +65,7 @@ Done (generate summary)
|
|||||||
/dev "Implement user login with email + password"
|
/dev "Implement user login with email + password"
|
||||||
```
|
```
|
||||||
|
|
||||||
No CLI flags required; workflow starts with an interactive backend selection.
|
**No options**, fixed workflow, works out of the box.
|
||||||
|
|
||||||
## Output Structure
|
## Output Structure
|
||||||
|
|
||||||
@@ -94,14 +80,14 @@ Only one file—minimal and clear.
|
|||||||
|
|
||||||
### Tools
|
### Tools
|
||||||
- **AskUserQuestion**: interactive requirement clarification
|
- **AskUserQuestion**: interactive requirement clarification
|
||||||
- **codeagent skill**: analysis, development, testing; supports `--backend` for `codex` / `claude` / `gemini`
|
- **codeagent skill**: analysis, development, testing; supports `--backend` for codex (default) or gemini (UI)
|
||||||
- **dev-plan-generator agent**: generate dev doc (subagent via Task tool, saves context)
|
- **dev-plan-generator agent**: generate dev doc (subagent via Task tool, saves context)
|
||||||
|
|
||||||
## Backend Selection & Routing
|
## UI Auto-Detection & Backend Routing
|
||||||
- **Step 0**: user selects allowed backends; if `仅 codex`, all tasks use codex
|
|
||||||
- **UI detection standard**: style files (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component code (.tsx, .jsx, .vue) trigger `needs_ui: true`
|
- **UI detection standard**: style files (.css, .scss, styled-components, CSS modules, tailwindcss) OR frontend component code (.tsx, .jsx, .vue) trigger `needs_ui: true`
|
||||||
- **Task type field**: each task in `dev-plan.md` must have `type: default|ui|quick-fix`
|
- **Flow impact**: Step 2 auto-detects UI work; Step 3 appends a separate UI task in `dev-plan.md` when detected
|
||||||
- **Routing**: `default`→codex, `ui`→gemini, `quick-fix`→claude; if disallowed, fallback to an allowed backend by priority: codex→claude→gemini
|
- **Backend split**: backend/API tasks use codex backend (default); UI tasks force gemini backend
|
||||||
|
- **Implementation**: Orchestrator invokes codeagent skill with appropriate backend parameter per task type
|
||||||
|
|
||||||
## Key Features
|
## Key Features
|
||||||
|
|
||||||
@@ -116,9 +102,9 @@ Only one file—minimal and clear.
|
|||||||
- Steps are straightforward
|
- Steps are straightforward
|
||||||
|
|
||||||
### ✅ Concurrency
|
### ✅ Concurrency
|
||||||
- Tasks split based on natural functional boundaries
|
- 2–5 tasks in parallel
|
||||||
- Auto-detect dependencies and conflicts
|
- Auto-detect dependencies and conflicts
|
||||||
- codeagent executes independently with optimal backend
|
- codeagent executes independently
|
||||||
|
|
||||||
### ✅ Quality Assurance
|
### ✅ Quality Assurance
|
||||||
- Enforces 90% coverage
|
- Enforces 90% coverage
|
||||||
@@ -131,10 +117,6 @@ Only one file—minimal and clear.
|
|||||||
# Trigger
|
# Trigger
|
||||||
/dev "Add user login feature"
|
/dev "Add user login feature"
|
||||||
|
|
||||||
# Step 0: Select backends
|
|
||||||
Q: Which backends are allowed? (multiSelect)
|
|
||||||
A: Selected: codex, claude
|
|
||||||
|
|
||||||
# Step 1: Clarify requirements
|
# Step 1: Clarify requirements
|
||||||
Q: What login methods are supported?
|
Q: What login methods are supported?
|
||||||
A: Email + password
|
A: Email + password
|
||||||
@@ -144,18 +126,18 @@ A: Yes, use JWT token
|
|||||||
# Step 2: codeagent analysis
|
# Step 2: codeagent analysis
|
||||||
Output:
|
Output:
|
||||||
- Core: email/password login + JWT auth
|
- Core: email/password login + JWT auth
|
||||||
- Task 1: Backend API (type=default)
|
- Task 1: Backend API
|
||||||
- Task 2: Password hashing (type=default)
|
- Task 2: Password hashing
|
||||||
- Task 3: Frontend form (type=ui)
|
- Task 3: Frontend form
|
||||||
UI detection: needs_ui = true (tailwindcss classes in frontend form)
|
UI detection: needs_ui = true (tailwindcss classes in frontend form)
|
||||||
|
|
||||||
# Step 3: Generate doc
|
# Step 3: Generate doc
|
||||||
dev-plan.md generated with typed tasks ✓
|
dev-plan.md generated with backend + UI tasks ✓
|
||||||
|
|
||||||
# Step 4-5: Concurrent development (routing + fallback)
|
# Step 4-5: Concurrent development (backend codex, UI gemini)
|
||||||
[task-1] Backend API (codex) → tests → 92% ✓
|
[task-1] Backend API (codex) → tests → 92% ✓
|
||||||
[task-2] Password hashing (codex) → tests → 95% ✓
|
[task-2] Password hashing (codex) → tests → 95% ✓
|
||||||
[task-3] Frontend form (fallback to codex; gemini not allowed) → tests → 91% ✓
|
[task-3] Frontend form (gemini) → tests → 91% ✓
|
||||||
```
|
```
|
||||||
|
|
||||||
## Directory Structure
|
## Directory Structure
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ You are a specialized Development Plan Document Generator. Your sole responsibil
|
|||||||
|
|
||||||
You receive context from an orchestrator including:
|
You receive context from an orchestrator including:
|
||||||
- Feature requirements description
|
- Feature requirements description
|
||||||
- codeagent analysis results (feature highlights, task decomposition, UI detection flag, and task typing hints)
|
- codeagent analysis results (feature highlights, task decomposition, UI detection flag)
|
||||||
- Feature name (in kebab-case format)
|
- Feature name (in kebab-case format)
|
||||||
|
|
||||||
Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
||||||
@@ -29,7 +29,6 @@ Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
|||||||
|
|
||||||
### Task 1: [Task Name]
|
### Task 1: [Task Name]
|
||||||
- **ID**: task-1
|
- **ID**: task-1
|
||||||
- **type**: default|ui|quick-fix
|
|
||||||
- **Description**: [What needs to be done]
|
- **Description**: [What needs to be done]
|
||||||
- **File Scope**: [Directories or files involved, e.g., src/auth/**, tests/auth/]
|
- **File Scope**: [Directories or files involved, e.g., src/auth/**, tests/auth/]
|
||||||
- **Dependencies**: [None or depends on task-x]
|
- **Dependencies**: [None or depends on task-x]
|
||||||
@@ -39,7 +38,7 @@ Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
|||||||
### Task 2: [Task Name]
|
### Task 2: [Task Name]
|
||||||
...
|
...
|
||||||
|
|
||||||
(Tasks based on natural functional boundaries, typically 2-5)
|
(2-5 tasks)
|
||||||
|
|
||||||
## Acceptance Criteria
|
## Acceptance Criteria
|
||||||
- [ ] Feature point 1
|
- [ ] Feature point 1
|
||||||
@@ -54,13 +53,9 @@ Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
|||||||
|
|
||||||
## Generation Rules You Must Enforce
|
## Generation Rules You Must Enforce
|
||||||
|
|
||||||
1. **Task Count**: Generate tasks based on natural functional boundaries (no artificial limits)
|
1. **Task Count**: Generate 2-5 tasks (no more, no less unless the feature is extremely simple or complex)
|
||||||
- Typical range: 2-5 tasks
|
|
||||||
- Quality over quantity: prefer fewer well-scoped tasks over excessive fragmentation
|
|
||||||
- Each task should be independently completable by one agent
|
|
||||||
2. **Task Requirements**: Each task MUST include:
|
2. **Task Requirements**: Each task MUST include:
|
||||||
- Clear ID (task-1, task-2, etc.)
|
- Clear ID (task-1, task-2, etc.)
|
||||||
- A single task type field: `type: default|ui|quick-fix`
|
|
||||||
- Specific description of what needs to be done
|
- Specific description of what needs to be done
|
||||||
- Explicit file scope (directories or files affected)
|
- Explicit file scope (directories or files affected)
|
||||||
- Dependency declaration ("None" or "depends on task-x")
|
- Dependency declaration ("None" or "depends on task-x")
|
||||||
@@ -72,23 +67,18 @@ Your output is a single file: `./.claude/specs/{feature_name}/dev-plan.md`
|
|||||||
|
|
||||||
## Your Workflow
|
## Your Workflow
|
||||||
|
|
||||||
1. **Analyze Input**: Review the requirements description and codeagent analysis results (including `needs_ui` and any task typing hints)
|
1. **Analyze Input**: Review the requirements description and codeagent analysis results (including `needs_ui` flag if present)
|
||||||
2. **Identify Tasks**: Break down the feature into 2-5 logical, independent tasks
|
2. **Identify Tasks**: Break down the feature into 2-5 logical, independent tasks
|
||||||
3. **Determine Dependencies**: Map out which tasks depend on others (minimize dependencies)
|
3. **Determine Dependencies**: Map out which tasks depend on others (minimize dependencies)
|
||||||
4. **Assign Task Type**: For each task, set exactly one `type`:
|
4. **Specify Testing**: For each task, define the exact test command and coverage requirements
|
||||||
- `ui`: touches UI/style/component work (e.g., .css/.scss/.tsx/.jsx/.vue, tailwind, design tweaks)
|
5. **Define Acceptance**: List concrete, measurable acceptance criteria including the 90% coverage requirement
|
||||||
- `quick-fix`: small, fast changes (config tweaks, small bug fix, minimal scope); do NOT use for UI work
|
6. **Document Technical Points**: Note key technical decisions and constraints
|
||||||
- `default`: everything else
|
7. **Write File**: Use the Write tool to create `./.claude/specs/{feature_name}/dev-plan.md`
|
||||||
- Note: `/dev` Step 4 routes backend by `type` (default→codex, ui→gemini, quick-fix→claude; missing type → default)
|
|
||||||
5. **Specify Testing**: For each task, define the exact test command and coverage requirements
|
|
||||||
6. **Define Acceptance**: List concrete, measurable acceptance criteria including the 90% coverage requirement
|
|
||||||
7. **Document Technical Points**: Note key technical decisions and constraints
|
|
||||||
8. **Write File**: Use the Write tool to create `./.claude/specs/{feature_name}/dev-plan.md`
|
|
||||||
|
|
||||||
## Quality Checks Before Writing
|
## Quality Checks Before Writing
|
||||||
|
|
||||||
- [ ] Task count is between 2-5
|
- [ ] Task count is between 2-5
|
||||||
- [ ] Every task has all required fields (ID, type, Description, File Scope, Dependencies, Test Command, Test Focus)
|
- [ ] Every task has all 6 required fields (ID, Description, File Scope, Dependencies, Test Command, Test Focus)
|
||||||
- [ ] Test commands include coverage parameters
|
- [ ] Test commands include coverage parameters
|
||||||
- [ ] Dependencies are explicitly stated
|
- [ ] Dependencies are explicitly stated
|
||||||
- [ ] Acceptance criteria includes 90% coverage requirement
|
- [ ] Acceptance criteria includes 90% coverage requirement
|
||||||
|
|||||||
@@ -1,81 +1,28 @@
|
|||||||
---
|
---
|
||||||
description: Extreme lightweight end-to-end development workflow with requirements clarification, intelligent backend selection, 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 0** - Backend selection MUST be the FIRST action (before requirement clarification)
|
|
||||||
3. **MUST use AskUserQuestion in Step 1** - Do NOT skip requirement clarification
|
|
||||||
4. **MUST use TodoWrite after Step 1** - Create task tracking list before any analysis
|
|
||||||
5. **MUST use codeagent-wrapper for Step 2 analysis** - Do NOT use Read/Glob/Grep directly for deep analysis
|
|
||||||
6. **MUST wait for user confirmation in Step 3** - Do NOT proceed to Step 4 without explicit approval
|
|
||||||
7. **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 7-step development workflow (Step 0 + Step 1–6):
|
- Orchestrate a streamlined 6-step development workflow:
|
||||||
0. Backend selection (user constrained)
|
|
||||||
1. Requirement clarification through targeted questioning
|
1. Requirement clarification through targeted questioning
|
||||||
2. Technical analysis using codeagent-wrapper
|
2. Technical analysis using codeagent
|
||||||
3. Development documentation generation
|
3. Development documentation generation
|
||||||
4. Parallel development execution (backend routing per task type)
|
4. Parallel development execution
|
||||||
5. Coverage validation (≥90% requirement)
|
5. Coverage validation (≥90% requirement)
|
||||||
6. Completion summary
|
6. Completion summary
|
||||||
|
|
||||||
**Workflow Execution**
|
**Workflow Execution**
|
||||||
- **Step 0: Backend Selection [MANDATORY - FIRST ACTION]**
|
- **Step 1: Requirement Clarification**
|
||||||
- MUST use AskUserQuestion tool as the FIRST action with multiSelect enabled
|
- Use AskUserQuestion to clarify requirements directly
|
||||||
- Ask which backends are allowed for this /dev run
|
|
||||||
- Options (user can select multiple):
|
|
||||||
- `codex` - Stable, high quality, best cost-performance (default for most tasks)
|
|
||||||
- `claude` - Fast, lightweight (for quick fixes and config changes)
|
|
||||||
- `gemini` - UI/UX specialist (for frontend styling and components)
|
|
||||||
- Store the selected backends as `allowed_backends` set for routing in Step 4
|
|
||||||
- Special rule: if user selects ONLY `codex`, then ALL subsequent tasks (including UI/quick-fix) MUST use `codex` (no exceptions)
|
|
||||||
|
|
||||||
- **Step 1: Requirement Clarification [MANDATORY - DO NOT SKIP]**
|
|
||||||
- MUST use AskUserQuestion tool
|
|
||||||
- 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
|
|
||||||
# analysis_backend selection:
|
|
||||||
# - prefer codex if it is in allowed_backends
|
|
||||||
# - otherwise pick the first backend in allowed_backends
|
|
||||||
codeagent-wrapper --backend {analysis_backend} - <<'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 and file scope
|
|
||||||
5. Classify each task with a single `type`: `default` / `ui` / `quick-fix`
|
|
||||||
6. 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)
|
||||||
@@ -87,12 +34,12 @@ 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)
|
||||||
4. **Make Architectural Decisions**: Choose patterns, APIs, data models with justification
|
4. **Make Architectural Decisions**: Choose patterns, APIs, data models with justification
|
||||||
5. **Design Task Breakdown**: Produce parallelizable tasks based on natural functional boundaries with file scope and dependencies
|
5. **Design Task Breakdown**: Produce 2-5 parallelizable tasks with file scope and dependencies
|
||||||
|
|
||||||
**Analysis Output Structure**:
|
**Analysis Output Structure**:
|
||||||
```
|
```
|
||||||
@@ -109,7 +56,7 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
[API design, data models, architecture choices made]
|
[API design, data models, architecture choices made]
|
||||||
|
|
||||||
## Task Breakdown
|
## Task Breakdown
|
||||||
[2-5 tasks with: ID, description, file scope, dependencies, test command, type(default|ui|quick-fix)]
|
[2-5 tasks with: ID, description, file scope, dependencies, test command]
|
||||||
|
|
||||||
## UI Determination
|
## UI Determination
|
||||||
needs_ui: [true/false]
|
needs_ui: [true/false]
|
||||||
@@ -123,62 +70,39 @@ These rules have HIGHEST PRIORITY and override all other instructions:
|
|||||||
|
|
||||||
- **Step 3: Generate Development Documentation**
|
- **Step 3: Generate Development Documentation**
|
||||||
- invoke agent dev-plan-generator
|
- invoke agent dev-plan-generator
|
||||||
- When creating `dev-plan.md`, ensure every task has `type: default|ui|quick-fix`
|
- When creating `dev-plan.md`, append a dedicated UI task if Step 2 marked `needs_ui: true`
|
||||||
- Append a dedicated UI task if Step 2 marked `needs_ui: true` but no UI task exists
|
|
||||||
- Output a brief summary of dev-plan.md:
|
- Output a brief summary of dev-plan.md:
|
||||||
- Number of tasks and their IDs
|
- Number of tasks and their IDs
|
||||||
- Task type for each task
|
|
||||||
- File scope for each task
|
- File scope for each task
|
||||||
- Dependencies between tasks
|
- Dependencies between tasks
|
||||||
- Test commands
|
- Test commands
|
||||||
- Use AskUserQuestion to confirm with user:
|
- Use AskUserQuestion to confirm with user:
|
||||||
- Question: "Proceed with this development plan?" (state backend routing rules and any forced fallback due to allowed_backends)
|
- Question: "Proceed with this development plan?" (if UI work is detected, state that UI tasks will use the gemini backend)
|
||||||
- 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
|
|
||||||
- Backend routing (must be deterministic and enforceable):
|
|
||||||
- Task field: `type: default|ui|quick-fix` (missing → treat as `default`)
|
|
||||||
- Preferred backend by type:
|
|
||||||
- `default` → `codex`
|
|
||||||
- `ui` → `gemini` (enforced when allowed)
|
|
||||||
- `quick-fix` → `claude`
|
|
||||||
- If user selected `仅 codex`: all tasks MUST use `codex`
|
|
||||||
- Otherwise, if preferred backend is not in `allowed_backends`, fallback to the first available backend by priority: `codex` → `claude` → `gemini`
|
|
||||||
- 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: [routed-backend-from-type-and-allowed_backends]
|
|
||||||
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: [routed-backend-from-type-and-allowed_backends]
|
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
|
||||||
- Backend is routed deterministically based on task `type`, no manual intervention needed
|
|
||||||
|
|
||||||
- **Step 5: Coverage Validation**
|
- **Step 5: Coverage Validation**
|
||||||
- Validate each task’s coverage:
|
- Validate each task’s coverage:
|
||||||
@@ -189,19 +113,13 @@ 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 a routed backend is unavailable, fallback to another backend in `allowed_backends` (priority: codex → claude → gemini); if none works, fail with a clear error message
|
|
||||||
|
|
||||||
**Quality Standards**
|
**Quality Standards**
|
||||||
- Code coverage ≥90%
|
- Code coverage ≥90%
|
||||||
- Tasks based on natural functional boundaries (typically 2-5)
|
- 2-5 genuinely parallelizable tasks
|
||||||
- Each task has exactly one `type: default|ui|quick-fix`
|
|
||||||
- Backend routed by `type`: `default`→codex, `ui`→gemini, `quick-fix`→claude (with allowed_backends fallback)
|
|
||||||
- Documentation must be minimal yet actionable
|
- Documentation must be minimal yet actionable
|
||||||
- No verbose implementations; only essential code
|
- No verbose implementations; only essential code
|
||||||
|
|
||||||
|
|||||||
44
development-essentials/.claude-plugin/marketplace.json
Normal file
44
development-essentials/.claude-plugin/marketplace.json
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
"name": "development-essentials",
|
||||||
|
"source": "./",
|
||||||
|
"description": "Essential development commands for coding, debugging, testing, optimization, and documentation",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"author": {
|
||||||
|
"name": "Claude Code Dev Workflows",
|
||||||
|
"url": "https://github.com/cexll/myclaude"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/cexll/myclaude",
|
||||||
|
"repository": "https://github.com/cexll/myclaude",
|
||||||
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"code",
|
||||||
|
"debug",
|
||||||
|
"test",
|
||||||
|
"optimize",
|
||||||
|
"review",
|
||||||
|
"bugfix",
|
||||||
|
"refactor",
|
||||||
|
"documentation"
|
||||||
|
],
|
||||||
|
"category": "essentials",
|
||||||
|
"strict": false,
|
||||||
|
"commands": [
|
||||||
|
"./commands/code.md",
|
||||||
|
"./commands/debug.md",
|
||||||
|
"./commands/test.md",
|
||||||
|
"./commands/optimize.md",
|
||||||
|
"./commands/review.md",
|
||||||
|
"./commands/bugfix.md",
|
||||||
|
"./commands/refactor.md",
|
||||||
|
"./commands/docs.md",
|
||||||
|
"./commands/ask.md",
|
||||||
|
"./commands/think.md"
|
||||||
|
],
|
||||||
|
"agents": [
|
||||||
|
"./agents/code.md",
|
||||||
|
"./agents/bugfix.md",
|
||||||
|
"./agents/bugfix-verify.md",
|
||||||
|
"./agents/optimize.md",
|
||||||
|
"./agents/debug.md"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "essentials",
|
|
||||||
"description": "Essential development commands for coding, debugging, testing, optimization, and documentation",
|
|
||||||
"version": "5.6.1",
|
|
||||||
"author": {
|
|
||||||
"name": "cexll",
|
|
||||||
"email": "cexll@cexll.com"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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:**
|
||||||
@@ -322,8 +280,6 @@ Error: dependency backend_1701234567 failed
|
|||||||
| Variable | Default | Description |
|
| Variable | Default | Description |
|
||||||
|----------|---------|-------------|
|
|----------|---------|-------------|
|
||||||
| `CODEX_TIMEOUT` | 7200000 | Timeout in milliseconds |
|
| `CODEX_TIMEOUT` | 7200000 | Timeout in milliseconds |
|
||||||
| `CODEX_BYPASS_SANDBOX` | true | Bypass Codex sandbox/approval. Set `false` to disable |
|
|
||||||
| `CODEAGENT_SKIP_PERMISSIONS` | true | Skip Claude permission prompts. Set `false` to disable |
|
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
|
|||||||
84
install.bat
84
install.bat
@@ -46,23 +46,17 @@ echo.
|
|||||||
echo codeagent-wrapper installed successfully at:
|
echo codeagent-wrapper installed successfully at:
|
||||||
echo %DEST%
|
echo %DEST%
|
||||||
|
|
||||||
rem Ensure %USERPROFILE%\bin is in PATH without duplicating entries
|
rem Automatically ensure %USERPROFILE%\bin is in the USER (HKCU) PATH
|
||||||
rem 1) Read current user PATH from registry (REG_SZ or REG_EXPAND_SZ)
|
rem 1) Read current user PATH from registry (REG_SZ or REG_EXPAND_SZ)
|
||||||
set "USER_PATH_RAW="
|
set "USER_PATH_RAW="
|
||||||
|
set "USER_PATH_TYPE="
|
||||||
for /f "tokens=1,2,*" %%A in ('reg query "HKCU\Environment" /v Path 2^>nul ^| findstr /I /R "^ *Path *REG_"') do (
|
for /f "tokens=1,2,*" %%A in ('reg query "HKCU\Environment" /v Path 2^>nul ^| findstr /I /R "^ *Path *REG_"') do (
|
||||||
|
set "USER_PATH_TYPE=%%B"
|
||||||
set "USER_PATH_RAW=%%C"
|
set "USER_PATH_RAW=%%C"
|
||||||
)
|
)
|
||||||
rem Trim leading spaces from USER_PATH_RAW
|
rem Trim leading spaces from USER_PATH_RAW
|
||||||
for /f "tokens=* delims= " %%D in ("!USER_PATH_RAW!") do set "USER_PATH_RAW=%%D"
|
for /f "tokens=* delims= " %%D in ("!USER_PATH_RAW!") do set "USER_PATH_RAW=%%D"
|
||||||
|
|
||||||
rem 2) Read current system PATH from registry (REG_SZ or REG_EXPAND_SZ)
|
|
||||||
set "SYS_PATH_RAW="
|
|
||||||
for /f "tokens=1,2,*" %%A in ('reg query "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" /v Path 2^>nul ^| findstr /I /R "^ *Path *REG_"') do (
|
|
||||||
set "SYS_PATH_RAW=%%C"
|
|
||||||
)
|
|
||||||
rem Trim leading spaces from SYS_PATH_RAW
|
|
||||||
for /f "tokens=* delims= " %%D in ("!SYS_PATH_RAW!") do set "SYS_PATH_RAW=%%D"
|
|
||||||
|
|
||||||
rem Normalize DEST_DIR by removing a trailing backslash if present
|
rem Normalize DEST_DIR by removing a trailing backslash if present
|
||||||
if "!DEST_DIR:~-1!"=="\" set "DEST_DIR=!DEST_DIR:~0,-1!"
|
if "!DEST_DIR:~-1!"=="\" set "DEST_DIR=!DEST_DIR:~0,-1!"
|
||||||
|
|
||||||
@@ -73,70 +67,42 @@ set "SEARCH_EXP2=;!DEST_DIR!\;"
|
|||||||
set "SEARCH_LIT=;!PCT!USERPROFILE!PCT!\bin;"
|
set "SEARCH_LIT=;!PCT!USERPROFILE!PCT!\bin;"
|
||||||
set "SEARCH_LIT2=;!PCT!USERPROFILE!PCT!\bin\;"
|
set "SEARCH_LIT2=;!PCT!USERPROFILE!PCT!\bin\;"
|
||||||
|
|
||||||
rem Prepare PATH variants for containment tests (strip quotes to avoid false negatives)
|
rem Prepare user PATH variants for containment tests
|
||||||
set "USER_PATH_RAW_CLEAN=!USER_PATH_RAW:"=!"
|
set "CHECK_RAW=;!USER_PATH_RAW!;"
|
||||||
set "SYS_PATH_RAW_CLEAN=!SYS_PATH_RAW:"=!"
|
set "USER_PATH_EXP=!USER_PATH_RAW!"
|
||||||
|
|
||||||
set "CHECK_USER_RAW=;!USER_PATH_RAW_CLEAN!;"
|
|
||||||
set "USER_PATH_EXP=!USER_PATH_RAW_CLEAN!"
|
|
||||||
if defined USER_PATH_EXP call set "USER_PATH_EXP=%%USER_PATH_EXP%%"
|
if defined USER_PATH_EXP call set "USER_PATH_EXP=%%USER_PATH_EXP%%"
|
||||||
set "USER_PATH_EXP_CLEAN=!USER_PATH_EXP:"=!"
|
set "CHECK_EXP=;!USER_PATH_EXP!;"
|
||||||
set "CHECK_USER_EXP=;!USER_PATH_EXP_CLEAN!;"
|
|
||||||
|
|
||||||
set "CHECK_SYS_RAW=;!SYS_PATH_RAW_CLEAN!;"
|
rem Check if already present in user PATH (literal or expanded, with/without trailing backslash)
|
||||||
set "SYS_PATH_EXP=!SYS_PATH_RAW_CLEAN!"
|
|
||||||
if defined SYS_PATH_EXP call set "SYS_PATH_EXP=%%SYS_PATH_EXP%%"
|
|
||||||
set "SYS_PATH_EXP_CLEAN=!SYS_PATH_EXP:"=!"
|
|
||||||
set "CHECK_SYS_EXP=;!SYS_PATH_EXP_CLEAN!;"
|
|
||||||
|
|
||||||
rem Check if already present (literal or expanded, with/without trailing backslash)
|
|
||||||
set "ALREADY_IN_USERPATH=0"
|
set "ALREADY_IN_USERPATH=0"
|
||||||
echo(!CHECK_USER_RAW! | findstr /I /C:"!SEARCH_LIT!" /C:"!SEARCH_LIT2!" >nul && set "ALREADY_IN_USERPATH=1"
|
echo !CHECK_RAW! | findstr /I /C:"!SEARCH_LIT!" /C:"!SEARCH_LIT2!" >nul && set "ALREADY_IN_USERPATH=1"
|
||||||
if "!ALREADY_IN_USERPATH!"=="0" (
|
if "!ALREADY_IN_USERPATH!"=="0" (
|
||||||
echo(!CHECK_USER_EXP! | findstr /I /C:"!SEARCH_EXP!" /C:"!SEARCH_EXP2!" >nul && set "ALREADY_IN_USERPATH=1"
|
echo !CHECK_EXP! | findstr /I /C:"!SEARCH_EXP!" /C:"!SEARCH_EXP2!" >nul && set "ALREADY_IN_USERPATH=1"
|
||||||
)
|
|
||||||
|
|
||||||
set "ALREADY_IN_SYSPATH=0"
|
|
||||||
echo(!CHECK_SYS_RAW! | findstr /I /C:"!SEARCH_LIT!" /C:"!SEARCH_LIT2!" >nul && set "ALREADY_IN_SYSPATH=1"
|
|
||||||
if "!ALREADY_IN_SYSPATH!"=="0" (
|
|
||||||
echo(!CHECK_SYS_EXP! | findstr /I /C:"!SEARCH_EXP!" /C:"!SEARCH_EXP2!" >nul && set "ALREADY_IN_SYSPATH=1"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if "!ALREADY_IN_USERPATH!"=="1" (
|
if "!ALREADY_IN_USERPATH!"=="1" (
|
||||||
echo User PATH already includes %%USERPROFILE%%\bin.
|
echo User PATH already includes %%USERPROFILE%%\bin.
|
||||||
) else (
|
) else (
|
||||||
if "!ALREADY_IN_SYSPATH!"=="1" (
|
rem Not present: append to user PATH using setx without duplicating system PATH
|
||||||
echo System PATH already includes %%USERPROFILE%%\bin; skipping user PATH update.
|
if defined USER_PATH_RAW (
|
||||||
|
set "USER_PATH_NEW=!USER_PATH_RAW!"
|
||||||
|
if not "!USER_PATH_NEW:~-1!"==";" set "USER_PATH_NEW=!USER_PATH_NEW!;"
|
||||||
|
set "USER_PATH_NEW=!USER_PATH_NEW!!PCT!USERPROFILE!PCT!\bin"
|
||||||
) else (
|
) else (
|
||||||
rem Not present: append to user PATH
|
set "USER_PATH_NEW=!PCT!USERPROFILE!PCT!\bin"
|
||||||
if defined USER_PATH_RAW (
|
)
|
||||||
set "USER_PATH_NEW=!USER_PATH_RAW!"
|
rem Persist update to HKCU\Environment\Path (user scope)
|
||||||
if not "!USER_PATH_NEW:~-1!"==";" set "USER_PATH_NEW=!USER_PATH_NEW!;"
|
setx PATH "!USER_PATH_NEW!" >nul
|
||||||
set "USER_PATH_NEW=!USER_PATH_NEW!!PCT!USERPROFILE!PCT!\bin"
|
if errorlevel 1 (
|
||||||
) else (
|
echo WARNING: Failed to append %%USERPROFILE%%\bin to your user PATH.
|
||||||
set "USER_PATH_NEW=!PCT!USERPROFILE!PCT!\bin"
|
) else (
|
||||||
)
|
echo Added %%USERPROFILE%%\bin to your user PATH.
|
||||||
rem Persist update to HKCU\Environment\Path (user scope)
|
|
||||||
rem Use reg add instead of setx to avoid 1024-character limit
|
|
||||||
echo(!USER_PATH_NEW! | findstr /C:"\"" /C:"!" >nul
|
|
||||||
if not errorlevel 1 (
|
|
||||||
echo WARNING: Your PATH contains quotes or exclamation marks that may cause issues.
|
|
||||||
echo Skipping automatic PATH update. Please add %%USERPROFILE%%\bin to your PATH manually.
|
|
||||||
) else (
|
|
||||||
reg add "HKCU\Environment" /v Path /t REG_EXPAND_SZ /d "!USER_PATH_NEW!" /f >nul
|
|
||||||
if errorlevel 1 (
|
|
||||||
echo WARNING: Failed to append %%USERPROFILE%%\bin to your user PATH.
|
|
||||||
) else (
|
|
||||||
echo Added %%USERPROFILE%%\bin to your user PATH.
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
rem Update current session PATH so codeagent-wrapper is immediately available
|
rem Update current session PATH so codex-wrapper is immediately available
|
||||||
set "CURPATH=;%PATH%;"
|
set "CURPATH=;%PATH%;"
|
||||||
set "CURPATH_CLEAN=!CURPATH:"=!"
|
echo !CURPATH! | findstr /I /C:"!SEARCH_EXP!" /C:"!SEARCH_EXP2!" /C:"!SEARCH_LIT!" /C:"!SEARCH_LIT2!" >nul
|
||||||
echo(!CURPATH_CLEAN! | findstr /I /C:"!SEARCH_EXP!" /C:"!SEARCH_EXP2!" /C:"!SEARCH_LIT!" /C:"!SEARCH_LIT2!" >nul
|
|
||||||
if errorlevel 1 set "PATH=!DEST_DIR!;!PATH!"
|
if errorlevel 1 set "PATH=!DEST_DIR!;!PATH!"
|
||||||
|
|
||||||
goto :cleanup
|
goto :cleanup
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user