diff --git a/Makefile b/Makefile index 12d8bf99a..a6811ab9c 100644 --- a/Makefile +++ b/Makefile @@ -608,37 +608,37 @@ launchctl: launchctl-brew-upgrader launchctl-cliproxyapi launchctl-code-syncer l .PHONY: launchctl-brew-upgrader launchctl-brew-upgrader: ## Restart brew-upgrader launchd agent. @echo "🔄 Restarting brew-upgrader..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.brew-upgrader || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.brew-upgrader || true @echo "✅ brew-upgrader restarted" .PHONY: launchctl-cliproxyapi launchctl-cliproxyapi: ## Restart cliproxyapi launchd agent. @echo "🔄 Restarting cliproxyapi..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.cliproxyapi || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.cliproxyapi || true @echo "✅ cliproxyapi restarted" .PHONY: launchctl-code-syncer launchctl-code-syncer: ## Restart code-syncer launchd agent. @echo "🔄 Restarting code-syncer..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.code-syncer || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.code-syncer || true @echo "✅ code-syncer restarted" .PHONY: launchctl-dotfiles-updater launchctl-dotfiles-updater: ## Restart dotfiles-updater launchd agent. @echo "🔄 Restarting dotfiles-updater..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.dotfiles-updater || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.dotfiles-updater || true @echo "✅ dotfiles-updater restarted" .PHONY: launchctl-neverssl-keepalive launchctl-neverssl-keepalive: ## Restart neverssl-keepalive launchd agent. @echo "🔄 Restarting neverssl-keepalive..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.neverssl-keepalive || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.neverssl-keepalive || true @echo "✅ neverssl-keepalive restarted" .PHONY: launchctl-ollama launchctl-ollama: ## Restart ollama launchd agent. @echo "🔄 Restarting ollama..." - @launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.ollama || true + @timeout 5 launchctl kickstart -k gui/$$(id -u)/org.nix-community.home.ollama || true @echo "✅ ollama restarted" ##@ Systemd Services (Linux) diff --git a/config/cliproxyapi/config.yaml b/config/cliproxyapi/config.yaml index f0807eec7..3daf2fc85 100644 --- a/config/cliproxyapi/config.yaml +++ b/config/cliproxyapi/config.yaml @@ -75,7 +75,6 @@ openai-compatibility: - "__OPENROUTER_API_KEY__" models: - name: "z-ai/glm-4.6" - - name: "z-ai/glm-4.7" - name: "z-ai" base-url: "https://api.z.ai/api/coding/paas/v4" api-keys: diff --git a/config/opencode/opencode.jsonc b/config/opencode/opencode.jsonc index c4f33a113..761e0d407 100644 --- a/config/opencode/opencode.jsonc +++ b/config/opencode/opencode.jsonc @@ -43,10 +43,10 @@ "name": "Claude Haiku 4.5 (via CLIProxyAPI)" }, "z-ai/glm-4.6": { - "name": "GLM-4.6 (via OpenRouter)", - "options": { - "stream": false - } + "name": "GLM-4.6 (via OpenRouter and Z.AI Coding Plan)" + }, + "z-ai/glm-4.7": { + "name": "GLM-4.7 (via OpenRouter and Z.AI Coding Plan)" } } }, @@ -85,7 +85,9 @@ "reasoningEffort": "medium", "reasoningSummary": "auto", "textVerbosity": "medium", - "include": ["reasoning.encrypted_content"] + "include": [ + "reasoning.encrypted_content" + ] }, "models": { "gpt-5-codex-low-oauth": { @@ -151,7 +153,9 @@ "deepseek/deepseek-chat-v3.1:free": { "options": { "provider": { - "order": ["baseten"], + "order": [ + "baseten" + ], "allow_fallbacks": false } } @@ -159,7 +163,9 @@ "moonshotai/kimi-k2": { "options": { "provider": { - "order": ["baseten"], + "order": [ + "baseten" + ], "allow_fallbacks": false } } @@ -167,7 +173,9 @@ "moonshotai/kimi-k2:free": { "options": { "provider": { - "order": ["baseten"], + "order": [ + "baseten" + ], "allow_fallbacks": false } } @@ -175,7 +183,9 @@ "openai/gpt-oss-120b:free": { "options": { "provider": { - "order": ["baseten"], + "order": [ + "baseten" + ], "allow_fallbacks": false } } @@ -183,7 +193,9 @@ "qwen/qwen3-coder:free": { "options": { "provider": { - "order": ["baseten"], + "order": [ + "baseten" + ], "allow_fallbacks": false } } @@ -198,7 +210,17 @@ "glm-4.6": { "name": "GLM-4.6 (via Z-AI)", }, - "zai-coding-plan/glm-4.7": { + }, + "options": { + "apiKey": "{env:ZAI_API_KEY}", + } + }, + "zai-coding-plan": { + "models": { + "glm-4.6": { + "name": "GLM-4.6 Coding Plan (via Z-AI)" + }, + "glm-4.7": { "name": "GLM-4.7 Coding Plan (via Z-AI)" } }, @@ -210,4 +232,4 @@ "tui": { "scroll_speed": 3 } -} +} \ No newline at end of file diff --git a/home-manager/services/brew-upgrader/default.nix b/home-manager/services/brew-upgrader/default.nix index c36902163..457e6863a 100644 --- a/home-manager/services/brew-upgrader/default.nix +++ b/home-manager/services/brew-upgrader/default.nix @@ -8,7 +8,6 @@ "${./upgrade.sh}" ]; RunAtLoad = true; - KeepAlive = true; StartInterval = 10800; StandardOutPath = "/tmp/brew-upgrader.log"; StandardErrorPath = "/tmp/brew-upgrader.error.log"; diff --git a/spec/cliproxyapi_spec.sh b/spec/cliproxyapi_spec.sh index 5a9263fdb..09f6c1d09 100644 --- a/spec/cliproxyapi_spec.sh +++ b/spec/cliproxyapi_spec.sh @@ -2,7 +2,7 @@ # shellcheck disable=SC2329 Describe 'cliproxyapi/start.sh' -SCRIPT="$PWD/home-manager/services/cliproxyapi/start.sh" +SCRIPT="$PWD/home-manager/services/cliproxyapi/scripts/start.sh" Describe 'configuration handling' setup() { diff --git a/spec/coverage_spec.sh b/spec/coverage_spec.sh index 05cce5836..44a65f937 100644 --- a/spec/coverage_spec.sh +++ b/spec/coverage_spec.sh @@ -29,7 +29,7 @@ It 'has spec file for home-manager/services/brew-upgrader/upgrade.sh' The path "spec/brew_upgrader_spec.sh" should be exist End -It 'has spec file for home-manager/services/cliproxyapi/start.sh' +It 'has spec file for home-manager/services/cliproxyapi/scripts/start.sh' The path "spec/cliproxyapi_spec.sh" should be exist End @@ -90,7 +90,7 @@ home-manager/services/brew-upgrader/upgrade.sh home-manager/services/cliproxyapi/scripts/backup-and-recover.sh home-manager/services/cliproxyapi/scripts/backup-auth.sh home-manager/services/cliproxyapi/scripts/recover-auth.sh -home-manager/services/cliproxyapi/start.sh +home-manager/services/cliproxyapi/scripts/start.sh home-manager/services/code-syncer/sync.sh home-manager/services/dotfiles-updater/update.sh home-manager/services/neverssl-keepalive/keepalive.sh