fix(runner): pass --resume flag when rebuilding adapter after repo add

When a repo is added mid-session, mark_dirty() destroys the adapter and
session manager. Previously the saved CLI session ID was lost, causing
Claude Code to start a fresh session without chat history.

Now the bridge preserves session IDs across adapter rebuilds and passes
them to build_options() via the new resume_from parameter, which sets
the resume option so the CLI resumes the existing conversation.

Also adds get_all_session_ids() to SessionManager to avoid accessing
private _workers attribute from the bridge.

Fixes: RHOAIENG-52263

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

Author: Ambient Code Bot

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

@@ -410,6 +410,7 @@ def build_options(
         self,
         input_data: Optional[RunAgentInput] = None,
         thread_id: Optional[str] = None,
+        resume_from: Optional[str] = None,
     ) -> "ClaudeAgentOptions":
         """
         Build ClaudeAgentOptions from stored options (object/dict/None) plus dynamic tools.
@@ -419,6 +420,8 @@ 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)
 
         Returns:
             Configured ClaudeAgentOptions instance
@@ -492,6 +495,11 @@ def build_options(
 
         # Remove api_key from options kwargs (handled via environment variable)
         merged_kwargs.pop("api_key", None)
+
+        # Resume from a previous CLI session (preserves chat context)
+        if resume_from:
+            merged_kwargs["resume"] = resume_from
+
         logger.debug(f"Merged kwargs after pop: {merged_kwargs}")
 
         # Apply forwarded_props as per-run overrides (before adding dynamic tools)

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

@@ -58,6 +58,8 @@ def __init__(self) -> None:
         self._stderr_lines: list[str] = []
         # Per-thread halt tracking to avoid race conditions on shared adapter
         self._halted_by_thread: dict[str, bool] = {}
+        # Preserved session IDs across adapter rebuilds (e.g. repo additions)
+        self._saved_session_ids: dict[str, str] = {}
 
     # ------------------------------------------------------------------
     # PlatformBridge interface
@@ -101,7 +103,10 @@ async def run(self, input_data: RunAgentInput) -> AsyncIterator[BaseEvent]:
         # 4. Get or create session worker for this thread
         thread_id = input_data.thread_id or self._context.session_id
         api_key = os.getenv("ANTHROPIC_API_KEY", "")
-        sdk_options = self._adapter.build_options(input_data, thread_id=thread_id)
+        saved_session_id = self._saved_session_ids.pop(thread_id, None)
+        sdk_options = self._adapter.build_options(
+            input_data, thread_id=thread_id, resume_from=saved_session_id
+        )
         worker = await self._session_manager.get_or_create(
             thread_id, sdk_options, api_key
         )
@@ -186,6 +191,9 @@ def mark_dirty(self) -> None:
         self._adapter = None
         self._halted_by_thread.clear()
         if self._session_manager:
+            # Preserve session IDs so --resume works after adapter rebuild.
+            # Must be captured synchronously before the async shutdown task runs.
+            self._saved_session_ids.update(self._session_manager.get_all_session_ids())
             manager = self._session_manager
             self._session_manager = None
             _async_safe_manager_shutdown(manager)

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

@@ -100,7 +100,11 @@ async def _run(self) -> None:
 
         os.environ["ANTHROPIC_API_KEY"] = self._api_key
 
-        from ambient_runner.bridges.claude.mock_client import MOCK_API_KEY, MockClaudeSDKClient
+        from ambient_runner.bridges.claude.mock_client import (
+            MOCK_API_KEY,
+            MockClaudeSDKClient,
+        )
+
         if self._api_key == MOCK_API_KEY:
             logger.info("[SessionWorker] Using MockClaudeSDKClient (replay mode)")
             client: Any = MockClaudeSDKClient(options=self._options)
@@ -302,6 +306,14 @@ def get_session_id(self, thread_id: str) -> Optional[str]:
             return worker.session_id
         return self._session_ids.get(thread_id)
 
+    def get_all_session_ids(self) -> dict[str, str]:
+        """Return a snapshot of all known session IDs (live workers + cached)."""
+        result = dict(self._session_ids)
+        for tid, worker in self._workers.items():
+            if worker.session_id:
+                result[tid] = worker.session_id
+        return result
+
     async def destroy(self, thread_id: str) -> None:
         """Stop and remove the worker for *thread_id*.