zishuo/myclaude
1
0
Fork 0
mirror of https://github.com/cexll/myclaude.git synced 2025-12-24 13:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct settings.json filename and bump version to v5.2.8

Browse Source 
- Fix incorrect filename reference from setting.json to settings.json in backend.go
- Update corresponding test fixtures to use correct filename
- Bump version from 5.2.7 to 5.2.8

Generated with SWE-Agent.ai

Co-Authored-By: SWE-Agent.ai <noreply@swe-agent.ai>
This commit is contained in:
cexll
2025-12-22 10:32:44 +08:00
parent 156a072a0b
commit 3fd3c67749
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codeagent-wrapper/backend.go
View File

@@ -37,7 +37,7 @@ func (ClaudeBackend) BuildArgs(cfg *Config, targetArg string) []string {
const maxClaudeSettingsBytes = 1 << 20 // 1MB const maxClaudeSettingsBytes = 1 << 20 // 1MB
// loadMinimalEnvSettings 从 ~/.claude/setting.json 只提取 env 配置。 // loadMinimalEnvSettings 从 ~/.claude/settings.json 只提取 env 配置。
// 只接受字符串类型的值；文件缺失/解析失败/超限都返回空。 // 只接受字符串类型的值；文件缺失/解析失败/超限都返回空。
func loadMinimalEnvSettings() map[string]string { func loadMinimalEnvSettings() map[string]string {
home, err := os.UserHomeDir() home, err := os.UserHomeDir()
@@ -45,7 +45,7 @@ func loadMinimalEnvSettings() map[string]string {
return nil return nil
} }
settingPath := filepath.Join(home, ".claude", "setting.json") settingPath := filepath.Join(home, ".claude", "settings.json")
info, err := os.Stat(settingPath) info, err := os.Stat(settingPath)
if err != nil || info.Size() > maxClaudeSettingsBytes { if err != nil || info.Size() > maxClaudeSettingsBytes {
return nil return nil

6
codeagent-wrapper/backend_test.go
View File

@@ -167,7 +167,7 @@ func TestLoadMinimalEnvSettings(t *testing.T) {
if err := os.MkdirAll(dir, 0o755); err != nil { if err := os.MkdirAll(dir, 0o755); err != nil {
t.Fatalf("MkdirAll: %v", err) t.Fatalf("MkdirAll: %v", err)
} }
path := filepath.Join(dir, "setting.json") path := filepath.Join(dir, "settings.json")
data := []byte(`{"env":{"ANTHROPIC_API_KEY":"secret","FOO":"bar"}}`) data := []byte(`{"env":{"ANTHROPIC_API_KEY":"secret","FOO":"bar"}}`)
if err := os.WriteFile(path, data, 0o600); err != nil { if err := os.WriteFile(path, data, 0o600); err != nil {
t.Fatalf("WriteFile: %v", err) t.Fatalf("WriteFile: %v", err)
@@ -181,7 +181,7 @@ func TestLoadMinimalEnvSettings(t *testing.T) {
t.Run("non-string values are ignored", func(t *testing.T) { t.Run("non-string values are ignored", func(t *testing.T) {
dir := filepath.Join(home, ".claude") dir := filepath.Join(home, ".claude")
path := filepath.Join(dir, "setting.json") path := filepath.Join(dir, "settings.json")
data := []byte(`{"env":{"GOOD":"ok","BAD":123,"ALSO_BAD":true}}`) data := []byte(`{"env":{"GOOD":"ok","BAD":123,"ALSO_BAD":true}}`)
if err := os.WriteFile(path, data, 0o600); err != nil { if err := os.WriteFile(path, data, 0o600); err != nil {
t.Fatalf("WriteFile: %v", err) t.Fatalf("WriteFile: %v", err)
@@ -201,7 +201,7 @@ func TestLoadMinimalEnvSettings(t *testing.T) {
t.Run("oversized file returns empty", func(t *testing.T) { t.Run("oversized file returns empty", func(t *testing.T) {
dir := filepath.Join(home, ".claude") dir := filepath.Join(home, ".claude")
path := filepath.Join(dir, "setting.json") path := filepath.Join(dir, "settings.json")
data := bytes.Repeat([]byte("a"), maxClaudeSettingsBytes+1) data := bytes.Repeat([]byte("a"), maxClaudeSettingsBytes+1)
if err := os.WriteFile(path, data, 0o600); err != nil { if err := os.WriteFile(path, data, 0o600); err != nil {
t.Fatalf("WriteFile: %v", err) t.Fatalf("WriteFile: %v", err)

2
codeagent-wrapper/main.go
View File

@@ -14,7 +14,7 @@ import (
) )
const ( const (
version = "5.2.7" version = "5.2.8"
defaultWorkdir = "." defaultWorkdir = "."
defaultTimeout = 7200 // seconds (2 hours) defaultTimeout = 7200 // seconds (2 hours)
codexLogLineLimit = 1000 codexLogLineLimit = 1000

6
codeagent-wrapper/main_test.go
View File

@@ -3017,7 +3017,7 @@ func TestVersionFlag(t *testing.T) {
t.Errorf("exit = %d, want 0", code) t.Errorf("exit = %d, want 0", code)
} }
}) })
want := "codeagent-wrapper version 5.2.7\n" want := "codeagent-wrapper version 5.2.8\n"
if output != want { if output != want {
t.Fatalf("output = %q, want %q", output, want) t.Fatalf("output = %q, want %q", output, want)
} }
@@ -3031,7 +3031,7 @@ func TestVersionShortFlag(t *testing.T) {
t.Errorf("exit = %d, want 0", code) t.Errorf("exit = %d, want 0", code)
} }
}) })
want := "codeagent-wrapper version 5.2.7\n" want := "codeagent-wrapper version 5.2.8\n"
if output != want { if output != want {
t.Fatalf("output = %q, want %q", output, want) t.Fatalf("output = %q, want %q", output, want)
} }
@@ -3045,7 +3045,7 @@ func TestVersionLegacyAlias(t *testing.T) {
t.Errorf("exit = %d, want 0", code) t.Errorf("exit = %d, want 0", code)
} }
}) })
want := "codex-wrapper version 5.2.7\n" want := "codex-wrapper version 5.2.8\n"
if output != want { if output != want {
t.Fatalf("output = %q, want %q", output, want) t.Fatalf("output = %q, want %q", output, want)
} }