fix: address third round of CodeRabbit review feedback

- Remove unused thread_id from build_options() and parent_tool_use_id
  from handle_tool_result_block()
- Fix base PlatformBridge.context property to return self._context
- Add NotImplementedError guard for thread_id in LangGraph interrupt()
- Use collections.abc.AsyncIterator in Claude bridge
- Reuse creds_file fixture in test_gemini_auth (remove leaked tempfile)
- Guard against key/name collisions in key-value, MCP, and agents editors
- Sanitize null values from KeyValueEditor before passing to MCP env/headers
- Add create-session-dialog.tsx to SDD manifest managed paths
- Fix runner spec markdown: add language to fenced code blocks, blank
  lines around tables

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Ambient Code Bot

.specify/sdd-manifest.yaml

@@ -27,6 +27,7 @@ managed-components:
     paths:
       - components/runners/ambient-runner/**
       - components/frontend/src/components/claude-agent-options/**
+      - components/frontend/src/components/create-session-dialog.tsx
       - .github/workflows/runner-tool-versions.yml
     constitution: .specify/constitutions/runner.md
     spec: .specify/specs/runner.md

.specify/specs/runner.md

@@ -15,7 +15,7 @@ The ambient-runner is a Python application that executes AI agent sessions insid
 
 ### Managed Paths
 
-```
+```text
 components/runners/ambient-runner/
 ├── Dockerfile                    # Runner container image
 ├── main.py                      # FastAPI entry point
@@ -42,7 +42,7 @@ components/runners/ambient-runner/
 
 ### Supporting Frontend Paths
 
-```
+```text
 components/frontend/src/components/claude-agent-options/
 ├── schema.ts                     # Zod schema (mirrors SDK types)
 ├── options-form.tsx              # Main form component
@@ -57,6 +57,7 @@ components/frontend/src/components/claude-agent-options/
 - Python 3.12 (system default), Node.js (AppStream), Go (go-toolset)
 
 ### Pinned Tools
+
 | Tool | Dockerfile ARG | Purpose |
 |------|---------------|---------|
 | gh | `GH_VERSION` | GitHub CLI for repo operations |
@@ -66,6 +67,7 @@ components/frontend/src/components/claude-agent-options/
 | gemini-cli | `GEMINI_CLI_VERSION` | Google Gemini CLI |
 
 ### Key Dependencies
+
 | Package | Constraint | Role |
 |---------|-----------|------|
 | claude-agent-sdk | `>=0.1.50` | Claude Code agent SDK |

components/frontend/src/components/claude-agent-options/_components/agents-editor.tsx

@@ -47,6 +47,8 @@ export function AgentsEditor({ value, onChange }: { value: Record<string, AgentD
     onChange(next);
   };
   const updateAgentName = (index: number, newName: string) => {
+    const oldName = entries[index][0];
+    if (newName !== oldName && newName in value) return;
     const next: Record<string, AgentDef> = {};
     for (let i = 0; i < entries.length; i++) {
       next[i === index ? newName : entries[i][0]] = entries[i][1];

components/frontend/src/components/claude-agent-options/_components/key-value-editor.tsx

@@ -47,6 +47,8 @@ export function KeyValueEditor({
     onChange(next);
   };
   const updateEntry = (index: number, newKey: string, newVal: string | null) => {
+    const oldKey = entries[index][0];
+    if (newKey !== oldKey && newKey in value) return;
     const next: Record<string, string | null> = {};
     for (let i = 0; i < entries.length; i++) {
       if (i === index) {

components/frontend/src/components/claude-agent-options/_components/mcp-servers-editor.tsx

@@ -58,6 +58,8 @@ export function McpServersEditor({ value, onChange }: { value: Record<string, Mc
     onChange(next);
   };
   const updateServerName = (index: number, newName: string) => {
+    const oldName = entries[index][0];
+    if (newName !== oldName && newName in value) return;
     const next: Record<string, McpFormServer> = {};
     for (let i = 0; i < entries.length; i++) {
       next[i === index ? newName : entries[i][0]] = entries[i][1];
@@ -96,15 +98,27 @@ export function McpServersEditor({ value, onChange }: { value: Record<string, Mc
               </div>
               <div>
                 <Label className="text-xs text-muted-foreground">Environment</Label>
-                <KeyValueEditor value={server.env ?? {}} onChange={(e) => updateServer(name, { ...server, env: e as Record<string, string> })} />
+                <KeyValueEditor value={server.env ?? {}} onChange={(e) => {
+                  const sanitized: Record<string, string> = {};
+                  for (const [ek, ev] of Object.entries(e)) {
+                    if (ev != null) sanitized[ek] = ev;
+                  }
+                  updateServer(name, { ...server, env: sanitized });
+                }} />
               </div>
             </>
           ) : (
             <>
               <Input className="font-mono text-xs" placeholder={server.type === "sse" ? "https://server.example.com/sse" : "https://server.example.com/mcp"} value={server.url ?? ""} onChange={(e) => updateServer(name, { ...server, url: e.target.value })} />
               <div>
                 <Label className="text-xs text-muted-foreground">Headers</Label>
-                <KeyValueEditor value={server.headers ?? {}} onChange={(h) => updateServer(name, { ...server, headers: h as Record<string, string> })} keyPlaceholder="Header-Name" valuePlaceholder="Header value" />
+                <KeyValueEditor value={server.headers ?? {}} onChange={(h) => {
+                  const sanitized: Record<string, string> = {};
+                  for (const [hk, hv] of Object.entries(h)) {
+                    if (hv != null) sanitized[hk] = hv;
+                  }
+                  updateServer(name, { ...server, headers: sanitized });
+                }} keyPlaceholder="Header-Name" valuePlaceholder="Header value" />
               </div>
             </>
           )}

components/runners/ambient-runner/ag_ui_claude_sdk/adapter.py

@@ -428,7 +428,6 @@ async def run(
     def build_options(
         self,
         input_data: RunAgentInput | None = None,
-        thread_id: str | None = None,
         resume_from: str | None = None,
     ) -> "ClaudeAgentOptions":
         """
@@ -438,7 +437,6 @@ def build_options(
 
         Args:
             input_data: Optional RunAgentInput for extracting dynamic tools
-            thread_id: Optional thread_id for session resumption lookup
             resume_from: Optional CLI session ID to resume (preserves chat history
                 across adapter rebuilds, e.g. after a repo is added mid-session)
 
@@ -1157,9 +1155,8 @@ def flush_pending_msg():
                                 upsert_message(
                                     build_agui_tool_message(tool_use_id, block_content)
                                 )
-                            parent_id = getattr(message, "parent_tool_use_id", None)
                             async for event in handle_tool_result_block(
-                                block, thread_id, run_id, parent_id
+                                block, thread_id, run_id
                             ):
                                 yield event
 

components/runners/ambient-runner/ag_ui_claude_sdk/handlers.py

@@ -134,20 +134,16 @@ async def handle_tool_result_block(
     block: Any,
     thread_id: str,
     run_id: str,
-    parent_tool_use_id: str | None = None,
 ) -> AsyncIterator[BaseEvent]:
     """
     Handle ToolResultBlock from Claude SDK.
 
     Emits TOOL_CALL_END and TOOL_CALL_RESULT events.
-    Nested tool results (with parent_tool_use_id) are also emitted - they represent
-    sub-agent calls (e.g., Task calling WebSearch).
 
     Args:
         block: ToolResultBlock from Claude SDK
         thread_id: Thread identifier
         run_id: Run identifier
-        parent_tool_use_id: Parent tool ID if this is a nested result
 
     Yields:
         AG-UI tool result events

components/runners/ambient-runner/ambient_runner/bridge.py

@@ -234,7 +234,7 @@ def get_error_context(self) -> str:
     @property
     def context(self) -> RunnerContext | None:
         """The current ``RunnerContext``, or ``None`` before ``set_context()``."""
-        return None
+        return self._context
 
     @property
     def configured_model(self) -> str:

components/runners/ambient-runner/ambient_runner/bridges/claude/bridge.py

@@ -12,7 +12,8 @@
 import logging
 import os
 import time
-from typing import Any, AsyncIterator
+from collections.abc import AsyncIterator
+from typing import Any
 
 from ag_ui.core import (
     BaseEvent,
@@ -167,7 +168,7 @@ async def run(
             thread_id, None
         ) or self._session_manager.get_session_id(thread_id)
         sdk_options = self._adapter.build_options(
-            input_data, thread_id=thread_id, resume_from=saved_session_id
+            input_data, resume_from=saved_session_id
         )
         worker = await self._session_manager.get_or_create(
             thread_id, sdk_options, api_key

components/runners/ambient-runner/ambient_runner/bridges/langgraph/bridge.py

@@ -88,6 +88,10 @@ async def interrupt(self, thread_id: str | None = None) -> None:
         """Interrupt the current LangGraph execution."""
         if self._adapter is None:
             raise RuntimeError("LangGraphBridge: no adapter to interrupt")
+        if thread_id is not None:
+            raise NotImplementedError(
+                "LangGraphBridge.interrupt() does not support thread_id"
+            )
 
         if hasattr(self._adapter, "interrupt"):
             await self._adapter.interrupt()