codex/security hermes bridge token

agent/anthropic_adapter.py

@@ -830,13 +830,20 @@ def _read_claude_code_credentials_from_keychain() -> Optional[Dict[str, Any]]:
         logger.debug("Keychain: no entry found for 'Claude Code-credentials'")
         return None
 
-    raw = result.stdout.strip()
+    stdout = result.stdout
+    if isinstance(stdout, bytes):
+        stdout = stdout.decode("utf-8", errors="replace")
+    if not isinstance(stdout, str):
+        logger.debug("Keychain: credentials payload was not text")
+        return None
+
+    raw = stdout.strip()
     if not raw:
         return None
 
     try:
         data = json.loads(raw)
-    except json.JSONDecodeError:
+    except (json.JSONDecodeError, TypeError):
         logger.debug("Keychain: credentials payload is not valid JSON")
         return None
 

agent/chat_completion_helpers.py

@@ -995,6 +995,9 @@ def build_assistant_message(agent, assistant_message, finish_reason: str) -> dic
                 if hasattr(extra, "model_dump"):
                     extra = extra.model_dump()
                 tc_dict["extra_content"] = extra
+            sig = getattr(tool_call, "thought_signature", None)
+            if isinstance(sig, str) and sig:
+                tc_dict["thought_signature"] = sig
             tool_calls.append(tc_dict)
         msg["tool_calls"] = tool_calls
 
@@ -1851,6 +1854,7 @@ def _call_chat_completions():
                             "type": "function",
                             "function": {"name": "", "arguments": ""},
                             "extra_content": None,
+                            "thought_signature": None,
                         }
                     entry = tool_calls_acc[idx]
                     if tc_delta.id:
@@ -1875,6 +1879,11 @@ def _call_chat_completions():
                         if hasattr(extra, "model_dump"):
                             extra = extra.model_dump()
                         entry["extra_content"] = extra
+                    sig = getattr(tc_delta, "thought_signature", None)
+                    if sig is None and hasattr(tc_delta, "model_extra"):
+                        sig = (tc_delta.model_extra or {}).get("thought_signature")
+                    if isinstance(sig, str) and sig:
+                        entry["thought_signature"] = sig
                     # Fire once per tool when the full name is available
                     name = entry["function"]["name"]
                     if name and idx not in tool_gen_notified:
@@ -1929,6 +1938,7 @@ def _call_chat_completions():
                     id=tc["id"],
                     type=tc["type"],
                     extra_content=tc.get("extra_content"),
+                    thought_signature=tc.get("thought_signature"),
                     function=SimpleNamespace(
                         name=tc["function"]["name"],
                         arguments=arguments,

agent/gemini_cloudcode_adapter.py

@@ -83,6 +83,21 @@ def _coerce_content_to_text(content: Any) -> str:
     return str(content)
 
 
+def _tool_call_thought_signature(tool_call: Dict[str, Any]) -> Optional[str]:
+    direct = tool_call.get("thought_signature") or tool_call.get("thoughtSignature")
+    if isinstance(direct, str) and direct:
+        return direct
+
+    extra = tool_call.get("extra_content") or {}
+    if not isinstance(extra, dict):
+        return None
+    google = extra.get("google") or extra.get("thought_signature")
+    if isinstance(google, dict):
+        sig = google.get("thought_signature") or google.get("thoughtSignature")
+        return sig if isinstance(sig, str) and sig else None
+    return google if isinstance(google, str) and google else None
+
+
 def _translate_tool_call_to_gemini(tool_call: Dict[str, Any]) -> Dict[str, Any]:
     """OpenAI tool_call -> Gemini functionCall part."""
     fn = tool_call.get("function") or {}
@@ -93,16 +108,15 @@ def _translate_tool_call_to_gemini(tool_call: Dict[str, Any]) -> Dict[str, Any]:
         args = {"_raw": args_raw}
     if not isinstance(args, dict):
         args = {"_value": args}
-    return {
+    part = {
         "functionCall": {
             "name": fn.get("name") or "",
             "args": args,
-        },
-        # Sentinel signature — matches opencode-gemini-auth's approach.
-        # Without this, Code Assist rejects function calls that originated
-        # outside its own chain.
-        "thoughtSignature": "skip_thought_signature_validator",
+        }
     }
+    thought_signature = _tool_call_thought_signature(tool_call)
+    part["thoughtSignature"] = thought_signature or "skip_thought_signature_validator"
+    return part
 
 
 def _translate_tool_result_to_gemini(message: Dict[str, Any]) -> Dict[str, Any]:

agent/gemini_native_adapter.py

@@ -220,6 +220,10 @@ def _extract_multimodal_parts(content: Any) -> List[Dict[str, Any]]:
 
 
 def _tool_call_extra_signature(tool_call: Dict[str, Any]) -> Optional[str]:
+    direct = tool_call.get("thought_signature") or tool_call.get("thoughtSignature")
+    if isinstance(direct, str) and direct:
+        return direct
+
     extra = tool_call.get("extra_content") or {}
     if not isinstance(extra, dict):
         return None

agent/transports/chat_completions.py

@@ -10,7 +10,7 @@
 """
 
 import copy
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 from agent.lmstudio_reasoning import resolve_lmstudio_effort
 from agent.moonshot_schema import is_moonshot_model, sanitize_moonshot_tools
@@ -115,6 +115,22 @@ def _model_consumes_thought_signature(model: Any) -> bool:
     return "gemini" in m or "gemma" in m
 
 
+def _tool_call_thought_signature(tool_call: Any) -> Optional[str]:
+    for attr in ("thought_signature", "thoughtSignature"):
+        sig = getattr(tool_call, attr, None)
+        if isinstance(sig, str) and sig:
+            return sig
+
+    model_extra = getattr(tool_call, "model_extra", None) or {}
+    if isinstance(model_extra, dict):
+        for key in ("thought_signature", "thoughtSignature"):
+            sig = model_extra.get(key)
+            if isinstance(sig, str) and sig:
+                return sig
+
+    return None
+
+
 class ChatCompletionsTransport(ProviderTransport):
     """Transport for api_mode='chat_completions'.
 
@@ -135,10 +151,10 @@ def convert_messages(
         - Codex Responses API fields: ``codex_reasoning_items`` /
           ``codex_message_items`` on the message, ``call_id`` /
           ``response_item_id`` on ``tool_calls`` entries.
-        - ``extra_content`` on ``tool_calls`` (Gemini thought_signature) —
+        - ``extra_content`` / direct ``thought_signature`` on ``tool_calls`` —
           stripped unless the outgoing ``model`` is itself Gemini-family.
-          Gemini 3 thinking models attach it for replay, but strict providers
-          (Fireworks, Mistral) reject any payload containing it with
+          Gemini 3 thinking models attach signatures for replay, but strict
+          providers (Fireworks, Mistral) reject any payload containing it with
           ``Extra inputs are not permitted, field: 'messages[N].tool_calls[M].extra_content'``.
           It must be kept for Gemini targets (replay required) and dropped for
           everyone else, including non-Gemini models that inherited stale
@@ -184,7 +200,14 @@ def convert_messages(
                     if isinstance(tc, dict) and (
                         "call_id" in tc
                         or "response_item_id" in tc
-                        or (strip_extra_content and "extra_content" in tc)
+                        or (
+                            strip_extra_content
+                            and (
+                                "extra_content" in tc
+                                or "thought_signature" in tc
+                                or "thoughtSignature" in tc
+                            )
+                        )
                     ):
                         needs_sanitize = True
                         break
@@ -214,6 +237,8 @@ def convert_messages(
                         tc.pop("response_item_id", None)
                         if strip_extra_content:
                             tc.pop("extra_content", None)
+                            tc.pop("thought_signature", None)
+                            tc.pop("thoughtSignature", None)
         return sanitized
 
     def convert_tools(self, tools: list[dict[str, Any]]) -> list[dict[str, Any]]:
@@ -628,6 +653,9 @@ def normalize_response(self, response: Any, **kwargs) -> NormalizedResponse:
                         except Exception:
                             pass
                     tc_provider_data["extra_content"] = extra
+                thought_signature = _tool_call_thought_signature(tc)
+                if thought_signature:
+                    tc_provider_data["thought_signature"] = thought_signature
                 tool_calls.append(
                     ToolCall(
                         id=tc.id,

agent/transports/types.py

@@ -75,6 +75,12 @@ def extra_content(self) -> dict[str, Any] | None:
         """
         return (self.provider_data or {}).get("extra_content")
 
+    @property
+    def thought_signature(self) -> str | None:
+        """Gemini OpenAI-compatible thought signature from provider_data."""
+        sig = (self.provider_data or {}).get("thought_signature")
+        return sig if isinstance(sig, str) and sig else None
+
 
 @dataclass
 class Usage:

apps/desktop/package.json

@@ -109,7 +109,7 @@
     "@typescript-eslint/eslint-plugin": "^8.59.1",
     "@typescript-eslint/parser": "^8.59.1",
     "@vitejs/plugin-react": "^6.0.1",
-    "concurrently": "^9.2.1",
+    "concurrently": "^10.0.3",
     "cross-env": "^10.1.0",
     "electron": "^40.9.3",
     "electron-builder": "^26.8.1",
@@ -124,7 +124,8 @@
     "prettier": "^3.8.3",
     "rcedit": "^5.0.2",
     "typescript": "^6.0.3",
-    "vite": "^8.0.10",
+    "undici": "^7.28.0",
+    "vite": "^8.0.16",
     "vitest": "^4.1.5",
     "wait-on": "^9.0.5"
   },