calvyn-code 0.14.13 → 0.14.15

package/cli.py

@@ -3536,18 +3536,22 @@ class HermesCLI:
                 normalize_model_for_provider,
             )
 
-            if resolved_provider not in _AGGREGATOR_PROVIDERS:
-                normalized_model = normalize_model_for_provider(current_model, resolved_provider)
-                if normalized_model and normalized_model != current_model:
+            if resolved_provider not in _AGGREGATOR_PROVIDERS:
+                normalized_model = normalize_model_for_provider(current_model, resolved_provider)
+                if normalized_model and normalized_model != current_model:
                     if not self._model_is_default:
                         self._console_print(
                             f"[yellow]⚠️  Normalized model '{current_model}' to '{normalized_model}' for {resolved_provider}.[/]"
                         )
-                    self.model = normalized_model
-                    current_model = normalized_model
-                    changed = True
-        except Exception:
-            pass
+                    self.model = normalized_model
+                    current_model = normalized_model
+                    changed = True
+                if resolved_provider == "fireworks" and current_model.startswith("accounts/fireworks/models/"):
+                    self._explicit_base_url = "https://api.fireworks.ai/inference/v1"
+                    self.base_url = "https://api.fireworks.ai/inference/v1"
+                    self.api_mode = "chat_completions"
+        except Exception:
+            pass
 
         if resolved_provider == "copilot":
             try:
@@ -6840,14 +6844,11 @@ class HermesCLI:
         # Always overwrite explicit overrides so stale credentials from the
         # previous provider (e.g. Ollama api_key/base_url) don't leak into
         # the new provider's credential resolution on the next turn.
-        self._explicit_api_key = result.api_key
-        self._explicit_base_url = result.base_url
-        if result.api_key:
-            self.api_key = result.api_key
-        if result.base_url:
-            self.base_url = result.base_url
-        if result.api_mode:
-            self.api_mode = result.api_mode
+        self._explicit_api_key = result.api_key or ""
+        self._explicit_base_url = result.base_url or ""
+        self.api_key = result.api_key or ""
+        self.base_url = result.base_url or ""
+        self.api_mode = result.api_mode or "chat_completions"
 
         if self.agent is not None:
             try:
@@ -6906,12 +6907,15 @@ class HermesCLI:
             _cprint(f"    ⚠ {result.warning_message}")
         if persist_global:
             save_config_value("model.default", result.new_model)
-            if result.provider_changed:
-                save_config_value("model.provider", result.target_provider)
+            save_config_value("model.provider", result.target_provider)
+            save_config_value("model.base_url", result.base_url or "")
+            save_config_value("model.api_mode", result.api_mode or "chat_completions")
             _cprint("    Saved to config.yaml (--global)")
         else:
             save_config_value("model.default", result.new_model)
             save_config_value("model.provider", result.target_provider)
+            save_config_value("model.base_url", result.base_url or "")
+            save_config_value("model.api_mode", result.api_mode or "chat_completions")
             _cprint("    Saved to config.yaml")
 
     def _handle_model_picker_selection(self, persist_global: bool = False) -> None:
@@ -7078,14 +7082,11 @@ class HermesCLI:
         # Always overwrite explicit overrides so stale credentials from the
         # previous provider (e.g. Ollama api_key/base_url) don't leak into
         # the new provider's credential resolution on the next turn.
-        self._explicit_api_key = result.api_key
-        self._explicit_base_url = result.base_url
-        if result.api_key:
-            self.api_key = result.api_key
-        if result.base_url:
-            self.base_url = result.base_url
-        if result.api_mode:
-            self.api_mode = result.api_mode
+        self._explicit_api_key = result.api_key or ""
+        self._explicit_base_url = result.base_url or ""
+        self.api_key = result.api_key or ""
+        self.base_url = result.base_url or ""
+        self.api_mode = result.api_mode or "chat_completions"
 
         # Apply to running agent (in-place swap)
         if self.agent is not None:
@@ -7151,12 +7152,15 @@ class HermesCLI:
         # Persistence
         if persist_global:
             save_config_value("model.default", result.new_model)
-            if result.provider_changed:
-                save_config_value("model.provider", result.target_provider)
+            save_config_value("model.provider", result.target_provider)
+            save_config_value("model.base_url", result.base_url or "")
+            save_config_value("model.api_mode", result.api_mode or "chat_completions")
             _cprint("    Saved to config.yaml (--global)")
         else:
             save_config_value("model.default", result.new_model)
             save_config_value("model.provider", result.target_provider)
+            save_config_value("model.base_url", result.base_url or "")
+            save_config_value("model.api_mode", result.api_mode or "chat_completions")
             _cprint("    Saved to config.yaml")
 
     def _handle_codex_runtime(self, cmd_original: str) -> None:

package/hermes_cli/model_normalize.py

@@ -91,18 +91,19 @@ _AUTHORITATIVE_NATIVE_PROVIDERS: frozenset[str] = frozenset({
 
 # Direct providers that accept bare native names but should repair a matching
 # provider/ prefix when users copy the aggregator form into config.yaml.
-_MATCHING_PREFIX_STRIP_PROVIDERS: frozenset[str] = frozenset({
-    "zai",
-    "kimi-coding",
-    "kimi-coding-cn",
-    "minimax",
-    "minimax-oauth",
-    "minimax-cn",
-    "alibaba",
-    "qwen-oauth",
-    "xiaomi",
-    "arcee",
-    "ollama-cloud",
+_MATCHING_PREFIX_STRIP_PROVIDERS: frozenset[str] = frozenset({
+    "zai",
+    "kimi-coding",
+    "kimi-coding-cn",
+    "minimax",
+    "minimax-oauth",
+    "minimax-cn",
+    "fireworks",
+    "alibaba",
+    "qwen-oauth",
+    "xiaomi",
+    "arcee",
+    "ollama-cloud",
     "custom",
 })
 
@@ -450,13 +451,22 @@ def normalize_model_for_provider(model_input: str, target_provider: str) -> str:
             return bare
         return _normalize_for_deepseek(bare)
 
-    # --- Direct providers: repair matching provider prefixes only ---
-    if provider in _MATCHING_PREFIX_STRIP_PROVIDERS:
-        result = _strip_matching_provider_prefix(name, provider)
-        # Some providers require lowercase model IDs (e.g. Xiaomi's API
-        # rejects "MiMo-V2.5-Pro" but accepts "mimo-v2.5-pro").
-        if provider in _LOWERCASE_MODEL_PROVIDERS:
-            result = result.lower()
+    # --- Direct providers: repair matching provider prefixes only ---
+    if provider in _MATCHING_PREFIX_STRIP_PROVIDERS:
+        if provider == "fireworks":
+            if name.startswith("fireworks/"):
+                return "accounts/fireworks/models/" + name.split("/", 1)[1]
+            if name.startswith("accounts/fireworks/models/"):
+                return name
+            if "/" in name:
+                _, bare = name.split("/", 1)
+                return f"accounts/fireworks/models/{bare}"
+            return f"accounts/fireworks/models/{name}"
+        result = _strip_matching_provider_prefix(name, provider)
+        # Some providers require lowercase model IDs (e.g. Xiaomi's API
+        # rejects "MiMo-V2.5-Pro" but accepts "mimo-v2.5-pro").
+        if provider in _LOWERCASE_MODEL_PROVIDERS:
+            result = result.lower()
         return result
 
     # --- Authoritative native providers: preserve user-facing slugs as-is ---

package/hermes_cli/model_switch.py

@@ -186,6 +186,31 @@ _BUILTIN_DIRECT_ALIASES: dict[str, DirectAlias] = {
         provider="openai",
         base_url="",
     ),
+    "fireworks/gpt-oss-120b": DirectAlias(
+        model="accounts/fireworks/models/gpt-oss-120b",
+        provider="fireworks",
+        base_url="https://api.fireworks.ai/inference/v1",
+    ),
+    "fireworks/gpt-oss-20b": DirectAlias(
+        model="accounts/fireworks/models/gpt-oss-20b",
+        provider="fireworks",
+        base_url="https://api.fireworks.ai/inference/v1",
+    ),
+    "fireworks/glm-5": DirectAlias(
+        model="accounts/fireworks/models/glm-5",
+        provider="fireworks",
+        base_url="https://api.fireworks.ai/inference/v1",
+    ),
+    "fireworks/deepseek-v3p1": DirectAlias(
+        model="accounts/fireworks/models/deepseek-v3p1",
+        provider="fireworks",
+        base_url="https://api.fireworks.ai/inference/v1",
+    ),
+    "fireworks/qwen3-coder-480b-a35b-instruct": DirectAlias(
+        model="accounts/fireworks/models/qwen3-coder-480b-a35b-instruct",
+        provider="fireworks",
+        base_url="https://api.fireworks.ai/inference/v1",
+    ),
 }
 
 # Merged dict (builtins + user config); populated by _load_direct_aliases()

package/hermes_cli/models.py

@@ -354,6 +354,8 @@ _PROVIDER_MODELS: dict[str, list[str]] = {
         "accounts/fireworks/models/llama4-maverick-instruct-basic",
         "accounts/fireworks/models/deepseek-v3p1",
         "accounts/fireworks/models/qwen3-coder-480b-a35b-instruct",
+        "accounts/fireworks/models/glm-5",
+        "accounts/fireworks/models/kimi-k2-0905",
     ],
     "opencode-zen": [
         "kimi-k2.5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calvyn-code",
-  "version": "0.14.13",
+  "version": "0.14.15",
   "description": "Calvyn Code — AI агент с инструментами, мессенджерами и локальным CLI",
   "bin": {
     "calvyn": "bin/calvyn.js",