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

codex_autorunner/surfaces/web/routes/messages.py

@@ -27,6 +27,7 @@ from urllib.parse import quote
 import yaml
 from fastapi import APIRouter, File, Form, HTTPException, Request, UploadFile
 
+from ....core.filebox import ensure_structure, save_file
 from ....core.flows.models import FlowRunRecord, FlowRunStatus
 from ....core.flows.store import FlowStore
 from ....core.utils import find_repo_root
@@ -47,15 +48,29 @@ def _flows_db_path(repo_root: Path) -> Path:
     return repo_root / ".codex-autorunner" / "flows.db"
 
 
-def _load_store_or_404(db_path: Path) -> FlowStore:
-    store = FlowStore(db_path)
-    try:
-        store.initialize()
-        return store
-    except Exception as exc:
-        raise HTTPException(
-            status_code=404, detail="Flows database unavailable"
-        ) from exc
+def _resolve_workspace_and_runs(
+    record_input: dict[str, Any], repo_root: Path
+) -> tuple[Path, Path]:
+    """
+    Normalize workspace_root/runs_dir with sensible fallbacks.
+
+    - workspace_root defaults to the current repo_root.
+    - runs_dir defaults to .codex-autorunner/runs.
+    - If runs_dir is absolute, keep it as-is; otherwise join to workspace_root.
+    """
+
+    raw_workspace = record_input.get("workspace_root")
+    workspace_root = Path(raw_workspace) if raw_workspace else repo_root
+    if not workspace_root.is_absolute():
+        workspace_root = (repo_root / workspace_root).resolve()
+    else:
+        workspace_root = workspace_root.resolve()
+
+    runs_dir_raw = record_input.get("runs_dir") or ".codex-autorunner/runs"
+    runs_dir_path = Path(runs_dir_raw)
+    if not runs_dir_path.is_absolute():
+        runs_dir_path = (workspace_root / runs_dir_path).resolve()
+    return workspace_root, runs_dir_path
 
 
 def _timestamp(path: Path) -> Optional[str]:
@@ -103,8 +118,7 @@ def _collect_dispatch_history(
     *, repo_root: Path, run_id: str, record_input: dict[str, Any]
 ) -> list[dict[str, Any]]:
     """Collect all dispatches from the dispatch history directory."""
-    workspace_root = Path(record_input.get("workspace_root") or repo_root)
-    runs_dir = Path(record_input.get("runs_dir") or ".codex-autorunner/runs")
+    workspace_root, runs_dir = _resolve_workspace_and_runs(record_input, repo_root)
     outbox_paths = resolve_outbox_paths(
         workspace_root=workspace_root, runs_dir=runs_dir, run_id=run_id
     )
@@ -161,8 +175,7 @@ def _collect_dispatch_history(
 def _collect_reply_history(
     *, repo_root: Path, run_id: str, record_input: dict[str, Any]
 ):
-    workspace_root = Path(record_input.get("workspace_root") or repo_root)
-    runs_dir = Path(record_input.get("runs_dir") or ".codex-autorunner/runs")
+    workspace_root, runs_dir = _resolve_workspace_and_runs(record_input, repo_root)
     reply_paths = resolve_reply_paths(
         workspace_root=workspace_root, runs_dir=runs_dir, run_id=run_id
     )
@@ -236,20 +249,22 @@ def build_messages_routes() -> APIRouter:
 
     @router.get("/api/messages/active")
     def get_active_message(request: Request):
+        from ....core.config import load_repo_config
+
         repo_root = find_repo_root()
         db_path = _flows_db_path(repo_root)
         if not db_path.exists():
             return {"active": False}
-        store = FlowStore(db_path)
         try:
-            store.initialize()
+            with FlowStore(
+                db_path, durable=load_repo_config(repo_root).durable_writes
+            ) as store:
+                paused = store.list_flow_runs(
+                    flow_type="ticket_flow", status=FlowRunStatus.PAUSED
+                )
         except Exception:
             # Corrupt flows db should not 500 the UI.
             return {"active": False}
-
-        paused = store.list_flow_runs(
-            flow_type="ticket_flow", status=FlowRunStatus.PAUSED
-        )
         if not paused:
             return {"active": False}
 
@@ -281,16 +296,20 @@ def build_messages_routes() -> APIRouter:
 
     @router.get("/api/messages/threads")
     def list_threads():
+        from ....core.config import load_repo_config
+
         repo_root = find_repo_root()
         db_path = _flows_db_path(repo_root)
         if not db_path.exists():
             return {"conversations": []}
-        store = FlowStore(db_path)
         try:
-            store.initialize()
+            with FlowStore(
+                db_path, durable=load_repo_config(repo_root).durable_writes
+            ) as store:
+                runs = store.list_flow_runs(flow_type="ticket_flow")
         except Exception:
             return {"conversations": []}
-        runs = store.list_flow_runs(flow_type="ticket_flow")
+
         conversations: list[dict[str, Any]] = []
         for record in runs:
             record_input = dict(record.input_data or {})
@@ -327,6 +346,8 @@ def build_messages_routes() -> APIRouter:
 
     @router.get("/api/messages/threads/{run_id}")
     def get_thread(run_id: str):
+        from ....core.config import load_repo_config
+
         repo_root = find_repo_root()
         db_path = _flows_db_path(repo_root)
         empty_response = {
@@ -337,14 +358,15 @@ def build_messages_routes() -> APIRouter:
         }
         if not db_path.exists():
             return empty_response
-        store = _load_store_or_404(db_path)
         try:
-            record = store.get_flow_run(run_id)
-        finally:
-            try:
-                store.close()
-            except Exception:
-                pass
+            with FlowStore(
+                db_path, durable=load_repo_config(repo_root).durable_writes
+            ) as store:
+                record = store.get_flow_run(run_id)
+        except Exception:
+            raise HTTPException(
+                status_code=404, detail="Flows database unavailable"
+            ) from None
         if not record:
             return empty_response
         input_data = dict(record.input_data or {})
@@ -378,29 +400,31 @@ def build_messages_routes() -> APIRouter:
         body: str = Form(""),
         title: Optional[str] = Form(None),
         # NOTE: FastAPI/starlette will supply either a single UploadFile or a list
-        # depending on how the multipart form is encoded. Declaring this as a
+        # depending on how is multipart form is encoded. Declaring this as a
         # concrete list avoids a common 422 where a single file upload is treated
         # as a non-list value.
         files: list[UploadFile] = File(default=[]),  # noqa: B006,B008
     ):
+        from ....core.config import load_repo_config
+
         repo_root = find_repo_root()
         db_path = _flows_db_path(repo_root)
         if not db_path.exists():
             raise HTTPException(status_code=404, detail="No flows database")
-        store = _load_store_or_404(db_path)
         try:
-            record = store.get_flow_run(run_id)
-        finally:
-            try:
-                store.close()
-            except Exception:
-                pass
+            with FlowStore(
+                db_path, durable=load_repo_config(repo_root).durable_writes
+            ) as store:
+                record = store.get_flow_run(run_id)
+        except Exception:
+            raise HTTPException(
+                status_code=404, detail="Flows database unavailable"
+            ) from None
         if not record:
             raise HTTPException(status_code=404, detail="Run not found")
 
         input_data = dict(record.input_data or {})
-        workspace_root = Path(input_data.get("workspace_root") or repo_root)
-        runs_dir = Path(input_data.get("runs_dir") or ".codex-autorunner/runs")
+        workspace_root, runs_dir = _resolve_workspace_and_runs(input_data, repo_root)
         reply_paths = resolve_reply_paths(
             workspace_root=workspace_root, runs_dir=runs_dir, run_id=run_id
         )
@@ -436,6 +460,13 @@ def build_messages_routes() -> APIRouter:
             data = await upload.read()
             try:
                 dest.write_bytes(data)
+                try:
+                    ensure_structure(repo_root)
+                    save_file(repo_root, "inbox", filename, data)
+                except Exception:
+                    _logger.debug(
+                        "Failed to mirror attachment into FileBox", exc_info=True
+                    )
             except OSError as exc:
                 raise HTTPException(
                     status_code=500, detail=f"Failed to write attachment: {exc}"