codex-autorunner 0.1.2__py3-none-any.whl → 1.1.0__py3-none-any.whl

codex_autorunner/core/app_server_prompts.py

@@ -3,119 +3,31 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Callable, Optional
 
-from .config import (
-    AppServerAutorunnerPromptConfig,
-    AppServerDocChatPromptConfig,
-    AppServerSpecIngestPromptConfig,
-    Config,
-)
+from .config import AppServerAutorunnerPromptConfig, Config
 
 TRUNCATION_MARKER = "...[truncated]"
 
 
-DOC_CHAT_APP_SERVER_TEMPLATE = """You are an autonomous coding assistant helping maintain the work docs for this repository.
-
-Instructions:
-- This run is non-interactive. Do not ask the user questions. If unsure, make reasonable assumptions and proceed.
-- Use the base doc content below. Drafts (if present) are the authoritative base.
-- You may inspect the repo and update the work docs listed when needed.
-- If you update docs, edit the files directly. If no changes are needed, do not edit files.
-- Respond with a short summary of what you did or found.
-
-Work docs (paths):
-- TODO: {todo_path}
-- PROGRESS: {progress_path}
-- OPINIONS: {opinions_path}
-- SPEC: {spec_path}
-- SUMMARY: {summary_path}
-
-{user_viewing_block}
-
-User request:
-{message}
-
-{docs_context_block}
-{recent_summary_block}
-"""
-
-
-SPEC_INGEST_APP_SERVER_TEMPLATE = """You are preparing work docs (TODO/PROGRESS/OPINIONS) from the SPEC.
-
-SPEC path: {spec_path}
-TODO path: {todo_path}
-PROGRESS path: {progress_path}
-OPINIONS path: {opinions_path}
-
-Instructions:
-- Read the SPEC and existing docs from disk.
-- Edit the TODO, PROGRESS, and OPINIONS files directly to reflect the SPEC.
-- The TODO must be a Markdown checklist. Every task MUST be a checkbox line:
-  - Use `- [ ] <task>` for open items and `- [x] <task>` for completed items.
-  - Do NOT use plain bullets like `- task` or paragraphs for tasks.
-- Do NOT output a patch block. Just edit the files.
-- Output a short summary prefixed with "Agent: " explaining what you did.
-
-User request:
-{message}
-
-{spec_excerpt_block}
-"""
-
-
-SNAPSHOT_APP_SERVER_TEMPLATE = """You are generating a compact Markdown repo snapshot meant to be pasted into another LLM chat.
-
-Snapshot path: {snapshot_path}
-
-Instructions:
-- Analyze the provided context and the repository.
-- Write the snapshot content directly to the snapshot path.
-- Keep the file concise and high-signal.
-
-Required output format (keep headings exactly):
-# Repo Snapshot
-
-## What this repo is
-- 3–6 bullets.
-
-## Architecture overview
-- Components and responsibilities.
-- Data/control flow (high level).
-- How things actually work
-
-## Key files and modules
-- Bullet list of important paths with 1-line notes.
-
-## Extension points and sharp edges
-- Config/state/concurrency hazards, limits, sharp edges.
-
-Inputs:
-{seed_context}
-
-{changes_block}
-{previous_snapshot_block}
-"""
-
-
 AUTORUNNER_APP_SERVER_TEMPLATE = """You are an autonomous coding assistant operating on a git repository.
 
-Work docs (read from disk as needed):
-- TODO: {todo_path}
-- PROGRESS: {progress_path}
-- OPINIONS: {opinions_path}
-- SPEC: {spec_path}
-- SUMMARY: {summary_path}
+Workspace docs (optional; read from disk when useful):
+- Active context: {active_context_path}
+- Decisions: {decisions_path}
+- Spec: {spec_path}
+
+Tickets:
+- The authoritative work items are ticket files under `.codex-autorunner/tickets/`.
+- Pick the next not-done ticket, implement it, and update the ticket file (`done: true`) when complete.
 
 Instructions:
 - This run is non-interactive. Do not ask the user questions. If unsure, make reasonable assumptions and proceed.
-- Work through TODO items from top to bottom.
-- Prefer fixing issues over documenting them.
-- Keep TODO/PROGRESS/OPINIONS/SPEC/SUMMARY in sync.
-- Make actual edits in the repo as needed.
+- Prefer small, safe diffs and keep work focused on the current ticket.
+- You may create new tickets only when needed to break down the current work.
 
 User request:
 {message}
 
-{todo_excerpt_block}
+{workspace_spec_block}
 {prev_run_block}
 """
 
@@ -169,144 +81,6 @@ def _shrink_prompt(
     return prompt
 
 
-def build_doc_chat_prompt(
-    config: Config,
-    *,
-    message: str,
-    recent_summary: Optional[str],
-    docs: dict[str, dict[str, str]],
-    context_doc: Optional[str] = None,
-) -> str:
-    prompt_cfg: AppServerDocChatPromptConfig = config.app_server.prompts.doc_chat
-    doc_paths = {
-        "todo": _display_path(config.root, config.doc_path("todo")),
-        "progress": _display_path(config.root, config.doc_path("progress")),
-        "opinions": _display_path(config.root, config.doc_path("opinions")),
-        "spec": _display_path(config.root, config.doc_path("spec")),
-        "summary": _display_path(config.root, config.doc_path("summary")),
-    }
-    message_text = truncate_text(message, prompt_cfg.message_max_chars)
-    doc_blocks = []
-    for key, path in doc_paths.items():
-        payload = docs.get(key, {})
-        source = payload.get("source") or "disk"
-        content = truncate_text(
-            str(payload.get("content") or ""), prompt_cfg.target_excerpt_max_chars
-        )
-        if not content.strip():
-            content = "(empty)"
-        label = f"{key.upper()} [{path}] ({source.upper()})"
-        doc_blocks.append(f"{label}\n{content}")
-    docs_context = "\n\n".join(doc_blocks)
-    recent_text = truncate_text(
-        recent_summary or "", prompt_cfg.recent_summary_max_chars
-    )
-    user_viewing = ""
-    if context_doc:
-        user_viewing = f"The user is currently looking at {context_doc.upper()}."
-
-    sections = {
-        "message": message_text,
-        "docs_context": docs_context,
-        "recent_summary": recent_text,
-        "user_viewing": user_viewing,
-    }
-
-    def render() -> str:
-        return DOC_CHAT_APP_SERVER_TEMPLATE.format(
-            todo_path=doc_paths["todo"],
-            progress_path=doc_paths["progress"],
-            opinions_path=doc_paths["opinions"],
-            spec_path=doc_paths["spec"],
-            summary_path=doc_paths["summary"],
-            message=sections["message"],
-            user_viewing_block=_optional_block(
-                "USER_VIEWING", sections["user_viewing"]
-            ),
-            docs_context_block=_optional_block("DOC_BASES", sections["docs_context"]),
-            recent_summary_block=_optional_block(
-                "RECENT_RUN_SUMMARY", sections["recent_summary"]
-            ),
-        )
-
-    return _shrink_prompt(
-        max_chars=prompt_cfg.max_chars,
-        render=render,
-        sections=sections,
-        order=["recent_summary", "docs_context", "message"],
-    )
-
-
-def build_spec_ingest_prompt(
-    config: Config,
-    *,
-    message: str,
-    spec_path: Optional[Path] = None,
-) -> str:
-    prompt_cfg: AppServerSpecIngestPromptConfig = config.app_server.prompts.spec_ingest
-    doc_paths = {
-        "todo": _display_path(config.root, config.doc_path("todo")),
-        "progress": _display_path(config.root, config.doc_path("progress")),
-        "opinions": _display_path(config.root, config.doc_path("opinions")),
-    }
-    spec_target = spec_path or config.doc_path("spec")
-    spec_path_str = _display_path(config.root, spec_target)
-    message_text = truncate_text(message, prompt_cfg.message_max_chars)
-    spec_excerpt = truncate_text(
-        spec_target.read_text(encoding="utf-8"),
-        prompt_cfg.spec_excerpt_max_chars,
-    )
-
-    sections = {
-        "message": message_text,
-        "spec_excerpt": spec_excerpt,
-    }
-
-    def render() -> str:
-        return SPEC_INGEST_APP_SERVER_TEMPLATE.format(
-            spec_path=spec_path_str,
-            todo_path=doc_paths["todo"],
-            progress_path=doc_paths["progress"],
-            opinions_path=doc_paths["opinions"],
-            message=sections["message"],
-            spec_excerpt_block=_optional_block(
-                "SPEC_EXCERPT", sections["spec_excerpt"]
-            ),
-        )
-
-    return _shrink_prompt(
-        max_chars=prompt_cfg.max_chars,
-        render=render,
-        sections=sections,
-        order=["spec_excerpt", "message"],
-    )
-
-
-def build_app_server_snapshot_prompt(
-    config: Config,
-    *,
-    seed_context: str,
-    previous_snapshot: Optional[str] = None,
-    changes: Optional[str] = None,
-) -> str:
-    snapshot_path = config.doc_path("snapshot")
-    previous_block = ""
-    if previous_snapshot:
-        previous_block = (
-            f"<PREVIOUS_SNAPSHOT>\n{previous_snapshot.strip()}\n</PREVIOUS_SNAPSHOT>"
-        )
-    changes_block = ""
-    if changes:
-        changes_block = f"<CHANGES_SINCE_LAST_SNAPSHOT>\n{changes.strip()}\n</CHANGES_SINCE_LAST_SNAPSHOT>"
-
-    return SNAPSHOT_APP_SERVER_TEMPLATE.format(
-        snapshot_path=snapshot_path,
-        seed_context=seed_context,
-        changes_block=changes_block,
-        previous_snapshot_block=previous_block,
-    )
-
-
 def build_autorunner_prompt(
     config: Config,
     *,
@@ -315,35 +89,36 @@ def build_autorunner_prompt(
 ) -> str:
     prompt_cfg: AppServerAutorunnerPromptConfig = config.app_server.prompts.autorunner
     doc_paths = {
-        "todo": _display_path(config.root, config.doc_path("todo")),
-        "progress": _display_path(config.root, config.doc_path("progress")),
-        "opinions": _display_path(config.root, config.doc_path("opinions")),
+        "active_context": _display_path(config.root, config.doc_path("active_context")),
+        "decisions": _display_path(config.root, config.doc_path("decisions")),
         "spec": _display_path(config.root, config.doc_path("spec")),
-        "summary": _display_path(config.root, config.doc_path("summary")),
     }
+
     message_text = truncate_text(message, prompt_cfg.message_max_chars)
-    todo_excerpt = truncate_text(
-        config.doc_path("todo").read_text(encoding="utf-8"),
+    spec_excerpt = truncate_text(
+        (
+            config.doc_path("spec").read_text(encoding="utf-8")
+            if config.doc_path("spec").exists()
+            else ""
+        ),
         prompt_cfg.todo_excerpt_max_chars,
     )
     prev_run_text = truncate_text(prev_run_summary or "", prompt_cfg.prev_run_max_chars)
 
     sections = {
         "message": message_text,
-        "todo_excerpt": todo_excerpt,
+        "workspace_spec": spec_excerpt,
         "prev_run": prev_run_text,
     }
 
     def render() -> str:
         return AUTORUNNER_APP_SERVER_TEMPLATE.format(
-            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"],
             message=sections["message"],
-            todo_excerpt_block=_optional_block(
-                "TODO_EXCERPT", sections["todo_excerpt"]
+            workspace_spec_block=_optional_block(
+                "WORKSPACE_SPEC", sections["workspace_spec"]
             ),
             prev_run_block=_optional_block("PREV_RUN_SUMMARY", sections["prev_run"]),
         )
@@ -352,13 +127,11 @@ def build_autorunner_prompt(
         max_chars=prompt_cfg.max_chars,
         render=render,
         sections=sections,
-        order=["prev_run", "todo_excerpt", "message"],
+        order=["prev_run", "workspace_spec", "message"],
     )
 
 
 APP_SERVER_PROMPT_BUILDERS = {
-    "doc_chat": build_doc_chat_prompt,
-    "spec_ingest": build_spec_ingest_prompt,
     "autorunner": build_autorunner_prompt,
 }
 
@@ -366,13 +139,7 @@ APP_SERVER_PROMPT_BUILDERS = {
 __all__ = [
     "AUTORUNNER_APP_SERVER_TEMPLATE",
     "APP_SERVER_PROMPT_BUILDERS",
-    "DOC_CHAT_APP_SERVER_TEMPLATE",
-    "SPEC_INGEST_APP_SERVER_TEMPLATE",
-    "SNAPSHOT_APP_SERVER_TEMPLATE",
     "TRUNCATION_MARKER",
     "build_autorunner_prompt",
-    "build_doc_chat_prompt",
-    "build_spec_ingest_prompt",
-    "build_app_server_snapshot_prompt",
     "truncate_text",
 ]

codex_autorunner/core/app_server_threads.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import logging
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Optional
@@ -12,19 +13,17 @@ APP_SERVER_THREADS_FILENAME = ".codex-autorunner/app_server_threads.json"
 APP_SERVER_THREADS_VERSION = 1
 APP_SERVER_THREADS_CORRUPT_SUFFIX = ".corrupt"
 APP_SERVER_THREADS_NOTICE_SUFFIX = ".corrupt.json"
-DOC_CHAT_KINDS = ("todo", "progress", "opinions", "spec", "summary")
-DOC_CHAT_PREFIX = "doc_chat."
-DOC_CHAT_KEY = "doc_chat"
-DOC_CHAT_OPENCODE_KEY = "doc_chat.opencode"
-DOC_CHAT_OPENCODE_PREFIX = "doc_chat.opencode."
-DOC_CHAT_KEYS = {DOC_CHAT_KEY} | {f"{DOC_CHAT_PREFIX}{kind}" for kind in DOC_CHAT_KINDS}
-DOC_CHAT_KEYS = DOC_CHAT_KEYS | {
-    DOC_CHAT_OPENCODE_KEY,
-    *(f"{DOC_CHAT_OPENCODE_PREFIX}{kind}" for kind in DOC_CHAT_KINDS),
-}
-FEATURE_KEYS = DOC_CHAT_KEYS | {
-    "spec_ingest",
-    "spec_ingest.opencode",
+FILE_CHAT_KEY = "file_chat"
+FILE_CHAT_OPENCODE_KEY = "file_chat.opencode"
+FILE_CHAT_PREFIX = "file_chat."
+FILE_CHAT_OPENCODE_PREFIX = "file_chat.opencode."
+
+LOGGER = logging.getLogger("codex_autorunner.app_server")
+
+# Static keys that can be reset/managed via the UI.
+FEATURE_KEYS = {
+    FILE_CHAT_KEY,
+    FILE_CHAT_OPENCODE_KEY,
     "autorunner",
     "autorunner.opencode",
 }
@@ -43,6 +42,10 @@ def normalize_feature_key(raw: str) -> str:
     key = key.replace("/", ".").replace(":", ".")
     if key in FEATURE_KEYS:
         return key
+    # Allow per-target file chat threads (e.g. file_chat.ticket.1, file_chat.workspace.spec).
+    for prefix in (FILE_CHAT_PREFIX, FILE_CHAT_OPENCODE_PREFIX):
+        if key.startswith(prefix) and len(key) > len(prefix):
+            return key
     raise ValueError(f"invalid feature key: {raw}")
 
 
@@ -84,20 +87,9 @@ class AppServerThreadRegistry:
 
     def feature_map(self) -> dict[str, object]:
         threads = self.load()
-        doc_chat_thread = threads.get(DOC_CHAT_KEY)
-        doc_chat_opencode_thread = threads.get(DOC_CHAT_OPENCODE_KEY)
         payload: dict[str, object] = {
-            "doc_chat": {
-                kind: doc_chat_thread or threads.get(f"{DOC_CHAT_PREFIX}{kind}")
-                for kind in DOC_CHAT_KINDS
-            },
-            "doc_chat_opencode": {
-                kind: doc_chat_opencode_thread
-                or threads.get(f"{DOC_CHAT_OPENCODE_PREFIX}{kind}")
-                for kind in DOC_CHAT_KINDS
-            },
-            "spec_ingest": threads.get("spec_ingest"),
-            "spec_ingest_opencode": threads.get("spec_ingest.opencode"),
+            "file_chat": threads.get(FILE_CHAT_KEY),
+            "file_chat_opencode": threads.get(FILE_CHAT_OPENCODE_KEY),
             "autorunner": threads.get("autorunner"),
             "autorunner_opencode": threads.get("autorunner.opencode"),
         }
@@ -188,8 +180,14 @@ class AppServerThreadRegistry:
         try:
             atomic_write(self._notice_path(), json.dumps(notice, indent=2) + "\n")
         except Exception:
-            pass
+            LOGGER.warning(
+                "Failed to write app server thread corruption notice.",
+                exc_info=True,
+            )
         try:
             self._save_unlocked({})
         except Exception:
-            pass
+            LOGGER.warning(
+                "Failed to reset app server thread registry after corruption.",
+                exc_info=True,
+            )

codex_autorunner/core/app_server_utils.py

@@ -0,0 +1,165 @@
+import os
+from pathlib import Path
+from typing import Any, Optional, Sequence
+
+from .logging_utils import log_event
+from .utils import resolve_executable, subprocess_env
+
+
+def app_server_env(
+    command: Sequence[str],
+    cwd: Path,
+    *,
+    base_env: Optional[dict[str, str]] = None,
+) -> dict[str, str]:
+    extra_paths: list[str] = []
+    if command:
+        binary = command[0]
+        resolved = resolve_executable(binary, env=base_env)
+        candidate: Optional[Path] = Path(resolved) if resolved else None
+        if candidate is None:
+            candidate = Path(binary).expanduser()
+            if not candidate.is_absolute():
+                candidate = (cwd / candidate).resolve()
+        if candidate.exists():
+            extra_paths.append(str(candidate.parent))
+    return subprocess_env(extra_paths=extra_paths, base_env=base_env)
+
+
+def seed_codex_home(
+    codex_home: Path,
+    *,
+    logger: Any = None,
+    event_prefix: str = "app_server",
+) -> None:
+    logger = logger or __import__("logging").getLogger(__name__)
+    auth_path = codex_home / "auth.json"
+    source_root = Path(os.environ.get("CODEX_HOME", "~/.codex")).expanduser()
+    if source_root.resolve() == codex_home.resolve():
+        return
+    source_auth = source_root / "auth.json"
+    if auth_path.exists():
+        if auth_path.is_symlink() and auth_path.resolve() == source_auth.resolve():
+            return
+        log_event(
+            logger,
+            __import__("logging").INFO,
+            f"{event_prefix}.codex_home.seed.skipped",
+            reason="auth_exists",
+            source=str(source_root),
+            target=str(codex_home),
+        )
+        return
+    if not source_root.exists():
+        log_event(
+            logger,
+            __import__("logging").WARNING,
+            f"{event_prefix}.codex_home.seed.skipped",
+            reason="source_missing",
+            source=str(source_root),
+            target=str(codex_home),
+        )
+        return
+    if not source_auth.exists():
+        log_event(
+            logger,
+            __import__("logging").WARNING,
+            f"{event_prefix}.codex_home.seed.skipped",
+            reason="auth_missing",
+            source=str(source_root),
+            target=str(codex_home),
+        )
+        return
+    try:
+        auth_path.symlink_to(source_auth)
+        log_event(
+            logger,
+            __import__("logging").INFO,
+            f"{event_prefix}.codex_home.seeded",
+            source=str(source_root),
+            target=str(codex_home),
+        )
+    except OSError as exc:
+        log_event(
+            logger,
+            __import__("logging").WARNING,
+            f"{event_prefix}.codex_home.seed.failed",
+            exc=exc,
+            source=str(source_root),
+            target=str(codex_home),
+        )
+
+
+def build_app_server_env(
+    command: Sequence[str],
+    workspace_root: Path,
+    state_dir: Path,
+    *,
+    logger: Any = None,
+    event_prefix: str = "app_server",
+    base_env: Optional[dict[str, str]] = None,
+) -> dict[str, str]:
+    env = app_server_env(command, workspace_root, base_env=base_env)
+    codex_home = state_dir / "codex_home"
+    codex_home.mkdir(parents=True, exist_ok=True)
+    seed_codex_home(codex_home, logger=logger, event_prefix=event_prefix)
+    env["CODEX_HOME"] = str(codex_home)
+    return env
+
+
+def _extract_turn_id(payload: Any) -> Optional[str]:
+    if not isinstance(payload, dict):
+        return None
+    for key in ("turnId", "turn_id", "id"):
+        value = payload.get(key)
+        if isinstance(value, str):
+            return value
+    turn = payload.get("turn")
+    if isinstance(turn, dict):
+        for key in ("id", "turnId", "turn_id"):
+            value = turn.get(key)
+            if isinstance(value, str):
+                return value
+    return None
+
+
+def _extract_thread_id_from_container(payload: Any) -> Optional[str]:
+    if not isinstance(payload, dict):
+        return None
+    for key in ("threadId", "thread_id"):
+        value = payload.get(key)
+        if isinstance(value, str):
+            return value
+    thread = payload.get("thread")
+    if isinstance(thread, dict):
+        for key in ("id", "threadId", "thread_id"):
+            value = thread.get(key)
+            if isinstance(value, str):
+                return value
+    return None
+
+
+def _extract_thread_id_for_turn(payload: Any) -> Optional[str]:
+    if not isinstance(payload, dict):
+        return None
+    for candidate in (payload, payload.get("turn"), payload.get("item")):
+        thread_id = _extract_thread_id_from_container(candidate)
+        if thread_id:
+            return thread_id
+    return None
+
+
+def _extract_thread_id(payload: Any) -> Optional[str]:
+    if not isinstance(payload, dict):
+        return None
+    for key in ("threadId", "thread_id", "id"):
+        value = payload.get(key)
+        if isinstance(value, str):
+            return value
+    thread = payload.get("thread")
+    if isinstance(thread, dict):
+        for key in ("id", "threadId", "thread_id"):
+            value = thread.get(key)
+            if isinstance(value, str):
+                return value
+    return None