codex-autorunner 0.1.1__py3-none-any.whl → 1.0.0__py3-none-any.whl

codex_autorunner/core/about_car.py

@@ -17,6 +17,26 @@ ABOUT_CAR_REL_PATH = Path(".codex-autorunner") / ABOUT_CAR_BASENAME
 # If this marker is present, codex-autorunner may safely refresh the file content.
 ABOUT_CAR_GENERATED_MARKER = "<!-- CAR:AUTOGENERATED -->"
 
+CAR_CONTEXT_KEYWORDS = (
+    "car",
+    "codex",
+    "spec",
+    "autorunner",
+    "workspace",
+    "ticket",
+    "tickets",
+    "context",
+    "decision",
+    "decisions",
+    "handoff",
+    "dispatch",
+    "inbox",
+)
+
+CAR_CONTEXT_HINT = (
+    "Context: read .codex-autorunner/ABOUT_CAR.md for repo-specific rules."
+)
+
 
 def _display_path(repo_root: Path, path: Path) -> str:
     try:
@@ -28,11 +48,9 @@ def _display_path(repo_root: Path, path: Path) -> str:
 def build_about_car_markdown(
     *,
     repo_root: Path,
-    todo_path: Path,
-    progress_path: Path,
-    opinions_path: Path,
+    active_context_path: Path,
+    decisions_path: Path,
     spec_path: Path,
-    summary_path: Path,
     hub_config_path: Optional[Path] = None,
     repo_override_path: Optional[Path] = None,
 ) -> str:
@@ -44,11 +62,9 @@ def build_about_car_markdown(
     repo_override_path = repo_override_path or (repo_root / REPO_OVERRIDE_FILENAME)
     root_config_path = repo_root / ROOT_CONFIG_FILENAME
     root_override_path = repo_root / ROOT_OVERRIDE_FILENAME
-    todo_disp = _display_path(repo_root, todo_path)
-    progress_disp = _display_path(repo_root, progress_path)
-    opinions_disp = _display_path(repo_root, opinions_path)
+    active_context_disp = _display_path(repo_root, active_context_path)
+    decisions_disp = _display_path(repo_root, decisions_path)
     spec_disp = _display_path(repo_root, spec_path)
-    summary_disp = _display_path(repo_root, summary_path)
     hub_config_disp = _display_path(repo_root, hub_config_path)
     repo_override_disp = _display_path(repo_root, repo_override_path)
     root_config_disp = _display_path(repo_root, root_config_path)
@@ -58,25 +74,25 @@ def build_about_car_markdown(
         f"{ABOUT_CAR_GENERATED_MARKER}\n"
         "# ABOUT_CAR — Codex Autorunner (CAR)\n\n"
         "You are running inside **Codex Autorunner (CAR)**.\n\n"
-        "CAR uses a small set of markdown **work docs** as the control surface for long-horizon work. "
-        "These docs live under the repo-local, gitignored `.codex-autorunner/` directory.\n\n"
-        "## Work docs (canonical)\n"
-        "- **TODO** — ordered checklist of high-level tasks: "
-        f"`{todo_disp}`\n"
-        "- **PROGRESS** — running notes / validation / context: "
-        f"`{progress_disp}`\n"
-        "- **OPINIONS** — constraints + style guidelines: "
-        f"`{opinions_disp}`\n"
-        "- **SPEC** — source-of-truth requirements and scope: "
-        f"`{spec_disp}`\n"
-        "- **SUMMARY** — user-facing report + external/user action items: "
-        f"`{summary_disp}`\n\n"
+        "CAR uses a ticket-first workflow.\n\n"
+        "## Required for operation\n"
+        "- Tickets live under `.codex-autorunner/tickets/`.\n\n"
+        "## Optional workspace docs\n"
+        "- **Active context**: "
+        f"`{active_context_disp}`\n"
+        "- **Decisions**: "
+        f"`{decisions_disp}`\n"
+        "- **Spec**: "
+        f"`{spec_disp}`\n\n"
         "## Critical rules\n"
-        f'- When the user says **"add this to the TODOs"**, edit `{todo_disp}`.\n'
-        "- Do **not** create new copies of TODO/PROGRESS/OPINIONS/SPEC/SUMMARY elsewhere in the repo.\n"
+        "- Do **not** create new copies of workspace docs elsewhere in the repo.\n"
         "- Treat `.codex-autorunner/` as intentional project structure even though it is hidden/gitignored.\n\n"
+        "## Agent Flow\n"
+        "- **Dispatch**: An update or message from the agent.\n"
+        "- **Handoff**: Passing control from agent to user (or vice versa).\n"
+        "- **Inbox**: Where the agent receives files/messages.\n\n"
         "## How CAR works (short)\n"
-        "- `car run/once` repeatedly runs Codex non-interactively, feeding it the work docs (and the prior run tail).\n"
+        "- The web UI provides ticket editing + unified file chat.\n"
         "- `car serve` starts the hub web UI. The **Terminal** tab launches the configured `codex` binary in a PTY.\n"
         f"- Hub config lives at `{hub_config_disp}` (generated).\n"
         f"- Repo overrides (optional) live at `{repo_override_disp}`.\n"
@@ -101,11 +117,9 @@ def ensure_about_car_file_for_repo(
 
     content = build_about_car_markdown(
         repo_root=repo_root,
-        todo_path=doc_paths["todo"],
-        progress_path=doc_paths["progress"],
-        opinions_path=doc_paths["opinions"],
+        active_context_path=doc_paths["active_context"],
+        decisions_path=doc_paths["decisions"],
         spec_path=doc_paths["spec"],
-        summary_path=doc_paths["summary"],
     )
     if content and not content.endswith("\n"):
         content += "\n"
@@ -129,10 +143,8 @@ def ensure_about_car_file(config: Config, *, force: bool = False) -> Path:
     """Config-aware wrapper that uses configured doc paths."""
     repo_root = config.root
     docs = {
-        "todo": config.doc_path("todo"),
-        "progress": config.doc_path("progress"),
-        "opinions": config.doc_path("opinions"),
+        "active_context": config.doc_path("active_context"),
+        "decisions": config.doc_path("decisions"),
         "spec": config.doc_path("spec"),
-        "summary": config.doc_path("summary"),
     }
     return ensure_about_car_file_for_repo(repo_root, doc_paths=docs, force=force)

codex_autorunner/core/adapter_utils.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from typing import Any, Callable
+
+
+def handle_agent_output(
+    log_app_server_output: Callable[[int, list[str]], None],
+    write_run_artifact: Callable[[int, str, str], Any],
+    merge_run_index_entry: Callable[[int, dict[str, Any]], None],
+    run_id: int,
+    output: str | list[str],
+) -> None:
+    if isinstance(output, str):
+        messages = [output]
+    else:
+        messages = output
+    log_app_server_output(run_id, messages)
+    output_text = "\n\n".join(messages).strip() if messages else ""
+    if output_text:
+        output_path = write_run_artifact(run_id, "output.txt", output_text)
+        merge_run_index_entry(run_id, {"artifacts": {"output_path": str(output_path)}})

codex_autorunner/core/app_server_events.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import threading
 import time
 from dataclasses import dataclass, field
 from typing import Any, AsyncIterator, Dict, Optional
@@ -45,11 +46,19 @@ class AppServerEventBuffer:
     ) -> None:
         self._entries: dict[TurnKey, TurnEventEntry] = {}
         self._turn_index: dict[str, str] = {}
-        self._lock = asyncio.Lock()
+        self._lock: Optional[asyncio.Lock] = None
+        self._lock_init = threading.Lock()
         self._max_events_per_turn = max_events_per_turn
         self._max_turns = max_turns
         self._turn_ttl_seconds = turn_ttl_seconds
 
+    def _ensure_lock(self) -> asyncio.Lock:
+        if self._lock is None:
+            with self._lock_init:
+                if self._lock is None:
+                    self._lock = asyncio.Lock()
+        return self._lock
+
     async def register_turn(
         self,
         thread_id: str,
@@ -60,7 +69,7 @@ class AppServerEventBuffer:
         if not thread_id or not turn_id:
             return
         entry = await self._ensure_entry(thread_id, turn_id)
-        async with self._lock:
+        async with self._ensure_lock():
             self._turn_index[turn_id] = thread_id
         if context:
             entry.context.update(context)
@@ -83,7 +92,7 @@ class AppServerEventBuffer:
             entry.last_event_at = time.monotonic()
             entry.condition.notify_all()
         context = dict(entry.context) if entry.context else {}
-        async with self._lock:
+        async with self._ensure_lock():
             self._turn_index[turn_id] = thread_id
             self._prune_locked()
         self._emit_log_lines(context, message)
@@ -96,7 +105,7 @@ class AppServerEventBuffer:
         heartbeat_interval: float = 15.0,
     ) -> AsyncIterator[str]:
         entry = await self._ensure_entry(thread_id, turn_id)
-        async with self._lock:
+        async with self._ensure_lock():
             entry.active_streams += 1
             self._turn_index[turn_id] = thread_id
         last_id = 0
@@ -116,12 +125,12 @@ class AppServerEventBuffer:
                     last_id = event["id"]
                     yield format_sse("app-server", event)
         finally:
-            async with self._lock:
+            async with self._ensure_lock():
                 entry.active_streams = max(0, entry.active_streams - 1)
 
     async def _ensure_entry(self, thread_id: str, turn_id: str) -> TurnEventEntry:
         key = (thread_id, turn_id)
-        async with self._lock:
+        async with self._ensure_lock():
             entry = self._entries.get(key)
             if entry is None:
                 entry = TurnEventEntry(thread_id=thread_id, turn_id=turn_id)

codex_autorunner/core/app_server_logging.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
+
+from .redaction import redact_text
+from .text_delta_coalescer import TextDeltaCoalescer
 
 
 def _coerce_dict(value: Any) -> dict[str, Any]:
@@ -67,11 +70,14 @@ def _extract_error_message(params: Any) -> str:
 
 
 class AppServerEventFormatter:
-    def __init__(self) -> None:
+    def __init__(self, redact_enabled: bool = True) -> None:
+        self._redact_enabled = redact_enabled
         self._thinking_items: set[str] = set()
+        self._reasoning_coalescers: dict[str, TextDeltaCoalescer] = {}
 
     def reset(self) -> None:
         self._thinking_items.clear()
+        self._reasoning_coalescers.clear()
 
     def format_event(self, message: Any) -> list[str]:
         if not isinstance(message, dict):
@@ -86,23 +92,41 @@ class AppServerEventFormatter:
             delta = params.get("delta")
             if not isinstance(delta, str) or not delta:
                 return []
+            has_valid_item_id = isinstance(item_id, str) and item_id
+            if has_valid_item_id and item_id not in self._thinking_items:
+                lines.append("thinking")
+                self._thinking_items.add(cast(str, item_id))
+            if has_valid_item_id:
+                if item_id not in self._reasoning_coalescers:
+                    self._reasoning_coalescers[cast(str, item_id)] = (
+                        TextDeltaCoalescer()
+                    )
+                self._reasoning_coalescers[cast(str, item_id)].add(delta)
+            else:
+                lines.append("thinking")
+                for line in delta.splitlines() or [""]:
+                    if line:
+                        lines.append(f"**{line}**")
+                    else:
+                        lines.append("")
+            return lines
+
+        if method == "item/reasoning/summaryPartAdded":
             if (
                 isinstance(item_id, str)
                 and item_id
-                and item_id not in self._thinking_items
+                and item_id in self._reasoning_coalescers
             ):
-                lines.append("thinking")
-                self._thinking_items.add(item_id)
-            for line in delta.splitlines() or [""]:
-                if line:
-                    lines.append(f"**{line}**")
-                else:
-                    lines.append("")
+                coalescer = self._reasoning_coalescers[item_id]
+                buffer = coalescer.flush_all()
+                for line in buffer:
+                    if line:
+                        lines.append(f"**{line}**")
+                    else:
+                        lines.append("")
+                self._reasoning_coalescers[item_id].clear()
             return lines
 
-        if method == "item/reasoning/summaryPartAdded":
-            return []
-
         if method in ("turn/completed", "error"):
             self.reset()
 
@@ -134,6 +158,20 @@ class AppServerEventFormatter:
                 if files:
                     lines.append("file update")
                     lines.extend([f"M {path}" for path in files])
+            elif item_type == "reasoning":
+                if (
+                    isinstance(item_id, str)
+                    and item_id
+                    and item_id in self._reasoning_coalescers
+                ):
+                    coalescer = self._reasoning_coalescers[item_id]
+                    buffer = coalescer.flush_all()
+                    self._reasoning_coalescers.pop(item_id, None)
+                    for line in buffer:
+                        if line:
+                            lines.append(f"**{line}**")
+                        else:
+                            lines.append("")
             elif item_type == "tool":
                 tool_name = item.get("name") or item.get("tool") or item.get("id")
                 if isinstance(tool_name, str) and tool_name:
@@ -151,7 +189,8 @@ class AppServerEventFormatter:
                 or params.get("value")
             )
             if isinstance(diff, str) and diff:
-                lines.extend(diff.splitlines())
+                diff_text = redact_text(diff) if self._redact_enabled else diff
+                lines.extend(diff_text.splitlines())
             return lines
 
         if method == "error":
@@ -163,7 +202,8 @@ class AppServerEventFormatter:
         if "outputdelta" in method.lower():
             delta = params.get("delta") or params.get("text") or params.get("output")
             if isinstance(delta, str) and delta:
-                lines.extend(delta.splitlines())
+                delta_text = redact_text(delta) if self._redact_enabled else delta
+                lines.extend(delta_text.splitlines())
             return lines
 
         return lines