claude-dev-env 2.8.0 → 2.10.0

package/scripts/spawn_grok_batch.py

@@ -15,9 +15,11 @@ Import ``run_grok_batch`` for the summary object, or run the module as a CLI::
 from __future__ import annotations
 
 import argparse
+import subprocess
 import json
 import sys
 import time
+import threading
 import uuid
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import suppress
@@ -82,16 +84,323 @@ from dev_env_scripts_constants.grok_worker_constants import (
     WORKER_SPEC_ROLE_NAME_KEY,
     WORKER_SPEC_TIMEOUT_KEY,
     WORKER_SPEC_TOOL_PROFILE_KEY,
+    BATCH_SPEC_ADVISOR_KEY,
+    ADVISOR_SPEC_LAUNCHER_KEY,
+    ADVISOR_SPEC_MODEL_KEY,
+    ADVISOR_SPEC_EFFORT_KEY,
+    DEFAULT_ADVISOR_LAUNCHER_PLACEHOLDER,
+    DEFAULT_ADVISOR_MODEL,
+    DEFAULT_ADVISOR_EFFORT,
+    MAXIMUM_WORKER_ADVISOR_CORRECTIONS,
+    MAXIMUM_ADVISOR_TIMEOUT_SECONDS,
+    ADVISOR_SIGNAL_ENDORSE,
+    ADVISOR_SIGNAL_CORRECTION,
+    ADVISOR_SIGNAL_PLAN,
+    ADVISOR_SIGNAL_STOP,
+    ALL_KNOWN_ADVISOR_SIGNALS,
+    CLASSIFICATION_ADVISOR_BLOCKED,
+    PENDING_BIND_SENTINEL,
+    ADVISOR_PROMPT_HEADER_TEMPLATE,
+    SUMMARY_ADVISOR_SESSION_ID_KEY,
+    SUMMARY_ADVISOR_SIGNAL_KEY,
+    SUMMARY_ADVISOR_LAUNCHER_KEY,
+    ADVISOR_CLI_PRINT_FLAG,
+    ADVISOR_CLI_MODEL_FLAG,
+    ADVISOR_CLI_EFFORT_FLAG,
+    ADVISOR_CLI_OUTPUT_FORMAT_FLAG,
+    ADVISOR_CLI_OUTPUT_FORMAT_JSON,
+    ADVISOR_CLI_RESUME_FLAG,
+    ADVISOR_BIND_PROMPT_TEMPLATE,
+    ADVISOR_VERDICT_PROMPT_TEMPLATE,
 )
 from dev_env_scripts_constants.timing import WORKER_STAGGER_SECONDS
 from grok_headless_runner import GrokRunnerOutcome, run_headless_worker
 from grok_worker_preflight import PreflightOutcome, run_preflight
 
+class AdvisorFailureError(ValueError):
+    """Raised when an advisor bind, resume, or launcher call fails closed."""
+
+
 batch_sleep = time.sleep
 batch_headless_runner = run_headless_worker
 batch_preflight = run_preflight
 
 
+def extract_advisor_signal(advisor_text: str) -> str | None:
+    """Return the first allowed opening signal token from advisor text.
+
+    ::
+
+        extract_advisor_signal("ENDORSE\\nlooks good")
+        ok: "ENDORSE"
+        extract_advisor_signal("hello ENDORSE")
+        flag: None
+
+    Args:
+        advisor_text: Raw advisor reply body.
+
+    Returns:
+        One of the four known signals, or ``None`` when the first token is
+        missing or outside the set.
+    """
+    stripped = (advisor_text or "").strip()
+    if not stripped:
+        return None
+    first_line = stripped.splitlines()[0].strip()
+    first_token = first_line.split()[0] if first_line else ""
+    if first_token in ALL_KNOWN_ADVISOR_SIGNALS:
+        return first_token
+    return None
+
+
+def _parse_advisor_spec(raw_advisor: object) -> AdvisorSpec | None:
+    if raw_advisor is None:
+        return None
+    if not isinstance(raw_advisor, dict):
+        raise ValueError("batch advisor must be an object when present")
+    launcher = raw_advisor.get(
+        ADVISOR_SPEC_LAUNCHER_KEY, DEFAULT_ADVISOR_LAUNCHER_PLACEHOLDER
+    )
+    model = raw_advisor.get(ADVISOR_SPEC_MODEL_KEY, DEFAULT_ADVISOR_MODEL)
+    effort = raw_advisor.get(ADVISOR_SPEC_EFFORT_KEY, DEFAULT_ADVISOR_EFFORT)
+    if not isinstance(launcher, str) or not launcher:
+        raise ValueError("advisor.launcher must be a non-empty string")
+    if launcher == PENDING_BIND_SENTINEL:
+        raise ValueError(f"advisor.launcher must not be {PENDING_BIND_SENTINEL}")
+    if not isinstance(model, str) or not model:
+        raise ValueError("advisor.model must be a non-empty string")
+    if not isinstance(effort, str) or not effort:
+        raise ValueError("advisor.effort must be a non-empty string")
+    return AdvisorSpec(launcher=launcher, model=model, effort=effort)
+
+
+def _advisor_body_text_from_stdout(stdout_text: str) -> str:
+    stripped = (stdout_text or "").strip()
+    if not stripped:
+        return ""
+    try:
+        parsed = json.loads(stripped)
+    except json.JSONDecodeError:
+        return stripped
+    if isinstance(parsed, dict):
+        advisor_body_field = parsed.get("result")
+        if isinstance(advisor_body_field, str):
+            return advisor_body_field
+        return stripped
+    if isinstance(parsed, list):
+        for each_record in reversed(parsed):
+            if (
+                isinstance(each_record, dict)
+                and each_record.get("type") == "result"
+                and isinstance(each_record.get("result"), str)
+            ):
+                return each_record["result"]
+        return stripped
+    return stripped
+
+
+def _session_id_from_advisor_stdout(stdout_text: str) -> str | None:
+    stripped = (stdout_text or "").strip()
+    if not stripped:
+        return None
+    try:
+        parsed = json.loads(stripped)
+    except json.JSONDecodeError:
+        return None
+    candidates: list[object] = []
+    if isinstance(parsed, dict):
+        candidates.append(parsed)
+    elif isinstance(parsed, list):
+        candidates.extend(each for each in parsed if isinstance(each, dict))
+    for each_record in candidates:
+        session_id = each_record.get("session_id")
+        if isinstance(session_id, str) and session_id and session_id != PENDING_BIND_SENTINEL:
+            return session_id
+    return None
+
+
+def invoke_advisor_launcher(
+    *,
+    launcher: str,
+    model: str,
+    effort: str,
+    prompt_text: str,
+    session_id: str | None = None,
+) -> tuple[str | None, str, int]:
+    """Run one advisor launcher call via direct subprocess.
+
+    Args:
+        launcher: Spec-supplied executable name (runtime only).
+        model: Advisor model name.
+        effort: Advisor effort level.
+        prompt_text: Prompt body piped on stdin.
+        session_id: When set, pass ``--resume`` for a post-report consult.
+
+    Returns:
+        ``(session_id_or_none, advisor_body_text, returncode)``.
+
+    Raises:
+        AdvisorFailureError: When the launcher is missing or times out.
+    """
+    all_command_arguments = [
+        launcher,
+        ADVISOR_CLI_PRINT_FLAG,
+        ADVISOR_CLI_MODEL_FLAG,
+        model,
+        ADVISOR_CLI_EFFORT_FLAG,
+        effort,
+        ADVISOR_CLI_OUTPUT_FORMAT_FLAG,
+        ADVISOR_CLI_OUTPUT_FORMAT_JSON,
+    ]
+    if session_id is not None:
+        all_command_arguments.extend([ADVISOR_CLI_RESUME_FLAG, session_id])
+    try:
+        completion = subprocess.run(
+            all_command_arguments,
+            input=prompt_text,
+            capture_output=True,
+            text=True,
+            encoding=UTF8_ENCODING,
+            check=False,
+            timeout=MAXIMUM_ADVISOR_TIMEOUT_SECONDS,
+        )
+    except FileNotFoundError as missing_launcher:
+        raise AdvisorFailureError(
+            f"advisor launcher not found: {launcher}"
+        ) from missing_launcher
+    except subprocess.TimeoutExpired as timed_out:
+        raise AdvisorFailureError(
+            f"advisor launcher timed out after {MAXIMUM_ADVISOR_TIMEOUT_SECONDS}s"
+        ) from timed_out
+    stdout_text = completion.stdout or ""
+    resolved_session = _session_id_from_advisor_stdout(stdout_text)
+    if session_id is not None and resolved_session is None:
+        resolved_session = session_id
+    advisor_body_text = _advisor_body_text_from_stdout(stdout_text)
+    return resolved_session, advisor_body_text, completion.returncode
+
+
+batch_invoke_advisor = invoke_advisor_launcher
+
+
+def bind_unique_worker_advisor(
+    *,
+    advisor_spec: AdvisorSpec,
+    role_name: str,
+    all_used_session_ids: set[str],
+) -> tuple[str, str]:
+    """Bind one unique advisor session for a worker; refuse duplicates and sentinels.
+
+    ::
+
+        bind_unique_worker_advisor(...)
+        ok: returns (session_id, ENDORSE)
+        flag: duplicate session id across workers raises ValueError
+
+    Args:
+        advisor_spec: Lead-supplied launcher/model/effort.
+        role_name: Worker role used in the bind prompt.
+        all_used_session_ids: Sessions already issued in this batch.
+
+    Returns:
+        ``(session_id, opening_signal)``.
+
+    Raises:
+        ValueError: On bind failure, sentinel, missing signal, or duplicate id.
+    """
+    if advisor_spec.launcher == DEFAULT_ADVISOR_LAUNCHER_PLACEHOLDER:
+        raise ValueError(
+            "advisor.launcher still holds the placeholder; supply a real launcher in the batch spec"
+        )
+    if advisor_spec.launcher == PENDING_BIND_SENTINEL:
+        raise ValueError(f"advisor.launcher is {PENDING_BIND_SENTINEL}")
+    prompt_text = ADVISOR_BIND_PROMPT_TEMPLATE.format(role_name=role_name)
+    session_id, advisor_body_text, returncode = batch_invoke_advisor(
+        launcher=advisor_spec.launcher,
+        model=advisor_spec.model,
+        effort=advisor_spec.effort,
+        prompt_text=prompt_text,
+    )
+    if returncode != 0 or not session_id or session_id == PENDING_BIND_SENTINEL:
+        raise AdvisorFailureError(
+            f"advisor bind failed for role {role_name}: returncode={returncode}"
+        )
+    if session_id in all_used_session_ids:
+        raise AdvisorFailureError(
+            f"duplicate advisor session id {session_id} for role {role_name}"
+        )
+    signal = extract_advisor_signal(advisor_body_text)
+    if signal is None:
+        raise ValueError(f"malformed advisor signal for role {role_name}")
+    if signal == ADVISOR_SIGNAL_STOP:
+        raise ValueError(f"advisor STOP for role {role_name}")
+    if signal != ADVISOR_SIGNAL_ENDORSE:
+        raise ValueError(
+            f"advisor pre-dispatch signal {signal} for role {role_name}; require ENDORSE"
+        )
+    all_used_session_ids.add(session_id)
+    return session_id, signal
+
+
+def obtain_advisor_completion_verdict(
+    *,
+    advisor_spec: AdvisorSpec,
+    role_name: str,
+    session_id: str,
+    report_text: str,
+) -> str:
+    """Resume the same advisor session until ENDORSE or the correction cap.
+
+    Args:
+        advisor_spec: Lead-supplied launcher/model/effort.
+        role_name: Worker role name.
+        session_id: Session from pre-dispatch bind.
+        report_text: Worker report body under review.
+
+    Returns:
+        The final accepted signal (``ENDORSE``).
+
+    Raises:
+        ValueError: On STOP, malformed signal, or correction cap exceeded.
+    """
+    if session_id == PENDING_BIND_SENTINEL:
+        raise ValueError(f"advisor session_id is {PENDING_BIND_SENTINEL}")
+    correction_count = 0
+    while True:
+        prompt_text = ADVISOR_VERDICT_PROMPT_TEMPLATE.format(
+            role_name=role_name,
+            session_id=session_id,
+            report_text=report_text,
+        )
+        _, advisor_body_text, returncode = batch_invoke_advisor(
+            launcher=advisor_spec.launcher,
+            model=advisor_spec.model,
+            effort=advisor_spec.effort,
+            prompt_text=prompt_text,
+            session_id=session_id,
+        )
+        if returncode != 0:
+            raise ValueError(
+                f"advisor resume failed for role {role_name}: returncode={returncode}"
+            )
+        signal = extract_advisor_signal(advisor_body_text)
+        if signal is None:
+            raise ValueError(f"malformed advisor signal for role {role_name}")
+        if signal == ADVISOR_SIGNAL_ENDORSE:
+            return signal
+        if signal == ADVISOR_SIGNAL_STOP:
+            raise ValueError(f"advisor STOP for role {role_name}")
+        if signal in (ADVISOR_SIGNAL_CORRECTION, ADVISOR_SIGNAL_PLAN):
+            correction_count += 1
+            if correction_count > MAXIMUM_WORKER_ADVISOR_CORRECTIONS:
+                raise ValueError(
+                    f"advisor correction cap exceeded for role {role_name}"
+                )
+            continue
+        raise ValueError(f"unexpected advisor signal {signal} for role {role_name}")
+
+
+
 def _require_known_worker_keys(all_worker_fields: dict[str, object]) -> None:
     """Reject a worker entry carrying a key the launcher does not accept.
 
@@ -137,6 +446,20 @@ class WorkerSpec:
     agent_name: str | None = None
 
 
+@dataclass(frozen=True)
+class AdvisorSpec:
+    """Lead-supplied worker advisor binding configuration for one batch.
+
+    The launcher name is runtime-only: the committed default is the placeholder
+    ``DEFAULT_ADVISOR_LAUNCHER_PLACEHOLDER``. The lead replaces it in the batch
+    specification; real account-scoped launcher names never land as constants.
+    """
+
+    launcher: str
+    model: str = DEFAULT_ADVISOR_MODEL
+    effort: str = DEFAULT_ADVISOR_EFFORT
+
+
 @dataclass(frozen=True)
 class BatchSpec:
     """Full batch specification for one fleet launch."""
@@ -144,6 +467,7 @@ class BatchSpec:
     role: str
     should_ping: bool
     all_workers: tuple[WorkerSpec, ...]
+    advisor: AdvisorSpec | None = None
 
 
 @dataclass(frozen=True)
@@ -170,6 +494,9 @@ class WorkerReport:
     leader_socket: str
     prompt_path: str
     debug_path: str
+    advisor_session_id: str | None = None
+    advisor_completion_signal: str | None = None
+    advisor_launcher: str | None = None
 
 
 @dataclass(frozen=True)
@@ -408,10 +735,12 @@ def load_batch_spec(specification_path: Path) -> BatchSpec:
         if not isinstance(each_entry, dict):
             raise ValueError("each worker must be an object")
         all_parsed_workers.append(_parse_worker_entry(each_entry))
+    advisor_spec = _parse_advisor_spec(parsed_payload.get(BATCH_SPEC_ADVISOR_KEY))
     return BatchSpec(
         role=role,
         should_ping=should_ping,
         all_workers=tuple(all_parsed_workers),
+        advisor=advisor_spec,
     )
 
 
@@ -459,11 +788,20 @@ def _write_assembled_prompt(
     *,
     worker_spec: WorkerSpec,
     prompt_path: Path,
+    advisor_session_id: str | None = None,
+    advisor_spec: AdvisorSpec | None = None,
 ) -> None:
     prompt_text = assemble_worker_prompt(
         all_prompt_part_paths=worker_spec.all_prompt_part_paths,
         tool_profile=worker_spec.tool_profile,
     )
+    if advisor_session_id is not None and advisor_spec is not None:
+        header = ADVISOR_PROMPT_HEADER_TEMPLATE.format(
+            session_id=advisor_session_id,
+            model=advisor_spec.model,
+            effort=advisor_spec.effort,
+        )
+        prompt_text = f"{header}{prompt_text}"
     prompt_path.write_text(prompt_text, encoding=UTF8_ENCODING)
 
 
@@ -497,6 +835,9 @@ def _worker_report(
     classification: str,
     is_ok: bool,
     report_text: str,
+    advisor_session_id: str | None = None,
+    advisor_completion_signal: str | None = None,
+    advisor_launcher: str | None = None,
 ) -> WorkerReport:
     with suppress(OSError):
         _write_report_file(scratch_paths.report_path, report_text)
@@ -511,6 +852,9 @@ def _worker_report(
         leader_socket=str(scratch_paths.leader_socket_path),
         prompt_path=str(scratch_paths.prompt_path),
         debug_path=str(scratch_paths.debug_path),
+        advisor_session_id=advisor_session_id,
+        advisor_completion_signal=advisor_completion_signal,
+        advisor_launcher=advisor_launcher,
     )
 
 
@@ -546,28 +890,218 @@ def _error_report_for_exception(
     )
 
 
+
+def _bind_worker_advisor_session(
+    *,
+    advisor_spec: AdvisorSpec,
+    role_name: str,
+    all_used_session_ids: set[str],
+    session_id_lock: object | None,
+) -> tuple[str, str]:
+    if session_id_lock is not None:
+        with session_id_lock:  # type: ignore[attr-defined]  # Lock protocol from threading.Lock
+            return bind_unique_worker_advisor(
+                advisor_spec=advisor_spec,
+                role_name=role_name,
+                all_used_session_ids=all_used_session_ids,
+            )
+    return bind_unique_worker_advisor(
+        advisor_spec=advisor_spec,
+        role_name=role_name,
+        all_used_session_ids=all_used_session_ids,
+    )
+
+
+def _advisor_blocked_report(
+    *,
+    worker_spec: WorkerSpec,
+    scratch_paths: WorkerScratchPaths,
+    report_text: str,
+    advisor_session_id: str | None = None,
+    advisor_launcher: str | None = None,
+) -> WorkerReport:
+    return _worker_report(
+        worker_spec=worker_spec,
+        scratch_paths=scratch_paths,
+        returncode=WORKER_EXCEPTION_RETURN_CODE,
+        classification=CLASSIFICATION_ADVISOR_BLOCKED,
+        is_ok=False,
+        report_text=report_text,
+        advisor_session_id=advisor_session_id,
+        advisor_completion_signal=None,
+        advisor_launcher=advisor_launcher,
+    )
+
+
+
+def _attach_advisor_completion_if_configured(
+    *,
+    worker_spec: WorkerSpec,
+    scratch_paths: WorkerScratchPaths,
+    worker_report: WorkerReport,
+    advisor_spec: AdvisorSpec | None,
+    advisor_session_id: str | None,
+    advisor_launcher: str | None,
+) -> WorkerReport:
+    if advisor_spec is None or advisor_session_id is None:
+        return worker_report
+    try:
+        completion_signal = obtain_advisor_completion_verdict(
+            advisor_spec=advisor_spec,
+            role_name=worker_spec.role_name,
+            session_id=advisor_session_id,
+            report_text=worker_report.report_text,
+        )
+    except ValueError as advisor_error:
+        return _advisor_blocked_report(
+            worker_spec=worker_spec,
+            scratch_paths=scratch_paths,
+            report_text=str(advisor_error),
+            advisor_session_id=advisor_session_id,
+            advisor_launcher=advisor_launcher,
+        )
+    return _worker_report(
+        worker_spec=worker_spec,
+        scratch_paths=scratch_paths,
+        returncode=worker_report.returncode,
+        classification=worker_report.classification,
+        is_ok=worker_report.is_ok,
+        report_text=worker_report.report_text,
+        advisor_session_id=advisor_session_id,
+        advisor_completion_signal=completion_signal,
+        advisor_launcher=advisor_launcher,
+    )
+
+
+def _maybe_bind_advisor_for_worker(
+    *,
+    worker_spec: WorkerSpec,
+    scratch_paths: WorkerScratchPaths,
+    advisor_spec: AdvisorSpec | None,
+    all_used_session_ids: set[str] | None,
+    session_id_lock: object | None,
+) -> tuple[str | None, str | None, WorkerReport | None]:
+    if advisor_spec is None:
+        return None, None, None
+    used_ids = all_used_session_ids if all_used_session_ids is not None else set()
+    advisor_session_id, pre_signal = _bind_worker_advisor_session(
+        advisor_spec=advisor_spec,
+        role_name=worker_spec.role_name,
+        all_used_session_ids=used_ids,
+        session_id_lock=session_id_lock,
+    )
+    if (
+        advisor_session_id == PENDING_BIND_SENTINEL
+        or pre_signal == PENDING_BIND_SENTINEL
+    ):
+        blocked = _advisor_blocked_report(
+            worker_spec=worker_spec,
+            scratch_paths=scratch_paths,
+            report_text=f"{PENDING_BIND_SENTINEL} sentinel before launch",
+            advisor_session_id=advisor_session_id,
+            advisor_launcher=advisor_spec.launcher,
+        )
+        return advisor_session_id, advisor_spec.launcher, blocked
+    return advisor_session_id, advisor_spec.launcher, None
+
+
+def _map_launch_exception(
+    *,
+    worker_spec: WorkerSpec,
+    scratch_paths: WorkerScratchPaths,
+    raised_exception: BaseException,
+    advisor_spec: AdvisorSpec | None,
+    advisor_session_id: str | None,
+    advisor_launcher: str | None,
+) -> WorkerReport:
+    if advisor_spec is not None and (
+        isinstance(raised_exception, AdvisorFailureError)
+        or PENDING_BIND_SENTINEL in str(raised_exception)
+        or "advisor" in str(raised_exception).lower()
+    ):
+        return _advisor_blocked_report(
+            worker_spec=worker_spec,
+            scratch_paths=scratch_paths,
+            report_text=f"{type(raised_exception).__name__}: {raised_exception}",
+            advisor_session_id=advisor_session_id,
+            advisor_launcher=advisor_launcher,
+        )
+    return _error_report_for_exception(
+        worker_spec=worker_spec,
+        scratch_paths=scratch_paths,
+        raised_exception=raised_exception,
+    )
+
+
+def _run_worker_body(
+    *,
+    worker_spec: WorkerSpec,
+    scratch_paths: WorkerScratchPaths,
+    run_state_directory: Path,
+    advisor_spec: AdvisorSpec | None,
+    advisor_session_id: str | None,
+    advisor_launcher: str | None,
+) -> WorkerReport:
+    _write_assembled_prompt(
+        worker_spec=worker_spec,
+        prompt_path=scratch_paths.prompt_path,
+        advisor_session_id=advisor_session_id,
+        advisor_spec=advisor_spec,
+    )
+    outcome = _invoke_worker(
+        worker_spec=worker_spec,
+        scratch_paths=scratch_paths,
+        run_state_directory=run_state_directory,
+    )
+    worker_report = _build_worker_report(
+        worker_spec=worker_spec,
+        outcome=outcome,
+        scratch_paths=scratch_paths,
+    )
+    return _attach_advisor_completion_if_configured(
+        worker_spec=worker_spec,
+        scratch_paths=scratch_paths,
+        worker_report=worker_report,
+        advisor_spec=advisor_spec,
+        advisor_session_id=advisor_session_id,
+        advisor_launcher=advisor_launcher,
+    )
+
+
 def _launch_one_worker(
     *,
     worker_spec: WorkerSpec,
     worker_index: int,
     run_state_directory: Path,
+    advisor_spec: AdvisorSpec | None = None,
+    all_used_session_ids: set[str] | None = None,
+    session_id_lock: object | None = None,
 ) -> WorkerReport:
     batch_sleep(worker_index * WORKER_STAGGER_SECONDS)
     scratch_paths = _mint_worker_scratch_paths(run_state_directory)
+    advisor_session_id: str | None = None
+    advisor_launcher: str | None = None
     try:
-        _write_assembled_prompt(
-            worker_spec=worker_spec,
-            prompt_path=scratch_paths.prompt_path,
-        )
-        outcome = _invoke_worker(
+        (
+            advisor_session_id,
+            advisor_launcher,
+            early_block,
+        ) = _maybe_bind_advisor_for_worker(
             worker_spec=worker_spec,
             scratch_paths=scratch_paths,
-            run_state_directory=run_state_directory,
+            advisor_spec=advisor_spec,
+            all_used_session_ids=all_used_session_ids,
+            session_id_lock=session_id_lock,
         )
-        return _build_worker_report(
+        if early_block is not None:
+            return early_block
+        return _run_worker_body(
             worker_spec=worker_spec,
-            outcome=outcome,
             scratch_paths=scratch_paths,
+            run_state_directory=run_state_directory,
+            advisor_spec=advisor_spec,
+            advisor_session_id=advisor_session_id,
+            advisor_launcher=advisor_launcher,
         )
     except (
         OSError,
@@ -576,14 +1110,19 @@ def _launch_one_worker(
         TypeError,
         AttributeError,
         LookupError,
+        AdvisorFailureError,
     ) as raised_exception:
-        return _error_report_for_exception(
+        return _map_launch_exception(
             worker_spec=worker_spec,
             scratch_paths=scratch_paths,
             raised_exception=raised_exception,
+            advisor_spec=advisor_spec,
+            advisor_session_id=advisor_session_id,
+            advisor_launcher=advisor_launcher,
         )
 
 
+
 def run_grok_batch(
     *,
     batch_spec: BatchSpec,
@@ -617,6 +1156,8 @@ def run_grok_batch(
             preflight_reason=None,
             all_worker_reports=(),
         )
+    all_used_session_ids: set[str] = set()
+    session_id_lock = threading.Lock()
     with ThreadPoolExecutor(max_workers=worker_count) as executor:
         all_futures = [
             executor.submit(
@@ -624,6 +1165,9 @@ def run_grok_batch(
                 worker_spec=each_worker,
                 worker_index=each_index,
                 run_state_directory=run_state_directory,
+                advisor_spec=batch_spec.advisor,
+                all_used_session_ids=all_used_session_ids,
+                session_id_lock=session_id_lock,
             )
             for each_index, each_worker in enumerate(batch_spec.all_workers)
         ]
@@ -658,6 +1202,9 @@ def batch_summary_as_dict(batch_summary: BatchSummary) -> dict[str, object]:
             SUMMARY_LEADER_SOCKET_KEY: each_report.leader_socket,
             SUMMARY_PROMPT_FILE_KEY: each_report.prompt_path,
             SUMMARY_DEBUG_FILE_KEY: each_report.debug_path,
+            SUMMARY_ADVISOR_SESSION_ID_KEY: each_report.advisor_session_id,
+            SUMMARY_ADVISOR_SIGNAL_KEY: each_report.advisor_completion_signal,
+            SUMMARY_ADVISOR_LAUNCHER_KEY: each_report.advisor_launcher,
         }
         for each_report in batch_summary.all_worker_reports
     ]