codexapi 0.6.3__tar.gz → 0.6.5__tar.gz

{codexapi-0.6.3/src/codexapi.egg-info → codexapi-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codexapi
-Version: 0.6.3
+Version: 0.6.5
 Summary: Minimal Python API for running the Codex CLI.
 License: MIT
 Keywords: codex,agent,cli,openai
@@ -128,7 +128,11 @@ Use `--no-yolo` to run Codex with `--full-auto` instead.
 
 Watch mode periodically ticks a long-running agent session with the current time
 and prints JSON status updates. The agent controls the loop by setting
-`continue` to true/false in its JSON response.
+`continue` to true/false in its JSON response. Each tick expects JSON keys:
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry before stopping with an
+error. When `~/.pushover` is configured, watch sends a notification when it
+stops.
 
 ```bash
 codexapi watch 5 "Run the benchmark and wait for results."
@@ -162,7 +166,8 @@ Optional Pushover notifications: create `~/.pushover` with two non-empty lines.
 Line 1 is your user or group key, line 2 is the app API token. When this file
 exists, Science will send a notification whenever it detects a new best result,
 including the metric values and percent improvement. Task runs will also send a
-✅/❌ notification with the task summary.
+✅/❌ notification with the task summary. Watch runs send a notification when the
+loop stops.
 
 Run a task file across a list file:
 
@@ -201,8 +206,9 @@ the same conversation and returns only the agent's message.
 
 Runs a long-lived agent session and periodically "ticks" it with the current
 local time and a reminder of `prompt`. Each tick expects JSON with keys:
-`status` (one line), `continue` (bool), and `comments` (string). The loop stops
-when `continue` is false.
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry. The loop stops when
+`continue` is false and sends a Pushover notification (when configured).
 
 ### `task(prompt, check=None, max_iterations=10, cwd=None, yolo=True, flags=None, progress=False, set_up=None, tear_down=None, on_success=None, on_failure=None) -> str`
 

{codexapi-0.6.3 → codexapi-0.6.5}/README.md

@@ -113,7 +113,11 @@ Use `--no-yolo` to run Codex with `--full-auto` instead.
 
 Watch mode periodically ticks a long-running agent session with the current time
 and prints JSON status updates. The agent controls the loop by setting
-`continue` to true/false in its JSON response.
+`continue` to true/false in its JSON response. Each tick expects JSON keys:
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry before stopping with an
+error. When `~/.pushover` is configured, watch sends a notification when it
+stops.
 
 ```bash
 codexapi watch 5 "Run the benchmark and wait for results."
@@ -147,7 +151,8 @@ Optional Pushover notifications: create `~/.pushover` with two non-empty lines.
 Line 1 is your user or group key, line 2 is the app API token. When this file
 exists, Science will send a notification whenever it detects a new best result,
 including the metric values and percent improvement. Task runs will also send a
-✅/❌ notification with the task summary.
+✅/❌ notification with the task summary. Watch runs send a notification when the
+loop stops.
 
 Run a task file across a list file:
 
@@ -186,8 +191,9 @@ the same conversation and returns only the agent's message.
 
 Runs a long-lived agent session and periodically "ticks" it with the current
 local time and a reminder of `prompt`. Each tick expects JSON with keys:
-`status` (one line), `continue` (bool), and `comments` (string). The loop stops
-when `continue` is false.
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry. The loop stops when
+`continue` is false and sends a Pushover notification (when configured).
 
 ### `task(prompt, check=None, max_iterations=10, cwd=None, yolo=True, flags=None, progress=False, set_up=None, tear_down=None, on_success=None, on_failure=None) -> str`
 

{codexapi-0.6.3 → codexapi-0.6.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codexapi"
-version = "0.6.3"
+version = "0.6.5"
 description = "Minimal Python API for running the Codex CLI."
 readme = "README.md"
 requires-python = ">=3.8"

{codexapi-0.6.3 → codexapi-0.6.5}/src/codexapi/__init__.py

@@ -27,4 +27,4 @@ __all__ = [
     "task_result",
     "watch",
 ]
-__version__ = "0.6.3"
+__version__ = "0.6.5"

{codexapi-0.6.3 → codexapi-0.6.5}/src/codexapi/cli.py

@@ -1543,6 +1543,8 @@ def main(argv=None):
             watch(args.minutes, prompt, args.cwd, args.yolo, args.flags)
         except KeyboardInterrupt:
             raise SystemExit(130)
+        except Exception as exc:
+            raise SystemExit(str(exc) or "watch failed") from None
         return
     if args.command == "task":
         if args.project:

{codexapi-0.6.3 → codexapi-0.6.5}/src/codexapi/pushover.py

@@ -15,7 +15,7 @@ _PUSHOVER_URL = "https://api.pushover.net/1/messages.json"
 _MAX_MESSAGE = 1024
 
 _STARTUP_MESSAGE = (
-    "Pushover user and app keys read, notifications for task and science enabled."
+    "Pushover user and app keys read, notifications for task/science/watch enabled."
 )
 
 

{codexapi-0.6.3 → codexapi-0.6.5}/src/codexapi/watch.py

@@ -6,17 +6,26 @@ small JSON status payload so the loop can decide whether to continue.
 """
 
 import json
+import sys
 import time
 from datetime import datetime
 
 from .agent import Agent
-
+from .pushover import Pushover
+
+_WELCOME_PROMPT = (
+    "Welcome! Today you are running in an autonomous loop that will enable you to return to a long-running task "
+    "or system at regular intervals to perform tasks or move towards goals defined by the user's instructions below. "
+    "Please follow the instructions completely before responding to the user. Each time you respond to the user, the "
+    "system will wait for {minutes} minutes and will then wake you up to check for any changes or progress and continue "
+    "your work. Every reply must be JSON in the specific format described at the end of this message."
+)
 _JSON_INSTRUCTIONS = (
     "Respond with JSON only (no markdown/backticks/extra text).\n"
     "Return a single JSON object with keys:\n"
     "  status: string (one line)\n"
     "  continue: boolean\n"
-    "  comments: string\n"
+    "  comments: string (optional)\n"
     "To stop this watch loop, set continue to false."
 )
 
@@ -43,6 +52,9 @@ def watch(minutes, prompt, cwd=None, yolo=True, flags=None):
 
     interval = minutes * 60
     session = Agent(cwd, yolo, None, flags)
+    pushover = Pushover()
+    pushover.ensure_ready()
+    title = _format_title(prompt)
 
     last_sent = None
     last_result = None
@@ -55,13 +67,36 @@ def watch(minutes, prompt, cwd=None, yolo=True, flags=None):
         last_sent = sent_at
 
         now = datetime.now().astimezone().isoformat(timespec="seconds")
-        message = _build_tick_prompt(prompt, now, elapsed, tick)
+        message = _build_tick_prompt(prompt, now, elapsed, tick, minutes)
         output = session(message)
-        result = _parse_status(output)
+        try:
+            result = _parse_status(output)
+        except ValueError as exc:
+            print(
+                f"[watch {tick} {now}] Invalid JSON from agent, requesting retry: {exc}",
+                file=sys.stderr,
+            )
+            retry_prompt = _json_retry_prompt(prompt, tick, str(exc), output)
+            retry_output = session(retry_prompt)
+            try:
+                result = _parse_status(retry_output)
+            except ValueError as exc2:
+                details = _format_json_double_failure(
+                    str(exc),
+                    output,
+                    str(exc2),
+                    retry_output,
+                )
+                pushover.send(title, f"Watch stopped (invalid JSON).\n{details}")
+                raise RuntimeError(
+                    "Agent was unable to provide valid JSON output after retry.\n"
+                    + details
+                ) from None
         last_result = result
         _print_status(now, elapsed, tick, result)
 
         if not result["continue"]:
+            pushover.send(title, _format_stop_message(tick, now, result))
             return last_result
 
         next_tick = sent_at + interval
@@ -70,11 +105,23 @@ def watch(minutes, prompt, cwd=None, yolo=True, flags=None):
             time.sleep(sleep_seconds)
 
 
-def _build_tick_prompt(prompt, now, elapsed, tick):
-    lines = [
-        f"Tick {tick}.",
-        f"Local time now: {now}",
-    ]
+def _build_tick_prompt(prompt, now, elapsed, tick, minutes):
+    lines = []
+
+    if tick == 1:
+        lines.extend(
+            [
+                _WELCOME_PROMPT.format(minutes=minutes),
+                "",
+            ]
+        )
+
+    lines.extend(
+        [
+            f"Tick {tick}.",
+            f"Local time now: {now}",
+        ]
+    )
     if elapsed is not None:
         lines.append(
             "Time since last tick: "
@@ -131,6 +178,77 @@ def _parse_status(output):
     }
 
 
+def _json_retry_prompt(prompt, tick, error, output):
+    snippet = _snippet(output, 600)
+    lines = [
+        f"Your last message (tick {tick}) was not valid JSON.",
+        f"Error: {error}",
+        "",
+        "Here is your previous output (truncated):",
+        snippet,
+        "",
+        "Please try again and respond with JSON only.",
+        "Return a fresh status update in the required JSON format.",
+        "If you want to ask the user a question, put it in comments.",
+        "",
+        _JSON_INSTRUCTIONS,
+    ]
+    return "\n".join(lines).strip()
+
+
+def _format_title(prompt):
+    text = _single_line(prompt).strip() or "codexapi watch"
+    if len(text) > 60:
+        text = text[:57] + "..."
+    return f"Watch: {text}"
+
+
+def _format_stop_message(tick, now, result):
+    status = _single_line(result.get("status") or "").strip()
+    header = f"Watch stopped at tick {tick} ({now})."
+    if status:
+        header = f"{header} {status}"
+    comments = (result.get("comments") or "").strip()
+    if comments:
+        return f"{header}\n{comments}"
+    return header
+
+
+def _format_json_failure(error, output):
+    snippet = _snippet(output, 600)
+    return "\n".join(
+        [
+            f"Error: {error}",
+            "",
+            "Last output (truncated):",
+            snippet,
+        ]
+    ).strip()
+
+
+def _format_json_double_failure(error_1, output_1, error_2, output_2):
+    first = _format_json_failure(error_1, output_1)
+    second = _format_json_failure(error_2, output_2)
+    return "\n".join(
+        [
+            "First attempt:",
+            first,
+            "",
+            "Second attempt:",
+            second,
+        ]
+    ).strip()
+
+
+def _snippet(text, limit):
+    text = str(text or "").strip()
+    if not text:
+        return "(empty)"
+    if len(text) <= limit:
+        return text
+    return text[:limit].rstrip() + "..."
+
+
 def _maybe_strip_code_fence(text):
     if not text.startswith("```"):
         return text
@@ -177,4 +295,3 @@ def _print_status(now, elapsed, tick, result):
     comments = result.get("comments") or ""
     if comments.strip():
         print(comments.rstrip())
-

{codexapi-0.6.3 → codexapi-0.6.5/src/codexapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codexapi
-Version: 0.6.3
+Version: 0.6.5
 Summary: Minimal Python API for running the Codex CLI.
 License: MIT
 Keywords: codex,agent,cli,openai
@@ -128,7 +128,11 @@ Use `--no-yolo` to run Codex with `--full-auto` instead.
 
 Watch mode periodically ticks a long-running agent session with the current time
 and prints JSON status updates. The agent controls the loop by setting
-`continue` to true/false in its JSON response.
+`continue` to true/false in its JSON response. Each tick expects JSON keys:
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry before stopping with an
+error. When `~/.pushover` is configured, watch sends a notification when it
+stops.
 
 ```bash
 codexapi watch 5 "Run the benchmark and wait for results."
@@ -162,7 +166,8 @@ Optional Pushover notifications: create `~/.pushover` with two non-empty lines.
 Line 1 is your user or group key, line 2 is the app API token. When this file
 exists, Science will send a notification whenever it detects a new best result,
 including the metric values and percent improvement. Task runs will also send a
-✅/❌ notification with the task summary.
+✅/❌ notification with the task summary. Watch runs send a notification when the
+loop stops.
 
 Run a task file across a list file:
 
@@ -201,8 +206,9 @@ the same conversation and returns only the agent's message.
 
 Runs a long-lived agent session and periodically "ticks" it with the current
 local time and a reminder of `prompt`. Each tick expects JSON with keys:
-`status` (one line), `continue` (bool), and `comments` (string). The loop stops
-when `continue` is false.
+`status` (one line), `continue` (bool), and optional `comments` (string). If the
+JSON is invalid, watch asks the agent once to retry. The loop stops when
+`continue` is false and sends a Pushover notification (when configured).
 
 ### `task(prompt, check=None, max_iterations=10, cwd=None, yolo=True, flags=None, progress=False, set_up=None, tear_down=None, on_success=None, on_failure=None) -> str`