新增功能: - 添加 --gemini-model 参数,支持指定 Gemini 模型(如 gemini-2.5-flash) - 支持 GEMINI_MODEL 环境变量配置,CLI 参数优先级高于环境变量 - 模型参数自动插入到 gemini CLI 调用的正确位置(-m 参数在其他参数之前) - 添加详细的日志记录和警告提示 - 更新帮助文档,说明参数用法和示例 技术实现: - Config 结构体新增 GeminiModel 字段 - parseArgs() 函数支持 --gemini-model 和 --gemini-model=<value> 两种语法 - buildGeminiArgs() 函数在构建参数时优先插入模型参数 - 添加跨后端和并行模式的参数验证警告 版本更新:v5.7.1 → v5.7.2
146 lines
3.3 KiB
Go
146 lines
3.3 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// Backend defines the contract for invoking different AI CLI backends.
|
|
// Each backend is responsible for supplying the executable command and
|
|
// building the argument list based on the wrapper config.
|
|
type Backend interface {
|
|
Name() string
|
|
BuildArgs(cfg *Config, targetArg string) []string
|
|
Command() string
|
|
}
|
|
|
|
type CodexBackend struct{}
|
|
|
|
func (CodexBackend) Name() string { return "codex" }
|
|
func (CodexBackend) Command() string {
|
|
return "codex"
|
|
}
|
|
func (CodexBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
|
return buildCodexArgs(cfg, targetArg)
|
|
}
|
|
|
|
type ClaudeBackend struct{}
|
|
|
|
func (ClaudeBackend) Name() string { return "claude" }
|
|
func (ClaudeBackend) Command() string {
|
|
return "claude"
|
|
}
|
|
func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
|
return buildClaudeArgs(cfg, targetArg)
|
|
}
|
|
|
|
const maxClaudeSettingsBytes = 1 << 20 // 1MB
|
|
|
|
// loadMinimalEnvSettings 从 ~/.claude/settings.json 只提取 env 配置。
|
|
// 只接受字符串类型的值;文件缺失/解析失败/超限都返回空。
|
|
func loadMinimalEnvSettings() map[string]string {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil || home == "" {
|
|
return nil
|
|
}
|
|
|
|
settingPath := filepath.Join(home, ".claude", "settings.json")
|
|
info, err := os.Stat(settingPath)
|
|
if err != nil || info.Size() > maxClaudeSettingsBytes {
|
|
return nil
|
|
}
|
|
|
|
data, err := os.ReadFile(settingPath)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
var cfg struct {
|
|
Env map[string]any `json:"env"`
|
|
}
|
|
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
return nil
|
|
}
|
|
if len(cfg.Env) == 0 {
|
|
return nil
|
|
}
|
|
|
|
env := make(map[string]string, len(cfg.Env))
|
|
for k, v := range cfg.Env {
|
|
s, ok := v.(string)
|
|
if !ok {
|
|
continue
|
|
}
|
|
env[k] = s
|
|
}
|
|
if len(env) == 0 {
|
|
return nil
|
|
}
|
|
return env
|
|
}
|
|
|
|
func buildClaudeArgs(cfg *Config, targetArg string) []string {
|
|
if cfg == nil {
|
|
return nil
|
|
}
|
|
args := []string{"-p"}
|
|
if cfg.SkipPermissions {
|
|
args = append(args, "--dangerously-skip-permissions")
|
|
}
|
|
|
|
// Prevent infinite recursion: disable all setting sources (user, project, local)
|
|
// This ensures a clean execution environment without CLAUDE.md or skills that would trigger codeagent
|
|
args = append(args, "--setting-sources", "")
|
|
|
|
if cfg.Mode == "resume" {
|
|
if cfg.SessionID != "" {
|
|
// Claude CLI uses -r <session_id> for resume.
|
|
args = append(args, "-r", cfg.SessionID)
|
|
}
|
|
}
|
|
// Note: claude CLI doesn't support -C flag; workdir set via cmd.Dir
|
|
|
|
args = append(args, "--output-format", "stream-json", "--verbose", targetArg)
|
|
|
|
return args
|
|
}
|
|
|
|
type GeminiBackend struct{}
|
|
|
|
func (GeminiBackend) Name() string { return "gemini" }
|
|
func (GeminiBackend) Command() string {
|
|
return "gemini"
|
|
}
|
|
func (GeminiBackend) BuildArgs(cfg *Config, targetArg string) []string {
|
|
return buildGeminiArgs(cfg, targetArg)
|
|
}
|
|
|
|
func buildGeminiArgs(cfg *Config, targetArg string) []string {
|
|
if cfg == nil {
|
|
return nil
|
|
}
|
|
|
|
args := []string{}
|
|
|
|
// Add model parameter first (if specified)
|
|
if model := strings.TrimSpace(cfg.GeminiModel); model != "" {
|
|
args = append(args, "-m", model)
|
|
}
|
|
|
|
// Existing args
|
|
args = append(args, "-o", "stream-json", "-y")
|
|
|
|
if cfg.Mode == "resume" {
|
|
if cfg.SessionID != "" {
|
|
args = append(args, "-r", cfg.SessionID)
|
|
}
|
|
}
|
|
// Note: gemini CLI doesn't support -C flag; workdir set via cmd.Dir
|
|
|
|
args = append(args, "-p", targetArg)
|
|
|
|
return args
|
|
}
|