mirror of
https://github.com/cexll/myclaude.git
synced 2026-02-28 09:23:05 +08:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b204ca94e2 | ||
|
a39bf72bc2 | ||
|
f43244ec3e | ||
|
|
4c25dd8d2f | ||
|
|
19d411a6a2 | ||
|
|
791bd03724 | ||
|
|
8252b67567 | ||
|
|
207d3c5436 | ||
|
5fe8c24f55 |
102
CHANGELOG.md
102
CHANGELOG.md
@@ -47,7 +47,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
- support `npx github:cexll/myclaude` for installation and execution
|
- support `npx github:stellarlinkco/myclaude` for installation and execution
|
||||||
- default module changed from `dev` to `do`
|
- default module changed from `dev` to `do`
|
||||||
|
|
||||||
### 🚜 Refactor
|
### 🚜 Refactor
|
||||||
@@ -138,7 +138,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- read GEMINI_MODEL from ~/.gemini/.env ([#131](https://github.com/cexll/myclaude/issues/131))
|
- read GEMINI_MODEL from ~/.gemini/.env ([#131](https://github.com/stellarlinkco/myclaude/issues/131))
|
||||||
|
|
||||||
- validate non-empty output message before printing
|
- validate non-empty output message before printing
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- update release workflow build path for new directory structure
|
- update release workflow build path for new directory structure
|
||||||
|
|
||||||
- write PATH config to both profile and rc files ([#128](https://github.com/cexll/myclaude/issues/128))
|
- write PATH config to both profile and rc files ([#128](https://github.com/stellarlinkco/myclaude/issues/128))
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
@@ -184,9 +184,9 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
|
|
||||||
- update 'Agent Hierarchy' model for frontend-ui-ux-engineer and document-writer in README ([#127](https://github.com/cexll/myclaude/issues/127))
|
- update 'Agent Hierarchy' model for frontend-ui-ux-engineer and document-writer in README ([#127](https://github.com/stellarlinkco/myclaude/issues/127))
|
||||||
|
|
||||||
- update mappings for frontend-ui-ux-engineer and document-writer in README ([#126](https://github.com/cexll/myclaude/issues/126))
|
- update mappings for frontend-ui-ux-engineer and document-writer in README ([#126](https://github.com/stellarlinkco/myclaude/issues/126))
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
@@ -205,7 +205,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- remove extraneous dash arg for opencode stdin mode ([#124](https://github.com/cexll/myclaude/issues/124))
|
- remove extraneous dash arg for opencode stdin mode ([#124](https://github.com/stellarlinkco/myclaude/issues/124))
|
||||||
|
|
||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
@@ -218,7 +218,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- correct default models for oracle and librarian agents ([#120](https://github.com/cexll/myclaude/issues/120))
|
- correct default models for oracle and librarian agents ([#120](https://github.com/stellarlinkco/myclaude/issues/120))
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
@@ -231,7 +231,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- filter codex 0.84.0 stderr noise logs ([#122](https://github.com/cexll/myclaude/issues/122))
|
- filter codex 0.84.0 stderr noise logs ([#122](https://github.com/stellarlinkco/myclaude/issues/122))
|
||||||
|
|
||||||
- filter codex stderr noise logs
|
- filter codex stderr noise logs
|
||||||
|
|
||||||
@@ -256,11 +256,11 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- propagate SkipPermissions to parallel tasks ([#113](https://github.com/cexll/myclaude/issues/113))
|
- propagate SkipPermissions to parallel tasks ([#113](https://github.com/stellarlinkco/myclaude/issues/113))
|
||||||
|
|
||||||
- add timeout for Windows process termination
|
- add timeout for Windows process termination
|
||||||
|
|
||||||
- reject dash as workdir parameter ([#118](https://github.com/cexll/myclaude/issues/118))
|
- reject dash as workdir parameter ([#118](https://github.com/stellarlinkco/myclaude/issues/118))
|
||||||
|
|
||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
@@ -315,14 +315,14 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- 修复 Gemini init 事件 session_id 未提取的问题 ([#111](https://github.com/cexll/myclaude/issues/111))
|
- 修复 Gemini init 事件 session_id 未提取的问题 ([#111](https://github.com/stellarlinkco/myclaude/issues/111))
|
||||||
|
|
||||||
- fix codeagent skill TaskOutput
|
- fix codeagent skill TaskOutput
|
||||||
|
|
||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge branch 'master' of github.com:cexll/myclaude
|
- Merge branch 'master' of github.com:stellarlinkco/myclaude
|
||||||
|
|
||||||
- add test-cases skill
|
- add test-cases skill
|
||||||
|
|
||||||
@@ -339,7 +339,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- 修复 Windows 后端退出：taskkill 结束进程树 + turn.completed 支持 ([#108](https://github.com/cexll/myclaude/issues/108))
|
- 修复 Windows 后端退出：taskkill 结束进程树 + turn.completed 支持 ([#108](https://github.com/stellarlinkco/myclaude/issues/108))
|
||||||
|
|
||||||
## [5.4.3] - 2026-01-06
|
## [5.4.3] - 2026-01-06
|
||||||
|
|
||||||
@@ -347,7 +347,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- support model parameter for all backends, auto-inject from settings ([#105](https://github.com/cexll/myclaude/issues/105))
|
- support model parameter for all backends, auto-inject from settings ([#105](https://github.com/stellarlinkco/myclaude/issues/105))
|
||||||
|
|
||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
@@ -367,7 +367,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- replace setx with reg add to avoid 1024-char PATH truncation ([#101](https://github.com/cexll/myclaude/issues/101))
|
- replace setx with reg add to avoid 1024-char PATH truncation ([#101](https://github.com/stellarlinkco/myclaude/issues/101))
|
||||||
|
|
||||||
## [5.4.1] - 2025-12-26
|
## [5.4.1] - 2025-12-26
|
||||||
|
|
||||||
@@ -375,21 +375,21 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- 移除未知事件格式的日志噪声 ([#96](https://github.com/cexll/myclaude/issues/96))
|
- 移除未知事件格式的日志噪声 ([#96](https://github.com/stellarlinkco/myclaude/issues/96))
|
||||||
|
|
||||||
- prevent duplicate PATH entries on reinstall ([#95](https://github.com/cexll/myclaude/issues/95))
|
- prevent duplicate PATH entries on reinstall ([#95](https://github.com/stellarlinkco/myclaude/issues/95))
|
||||||
|
|
||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
|
|
||||||
- 添加 FAQ 常见问题章节
|
- 添加 FAQ 常见问题章节
|
||||||
|
|
||||||
- update troubleshooting with idempotent PATH commands ([#95](https://github.com/cexll/myclaude/issues/95))
|
- update troubleshooting with idempotent PATH commands ([#95](https://github.com/stellarlinkco/myclaude/issues/95))
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
|
|
||||||
- Add intelligent backend selection based on task complexity ([#61](https://github.com/cexll/myclaude/issues/61))
|
- Add intelligent backend selection based on task complexity ([#61](https://github.com/stellarlinkco/myclaude/issues/61))
|
||||||
|
|
||||||
## [5.4.0] - 2025-12-24
|
## [5.4.0] - 2025-12-24
|
||||||
|
|
||||||
@@ -404,7 +404,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
|
|
||||||
- v5.4.0 structured execution report ([#94](https://github.com/cexll/myclaude/issues/94))
|
- v5.4.0 structured execution report ([#94](https://github.com/stellarlinkco/myclaude/issues/94))
|
||||||
|
|
||||||
## [5.2.8] - 2025-12-22
|
## [5.2.8] - 2025-12-22
|
||||||
|
|
||||||
@@ -430,21 +430,21 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- allow claude backend to read env from setting.json while preventing recursion ([#92](https://github.com/cexll/myclaude/issues/92))
|
- allow claude backend to read env from setting.json while preventing recursion ([#92](https://github.com/stellarlinkco/myclaude/issues/92))
|
||||||
|
|
||||||
- comprehensive security and quality improvements for PR #85 & #87 ([#90](https://github.com/cexll/myclaude/issues/90))
|
- comprehensive security and quality improvements for PR #85 & #87 ([#90](https://github.com/stellarlinkco/myclaude/issues/90))
|
||||||
|
|
||||||
- Parser重复解析优化 + 严重bug修复 + PR #86兼容性 ([#88](https://github.com/cexll/myclaude/issues/88))
|
- Parser重复解析优化 + 严重bug修复 + PR #86兼容性 ([#88](https://github.com/stellarlinkco/myclaude/issues/88))
|
||||||
|
|
||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Improve backend termination after message and extend timeout ([#86](https://github.com/cexll/myclaude/issues/86))
|
- Improve backend termination after message and extend timeout ([#86](https://github.com/stellarlinkco/myclaude/issues/86))
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
|
|
||||||
- add millisecond-precision timestamps to all log entries ([#91](https://github.com/cexll/myclaude/issues/91))
|
- add millisecond-precision timestamps to all log entries ([#91](https://github.com/stellarlinkco/myclaude/issues/91))
|
||||||
|
|
||||||
## [5.2.6] - 2025-12-19
|
## [5.2.6] - 2025-12-19
|
||||||
|
|
||||||
@@ -452,16 +452,16 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- filter noisy stderr output from gemini backend ([#83](https://github.com/cexll/myclaude/issues/83))
|
- filter noisy stderr output from gemini backend ([#83](https://github.com/stellarlinkco/myclaude/issues/83))
|
||||||
|
|
||||||
- 修復 wsl install.sh 格式問題 ([#78](https://github.com/cexll/myclaude/issues/78))
|
- 修復 wsl install.sh 格式問題 ([#78](https://github.com/stellarlinkco/myclaude/issues/78))
|
||||||
|
|
||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- update all readme
|
- update all readme
|
||||||
|
|
||||||
- BMADh和Requirements-Driven支持根据语义生成对应的文档 ([#82](https://github.com/cexll/myclaude/issues/82))
|
- BMADh和Requirements-Driven支持根据语义生成对应的文档 ([#82](https://github.com/stellarlinkco/myclaude/issues/82))
|
||||||
|
|
||||||
## [5.2.5] - 2025-12-17
|
## [5.2.5] - 2025-12-17
|
||||||
|
|
||||||
@@ -469,7 +469,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- 修复多 backend 并行日志 PID 混乱并移除包装格式 ([#74](https://github.com/cexll/myclaude/issues/74)) ([#76](https://github.com/cexll/myclaude/issues/76))
|
- 修复多 backend 并行日志 PID 混乱并移除包装格式 ([#74](https://github.com/stellarlinkco/myclaude/issues/74)) ([#76](https://github.com/stellarlinkco/myclaude/issues/76))
|
||||||
|
|
||||||
- replace "Codex" to "codeagent" in dev-plan-generator subagent
|
- replace "Codex" to "codeagent" in dev-plan-generator subagent
|
||||||
|
|
||||||
@@ -480,7 +480,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- Merge pull request #71 from aliceric27/master
|
- Merge pull request #71 from aliceric27/master
|
||||||
|
|
||||||
- Merge branch 'cexll:master' into master
|
- Merge branch 'stellarlinkco:master' into master
|
||||||
|
|
||||||
- Merge pull request #72 from changxvv/master
|
- Merge pull request #72 from changxvv/master
|
||||||
|
|
||||||
@@ -508,13 +508,13 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #70 from cexll/fix/prevent-codeagent-infinite-recursion
|
- Merge pull request #70 from stellarlinkco/fix/prevent-codeagent-infinite-recursion
|
||||||
|
|
||||||
- Merge pull request #69 from cexll/myclaude-master-20251215-073053-338465000
|
- Merge pull request #69 from stellarlinkco/myclaude-master-20251215-073053-338465000
|
||||||
|
|
||||||
- update CHANGELOG.md
|
- update CHANGELOG.md
|
||||||
|
|
||||||
- Merge pull request #65 from cexll/fix/issue-64-buffer-overflow
|
- Merge pull request #65 from stellarlinkco/fix/issue-64-buffer-overflow
|
||||||
|
|
||||||
## [5.2.3] - 2025-12-15
|
## [5.2.3] - 2025-12-15
|
||||||
|
|
||||||
@@ -522,7 +522,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- 修复 bufio.Scanner token too long 错误 ([#64](https://github.com/cexll/myclaude/issues/64))
|
- 修复 bufio.Scanner token too long 错误 ([#64](https://github.com/stellarlinkco/myclaude/issues/64))
|
||||||
|
|
||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
@@ -609,7 +609,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- Merge rc/5.2 into master: v5.2.0 release improvements
|
- Merge rc/5.2 into master: v5.2.0 release improvements
|
||||||
|
|
||||||
- Merge pull request #53 from cexll/rc/5.2
|
- Merge pull request #53 from stellarlinkco/rc/5.2
|
||||||
|
|
||||||
- remove docs
|
- remove docs
|
||||||
|
|
||||||
@@ -627,7 +627,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- Merge branch 'master' into rc/5.2
|
- Merge branch 'master' into rc/5.2
|
||||||
|
|
||||||
- Merge pull request #52 from cexll/fix/parallel-log-path-on-startup
|
- Merge pull request #52 from stellarlinkco/fix/parallel-log-path-on-startup
|
||||||
|
|
||||||
### 📚 Documentation
|
### 📚 Documentation
|
||||||
|
|
||||||
@@ -684,7 +684,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #51 from cexll/fix/channel-sync-race-conditions
|
- Merge pull request #51 from stellarlinkco/fix/channel-sync-race-conditions
|
||||||
|
|
||||||
- change codex-wrapper version
|
- change codex-wrapper version
|
||||||
|
|
||||||
@@ -701,7 +701,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #49 from cexll/freespace8/master
|
- Merge pull request #49 from stellarlinkco/freespace8/master
|
||||||
|
|
||||||
- resolve signal handling conflict preserving testability and Windows support
|
- resolve signal handling conflict preserving testability and Windows support
|
||||||
|
|
||||||
@@ -751,7 +751,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge branch 'master' of github.com:cexll/myclaude
|
- Merge branch 'master' of github.com:stellarlinkco/myclaude
|
||||||
|
|
||||||
- Merge pull request #43 from gurdasnijor/smithery/add-badge
|
- Merge pull request #43 from gurdasnijor/smithery/add-badge
|
||||||
|
|
||||||
@@ -795,7 +795,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #41 from cexll/fix-async-log
|
- Merge pull request #41 from stellarlinkco/fix-async-log
|
||||||
|
|
||||||
- remove test case 90
|
- remove test case 90
|
||||||
|
|
||||||
@@ -840,7 +840,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #34 from cexll/cce-worktree-master-20251129-111802-997076000
|
- Merge pull request #34 from stellarlinkco/cce-worktree-master-20251129-111802-997076000
|
||||||
|
|
||||||
- update CLAUDE.md and codex skill
|
- update CLAUDE.md and codex skill
|
||||||
|
|
||||||
@@ -892,7 +892,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
|
||||||
- update repository URLs to cexll/myclaude
|
- update repository URLs to stellarlinkco/myclaude
|
||||||
|
|
||||||
## [4.7-alpha1] - 2025-11-27
|
## [4.7-alpha1] - 2025-11-27
|
||||||
|
|
||||||
@@ -905,7 +905,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #29 from cexll/feat/codex-wrapper
|
- Merge pull request #29 from stellarlinkco/feat/codex-wrapper
|
||||||
|
|
||||||
- Add codex-wrapper Go implementation
|
- Add codex-wrapper Go implementation
|
||||||
|
|
||||||
@@ -957,9 +957,9 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- update codex skills model config
|
- update codex skills model config
|
||||||
|
|
||||||
- Merge branch 'master' of github.com:cexll/myclaude
|
- Merge branch 'master' of github.com:stellarlinkco/myclaude
|
||||||
|
|
||||||
- Merge pull request #24 from cexll/swe-agent/23-1763544297
|
- Merge pull request #24 from stellarlinkco/swe-agent/23-1763544297
|
||||||
|
|
||||||
### 🚀 Features
|
### 🚀 Features
|
||||||
|
|
||||||
@@ -1025,7 +1025,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- optimize codex skills
|
- optimize codex skills
|
||||||
|
|
||||||
- Merge branch 'master' of github.com:cexll/myclaude
|
- Merge branch 'master' of github.com:stellarlinkco/myclaude
|
||||||
|
|
||||||
- Rename SKILLS.md to SKILL.md
|
- Rename SKILLS.md to SKILL.md
|
||||||
|
|
||||||
@@ -1062,9 +1062,9 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge branch 'master' of github.com:cexll/myclaude
|
- Merge branch 'master' of github.com:stellarlinkco/myclaude
|
||||||
|
|
||||||
- Merge pull request #18 from cexll/swe-agent/17-1760969135
|
- Merge pull request #18 from stellarlinkco/swe-agent/17-1760969135
|
||||||
|
|
||||||
- update requirements clarity
|
- update requirements clarity
|
||||||
|
|
||||||
@@ -1092,13 +1092,13 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #15 from cexll/swe-agent/13-1760944712
|
- Merge pull request #15 from stellarlinkco/swe-agent/13-1760944712
|
||||||
|
|
||||||
- Fix #13: Clean up redundant README files
|
- Fix #13: Clean up redundant README files
|
||||||
|
|
||||||
- Optimize README structure - Solution A (modular)
|
- Optimize README structure - Solution A (modular)
|
||||||
|
|
||||||
- Merge pull request #14 from cexll/swe-agent/12-1760944588
|
- Merge pull request #14 from stellarlinkco/swe-agent/12-1760944588
|
||||||
|
|
||||||
- Fix #12: Update Makefile install paths for new directory structure
|
- Fix #12: Update Makefile install paths for new directory structure
|
||||||
|
|
||||||
@@ -1108,7 +1108,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### 💼 Other
|
### 💼 Other
|
||||||
|
|
||||||
|
|
||||||
- Merge pull request #11 from cexll/swe-agent/10-1760752533
|
- Merge pull request #11 from stellarlinkco/swe-agent/10-1760752533
|
||||||
|
|
||||||
- Fix marketplace metadata references
|
- Fix marketplace metadata references
|
||||||
|
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -7,12 +7,12 @@
|
|||||||
help:
|
help:
|
||||||
@echo "Claude Code Multi-Agent Workflow - Quick Deployment"
|
@echo "Claude Code Multi-Agent Workflow - Quick Deployment"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Recommended installation: npx github:cexll/myclaude"
|
@echo "Recommended installation: npx github:stellarlinkco/myclaude"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Usage: make [target]"
|
@echo "Usage: make [target]"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Targets:"
|
@echo "Targets:"
|
||||||
@echo " install - LEGACY: install all configurations (prefer npx github:cexll/myclaude)"
|
@echo " install - LEGACY: install all configurations (prefer npx github:stellarlinkco/myclaude)"
|
||||||
@echo " deploy-bmad - Deploy BMAD workflow (bmad-pilot)"
|
@echo " deploy-bmad - Deploy BMAD workflow (bmad-pilot)"
|
||||||
@echo " deploy-requirements - Deploy Requirements workflow (requirements-pilot)"
|
@echo " deploy-requirements - Deploy Requirements workflow (requirements-pilot)"
|
||||||
@echo " deploy-essentials - Deploy Development Essentials workflow"
|
@echo " deploy-essentials - Deploy Development Essentials workflow"
|
||||||
@@ -40,7 +40,7 @@ OUTPUT_STYLES_DIR = output-styles
|
|||||||
# Install all configurations
|
# Install all configurations
|
||||||
install: deploy-all
|
install: deploy-all
|
||||||
@echo "⚠️ LEGACY PATH: make install will be removed in future versions."
|
@echo "⚠️ LEGACY PATH: make install will be removed in future versions."
|
||||||
@echo " Prefer: npx github:cexll/myclaude"
|
@echo " Prefer: npx github:stellarlinkco/myclaude"
|
||||||
@echo "✅ Installation complete!"
|
@echo "✅ Installation complete!"
|
||||||
|
|
||||||
# Deploy BMAD workflow
|
# Deploy BMAD workflow
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Claude Code plugins for this repo are defined in `.claude-plugin/marketplace.jso
|
|||||||
## Install
|
## Install
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
/plugin marketplace add cexll/myclaude
|
/plugin marketplace add stellarlinkco/myclaude
|
||||||
/plugin list
|
/plugin list
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
26
README.md
26
README.md
@@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
# Claude Code Multi-Agent Workflow System
|
# Claude Code Multi-Agent Workflow System
|
||||||
|
|
||||||
[](https://smithery.ai/skills?ns=cexll&utm_source=github&utm_medium=badge)
|
[](https://smithery.ai/skills?ns=stellarlinkco&utm_source=github&utm_medium=badge)
|
||||||
[](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/stellarlinkco/myclaude)
|
||||||
|
|
||||||
> AI-powered development automation with multi-backend execution (Codex/Claude/Gemini/OpenCode)
|
> AI-powered development automation with multi-backend execution (Codex/Claude/Gemini/OpenCode)
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
## Modules Overview
|
## Modules Overview
|
||||||
@@ -30,7 +30,7 @@ npx github:cexll/myclaude
|
|||||||
|
|
||||||
### Available Skills
|
### Available Skills
|
||||||
|
|
||||||
Individual skills can be installed separately via `npx github:cexll/myclaude --list` (skills bundled in modules like do, omo, sparv are listed above):
|
Individual skills can be installed separately via `npx github:stellarlinkco/myclaude --list` (skills bundled in modules like do, omo, sparv are listed above):
|
||||||
|
|
||||||
| Skill | Description |
|
| Skill | Description |
|
||||||
|-------|-------------|
|
|-------|-------------|
|
||||||
@@ -48,16 +48,16 @@ Individual skills can be installed separately via `npx github:cexll/myclaude --l
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Interactive installer (recommended)
|
# Interactive installer (recommended)
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
|
|
||||||
# List installable items (modules / skills / wrapper)
|
# List installable items (modules / skills / wrapper)
|
||||||
npx github:cexll/myclaude --list
|
npx github:stellarlinkco/myclaude --list
|
||||||
|
|
||||||
# Detect installed modules and update from GitHub
|
# Detect installed modules and update from GitHub
|
||||||
npx github:cexll/myclaude --update
|
npx github:stellarlinkco/myclaude --update
|
||||||
|
|
||||||
# Custom install directory / overwrite
|
# Custom install directory / overwrite
|
||||||
npx github:cexll/myclaude --install-dir ~/.claude --force
|
npx github:stellarlinkco/myclaude --install-dir ~/.claude --force
|
||||||
```
|
```
|
||||||
|
|
||||||
`--update` detects already installed modules in the target install dir (defaults to `~/.claude`, via `installed_modules.json` when present) and updates them from GitHub (latest release) by overwriting the module files.
|
`--update` detects already installed modules in the target install dir (defaults to `~/.claude`, via `installed_modules.json` when present) and updates them from GitHub (latest release) by overwriting the module files.
|
||||||
@@ -132,13 +132,13 @@ Edit `config.json` to enable/disable modules:
|
|||||||
**Codex wrapper not found:**
|
**Codex wrapper not found:**
|
||||||
```bash
|
```bash
|
||||||
# Select: codeagent-wrapper
|
# Select: codeagent-wrapper
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
**Module not loading:**
|
**Module not loading:**
|
||||||
```bash
|
```bash
|
||||||
cat ~/.claude/installed_modules.json
|
cat ~/.claude/installed_modules.json
|
||||||
npx github:cexll/myclaude --force
|
npx github:stellarlinkco/myclaude --force
|
||||||
```
|
```
|
||||||
|
|
||||||
**Backend CLI errors:**
|
**Backend CLI errors:**
|
||||||
@@ -156,7 +156,7 @@ which gemini && gemini --version
|
|||||||
| Gemini can't read .gitignore files | Remove from .gitignore or use different backend |
|
| Gemini can't read .gitignore files | Remove from .gitignore or use different backend |
|
||||||
| Codex permission denied | Set `approval_policy = "never"` in ~/.codex/config.yaml |
|
| Codex permission denied | Set `approval_policy = "never"` in ~/.codex/config.yaml |
|
||||||
|
|
||||||
See [GitHub Issues](https://github.com/cexll/myclaude/issues) for more.
|
See [GitHub Issues](https://github.com/stellarlinkco/myclaude/issues) for more.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
@@ -164,8 +164,8 @@ AGPL-3.0 - see [LICENSE](LICENSE)
|
|||||||
|
|
||||||
### Commercial Licensing
|
### Commercial Licensing
|
||||||
|
|
||||||
For commercial use without AGPL obligations, contact: evanxian9@gmail.com
|
For commercial use without AGPL obligations, contact: support@stellarlink.co
|
||||||
|
|
||||||
## Support
|
## Support
|
||||||
|
|
||||||
- [GitHub Issues](https://github.com/cexll/myclaude/issues)
|
- [GitHub Issues](https://github.com/stellarlinkco/myclaude/issues)
|
||||||
|
|||||||
24
README_CN.md
24
README_CN.md
@@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
[](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/stellarlinkco/myclaude)
|
||||||
|
|
||||||
> AI 驱动的开发自动化 - 多后端执行架构 (Codex/Claude/Gemini/OpenCode)
|
> AI 驱动的开发自动化 - 多后端执行架构 (Codex/Claude/Gemini/OpenCode)
|
||||||
|
|
||||||
## 快速开始
|
## 快速开始
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
## 模块概览
|
## 模块概览
|
||||||
@@ -27,7 +27,7 @@ npx github:cexll/myclaude
|
|||||||
|
|
||||||
### 可用技能
|
### 可用技能
|
||||||
|
|
||||||
可通过 `npx github:cexll/myclaude --list` 单独安装技能（模块内置技能如 do、omo、sparv 见上表）：
|
可通过 `npx github:stellarlinkco/myclaude --list` 单独安装技能（模块内置技能如 do、omo、sparv 见上表）：
|
||||||
|
|
||||||
| 技能 | 描述 |
|
| 技能 | 描述 |
|
||||||
|------|------|
|
|------|------|
|
||||||
@@ -188,16 +188,16 @@ npx github:cexll/myclaude
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 交互式安装器（推荐）
|
# 交互式安装器（推荐）
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
|
|
||||||
# 列出可安装项（module:* / skill:* / codeagent-wrapper）
|
# 列出可安装项（module:* / skill:* / codeagent-wrapper）
|
||||||
npx github:cexll/myclaude --list
|
npx github:stellarlinkco/myclaude --list
|
||||||
|
|
||||||
# 检测已安装 modules 并从 GitHub 更新
|
# 检测已安装 modules 并从 GitHub 更新
|
||||||
npx github:cexll/myclaude --update
|
npx github:stellarlinkco/myclaude --update
|
||||||
|
|
||||||
# 指定安装目录 / 强制覆盖
|
# 指定安装目录 / 强制覆盖
|
||||||
npx github:cexll/myclaude --install-dir ~/.claude --force
|
npx github:stellarlinkco/myclaude --install-dir ~/.claude --force
|
||||||
```
|
```
|
||||||
|
|
||||||
`--update` 会在目标安装目录（默认 `~/.claude`，优先读取 `installed_modules.json`）检测已安装 modules，并从 GitHub 拉取最新发布版本覆盖更新。
|
`--update` 会在目标安装目录（默认 `~/.claude`，优先读取 `installed_modules.json`）检测已安装 modules，并从 GitHub 拉取最新发布版本覆盖更新。
|
||||||
@@ -244,13 +244,13 @@ npx github:cexll/myclaude --install-dir ~/.claude --force
|
|||||||
**Codex wrapper 未找到：**
|
**Codex wrapper 未找到：**
|
||||||
```bash
|
```bash
|
||||||
# 选择：codeagent-wrapper
|
# 选择：codeagent-wrapper
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
**模块未加载：**
|
**模块未加载：**
|
||||||
```bash
|
```bash
|
||||||
cat ~/.claude/installed_modules.json
|
cat ~/.claude/installed_modules.json
|
||||||
npx github:cexll/myclaude --force
|
npx github:stellarlinkco/myclaude --force
|
||||||
```
|
```
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
@@ -261,7 +261,7 @@ npx github:cexll/myclaude --force
|
|||||||
| Gemini 无法读取 .gitignore 文件 | 从 .gitignore 移除或使用其他后端 |
|
| Gemini 无法读取 .gitignore 文件 | 从 .gitignore 移除或使用其他后端 |
|
||||||
| Codex 权限拒绝 | 在 ~/.codex/config.yaml 设置 `approval_policy = "never"` |
|
| Codex 权限拒绝 | 在 ~/.codex/config.yaml 设置 `approval_policy = "never"` |
|
||||||
|
|
||||||
更多问题请访问 [GitHub Issues](https://github.com/cexll/myclaude/issues)。
|
更多问题请访问 [GitHub Issues](https://github.com/stellarlinkco/myclaude/issues)。
|
||||||
|
|
||||||
## 许可证
|
## 许可证
|
||||||
|
|
||||||
@@ -269,8 +269,8 @@ AGPL-3.0 - 查看 [LICENSE](LICENSE)
|
|||||||
|
|
||||||
### 商业授权
|
### 商业授权
|
||||||
|
|
||||||
如需商业授权（无需遵守 AGPL 义务），请联系：evanxian9@gmail.com
|
如需商业授权（无需遵守 AGPL 义务），请联系：support@stellarlink.co
|
||||||
|
|
||||||
## 支持
|
## 支持
|
||||||
|
|
||||||
- [GitHub Issues](https://github.com/cexll/myclaude/issues)
|
- [GitHub Issues](https://github.com/stellarlinkco/myclaude/issues)
|
||||||
|
|||||||
146
bin/cli.js
146
bin/cli.js
@@ -10,11 +10,13 @@ const readline = require("readline");
|
|||||||
const zlib = require("zlib");
|
const zlib = require("zlib");
|
||||||
const { spawn, spawnSync } = require("child_process");
|
const { spawn, spawnSync } = require("child_process");
|
||||||
|
|
||||||
const REPO = { owner: "cexll", name: "myclaude" };
|
const REPO = { owner: "stellarlinkco", name: "myclaude" };
|
||||||
const API_HEADERS = {
|
const API_HEADERS = {
|
||||||
"User-Agent": "myclaude-npx",
|
"User-Agent": "myclaude-npx",
|
||||||
Accept: "application/vnd.github+json",
|
Accept: "application/vnd.github+json",
|
||||||
};
|
};
|
||||||
|
const WRAPPER_REQUIRED_MODULES = new Set(["do", "omo"]);
|
||||||
|
const WRAPPER_REQUIRED_SKILLS = new Set(["dev"]);
|
||||||
|
|
||||||
function parseArgs(argv) {
|
function parseArgs(argv) {
|
||||||
const out = {
|
const out = {
|
||||||
@@ -58,12 +60,12 @@ function printHelp() {
|
|||||||
"myclaude (npx installer)",
|
"myclaude (npx installer)",
|
||||||
"",
|
"",
|
||||||
"Usage:",
|
"Usage:",
|
||||||
" npx github:cexll/myclaude",
|
" npx github:stellarlinkco/myclaude",
|
||||||
" npx github:cexll/myclaude --list",
|
" npx github:stellarlinkco/myclaude --list",
|
||||||
" npx github:cexll/myclaude --update",
|
" npx github:stellarlinkco/myclaude --update",
|
||||||
" npx github:cexll/myclaude --install-dir ~/.claude --force",
|
" npx github:stellarlinkco/myclaude --install-dir ~/.claude --force",
|
||||||
" npx github:cexll/myclaude uninstall",
|
" npx github:stellarlinkco/myclaude uninstall",
|
||||||
" npx github:cexll/myclaude uninstall --module bmad,do -y",
|
" npx github:stellarlinkco/myclaude uninstall --module bmad,do -y",
|
||||||
"",
|
"",
|
||||||
"Options:",
|
"Options:",
|
||||||
" --install-dir <path> Default: ~/.claude",
|
" --install-dir <path> Default: ~/.claude",
|
||||||
@@ -499,9 +501,19 @@ async function updateInstalledModules(installDir, tag, config, dryRun) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await fs.promises.mkdir(installDir, { recursive: true });
|
await fs.promises.mkdir(installDir, { recursive: true });
|
||||||
|
const installState = { wrapperInstalled: false };
|
||||||
|
|
||||||
|
async function ensureWrapperInstalled() {
|
||||||
|
if (installState.wrapperInstalled) return;
|
||||||
|
process.stdout.write("Installing codeagent-wrapper...\n");
|
||||||
|
await runInstallSh(repoRoot, installDir, tag);
|
||||||
|
installState.wrapperInstalled = true;
|
||||||
|
}
|
||||||
|
|
||||||
for (const name of toUpdate) {
|
for (const name of toUpdate) {
|
||||||
|
if (WRAPPER_REQUIRED_MODULES.has(name)) await ensureWrapperInstalled();
|
||||||
process.stdout.write(`Updating module: ${name}\n`);
|
process.stdout.write(`Updating module: ${name}\n`);
|
||||||
const r = await applyModule(name, config, repoRoot, installDir, true, tag);
|
const r = await applyModule(name, config, repoRoot, installDir, true, tag, installState);
|
||||||
upsertModuleStatus(installDir, r);
|
upsertModuleStatus(installDir, r);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
@@ -777,7 +789,57 @@ async function rmTree(p) {
|
|||||||
await fs.promises.rmdir(p, { recursive: true });
|
await fs.promises.rmdir(p, { recursive: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyModule(moduleName, config, repoRoot, installDir, force, tag) {
|
function defaultModelsConfig() {
|
||||||
|
return {
|
||||||
|
default_backend: "codex",
|
||||||
|
default_model: "gpt-4.1",
|
||||||
|
backends: {},
|
||||||
|
agents: {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergeModuleAgentsToModels(moduleName, mod, repoRoot) {
|
||||||
|
const moduleAgents = mod && mod.agents;
|
||||||
|
if (!isPlainObject(moduleAgents) || !Object.keys(moduleAgents).length) return false;
|
||||||
|
|
||||||
|
const modelsPath = path.join(os.homedir(), ".codeagent", "models.json");
|
||||||
|
fs.mkdirSync(path.dirname(modelsPath), { recursive: true });
|
||||||
|
|
||||||
|
let models;
|
||||||
|
if (fs.existsSync(modelsPath)) {
|
||||||
|
models = JSON.parse(fs.readFileSync(modelsPath, "utf8"));
|
||||||
|
} else {
|
||||||
|
const templatePath = path.join(repoRoot, "templates", "models.json.example");
|
||||||
|
if (fs.existsSync(templatePath)) {
|
||||||
|
models = JSON.parse(fs.readFileSync(templatePath, "utf8"));
|
||||||
|
if (!isPlainObject(models)) models = defaultModelsConfig();
|
||||||
|
models.agents = {};
|
||||||
|
} else {
|
||||||
|
models = defaultModelsConfig();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isPlainObject(models)) models = defaultModelsConfig();
|
||||||
|
if (!isPlainObject(models.agents)) models.agents = {};
|
||||||
|
|
||||||
|
let modified = false;
|
||||||
|
for (const [agentName, agentCfg] of Object.entries(moduleAgents)) {
|
||||||
|
if (!isPlainObject(agentCfg)) continue;
|
||||||
|
const existing = models.agents[agentName];
|
||||||
|
const canOverwrite = !isPlainObject(existing) || Object.prototype.hasOwnProperty.call(existing, "__module__");
|
||||||
|
if (!canOverwrite) continue;
|
||||||
|
const next = { ...agentCfg, __module__: moduleName };
|
||||||
|
if (!deepEqual(existing, next)) {
|
||||||
|
models.agents[agentName] = next;
|
||||||
|
modified = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modified) fs.writeFileSync(modelsPath, JSON.stringify(models, null, 2) + "\n", "utf8");
|
||||||
|
return modified;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function applyModule(moduleName, config, repoRoot, installDir, force, tag, installState) {
|
||||||
const mod = config && config.modules && config.modules[moduleName];
|
const mod = config && config.modules && config.modules[moduleName];
|
||||||
if (!mod) throw new Error(`Unknown module: ${moduleName}`);
|
if (!mod) throw new Error(`Unknown module: ${moduleName}`);
|
||||||
const ops = Array.isArray(mod.operations) ? mod.operations : [];
|
const ops = Array.isArray(mod.operations) ? mod.operations : [];
|
||||||
@@ -803,7 +865,12 @@ async function applyModule(moduleName, config, repoRoot, installDir, force, tag)
|
|||||||
if (cmd !== "bash install.sh") {
|
if (cmd !== "bash install.sh") {
|
||||||
throw new Error(`Refusing run_command: ${cmd || "(empty)"}`);
|
throw new Error(`Refusing run_command: ${cmd || "(empty)"}`);
|
||||||
}
|
}
|
||||||
|
if (installState && installState.wrapperInstalled) {
|
||||||
|
result.operations.push({ type, status: "success", skipped: true });
|
||||||
|
continue;
|
||||||
|
}
|
||||||
await runInstallSh(repoRoot, installDir, tag);
|
await runInstallSh(repoRoot, installDir, tag);
|
||||||
|
if (installState) installState.wrapperInstalled = true;
|
||||||
} else {
|
} else {
|
||||||
throw new Error(`Unsupported operation type: ${type}`);
|
throw new Error(`Unsupported operation type: ${type}`);
|
||||||
}
|
}
|
||||||
@@ -834,6 +901,19 @@ async function applyModule(moduleName, config, repoRoot, installDir, force, tag)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (mergeModuleAgentsToModels(moduleName, mod, repoRoot)) {
|
||||||
|
result.has_agents = true;
|
||||||
|
result.operations.push({ type: "merge_agents", status: "success" });
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
result.operations.push({
|
||||||
|
type: "merge_agents",
|
||||||
|
status: "failed",
|
||||||
|
error: err && err.message ? err.message : String(err),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1006,34 +1086,54 @@ async function installSelected(picks, tag, config, installDir, force, dryRun) {
|
|||||||
try {
|
try {
|
||||||
let repoRoot = repoRootFromHere();
|
let repoRoot = repoRootFromHere();
|
||||||
if (needRepo || needWrapper) {
|
if (needRepo || needWrapper) {
|
||||||
if (!tag) throw new Error("No tag available to download");
|
if (tag) {
|
||||||
const archive = path.join(tmp, "src.tgz");
|
const archive = path.join(tmp, "src.tgz");
|
||||||
const url = `https://codeload.github.com/${REPO.owner}/${REPO.name}/tar.gz/refs/tags/${encodeURIComponent(
|
const url = `https://codeload.github.com/${REPO.owner}/${REPO.name}/tar.gz/refs/tags/${encodeURIComponent(
|
||||||
tag
|
tag
|
||||||
)}`;
|
)}`;
|
||||||
process.stdout.write(`Downloading ${REPO.owner}/${REPO.name}@${tag}...\n`);
|
process.stdout.write(`Downloading ${REPO.owner}/${REPO.name}@${tag}...\n`);
|
||||||
await downloadToFile(url, archive);
|
await downloadToFile(url, archive);
|
||||||
process.stdout.write("Extracting...\n");
|
process.stdout.write("Extracting...\n");
|
||||||
const extracted = path.join(tmp, "src");
|
const extracted = path.join(tmp, "src");
|
||||||
await extractTarGz(archive, extracted);
|
await extractTarGz(archive, extracted);
|
||||||
repoRoot = extracted;
|
repoRoot = extracted;
|
||||||
|
} else {
|
||||||
|
process.stdout.write("Offline mode: installing from local package contents.\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await fs.promises.mkdir(installDir, { recursive: true });
|
await fs.promises.mkdir(installDir, { recursive: true });
|
||||||
|
const installState = { wrapperInstalled: false };
|
||||||
|
|
||||||
|
async function ensureWrapperInstalled() {
|
||||||
|
if (installState.wrapperInstalled) return;
|
||||||
|
process.stdout.write("Installing codeagent-wrapper...\n");
|
||||||
|
await runInstallSh(repoRoot, installDir, tag);
|
||||||
|
installState.wrapperInstalled = true;
|
||||||
|
}
|
||||||
|
|
||||||
for (const p of picks) {
|
for (const p of picks) {
|
||||||
if (p.kind === "wrapper") {
|
if (p.kind === "wrapper") {
|
||||||
process.stdout.write("Installing codeagent-wrapper...\n");
|
await ensureWrapperInstalled();
|
||||||
await runInstallSh(repoRoot, installDir, tag);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (p.kind === "module") {
|
if (p.kind === "module") {
|
||||||
|
if (WRAPPER_REQUIRED_MODULES.has(p.moduleName)) await ensureWrapperInstalled();
|
||||||
process.stdout.write(`Installing module: ${p.moduleName}\n`);
|
process.stdout.write(`Installing module: ${p.moduleName}\n`);
|
||||||
const r = await applyModule(p.moduleName, config, repoRoot, installDir, force, tag);
|
const r = await applyModule(
|
||||||
|
p.moduleName,
|
||||||
|
config,
|
||||||
|
repoRoot,
|
||||||
|
installDir,
|
||||||
|
force,
|
||||||
|
tag,
|
||||||
|
installState
|
||||||
|
);
|
||||||
upsertModuleStatus(installDir, r);
|
upsertModuleStatus(installDir, r);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (p.kind === "skill") {
|
if (p.kind === "skill") {
|
||||||
|
if (WRAPPER_REQUIRED_SKILLS.has(p.skillName)) await ensureWrapperInstalled();
|
||||||
process.stdout.write(`Installing skill: ${p.skillName}\n`);
|
process.stdout.write(`Installing skill: ${p.skillName}\n`);
|
||||||
await copyDirRecursive(
|
await copyDirRecursive(
|
||||||
path.join(repoRoot, "skills", p.skillName),
|
path.join(repoRoot, "skills", p.skillName),
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ filter_unconventional = false
|
|||||||
split_commits = false
|
split_commits = false
|
||||||
# regex for preprocessing the commit messages
|
# regex for preprocessing the commit messages
|
||||||
commit_preprocessors = [
|
commit_preprocessors = [
|
||||||
{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/cexll/myclaude/issues/${2}))" },
|
{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/stellarlinkco/myclaude/issues/${2}))" },
|
||||||
]
|
]
|
||||||
# regex for parsing and grouping commits
|
# regex for parsing and grouping commits
|
||||||
commit_parsers = [
|
commit_parsers = [
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ Entry point: `cmd/codeagent-wrapper/main.go` (binary: `codeagent-wrapper`).
|
|||||||
### Recommended (interactive installer)
|
### Recommended (interactive installer)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
Select the `codeagent-wrapper` module to install.
|
Select the `codeagent-wrapper` module to install.
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
### 推荐方式（交互式安装器）
|
### 推荐方式（交互式安装器）
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
选择 `codeagent-wrapper` 模块进行安装。
|
选择 `codeagent-wrapper` 模块进行安装。
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Multi-backend AI code execution wrapper supporting Codex, Claude, Gemini, and Op
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Recommended: run the installer and select "codeagent-wrapper"
|
# Recommended: run the installer and select "codeagent-wrapper"
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
|
|
||||||
# Manual build (optional; requires repo checkout)
|
# Manual build (optional; requires repo checkout)
|
||||||
cd codeagent-wrapper
|
cd codeagent-wrapper
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ type cliOptions struct {
|
|||||||
ReasoningEffort string
|
ReasoningEffort string
|
||||||
Agent string
|
Agent string
|
||||||
PromptFile string
|
PromptFile string
|
||||||
|
Output string
|
||||||
Skills string
|
Skills string
|
||||||
SkipPermissions bool
|
SkipPermissions bool
|
||||||
Worktree bool
|
Worktree bool
|
||||||
@@ -135,6 +136,7 @@ func addRootFlags(fs *pflag.FlagSet, opts *cliOptions) {
|
|||||||
fs.StringVar(&opts.ReasoningEffort, "reasoning-effort", "", "Reasoning effort (backend-specific)")
|
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.Agent, "agent", "", "Agent preset name (from ~/.codeagent/models.json)")
|
||||||
fs.StringVar(&opts.PromptFile, "prompt-file", "", "Prompt file path")
|
fs.StringVar(&opts.PromptFile, "prompt-file", "", "Prompt file path")
|
||||||
|
fs.StringVar(&opts.Output, "output", "", "Write structured JSON output to file")
|
||||||
fs.StringVar(&opts.Skills, "skills", "", "Comma-separated skill names for spec injection")
|
fs.StringVar(&opts.Skills, "skills", "", "Comma-separated skill names for spec injection")
|
||||||
|
|
||||||
fs.BoolVar(&opts.SkipPermissions, "skip-permissions", false, "Skip permissions prompts (also via CODEAGENT_SKIP_PERMISSIONS)")
|
fs.BoolVar(&opts.SkipPermissions, "skip-permissions", false, "Skip permissions prompts (also via CODEAGENT_SKIP_PERMISSIONS)")
|
||||||
@@ -198,10 +200,9 @@ func runWithLoggerAndCleanup(fn func() int) (exitCode int) {
|
|||||||
for _, entry := range entries {
|
for _, entry := range entries {
|
||||||
fmt.Fprintln(os.Stderr, entry)
|
fmt.Fprintln(os.Stderr, entry)
|
||||||
}
|
}
|
||||||
fmt.Fprintf(os.Stderr, "Log file: %s (deleted)\n", logger.Path())
|
fmt.Fprintf(os.Stderr, "Log file: %s\n", logger.Path())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ = logger.RemoveLogFile()
|
|
||||||
}()
|
}()
|
||||||
defer runCleanupHook()
|
defer runCleanupHook()
|
||||||
|
|
||||||
@@ -237,6 +238,7 @@ func buildSingleConfig(cmd *cobra.Command, args []string, rawArgv []string, opts
|
|||||||
agentName := ""
|
agentName := ""
|
||||||
promptFile := ""
|
promptFile := ""
|
||||||
promptFileExplicit := false
|
promptFileExplicit := false
|
||||||
|
outputPath := ""
|
||||||
yolo := false
|
yolo := false
|
||||||
|
|
||||||
if cmd.Flags().Changed("agent") {
|
if cmd.Flags().Changed("agent") {
|
||||||
@@ -281,6 +283,15 @@ func buildSingleConfig(cmd *cobra.Command, args []string, rawArgv []string, opts
|
|||||||
promptFile = resolvedPromptFile
|
promptFile = resolvedPromptFile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if cmd.Flags().Changed("output") {
|
||||||
|
outputPath = strings.TrimSpace(opts.Output)
|
||||||
|
if outputPath == "" {
|
||||||
|
return nil, fmt.Errorf("--output flag requires a value")
|
||||||
|
}
|
||||||
|
} else if val := strings.TrimSpace(v.GetString("output")); val != "" {
|
||||||
|
outputPath = val
|
||||||
|
}
|
||||||
|
|
||||||
agentFlagChanged := cmd.Flags().Changed("agent")
|
agentFlagChanged := cmd.Flags().Changed("agent")
|
||||||
backendFlagChanged := cmd.Flags().Changed("backend")
|
backendFlagChanged := cmd.Flags().Changed("backend")
|
||||||
if backendFlagChanged {
|
if backendFlagChanged {
|
||||||
@@ -357,6 +368,7 @@ func buildSingleConfig(cmd *cobra.Command, args []string, rawArgv []string, opts
|
|||||||
Agent: agentName,
|
Agent: agentName,
|
||||||
PromptFile: promptFile,
|
PromptFile: promptFile,
|
||||||
PromptFileExplicit: promptFileExplicit,
|
PromptFileExplicit: promptFileExplicit,
|
||||||
|
OutputPath: outputPath,
|
||||||
SkipPermissions: skipPermissions,
|
SkipPermissions: skipPermissions,
|
||||||
Yolo: yolo,
|
Yolo: yolo,
|
||||||
Model: model,
|
Model: model,
|
||||||
@@ -432,7 +444,7 @@ func runParallelMode(cmd *cobra.Command, args []string, opts *cliOptions, v *vip
|
|||||||
}
|
}
|
||||||
|
|
||||||
if cmd.Flags().Changed("agent") || cmd.Flags().Changed("prompt-file") || cmd.Flags().Changed("reasoning-effort") || cmd.Flags().Changed("skills") {
|
if cmd.Flags().Changed("agent") || cmd.Flags().Changed("prompt-file") || cmd.Flags().Changed("reasoning-effort") || cmd.Flags().Changed("skills") {
|
||||||
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend, --model, --full-output and --skip-permissions are allowed.")
|
fmt.Fprintln(os.Stderr, "ERROR: --parallel reads its task configuration from stdin; only --backend, --model, --output, --full-output and --skip-permissions are allowed.")
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -463,6 +475,17 @@ func runParallelMode(cmd *cobra.Command, args []string, opts *cliOptions, v *vip
|
|||||||
fullOutput = v.GetBool("full-output")
|
fullOutput = v.GetBool("full-output")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
outputPath := ""
|
||||||
|
if cmd.Flags().Changed("output") {
|
||||||
|
outputPath = strings.TrimSpace(opts.Output)
|
||||||
|
if outputPath == "" {
|
||||||
|
fmt.Fprintln(os.Stderr, "ERROR: --output flag requires a value")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
} else if val := strings.TrimSpace(v.GetString("output")); val != "" {
|
||||||
|
outputPath = val
|
||||||
|
}
|
||||||
|
|
||||||
skipChanged := cmd.Flags().Changed("skip-permissions") || cmd.Flags().Changed("dangerously-skip-permissions")
|
skipChanged := cmd.Flags().Changed("skip-permissions") || cmd.Flags().Changed("dangerously-skip-permissions")
|
||||||
skipPermissions := false
|
skipPermissions := false
|
||||||
if skipChanged {
|
if skipChanged {
|
||||||
@@ -525,6 +548,11 @@ func runParallelMode(cmd *cobra.Command, args []string, opts *cliOptions, v *vip
|
|||||||
results[i].KeyOutput = extractKeyOutputFromLines(lines, 150)
|
results[i].KeyOutput = extractKeyOutputFromLines(lines, 150)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := writeStructuredOutput(outputPath, results); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
fmt.Println(generateFinalOutputWithMode(results, !fullOutput))
|
fmt.Println(generateFinalOutputWithMode(results, !fullOutput))
|
||||||
|
|
||||||
exitCode := 0
|
exitCode := 0
|
||||||
@@ -688,16 +716,32 @@ func runSingleMode(cfg *Config, name string) int {
|
|||||||
|
|
||||||
result := runTaskFn(taskSpec, false, cfg.Timeout)
|
result := runTaskFn(taskSpec, false, cfg.Timeout)
|
||||||
|
|
||||||
if result.ExitCode != 0 {
|
exitCode := result.ExitCode
|
||||||
return result.ExitCode
|
if exitCode == 0 && strings.TrimSpace(result.Message) == "" {
|
||||||
|
errMsg := fmt.Sprintf("no output message: backend=%s returned empty result.Message with exit_code=0", cfg.Backend)
|
||||||
|
logError(errMsg)
|
||||||
|
exitCode = 1
|
||||||
|
if strings.TrimSpace(result.Error) == "" {
|
||||||
|
result.Error = errMsg
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate that we got a meaningful output message
|
if err := writeStructuredOutput(cfg.OutputPath, []TaskResult{result}); err != nil {
|
||||||
if strings.TrimSpace(result.Message) == "" {
|
logError(err.Error())
|
||||||
logError(fmt.Sprintf("no output message: backend=%s returned empty result.Message with exit_code=0", cfg.Backend))
|
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if exitCode != 0 {
|
||||||
|
// Surface any parsed backend output even on non-zero exit to avoid "(no output)" in tool runners.
|
||||||
|
if strings.TrimSpace(result.Message) != "" {
|
||||||
|
fmt.Println(result.Message)
|
||||||
|
if result.SessionID != "" {
|
||||||
|
fmt.Printf("\n---\nSESSION_ID: %s\n", result.SessionID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return exitCode
|
||||||
|
}
|
||||||
|
|
||||||
fmt.Println(result.Message)
|
fmt.Println(result.Message)
|
||||||
if result.SessionID != "" {
|
if result.SessionID != "" {
|
||||||
fmt.Printf("\n---\nSESSION_ID: %s\n", result.SessionID)
|
fmt.Printf("\n---\nSESSION_ID: %s\n", result.SessionID)
|
||||||
|
|||||||
@@ -169,6 +169,12 @@ func (f *execFakeRunner) Process() executor.ProcessHandle {
|
|||||||
return &execFakeProcess{pid: 1}
|
return &execFakeProcess{pid: 1}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *execFakeRunner) UnsetEnv(keys ...string) {
|
||||||
|
for _, k := range keys {
|
||||||
|
delete(f.env, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
func TestExecutorRunCodexTaskWithContext(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
|||||||
@@ -274,6 +274,10 @@ func (d *drainBlockingCmd) Process() executor.ProcessHandle {
|
|||||||
return d.inner.Process()
|
return d.inner.Process()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *drainBlockingCmd) UnsetEnv(keys ...string) {
|
||||||
|
d.inner.UnsetEnv(keys...)
|
||||||
|
}
|
||||||
|
|
||||||
type bufferWriteCloser struct {
|
type bufferWriteCloser struct {
|
||||||
buf bytes.Buffer
|
buf bytes.Buffer
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
@@ -568,6 +572,14 @@ func (f *fakeCmd) Process() executor.ProcessHandle {
|
|||||||
return f.process
|
return f.process
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *fakeCmd) UnsetEnv(keys ...string) {
|
||||||
|
f.mu.Lock()
|
||||||
|
defer f.mu.Unlock()
|
||||||
|
for _, k := range keys {
|
||||||
|
delete(f.env, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (f *fakeCmd) runStdoutScript() {
|
func (f *fakeCmd) runStdoutScript() {
|
||||||
if len(f.stdoutPlan) == 0 {
|
if len(f.stdoutPlan) == 0 {
|
||||||
if !f.keepStdoutOpen {
|
if !f.keepStdoutOpen {
|
||||||
@@ -1443,6 +1455,60 @@ func TestBackendParseArgs_PromptFileOverridesAgent(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBackendParseArgs_OutputFlag(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args []string
|
||||||
|
want string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "output flag",
|
||||||
|
args: []string{"codeagent-wrapper", "--output", "/tmp/out.json", "task"},
|
||||||
|
want: "/tmp/out.json",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "output equals syntax",
|
||||||
|
args: []string{"codeagent-wrapper", "--output=/tmp/out.json", "task"},
|
||||||
|
want: "/tmp/out.json",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "output trimmed",
|
||||||
|
args: []string{"codeagent-wrapper", "--output", " /tmp/out.json ", "task"},
|
||||||
|
want: "/tmp/out.json",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "output missing value",
|
||||||
|
args: []string{"codeagent-wrapper", "--output"},
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "output equals missing value",
|
||||||
|
args: []string{"codeagent-wrapper", "--output=", "task"},
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
os.Args = tt.args
|
||||||
|
cfg, err := parseArgs()
|
||||||
|
if tt.wantErr {
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("expected error, got nil")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if cfg.OutputPath != tt.want {
|
||||||
|
t.Fatalf("OutputPath = %q, want %q", cfg.OutputPath, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestBackendParseArgs_SkipPermissions(t *testing.T) {
|
func TestBackendParseArgs_SkipPermissions(t *testing.T) {
|
||||||
const envKey = "CODEAGENT_SKIP_PERMISSIONS"
|
const envKey = "CODEAGENT_SKIP_PERMISSIONS"
|
||||||
t.Setenv(envKey, "true")
|
t.Setenv(envKey, "true")
|
||||||
@@ -3739,6 +3805,245 @@ noop`)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRunSingleWithOutputFile(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
outputPath := filepath.Join(tempDir, "single-output.json")
|
||||||
|
|
||||||
|
oldArgs := os.Args
|
||||||
|
t.Cleanup(func() { os.Args = oldArgs })
|
||||||
|
os.Args = []string{"codeagent-wrapper", "--output", outputPath, "task"}
|
||||||
|
|
||||||
|
stdinReader = strings.NewReader("")
|
||||||
|
isTerminalFn = func() bool { return true }
|
||||||
|
|
||||||
|
origRunTaskFn := runTaskFn
|
||||||
|
runTaskFn = func(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
||||||
|
return TaskResult{
|
||||||
|
TaskID: "single-task",
|
||||||
|
ExitCode: 0,
|
||||||
|
Message: "single-result",
|
||||||
|
SessionID: "sid-single",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { runTaskFn = origRunTaskFn })
|
||||||
|
|
||||||
|
if code := run(); code != 0 {
|
||||||
|
t.Fatalf("run exit = %d, want 0", code)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := os.ReadFile(outputPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to read output file: %v", err)
|
||||||
|
}
|
||||||
|
if len(data) == 0 || data[len(data)-1] != '\n' {
|
||||||
|
t.Fatalf("output file should end with newline, got %q", string(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload struct {
|
||||||
|
Results []TaskResult `json:"results"`
|
||||||
|
Summary struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
Success int `json:"success"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
} `json:"summary"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &payload); err != nil {
|
||||||
|
t.Fatalf("failed to unmarshal output json: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Summary.Total != 1 || payload.Summary.Success != 1 || payload.Summary.Failed != 0 {
|
||||||
|
t.Fatalf("unexpected summary: %+v", payload.Summary)
|
||||||
|
}
|
||||||
|
if len(payload.Results) != 1 {
|
||||||
|
t.Fatalf("results length = %d, want 1", len(payload.Results))
|
||||||
|
}
|
||||||
|
if payload.Results[0].Message != "single-result" {
|
||||||
|
t.Fatalf("result message = %q, want %q", payload.Results[0].Message, "single-result")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunSingleWithOutputFileOnFailureExitCode(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
outputPath := filepath.Join(tempDir, "single-output-failed.json")
|
||||||
|
|
||||||
|
oldArgs := os.Args
|
||||||
|
t.Cleanup(func() { os.Args = oldArgs })
|
||||||
|
os.Args = []string{"codeagent-wrapper", "--output", outputPath, "task"}
|
||||||
|
|
||||||
|
stdinReader = strings.NewReader("")
|
||||||
|
isTerminalFn = func() bool { return true }
|
||||||
|
|
||||||
|
origRunTaskFn := runTaskFn
|
||||||
|
runTaskFn = func(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
||||||
|
return TaskResult{
|
||||||
|
TaskID: "single-task",
|
||||||
|
ExitCode: 7,
|
||||||
|
Message: "failed-result",
|
||||||
|
Error: "backend error",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { runTaskFn = origRunTaskFn })
|
||||||
|
|
||||||
|
if code := run(); code != 7 {
|
||||||
|
t.Fatalf("run exit = %d, want 7", code)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := os.ReadFile(outputPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to read output file: %v", err)
|
||||||
|
}
|
||||||
|
if len(data) == 0 || data[len(data)-1] != '\n' {
|
||||||
|
t.Fatalf("output file should end with newline, got %q", string(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload struct {
|
||||||
|
Results []TaskResult `json:"results"`
|
||||||
|
Summary struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
Success int `json:"success"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
} `json:"summary"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &payload); err != nil {
|
||||||
|
t.Fatalf("failed to unmarshal output json: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Summary.Total != 1 || payload.Summary.Success != 0 || payload.Summary.Failed != 1 {
|
||||||
|
t.Fatalf("unexpected summary: %+v", payload.Summary)
|
||||||
|
}
|
||||||
|
if len(payload.Results) != 1 {
|
||||||
|
t.Fatalf("results length = %d, want 1", len(payload.Results))
|
||||||
|
}
|
||||||
|
if payload.Results[0].ExitCode != 7 {
|
||||||
|
t.Fatalf("result exit_code = %d, want 7", payload.Results[0].ExitCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunSingleWithOutputFileOnEmptyMessage(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
outputPath := filepath.Join(tempDir, "single-output-empty.json")
|
||||||
|
|
||||||
|
oldArgs := os.Args
|
||||||
|
t.Cleanup(func() { os.Args = oldArgs })
|
||||||
|
os.Args = []string{"codeagent-wrapper", "--output", outputPath, "task"}
|
||||||
|
|
||||||
|
stdinReader = strings.NewReader("")
|
||||||
|
isTerminalFn = func() bool { return true }
|
||||||
|
|
||||||
|
origRunTaskFn := runTaskFn
|
||||||
|
runTaskFn = func(taskSpec TaskSpec, silent bool, timeoutSec int) TaskResult {
|
||||||
|
return TaskResult{
|
||||||
|
TaskID: "single-task",
|
||||||
|
ExitCode: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { runTaskFn = origRunTaskFn })
|
||||||
|
|
||||||
|
if code := run(); code != 1 {
|
||||||
|
t.Fatalf("run exit = %d, want 1", code)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := os.ReadFile(outputPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to read output file: %v", err)
|
||||||
|
}
|
||||||
|
if len(data) == 0 || data[len(data)-1] != '\n' {
|
||||||
|
t.Fatalf("output file should end with newline, got %q", string(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload struct {
|
||||||
|
Results []TaskResult `json:"results"`
|
||||||
|
Summary struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
Success int `json:"success"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
} `json:"summary"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &payload); err != nil {
|
||||||
|
t.Fatalf("failed to unmarshal output json: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Summary.Total != 1 || payload.Summary.Success != 0 || payload.Summary.Failed != 1 {
|
||||||
|
t.Fatalf("unexpected summary: %+v", payload.Summary)
|
||||||
|
}
|
||||||
|
if len(payload.Results) != 1 {
|
||||||
|
t.Fatalf("results length = %d, want 1", len(payload.Results))
|
||||||
|
}
|
||||||
|
if !strings.Contains(payload.Results[0].Error, "no output message:") {
|
||||||
|
t.Fatalf("result error = %q, want no output message", payload.Results[0].Error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunParallelWithOutputFile(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
outputPath := filepath.Join(tempDir, "parallel-output.json")
|
||||||
|
|
||||||
|
oldArgs := os.Args
|
||||||
|
t.Cleanup(func() { os.Args = oldArgs })
|
||||||
|
os.Args = []string{"codeagent-wrapper", "--parallel", "--output", outputPath}
|
||||||
|
|
||||||
|
stdinReader = strings.NewReader(`---TASK---
|
||||||
|
id: T1
|
||||||
|
---CONTENT---
|
||||||
|
noop`)
|
||||||
|
t.Cleanup(func() { stdinReader = os.Stdin })
|
||||||
|
|
||||||
|
origRunCodexTaskFn := runCodexTaskFn
|
||||||
|
runCodexTaskFn = func(task TaskSpec, timeout int) TaskResult {
|
||||||
|
return TaskResult{TaskID: task.ID, ExitCode: 0, Message: "parallel output marker"}
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { runCodexTaskFn = origRunCodexTaskFn })
|
||||||
|
|
||||||
|
out := captureOutput(t, func() {
|
||||||
|
if code := run(); code != 0 {
|
||||||
|
t.Fatalf("run exit = %d, want 0", code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
if !strings.Contains(out, "=== Execution Report ===") {
|
||||||
|
t.Fatalf("stdout should keep summary format, got %q", out)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := os.ReadFile(outputPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to read output file: %v", err)
|
||||||
|
}
|
||||||
|
if len(data) == 0 || data[len(data)-1] != '\n' {
|
||||||
|
t.Fatalf("output file should end with newline, got %q", string(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload struct {
|
||||||
|
Results []TaskResult `json:"results"`
|
||||||
|
Summary struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
Success int `json:"success"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
} `json:"summary"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &payload); err != nil {
|
||||||
|
t.Fatalf("failed to unmarshal output json: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.Summary.Total != 1 || payload.Summary.Success != 1 || payload.Summary.Failed != 0 {
|
||||||
|
t.Fatalf("unexpected summary: %+v", payload.Summary)
|
||||||
|
}
|
||||||
|
if len(payload.Results) != 1 {
|
||||||
|
t.Fatalf("results length = %d, want 1", len(payload.Results))
|
||||||
|
}
|
||||||
|
if payload.Results[0].TaskID != "T1" {
|
||||||
|
t.Fatalf("result task_id = %q, want %q", payload.Results[0].TaskID, "T1")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestParallelInvalidBackend(t *testing.T) {
|
func TestParallelInvalidBackend(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
cleanupLogsFn = func() (CleanupStats, error) { return CleanupStats{}, nil }
|
||||||
@@ -4330,9 +4635,9 @@ func TestRun_ExplicitStdinReadError(t *testing.T) {
|
|||||||
if !strings.Contains(logOutput, "Failed to read stdin: broken stdin") {
|
if !strings.Contains(logOutput, "Failed to read stdin: broken stdin") {
|
||||||
t.Fatalf("log missing read error entry, got %q", logOutput)
|
t.Fatalf("log missing read error entry, got %q", logOutput)
|
||||||
}
|
}
|
||||||
// Log file is always removed after completion (new behavior)
|
// Log file should remain for inspection; cleanup is handled via `codeagent-wrapper cleanup`.
|
||||||
if _, err := os.Stat(logPath); !os.IsNotExist(err) {
|
if _, err := os.Stat(logPath); err != nil {
|
||||||
t.Fatalf("log file should be removed after completion")
|
t.Fatalf("expected log file to exist after completion: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4348,6 +4653,51 @@ func TestRun_CommandFails(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRun_NonZeroExitPrintsParsedMessage(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
var scriptPath string
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
scriptPath = filepath.Join(tempDir, "codex.bat")
|
||||||
|
script := "@echo off\r\n" +
|
||||||
|
"echo {\"type\":\"thread.started\",\"thread_id\":\"tid\"}\r\n" +
|
||||||
|
"echo {\"type\":\"item.completed\",\"item\":{\"type\":\"agent_message\",\"text\":\"parsed-error\"}}\r\n" +
|
||||||
|
"exit /b 1\r\n"
|
||||||
|
if err := os.WriteFile(scriptPath, []byte(script), 0o755); err != nil {
|
||||||
|
t.Fatalf("failed to write script: %v", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
scriptPath = filepath.Join(tempDir, "codex.sh")
|
||||||
|
script := `#!/bin/sh
|
||||||
|
printf '%s\n' '{"type":"thread.started","thread_id":"tid"}'
|
||||||
|
printf '%s\n' '{"type":"item.completed","item":{"type":"agent_message","text":"parsed-error"}}'
|
||||||
|
sleep 0.05
|
||||||
|
exit 1
|
||||||
|
`
|
||||||
|
if err := os.WriteFile(scriptPath, []byte(script), 0o755); err != nil {
|
||||||
|
t.Fatalf("failed to write script: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
restore := withBackend(scriptPath, func(cfg *Config, targetArg string) []string { return []string{} })
|
||||||
|
defer restore()
|
||||||
|
|
||||||
|
os.Args = []string{"codeagent-wrapper", "task"}
|
||||||
|
stdinReader = strings.NewReader("")
|
||||||
|
isTerminalFn = func() bool { return true }
|
||||||
|
|
||||||
|
var exitCode int
|
||||||
|
output := captureOutput(t, func() { exitCode = run() })
|
||||||
|
if exitCode != 1 {
|
||||||
|
t.Fatalf("exit=%d, want 1", exitCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(output, "parsed-error") {
|
||||||
|
t.Fatalf("stdout=%q, want parsed backend message", output)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestRun_InvalidBackend(t *testing.T) {
|
func TestRun_InvalidBackend(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
os.Args = []string{"codeagent-wrapper", "--backend", "unknown", "task"}
|
os.Args = []string{"codeagent-wrapper", "--backend", "unknown", "task"}
|
||||||
@@ -4427,9 +4777,9 @@ func TestRun_PipedTaskReadError(t *testing.T) {
|
|||||||
if !strings.Contains(logOutput, "Failed to read piped stdin: read stdin: pipe failure") {
|
if !strings.Contains(logOutput, "Failed to read piped stdin: read stdin: pipe failure") {
|
||||||
t.Fatalf("log missing piped read error, got %q", logOutput)
|
t.Fatalf("log missing piped read error, got %q", logOutput)
|
||||||
}
|
}
|
||||||
// Log file is always removed after completion (new behavior)
|
// Log file should remain for inspection; cleanup is handled via `codeagent-wrapper cleanup`.
|
||||||
if _, err := os.Stat(logPath); !os.IsNotExist(err) {
|
if _, err := os.Stat(logPath); err != nil {
|
||||||
t.Fatalf("log file should be removed after completion")
|
t.Fatalf("expected log file to exist after completion: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4483,12 +4833,12 @@ func TestRun_LoggerLifecycle(t *testing.T) {
|
|||||||
if !fileExisted {
|
if !fileExisted {
|
||||||
t.Fatalf("log file was not present during run")
|
t.Fatalf("log file was not present during run")
|
||||||
}
|
}
|
||||||
if _, err := os.Stat(logPath); !os.IsNotExist(err) {
|
if _, err := os.Stat(logPath); err != nil {
|
||||||
t.Fatalf("log file should be removed on success, but it exists")
|
t.Fatalf("expected log file to exist on success: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRun_LoggerRemovedOnSignal(t *testing.T) {
|
func TestRun_LoggerKeptOnSignal(t *testing.T) {
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
t.Skip("signal-based test is not supported on Windows")
|
t.Skip("signal-based test is not supported on Windows")
|
||||||
}
|
}
|
||||||
@@ -4502,7 +4852,8 @@ func TestRun_LoggerRemovedOnSignal(t *testing.T) {
|
|||||||
defer signal.Reset(syscall.SIGINT, syscall.SIGTERM)
|
defer signal.Reset(syscall.SIGINT, syscall.SIGTERM)
|
||||||
|
|
||||||
// Set shorter delays for faster test
|
// Set shorter delays for faster test
|
||||||
_ = executor.SetForceKillDelay(1)
|
restoreForceKillDelay := executor.SetForceKillDelay(1)
|
||||||
|
defer restoreForceKillDelay()
|
||||||
|
|
||||||
tempDir := setTempDirEnv(t, t.TempDir())
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
logPath := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
logPath := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
||||||
@@ -4525,13 +4876,19 @@ printf '%s\n' '{"type":"item.completed","item":{"type":"agent_message","text":"l
|
|||||||
exitCh := make(chan int, 1)
|
exitCh := make(chan int, 1)
|
||||||
go func() { exitCh <- run() }()
|
go func() { exitCh <- run() }()
|
||||||
|
|
||||||
deadline := time.Now().Add(1 * time.Second)
|
ready := false
|
||||||
|
deadline := time.Now().Add(2 * time.Second)
|
||||||
for time.Now().Before(deadline) {
|
for time.Now().Before(deadline) {
|
||||||
if _, err := os.Stat(logPath); err == nil {
|
data, err := os.ReadFile(logPath)
|
||||||
|
if err == nil && strings.Contains(string(data), "Starting ") {
|
||||||
|
ready = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
time.Sleep(10 * time.Millisecond)
|
time.Sleep(10 * time.Millisecond)
|
||||||
}
|
}
|
||||||
|
if !ready {
|
||||||
|
t.Fatalf("logger did not become ready before deadline")
|
||||||
|
}
|
||||||
|
|
||||||
if proc, err := os.FindProcess(os.Getpid()); err == nil && proc != nil {
|
if proc, err := os.FindProcess(os.Getpid()); err == nil && proc != nil {
|
||||||
_ = proc.Signal(syscall.SIGINT)
|
_ = proc.Signal(syscall.SIGINT)
|
||||||
@@ -4547,9 +4904,9 @@ printf '%s\n' '{"type":"item.completed","item":{"type":"agent_message","text":"l
|
|||||||
if exitCode != 130 {
|
if exitCode != 130 {
|
||||||
t.Fatalf("exit code = %d, want 130", exitCode)
|
t.Fatalf("exit code = %d, want 130", exitCode)
|
||||||
}
|
}
|
||||||
// Log file is always removed after completion (new behavior)
|
// Log file should remain for inspection; cleanup is handled via `codeagent-wrapper cleanup`.
|
||||||
if _, err := os.Stat(logPath); !os.IsNotExist(err) {
|
if _, err := os.Stat(logPath); err != nil {
|
||||||
t.Fatalf("log file should be removed after completion")
|
t.Fatalf("expected log file to exist after completion: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4810,6 +5167,34 @@ func TestParallelLogPathInSerialMode(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRun_KeptLogFileOnSuccess(t *testing.T) {
|
||||||
|
defer resetTestHooks()
|
||||||
|
|
||||||
|
tempDir := setTempDirEnv(t, t.TempDir())
|
||||||
|
|
||||||
|
os.Args = []string{"codeagent-wrapper", "do-stuff"}
|
||||||
|
stdinReader = strings.NewReader("")
|
||||||
|
isTerminalFn = func() bool { return true }
|
||||||
|
codexCommand = createFakeCodexScript(t, "cli-session", "ok")
|
||||||
|
buildCodexArgsFn = func(cfg *Config, targetArg string) []string { return []string{} }
|
||||||
|
cleanupLogsFn = nil
|
||||||
|
|
||||||
|
var exitCode int
|
||||||
|
_ = captureStderr(t, func() {
|
||||||
|
_ = captureOutput(t, func() {
|
||||||
|
exitCode = run()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
if exitCode != 0 {
|
||||||
|
t.Fatalf("run() exit = %d, want 0", exitCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedLog := filepath.Join(tempDir, fmt.Sprintf("codeagent-wrapper-%d.log", os.Getpid()))
|
||||||
|
if _, err := os.Stat(expectedLog); err != nil {
|
||||||
|
t.Fatalf("expected log file to exist: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestRun_CLI_Success(t *testing.T) {
|
func TestRun_CLI_Success(t *testing.T) {
|
||||||
defer resetTestHooks()
|
defer resetTestHooks()
|
||||||
os.Args = []string{"codeagent-wrapper", "do-things"}
|
os.Args = []string{"codeagent-wrapper", "do-things"}
|
||||||
|
|||||||
65
codeagent-wrapper/internal/app/output_file.go
Normal file
65
codeagent-wrapper/internal/app/output_file.go
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
package wrapper
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/goccy/go-json"
|
||||||
|
)
|
||||||
|
|
||||||
|
type outputSummary struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
Success int `json:"success"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type outputPayload struct {
|
||||||
|
Results []TaskResult `json:"results"`
|
||||||
|
Summary outputSummary `json:"summary"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeStructuredOutput(path string, results []TaskResult) error {
|
||||||
|
path = strings.TrimSpace(path)
|
||||||
|
if path == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanPath := filepath.Clean(path)
|
||||||
|
dir := filepath.Dir(cleanPath)
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return fmt.Errorf("failed to create output directory for %q: %w", cleanPath, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
f, err := os.Create(cleanPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create output file %q: %w", cleanPath, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
encodeErr := json.NewEncoder(f).Encode(outputPayload{
|
||||||
|
Results: results,
|
||||||
|
Summary: summarizeResults(results),
|
||||||
|
})
|
||||||
|
closeErr := f.Close()
|
||||||
|
|
||||||
|
if encodeErr != nil {
|
||||||
|
return fmt.Errorf("failed to write structured output to %q: %w", cleanPath, encodeErr)
|
||||||
|
}
|
||||||
|
if closeErr != nil {
|
||||||
|
return fmt.Errorf("failed to close output file %q: %w", cleanPath, closeErr)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func summarizeResults(results []TaskResult) outputSummary {
|
||||||
|
summary := outputSummary{Total: len(results)}
|
||||||
|
for _, res := range results {
|
||||||
|
if res.ExitCode == 0 && res.Error == "" {
|
||||||
|
summary.Success++
|
||||||
|
} else {
|
||||||
|
summary.Failed++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return summary
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ type Config struct {
|
|||||||
Task string
|
Task string
|
||||||
SessionID string
|
SessionID string
|
||||||
WorkDir string
|
WorkDir string
|
||||||
|
OutputPath string
|
||||||
Model string
|
Model string
|
||||||
ReasoningEffort string
|
ReasoningEffort string
|
||||||
ExplicitStdin bool
|
ExplicitStdin bool
|
||||||
|
|||||||
@@ -41,6 +41,11 @@ func (f *fakeCmd) SetEnv(env map[string]string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (f *fakeCmd) Process() processHandle { return nil }
|
func (f *fakeCmd) Process() processHandle { return nil }
|
||||||
|
func (f *fakeCmd) UnsetEnv(keys ...string) {
|
||||||
|
for _, k := range keys {
|
||||||
|
delete(f.env, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestEnvInjection_LogsToStderrAndMasksKey(t *testing.T) {
|
func TestEnvInjection_LogsToStderrAndMasksKey(t *testing.T) {
|
||||||
// Arrange ~/.codeagent/models.json via HOME override.
|
// Arrange ~/.codeagent/models.json via HOME override.
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ type commandRunner interface {
|
|||||||
SetStderr(io.Writer)
|
SetStderr(io.Writer)
|
||||||
SetDir(string)
|
SetDir(string)
|
||||||
SetEnv(env map[string]string)
|
SetEnv(env map[string]string)
|
||||||
|
UnsetEnv(keys ...string)
|
||||||
Process() processHandle
|
Process() processHandle
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,6 +222,33 @@ func (r *realCmd) SetEnv(env map[string]string) {
|
|||||||
r.cmd.Env = out
|
r.cmd.Env = out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *realCmd) UnsetEnv(keys ...string) {
|
||||||
|
if r == nil || r.cmd == nil || len(keys) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// If cmd.Env is nil, Go inherits all parent env vars.
|
||||||
|
// Populate explicitly so we can selectively remove keys.
|
||||||
|
if r.cmd.Env == nil {
|
||||||
|
r.cmd.Env = os.Environ()
|
||||||
|
}
|
||||||
|
drop := make(map[string]struct{}, len(keys))
|
||||||
|
for _, k := range keys {
|
||||||
|
drop[k] = struct{}{}
|
||||||
|
}
|
||||||
|
filtered := make([]string, 0, len(r.cmd.Env))
|
||||||
|
for _, kv := range r.cmd.Env {
|
||||||
|
idx := strings.IndexByte(kv, '=')
|
||||||
|
name := kv
|
||||||
|
if idx >= 0 {
|
||||||
|
name = kv[:idx]
|
||||||
|
}
|
||||||
|
if _, ok := drop[name]; !ok {
|
||||||
|
filtered = append(filtered, kv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r.cmd.Env = filtered
|
||||||
|
}
|
||||||
|
|
||||||
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
|
||||||
@@ -1126,6 +1154,13 @@ func RunCodexTaskWithContext(parentCtx context.Context, taskSpec TaskSpec, backe
|
|||||||
|
|
||||||
injectTempEnv(cmd)
|
injectTempEnv(cmd)
|
||||||
|
|
||||||
|
// Claude Code sets CLAUDECODE=1 in its child processes. If we don't
|
||||||
|
// remove it, the spawned `claude -p` detects the variable and refuses
|
||||||
|
// to start ("cannot be launched inside another Claude Code session").
|
||||||
|
if commandName == "claude" {
|
||||||
|
cmd.UnsetEnv("CLAUDECODE")
|
||||||
|
}
|
||||||
|
|
||||||
// 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 != "" {
|
||||||
@@ -1400,6 +1435,15 @@ waitLoop:
|
|||||||
logErrorFn(fmt.Sprintf("%s exited with status %d", commandName, code))
|
logErrorFn(fmt.Sprintf("%s exited with status %d", commandName, code))
|
||||||
result.ExitCode = code
|
result.ExitCode = code
|
||||||
result.Error = attachStderr(fmt.Sprintf("%s exited with status %d", commandName, code))
|
result.Error = attachStderr(fmt.Sprintf("%s exited with status %d", commandName, code))
|
||||||
|
// Preserve parsed output when the backend exits non-zero (e.g. API error with stream-json output).
|
||||||
|
result.Message = parsed.message
|
||||||
|
result.SessionID = parsed.threadID
|
||||||
|
if stdoutLogger != nil {
|
||||||
|
stdoutLogger.Flush()
|
||||||
|
}
|
||||||
|
if stderrLogger != nil {
|
||||||
|
stderrLogger.Flush()
|
||||||
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
logErrorFn(commandName + " error: " + waitErr.Error())
|
logErrorFn(commandName + " error: " + waitErr.Error())
|
||||||
|
|||||||
@@ -20,8 +20,7 @@ var geminiNoisePatterns = []string{
|
|||||||
|
|
||||||
// codexNoisePatterns contains stderr patterns to filter for codex backend
|
// codexNoisePatterns contains stderr patterns to filter for codex backend
|
||||||
var codexNoisePatterns = []string{
|
var codexNoisePatterns = []string{
|
||||||
"ERROR codex_core::codex: needs_follow_up:",
|
"ERROR codex_core::",
|
||||||
"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
|
||||||
|
|||||||
@@ -71,3 +71,35 @@ func TestFilteringWriterPartialLines(t *testing.T) {
|
|||||||
t.Errorf("got %q, want %q", got, "Hello World\n")
|
t.Errorf("got %q, want %q", got, "Hello World\n")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFilteringWriterCodexNoise(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
input string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "filter all codex_core errors",
|
||||||
|
input: "ERROR codex_core::rollout::list: state db missing rollout path for thread 123\nERROR codex_core::skills::loader: missing skill\nVisible output\n",
|
||||||
|
want: "Visible output\n",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "keep non codex_core errors",
|
||||||
|
input: "ERROR another_module::state: real failure\nERROR codex_core::codex: needs_follow_up: true\nDone\n",
|
||||||
|
want: "ERROR another_module::state: real failure\nDone\n",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
fw := newFilteringWriter(&buf, codexNoisePatterns)
|
||||||
|
_, _ = fw.Write([]byte(tt.input))
|
||||||
|
fw.Flush()
|
||||||
|
|
||||||
|
if got := buf.String(); got != tt.want {
|
||||||
|
t.Errorf("got %q, want %q", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "https://github.com/cexll/myclaude/config.schema.json",
|
"$id": "https://github.com/stellarlinkco/myclaude/config.schema.json",
|
||||||
"title": "Modular Installation Config",
|
"title": "Modular Installation Config",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
setlocal enabledelayedexpansion
|
setlocal enabledelayedexpansion
|
||||||
|
|
||||||
set "EXIT_CODE=0"
|
set "EXIT_CODE=0"
|
||||||
set "REPO=cexll/myclaude"
|
set "REPO=stellarlinkco/myclaude"
|
||||||
set "VERSION=latest"
|
set "VERSION=latest"
|
||||||
set "OS=windows"
|
set "OS=windows"
|
||||||
|
|
||||||
|
|||||||
44
install.py
44
install.py
@@ -24,6 +24,7 @@ except ImportError: # pragma: no cover
|
|||||||
|
|
||||||
DEFAULT_INSTALL_DIR = "~/.claude"
|
DEFAULT_INSTALL_DIR = "~/.claude"
|
||||||
SETTINGS_FILE = "settings.json"
|
SETTINGS_FILE = "settings.json"
|
||||||
|
WRAPPER_REQUIRED_MODULES = {"do", "omo"}
|
||||||
|
|
||||||
|
|
||||||
def _ensure_list(ctx: Dict[str, Any], key: str) -> List[Any]:
|
def _ensure_list(ctx: Dict[str, Any], key: str) -> List[Any]:
|
||||||
@@ -898,6 +899,24 @@ def execute_module(name: str, cfg: Dict[str, Any], ctx: Dict[str, Any]) -> Dict[
|
|||||||
"installed_at": datetime.now().isoformat(),
|
"installed_at": datetime.now().isoformat(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if name in WRAPPER_REQUIRED_MODULES:
|
||||||
|
try:
|
||||||
|
ensure_wrapper_installed(ctx)
|
||||||
|
result["operations"].append({"type": "ensure_wrapper", "status": "success"})
|
||||||
|
except Exception as exc: # noqa: BLE001
|
||||||
|
result["status"] = "failed"
|
||||||
|
result["operations"].append(
|
||||||
|
{"type": "ensure_wrapper", "status": "failed", "error": str(exc)}
|
||||||
|
)
|
||||||
|
write_log(
|
||||||
|
{
|
||||||
|
"level": "ERROR",
|
||||||
|
"message": f"Module {name} failed on ensure_wrapper: {exc}",
|
||||||
|
},
|
||||||
|
ctx,
|
||||||
|
)
|
||||||
|
raise
|
||||||
|
|
||||||
for op in cfg.get("operations", []):
|
for op in cfg.get("operations", []):
|
||||||
op_type = op.get("type")
|
op_type = op.get("type")
|
||||||
try:
|
try:
|
||||||
@@ -1081,8 +1100,13 @@ def op_run_command(op: Dict[str, Any], ctx: Dict[str, Any]) -> None:
|
|||||||
for key, value in op.get("env", {}).items():
|
for key, value in op.get("env", {}).items():
|
||||||
env[key] = value.replace("${install_dir}", str(ctx["install_dir"]))
|
env[key] = value.replace("${install_dir}", str(ctx["install_dir"]))
|
||||||
|
|
||||||
command = op.get("command", "")
|
raw_command = str(op.get("command", "")).strip()
|
||||||
if sys.platform == "win32" and command.strip() == "bash install.sh":
|
if raw_command == "bash install.sh" and ctx.get("_wrapper_installed"):
|
||||||
|
write_log({"level": "INFO", "message": "Skip wrapper install; already installed in this run"}, ctx)
|
||||||
|
return
|
||||||
|
|
||||||
|
command = raw_command
|
||||||
|
if sys.platform == "win32" and raw_command == "bash install.sh":
|
||||||
command = "cmd /c install.bat"
|
command = "cmd /c install.bat"
|
||||||
|
|
||||||
# Stream output in real-time while capturing for logging
|
# Stream output in real-time while capturing for logging
|
||||||
@@ -1156,6 +1180,22 @@ def op_run_command(op: Dict[str, Any], ctx: Dict[str, Any]) -> None:
|
|||||||
if process.returncode != 0:
|
if process.returncode != 0:
|
||||||
raise RuntimeError(f"Command failed with code {process.returncode}: {command}")
|
raise RuntimeError(f"Command failed with code {process.returncode}: {command}")
|
||||||
|
|
||||||
|
if raw_command == "bash install.sh":
|
||||||
|
ctx["_wrapper_installed"] = True
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_wrapper_installed(ctx: Dict[str, Any]) -> None:
|
||||||
|
if ctx.get("_wrapper_installed"):
|
||||||
|
return
|
||||||
|
op_run_command(
|
||||||
|
{
|
||||||
|
"type": "run_command",
|
||||||
|
"command": "bash install.sh",
|
||||||
|
"env": {"INSTALL_DIR": "${install_dir}"},
|
||||||
|
},
|
||||||
|
ctx,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def write_log(entry: Dict[str, Any], ctx: Dict[str, Any]) -> None:
|
def write_log(entry: Dict[str, Any], ctx: Dict[str, Any]) -> None:
|
||||||
log_path = Path(ctx["log_file"])
|
log_path = Path(ctx["log_file"])
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ set -e
|
|||||||
if [ -z "${SKIP_WARNING:-}" ]; then
|
if [ -z "${SKIP_WARNING:-}" ]; then
|
||||||
echo "⚠️ WARNING: install.sh is LEGACY and will be removed in future versions."
|
echo "⚠️ WARNING: install.sh is LEGACY and will be removed in future versions."
|
||||||
echo "Please use the new installation method:"
|
echo "Please use the new installation method:"
|
||||||
echo " npx github:cexll/myclaude"
|
echo " npx github:stellarlinkco/myclaude"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Set SKIP_WARNING=1 to bypass this message"
|
echo "Set SKIP_WARNING=1 to bypass this message"
|
||||||
echo "Continuing with legacy installation in 5 seconds..."
|
echo "Continuing with legacy installation in 5 seconds..."
|
||||||
@@ -23,7 +23,7 @@ case "$ARCH" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Build download URL
|
# Build download URL
|
||||||
REPO="cexll/myclaude"
|
REPO="stellarlinkco/myclaude"
|
||||||
VERSION="${CODEAGENT_WRAPPER_VERSION:-latest}"
|
VERSION="${CODEAGENT_WRAPPER_VERSION:-latest}"
|
||||||
BINARY_NAME="codeagent-wrapper-${OS}-${ARCH}"
|
BINARY_NAME="codeagent-wrapper-${OS}-${ARCH}"
|
||||||
if [ "$VERSION" = "latest" ]; then
|
if [ "$VERSION" = "latest" ]; then
|
||||||
|
|||||||
@@ -7,17 +7,17 @@ This directory contains agent skills (each skill lives in its own folder with a
|
|||||||
List installable items:
|
List installable items:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude --list
|
npx github:stellarlinkco/myclaude --list
|
||||||
```
|
```
|
||||||
|
|
||||||
Install (interactive; pick `skill:<name>`):
|
Install (interactive; pick `skill:<name>`):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude
|
npx github:stellarlinkco/myclaude
|
||||||
```
|
```
|
||||||
|
|
||||||
Force overwrite / custom install directory:
|
Force overwrite / custom install directory:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx github:cexll/myclaude --install-dir ~/.claude --force
|
npx github:stellarlinkco/myclaude --install-dir ~/.claude --force
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,334 +0,0 @@
|
|||||||
---
|
|
||||||
name: codex
|
|
||||||
description: Execute Codex CLI for code analysis, refactoring, and automated code changes. Use when you need to delegate complex code tasks to Codex AI with file references (@syntax) and structured output.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Codex CLI Integration
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Execute Codex CLI commands and parse structured JSON responses. Supports file references via `@` syntax, multiple models, and sandbox controls.
|
|
||||||
|
|
||||||
## When to Use
|
|
||||||
|
|
||||||
- Complex code analysis requiring deep understanding
|
|
||||||
- Large-scale refactoring across multiple files
|
|
||||||
- Automated code generation with safety controls
|
|
||||||
|
|
||||||
## Fallback Policy
|
|
||||||
|
|
||||||
Codex is the **primary execution method** for all code edits and tests. Direct execution is only permitted when:
|
|
||||||
|
|
||||||
1. Codex is unavailable (service down, network issues)
|
|
||||||
2. Codex fails **twice consecutively** on the same task
|
|
||||||
|
|
||||||
When falling back to direct execution:
|
|
||||||
- Log `CODEX_FALLBACK` with the reason
|
|
||||||
- Retry Codex on the next task (don't permanently switch)
|
|
||||||
- Document the fallback in the final summary
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
**Mandatory**: Run every automated invocation through the Bash tool in the foreground with **HEREDOC syntax** to avoid shell quoting issues, keeping the `timeout` parameter fixed at `7200000` milliseconds (do not change it or use any other entry point).
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codex-wrapper - [working_dir] <<'EOF'
|
|
||||||
<task content here>
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why HEREDOC?** Tasks often contain code blocks, nested quotes, shell metacharacters (`$`, `` ` ``, `\`), and multiline text. HEREDOC (Here Document) syntax passes these safely without shell interpretation, eliminating quote-escaping nightmares.
|
|
||||||
|
|
||||||
**Foreground only (no background/BashOutput)**: Never set `background: true`, never accept Claude's "Running in the background" mode, and avoid `BashOutput` streaming loops. Keep a single foreground Bash call per Codex task; if work might be long, split it into smaller foreground runs instead of offloading to background execution.
|
|
||||||
|
|
||||||
**Simple tasks** (backward compatibility):
|
|
||||||
For simple single-line tasks without special characters, you can still use direct quoting:
|
|
||||||
```bash
|
|
||||||
codex-wrapper "simple task here" [working_dir]
|
|
||||||
```
|
|
||||||
|
|
||||||
**Resume a session with HEREDOC:**
|
|
||||||
```bash
|
|
||||||
codex-wrapper resume <session_id> - [working_dir] <<'EOF'
|
|
||||||
<task content>
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Cross-platform notes:**
|
|
||||||
- **Bash/Zsh**: Use `<<'EOF'` (single quotes prevent variable expansion)
|
|
||||||
- **PowerShell 5.1+**: Use `@'` and `'@` (here-string syntax)
|
|
||||||
```powershell
|
|
||||||
codex-wrapper - @'
|
|
||||||
task content
|
|
||||||
'@
|
|
||||||
```
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
- **CODEX_TIMEOUT**: Override timeout in milliseconds (default: 7200000 = 2 hours)
|
|
||||||
- Example: `export CODEX_TIMEOUT=3600000` for 1 hour
|
|
||||||
|
|
||||||
## Timeout Control
|
|
||||||
|
|
||||||
- **Built-in**: Binary enforces 2-hour timeout by default
|
|
||||||
- **Override**: Set `CODEX_TIMEOUT` environment variable (in milliseconds, e.g., `CODEX_TIMEOUT=3600000` for 1 hour)
|
|
||||||
- **Behavior**: On timeout, sends SIGTERM, then SIGKILL after 5s if process doesn't exit
|
|
||||||
- **Exit code**: Returns 124 on timeout (consistent with GNU timeout)
|
|
||||||
- **Bash tool**: Always set `timeout: 7200000` parameter for double protection
|
|
||||||
|
|
||||||
### Parameters
|
|
||||||
|
|
||||||
- `task` (required): Task description, supports `@file` references
|
|
||||||
- `working_dir` (optional): Working directory (default: current)
|
|
||||||
|
|
||||||
### Return Format
|
|
||||||
|
|
||||||
Extracts `agent_message` from Codex JSON stream and appends session ID:
|
|
||||||
```
|
|
||||||
Agent response text here...
|
|
||||||
|
|
||||||
---
|
|
||||||
SESSION_ID: 019a7247-ac9d-71f3-89e2-a823dbd8fd14
|
|
||||||
```
|
|
||||||
|
|
||||||
Error format (stderr):
|
|
||||||
```
|
|
||||||
ERROR: Error message
|
|
||||||
```
|
|
||||||
|
|
||||||
Return only the final agent message and session ID—do not paste raw `BashOutput` logs or background-task chatter into the conversation.
|
|
||||||
|
|
||||||
### Invocation Pattern
|
|
||||||
|
|
||||||
All automated executions must use HEREDOC syntax through the Bash tool in the foreground, with `timeout` fixed at `7200000` (non-negotiable):
|
|
||||||
|
|
||||||
```
|
|
||||||
Bash tool parameters:
|
|
||||||
- command: codex-wrapper - [working_dir] <<'EOF'
|
|
||||||
<task content>
|
|
||||||
EOF
|
|
||||||
- timeout: 7200000
|
|
||||||
- description: <brief description of the task>
|
|
||||||
```
|
|
||||||
|
|
||||||
Run every call in the foreground—never append `&` to background it—so logs and errors stay visible for timely interruption or diagnosis.
|
|
||||||
|
|
||||||
**Important:** Use HEREDOC (`<<'EOF'`) for all but the simplest tasks. This prevents shell interpretation of quotes, variables, and special characters.
|
|
||||||
|
|
||||||
### Examples
|
|
||||||
|
|
||||||
**Basic code analysis:**
|
|
||||||
```bash
|
|
||||||
# Recommended: with HEREDOC (handles any special characters)
|
|
||||||
codex-wrapper - <<'EOF'
|
|
||||||
explain @src/main.ts
|
|
||||||
EOF
|
|
||||||
# timeout: 7200000
|
|
||||||
|
|
||||||
# Alternative: simple direct quoting (if task is simple)
|
|
||||||
codex-wrapper "explain @src/main.ts"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Refactoring with multiline instructions:**
|
|
||||||
```bash
|
|
||||||
codex-wrapper - <<'EOF'
|
|
||||||
refactor @src/utils for performance:
|
|
||||||
- Extract duplicate code into helpers
|
|
||||||
- Use memoization for expensive calculations
|
|
||||||
- Add inline comments for non-obvious logic
|
|
||||||
EOF
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**Multi-file analysis:**
|
|
||||||
```bash
|
|
||||||
codex-wrapper - "/path/to/project" <<'EOF'
|
|
||||||
analyze @. and find security issues:
|
|
||||||
1. Check for SQL injection vulnerabilities
|
|
||||||
2. Identify XSS risks in templates
|
|
||||||
3. Review authentication/authorization logic
|
|
||||||
4. Flag hardcoded credentials or secrets
|
|
||||||
EOF
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**Resume previous session:**
|
|
||||||
```bash
|
|
||||||
# First session
|
|
||||||
codex-wrapper - <<'EOF'
|
|
||||||
add comments to @utils.js explaining the caching logic
|
|
||||||
EOF
|
|
||||||
# Output includes: SESSION_ID: 019a7247-ac9d-71f3-89e2-a823dbd8fd14
|
|
||||||
|
|
||||||
# Continue the conversation with more context
|
|
||||||
codex-wrapper resume 019a7247-ac9d-71f3-89e2-a823dbd8fd14 - <<'EOF'
|
|
||||||
now add TypeScript type hints and handle edge cases where cache is null
|
|
||||||
EOF
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**Task with code snippets and special characters:**
|
|
||||||
```bash
|
|
||||||
codex-wrapper - <<'EOF'
|
|
||||||
Fix the bug in @app.js where the regex /\d+/ doesn't match "123"
|
|
||||||
The current code is:
|
|
||||||
const re = /\d+/;
|
|
||||||
if (re.test(input)) { ... }
|
|
||||||
Add proper escaping and handle $variables correctly.
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
### Parallel Execution
|
|
||||||
|
|
||||||
> Important:
|
|
||||||
> - `--parallel` only reads task definitions from stdin.
|
|
||||||
> - It does not accept extra command-line arguments (no inline `workdir`, `task`, or other params).
|
|
||||||
> - Put all task metadata and content in stdin; nothing belongs after `--parallel` on the command line.
|
|
||||||
|
|
||||||
**Correct vs Incorrect Usage**
|
|
||||||
|
|
||||||
**Correct:**
|
|
||||||
```bash
|
|
||||||
# Option 1: file redirection
|
|
||||||
codex-wrapper --parallel < tasks.txt
|
|
||||||
|
|
||||||
# Option 2: heredoc (recommended for multiple tasks)
|
|
||||||
codex-wrapper --parallel <<'EOF'
|
|
||||||
---TASK---
|
|
||||||
id: task1
|
|
||||||
workdir: /path/to/dir
|
|
||||||
---CONTENT---
|
|
||||||
task content
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Option 3: pipe
|
|
||||||
echo "---TASK---..." | codex-wrapper --parallel
|
|
||||||
```
|
|
||||||
|
|
||||||
**Incorrect (will trigger shell parsing errors):**
|
|
||||||
```bash
|
|
||||||
# Bad: no extra args allowed after --parallel
|
|
||||||
codex-wrapper --parallel - /path/to/dir <<'EOF'
|
|
||||||
...
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Bad: --parallel does not take a task argument
|
|
||||||
codex-wrapper --parallel "task description"
|
|
||||||
|
|
||||||
# Bad: workdir must live inside the task config
|
|
||||||
codex-wrapper --parallel /path/to/dir < tasks.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
For multiple independent or dependent tasks, use `--parallel` mode with delimiter format:
|
|
||||||
|
|
||||||
**Typical Workflow (analyze → implement → test, chained in a single parallel call)**:
|
|
||||||
```bash
|
|
||||||
codex-wrapper --parallel <<'EOF'
|
|
||||||
---TASK---
|
|
||||||
id: analyze_1732876800
|
|
||||||
workdir: /home/user/project
|
|
||||||
---CONTENT---
|
|
||||||
analyze @spec.md and summarize API and UI requirements
|
|
||||||
---TASK---
|
|
||||||
id: implement_1732876801
|
|
||||||
workdir: /home/user/project
|
|
||||||
dependencies: analyze_1732876800
|
|
||||||
---CONTENT---
|
|
||||||
implement features from analyze_1732876800 summary in backend @services and frontend @ui
|
|
||||||
---TASK---
|
|
||||||
id: test_1732876802
|
|
||||||
workdir: /home/user/project
|
|
||||||
dependencies: implement_1732876801
|
|
||||||
---CONTENT---
|
|
||||||
add and run regression tests covering the new endpoints and UI flows
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
A single `codex-wrapper --parallel` call schedules all three stages concurrently, using `dependencies` to enforce sequential ordering without multiple invocations.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
codex-wrapper --parallel <<'EOF'
|
|
||||||
---TASK---
|
|
||||||
id: backend_1732876800
|
|
||||||
workdir: /home/user/project/backend
|
|
||||||
---CONTENT---
|
|
||||||
implement /api/orders endpoints with validation and pagination
|
|
||||||
---TASK---
|
|
||||||
id: frontend_1732876801
|
|
||||||
workdir: /home/user/project/frontend
|
|
||||||
---CONTENT---
|
|
||||||
build Orders page consuming /api/orders with loading/error states
|
|
||||||
---TASK---
|
|
||||||
id: tests_1732876802
|
|
||||||
workdir: /home/user/project/tests
|
|
||||||
dependencies: backend_1732876800, frontend_1732876801
|
|
||||||
---CONTENT---
|
|
||||||
run API contract tests and UI smoke tests (waits for backend+frontend)
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Delimiter Format**:
|
|
||||||
- `---TASK---`: Starts a new task block
|
|
||||||
- `id: <task-id>`: Required, unique task identifier
|
|
||||||
- Best practice: use `<feature>_<timestamp>` format (e.g., `auth_1732876800`, `api_test_1732876801`)
|
|
||||||
- Ensures uniqueness across runs and makes tasks traceable
|
|
||||||
- `workdir: <path>`: Optional, working directory (default: `.`)
|
|
||||||
- Best practice: use absolute paths (e.g., `/home/user/project/backend`)
|
|
||||||
- Avoids ambiguity and ensures consistent behavior across environments
|
|
||||||
- Must be specified inside each task block; do not pass `workdir` as a CLI argument to `--parallel`
|
|
||||||
- Each task can set its own `workdir` when different directories are needed
|
|
||||||
- `dependencies: <id1>, <id2>`: Optional, comma-separated task IDs
|
|
||||||
- `session_id: <uuid>`: Optional, resume a previous session
|
|
||||||
- `---CONTENT---`: Separates metadata from task content
|
|
||||||
- Task content: Any text, code, special characters (no escaping needed)
|
|
||||||
|
|
||||||
**Dependencies Best Practices**
|
|
||||||
|
|
||||||
- Avoid multiple invocations: Place "analyze then implement" in a single `codex-wrapper --parallel` call, chaining them via `dependencies`, rather than running analysis first and then launching implementation separately.
|
|
||||||
- Naming convention: Use `<action>_<timestamp>` format (e.g., `analyze_1732876800`, `implement_1732876801`), where action names map to features/stages and timestamps ensure uniqueness and sortability.
|
|
||||||
- Dependency chain design: Keep chains short; only add dependencies for tasks that truly require ordering, let others run in parallel, avoiding over-serialization that reduces throughput.
|
|
||||||
|
|
||||||
**Resume Failed Tasks**:
|
|
||||||
```bash
|
|
||||||
# Use session_id from previous output to resume
|
|
||||||
codex-wrapper --parallel <<'EOF'
|
|
||||||
---TASK---
|
|
||||||
id: T2
|
|
||||||
session_id: 019xxx-previous-session-id
|
|
||||||
---CONTENT---
|
|
||||||
fix the previous error and retry
|
|
||||||
EOF
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output**: Human-readable text format
|
|
||||||
```
|
|
||||||
=== Parallel Execution Summary ===
|
|
||||||
Total: 3 | Success: 2 | Failed: 1
|
|
||||||
|
|
||||||
--- Task: T1 ---
|
|
||||||
Status: SUCCESS
|
|
||||||
Session: 019xxx
|
|
||||||
|
|
||||||
Task output message...
|
|
||||||
|
|
||||||
--- Task: T2 ---
|
|
||||||
Status: FAILED (exit code 1)
|
|
||||||
Error: some error message
|
|
||||||
```
|
|
||||||
|
|
||||||
**Features**:
|
|
||||||
- Automatic topological sorting based on dependencies
|
|
||||||
- Unlimited concurrency for independent tasks
|
|
||||||
- Error isolation (failed tasks don't stop others)
|
|
||||||
- Dependency blocking (dependent tasks skip if parent fails)
|
|
||||||
|
|
||||||
## Notes
|
|
||||||
|
|
||||||
- **Binary distribution**: Single Go binary, zero dependencies
|
|
||||||
- **Installation**: Download from GitHub Releases or use install.sh
|
|
||||||
- **Cross-platform compatible**: Linux (amd64/arm64), macOS (amd64/arm64)
|
|
||||||
- All automated runs must use the Bash tool with the fixed timeout to provide dual timeout protection and unified logging/exit semantics
|
|
||||||
for automation (new sessions only)
|
|
||||||
- Uses `--skip-git-repo-check` to work in any directory
|
|
||||||
- Streams progress, returns only final agent message
|
|
||||||
- Every execution returns a session ID for resuming conversations
|
|
||||||
- Requires Codex CLI installed and authenticated
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
name: do
|
name: do
|
||||||
description: This skill should be used for structured feature development with codebase understanding. Triggers on /do command. Provides a 5-phase workflow (Understand, Clarify, Design, Implement, Complete) using codeagent-wrapper to orchestrate code-explorer, code-architect, code-reviewer, and develop agents in parallel.
|
description: This skill should be used for structured feature development with codebase understanding. Triggers on /do command. Provides a 5-phase workflow (Understand, Clarify, Design, Implement, Complete) using codeagent-wrapper to orchestrate code-explorer, code-architect, code-reviewer, and develop agents in parallel.
|
||||||
allowed-tools: ["Bash(.claude/skills/do/scripts/setup-do.py:*)", "Bash(.claude/skills/do/scripts/task.py:*)"]
|
allowed-tools: ["Bash(python3:*/.claude/skills/do/scripts/setup-do.py*)", "Bash(python3:*/.claude/skills/do/scripts/task.py*)"]
|
||||||
---
|
---
|
||||||
|
|
||||||
# do - Feature Development Orchestrator
|
# do - Feature Development Orchestrator
|
||||||
@@ -13,7 +13,7 @@ An orchestrator for systematic feature development. Invoke agents via `codeagent
|
|||||||
When triggered via `/do <task>`, initialize the task directory immediately without asking about worktree:
|
When triggered via `/do <task>`, initialize the task directory immediately without asking about worktree:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
python3 ".claude/skills/do/scripts/setup-do.py" "<task description>"
|
python3 "$HOME/.claude/skills/do/scripts/setup-do.py" "<task description>"
|
||||||
```
|
```
|
||||||
|
|
||||||
This creates a task directory under `.claude/do-tasks/` with:
|
This creates a task directory under `.claude/do-tasks/` with:
|
||||||
@@ -27,13 +27,13 @@ Use `task.py` to manage task state:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Update phase
|
# Update phase
|
||||||
python3 ".claude/skills/do/scripts/task.py" update-phase 2
|
python3 "$HOME/.claude/skills/do/scripts/task.py" update-phase 2
|
||||||
|
|
||||||
# Check status
|
# Check status
|
||||||
python3 ".claude/skills/do/scripts/task.py" status
|
python3 "$HOME/.claude/skills/do/scripts/task.py" status
|
||||||
|
|
||||||
# List all tasks
|
# List all tasks
|
||||||
python3 ".claude/skills/do/scripts/task.py" list
|
python3 "$HOME/.claude/skills/do/scripts/task.py" list
|
||||||
```
|
```
|
||||||
|
|
||||||
## Worktree Mode
|
## Worktree Mode
|
||||||
@@ -42,7 +42,7 @@ The worktree is created **only when needed** (right before Phase 4: Implement).
|
|||||||
|
|
||||||
1. Run setup with `--worktree` flag to create the worktree:
|
1. Run setup with `--worktree` flag to create the worktree:
|
||||||
```bash
|
```bash
|
||||||
python3 ".claude/skills/do/scripts/setup-do.py" --worktree "<task description>"
|
python3 "$HOME/.claude/skills/do/scripts/setup-do.py" --worktree "<task description>"
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Use the `DO_WORKTREE_DIR` environment variable to direct `codeagent-wrapper` develop agent into the worktree. **Do NOT pass `--worktree` to subsequent calls** — that creates a new worktree each time.
|
2. Use the `DO_WORKTREE_DIR` environment variable to direct `codeagent-wrapper` develop agent into the worktree. **Do NOT pass `--worktree` to subsequent calls** — that creates a new worktree each time.
|
||||||
@@ -181,7 +181,7 @@ Develop in a separate worktree? (Isolates changes from main branch)
|
|||||||
|
|
||||||
If user chooses worktree:
|
If user chooses worktree:
|
||||||
```bash
|
```bash
|
||||||
python3 ".claude/skills/do/scripts/setup-do.py" --worktree "<task description>"
|
python3 "$HOME/.claude/skills/do/scripts/setup-do.py" --worktree "<task description>"
|
||||||
# Save the worktree path from output for DO_WORKTREE_DIR
|
# Save the worktree path from output for DO_WORKTREE_DIR
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -1,120 +0,0 @@
|
|||||||
---
|
|
||||||
name: gemini
|
|
||||||
description: Execute Gemini CLI for AI-powered code analysis and generation. Use when you need to leverage Google's Gemini models for complex reasoning tasks.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Gemini CLI Integration
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Execute Gemini CLI commands with support for multiple models and flexible prompt input. Integrates Google's Gemini AI models into Claude Code workflows.
|
|
||||||
|
|
||||||
## When to Use
|
|
||||||
|
|
||||||
- Complex reasoning tasks requiring advanced AI capabilities
|
|
||||||
- Code generation and analysis with Gemini models
|
|
||||||
- Tasks requiring Google's latest AI technology
|
|
||||||
- Alternative perspective on code problems
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
**Mandatory**: Run via uv with fixed timeout 7200000ms (foreground):
|
|
||||||
```bash
|
|
||||||
uv run ~/.claude/skills/gemini/scripts/gemini.py "<prompt>" [working_dir]
|
|
||||||
```
|
|
||||||
|
|
||||||
**Optional** (direct execution or using Python):
|
|
||||||
```bash
|
|
||||||
~/.claude/skills/gemini/scripts/gemini.py "<prompt>" [working_dir]
|
|
||||||
# or
|
|
||||||
python3 ~/.claude/skills/gemini/scripts/gemini.py "<prompt>" [working_dir]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
- **GEMINI_MODEL**: Configure model (default: `gemini-3-pro-preview`)
|
|
||||||
- Example: `export GEMINI_MODEL=gemini-3`
|
|
||||||
|
|
||||||
## Timeout Control
|
|
||||||
|
|
||||||
- **Fixed**: 7200000 milliseconds (2 hours), immutable
|
|
||||||
- **Bash tool**: Always set `timeout: 7200000` for double protection
|
|
||||||
|
|
||||||
### Parameters
|
|
||||||
|
|
||||||
- `prompt` (required): Task prompt or question
|
|
||||||
- `working_dir` (optional): Working directory (default: current directory)
|
|
||||||
|
|
||||||
### Return Format
|
|
||||||
|
|
||||||
Plain text output from Gemini:
|
|
||||||
|
|
||||||
```text
|
|
||||||
Model response text here...
|
|
||||||
```
|
|
||||||
|
|
||||||
Error format (stderr):
|
|
||||||
|
|
||||||
```text
|
|
||||||
ERROR: Error message
|
|
||||||
```
|
|
||||||
|
|
||||||
### Invocation Pattern
|
|
||||||
|
|
||||||
When calling via Bash tool, always include the timeout parameter:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
Bash tool parameters:
|
|
||||||
- command: uv run ~/.claude/skills/gemini/scripts/gemini.py "<prompt>"
|
|
||||||
- timeout: 7200000
|
|
||||||
- description: <brief description of the task>
|
|
||||||
```
|
|
||||||
|
|
||||||
Alternatives:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
# Direct execution (simplest)
|
|
||||||
- command: ~/.claude/skills/gemini/scripts/gemini.py "<prompt>"
|
|
||||||
|
|
||||||
# Using python3
|
|
||||||
- command: python3 ~/.claude/skills/gemini/scripts/gemini.py "<prompt>"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Examples
|
|
||||||
|
|
||||||
**Basic query:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
uv run ~/.claude/skills/gemini/scripts/gemini.py "explain quantum computing"
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**Code analysis:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
uv run ~/.claude/skills/gemini/scripts/gemini.py "review this code for security issues: $(cat app.py)"
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**With specific working directory:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
uv run ~/.claude/skills/gemini/scripts/gemini.py "analyze project structure" "/path/to/project"
|
|
||||||
# timeout: 7200000
|
|
||||||
```
|
|
||||||
|
|
||||||
**Using python3 directly (alternative):**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
python3 ~/.claude/skills/gemini/scripts/gemini.py "your prompt here"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Notes
|
|
||||||
|
|
||||||
- **Recommended**: Use `uv run` for automatic Python environment management (requires uv installed)
|
|
||||||
- **Alternative**: Direct execution `./gemini.py` (uses system Python via shebang)
|
|
||||||
- Python implementation using standard library (zero dependencies)
|
|
||||||
- Cross-platform compatible (Windows/macOS/Linux)
|
|
||||||
- PEP 723 compliant (inline script metadata)
|
|
||||||
- Requires Gemini CLI installed and authenticated
|
|
||||||
- Supports all Gemini model variants (configure via `GEMINI_MODEL` environment variable)
|
|
||||||
- Output is streamed directly from Gemini CLI
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# /// script
|
|
||||||
# requires-python = ">=3.8"
|
|
||||||
# dependencies = []
|
|
||||||
# ///
|
|
||||||
"""
|
|
||||||
Gemini CLI wrapper with cross-platform support.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
uv run gemini.py "<prompt>" [workdir]
|
|
||||||
python3 gemini.py "<prompt>"
|
|
||||||
./gemini.py "your prompt"
|
|
||||||
"""
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
DEFAULT_MODEL = os.environ.get('GEMINI_MODEL', 'gemini-3-pro-preview')
|
|
||||||
DEFAULT_WORKDIR = '.'
|
|
||||||
TIMEOUT_MS = 7_200_000 # 固定 2 小时，毫秒
|
|
||||||
DEFAULT_TIMEOUT = TIMEOUT_MS // 1000
|
|
||||||
FORCE_KILL_DELAY = 5
|
|
||||||
|
|
||||||
|
|
||||||
def log_error(message: str):
|
|
||||||
"""输出错误信息到 stderr"""
|
|
||||||
sys.stderr.write(f"ERROR: {message}\n")
|
|
||||||
|
|
||||||
|
|
||||||
def log_warn(message: str):
|
|
||||||
"""输出警告信息到 stderr"""
|
|
||||||
sys.stderr.write(f"WARN: {message}\n")
|
|
||||||
|
|
||||||
|
|
||||||
def log_info(message: str):
|
|
||||||
"""输出信息到 stderr"""
|
|
||||||
sys.stderr.write(f"INFO: {message}\n")
|
|
||||||
|
|
||||||
|
|
||||||
def parse_args():
|
|
||||||
"""解析位置参数"""
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
log_error('Prompt required')
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'prompt': sys.argv[1],
|
|
||||||
'workdir': sys.argv[2] if len(sys.argv) > 2 else DEFAULT_WORKDIR
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def build_gemini_args(args) -> list:
|
|
||||||
"""构建 gemini CLI 参数"""
|
|
||||||
return [
|
|
||||||
'gemini',
|
|
||||||
'-m', DEFAULT_MODEL,
|
|
||||||
'-p', args['prompt']
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
log_info('Script started')
|
|
||||||
args = parse_args()
|
|
||||||
log_info(f"Prompt length: {len(args['prompt'])}")
|
|
||||||
log_info(f"Working dir: {args['workdir']}")
|
|
||||||
gemini_args = build_gemini_args(args)
|
|
||||||
timeout_sec = DEFAULT_TIMEOUT
|
|
||||||
log_info(f"Timeout: {timeout_sec}s")
|
|
||||||
|
|
||||||
# 如果指定了工作目录，切换到该目录
|
|
||||||
if args['workdir'] != DEFAULT_WORKDIR:
|
|
||||||
try:
|
|
||||||
os.chdir(args['workdir'])
|
|
||||||
except FileNotFoundError:
|
|
||||||
log_error(f"Working directory not found: {args['workdir']}")
|
|
||||||
sys.exit(1)
|
|
||||||
except PermissionError:
|
|
||||||
log_error(f"Permission denied: {args['workdir']}")
|
|
||||||
sys.exit(1)
|
|
||||||
log_info('Changed working directory')
|
|
||||||
|
|
||||||
try:
|
|
||||||
log_info(f"Starting gemini with model {DEFAULT_MODEL}")
|
|
||||||
process = None
|
|
||||||
# 启动 gemini 子进程，直接透传 stdout 和 stderr
|
|
||||||
process = subprocess.Popen(
|
|
||||||
gemini_args,
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
stderr=subprocess.PIPE,
|
|
||||||
text=True,
|
|
||||||
bufsize=1 # 行缓冲
|
|
||||||
)
|
|
||||||
|
|
||||||
# 实时输出 stdout
|
|
||||||
for line in process.stdout:
|
|
||||||
sys.stdout.write(line)
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
# 等待进程结束
|
|
||||||
returncode = process.wait(timeout=timeout_sec)
|
|
||||||
|
|
||||||
# 读取 stderr
|
|
||||||
stderr_output = process.stderr.read()
|
|
||||||
if stderr_output:
|
|
||||||
sys.stderr.write(stderr_output)
|
|
||||||
|
|
||||||
# 检查退出码
|
|
||||||
if returncode != 0:
|
|
||||||
log_error(f'Gemini exited with status {returncode}')
|
|
||||||
sys.exit(returncode)
|
|
||||||
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
except subprocess.TimeoutExpired:
|
|
||||||
log_error(f'Gemini execution timeout ({timeout_sec}s)')
|
|
||||||
if process is not None:
|
|
||||||
process.kill()
|
|
||||||
try:
|
|
||||||
process.wait(timeout=FORCE_KILL_DELAY)
|
|
||||||
except subprocess.TimeoutExpired:
|
|
||||||
pass
|
|
||||||
sys.exit(124)
|
|
||||||
|
|
||||||
except FileNotFoundError:
|
|
||||||
log_error("gemini command not found in PATH")
|
|
||||||
log_error("Please install Gemini CLI: https://github.com/google/generative-ai-python")
|
|
||||||
sys.exit(127)
|
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
if process is not None:
|
|
||||||
process.terminate()
|
|
||||||
try:
|
|
||||||
process.wait(timeout=FORCE_KILL_DELAY)
|
|
||||||
except subprocess.TimeoutExpired:
|
|
||||||
process.kill()
|
|
||||||
sys.exit(130)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
Reference in New Issue
Block a user