optio-opencode 0.1.9__tar.gz → 0.2.1__tar.gz

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-opencode
-Version: 0.1.9
+Version: 0.2.1
 Summary: Run opencode web as an optio task; local subprocess or remote via SSH.
 Author-email: Kristof Csillag <kristof.csillag@deai-labs.com>
 License-Expression: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: optio-core<0.3,>=0.2
 Requires-Dist: optio-host<0.3,>=0.2
-Requires-Dist: optio-agents<0.2,>=0.1
+Requires-Dist: optio-agents<0.3,>=0.2
 Requires-Dist: asyncssh>=2.14
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "optio-opencode"
-version = "0.1.9"
+version = "0.2.1"
 description = "Run opencode web as an optio task; local subprocess or remote via SSH."
 readme = "README.md"
 license = "Apache-2.0"
@@ -30,7 +30,7 @@ dependencies = [
     # 0.1.1 introduces the bind_addr kwarg on Host.establish_tunnel —
     # required for OPTIO_WIDGET_TUNNEL_BIND to work.
     "optio-host>=0.2,<0.3",
-    "optio-agents>=0.1,<0.2",
+    "optio-agents>=0.2,<0.3",
     "asyncssh>=2.14",
 ]
 

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/src/optio_opencode/prompt.py

@@ -81,6 +81,9 @@ the situation as a resume:
 
 If a resume slips past unnoticed, a failing tool call is the
 next-best signal — re-check `./resume.log` then.
+
+You may also be notified of a resume by a `System:` message on your input
+channel; when you see one, follow the `resume.log` procedure above.
 """
 
 

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/src/optio_opencode/session.py

@@ -31,6 +31,7 @@ from optio_core.context import ProcessContext
 from optio_core.models import BasicAuth, TaskInstance
 
 from optio_agents import HookContext
+from optio_agents import RESUME_NOTICE, SYSTEM_MESSAGE_PREFIX
 from optio_host.host import Host, LocalHost, ProcessHandle, RemoteHost
 from optio_host.paths import task_dir
 from optio_agents.protocol.session import _SessionFailed, run_log_protocol_session
@@ -95,74 +96,76 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
     # server (for the seed model default) before terminating it.
     worker_port: int | None = None
 
-    # --- resume decision (BEFORE the protocol session starts) -------------
-    resume_requested = bool(getattr(ctx, "resume", False))
-    snapshot: dict | None = None
-    if resume_requested:
-        snapshot = await load_latest_snapshot(
-            ctx._db, prefix=ctx._prefix, process_id=ctx.process_id,
-        )
+    # Set by _prepare (the driver runs it after the workdir wipe, before the
+    # optio.log tail); read by the body and the teardown finally.
+    resuming = False
 
-    # Connect + install BEFORE deciding fresh vs resume. The resume path
-    # needs ``opencode import`` to replay the saved session DB, which
-    # requires opencode to be installed on the host and resolved to an
-    # absolute path. Hoisting also lets the fresh path skip the redundant
-    # ``host.connect()`` later. ``setup_workdir`` is idempotent (mkdir -p)
-    # and the protocol driver still calls it again for the fresh path —
-    # harmless. Install progress reports through ``ctx``, so the
-    # dashboard sees activity from the very first step.
     await host.connect()
-    await host.setup_workdir()
-    opencode_exec = await host_actions.ensure_opencode_installed(
-        HookContext(ctx, host),
-        install_if_missing=config.install_if_missing,
-        install_dir=config.opencode_install_dir,
-    )
 
-    # Resume restore must run BEFORE the protocol session begins, so the
-    # driver's tail_task does not subscribe to the restored stale optio.log
-    # (which contains last run's DONE / ERROR events). The body below sees
-    # ``resuming`` already decided.
-    resuming = snapshot is not None
-    if resuming:
-        await host.remove_file(opencode_db)
-        try:
-            await host.restore_workdir(_stream_blob(ctx, snapshot["workdirBlobId"]))
-            session_bytes_raw = await _read_blob_bytes(ctx, snapshot["sessionBlobId"])
-            decrypt = config.session_blob_decrypt or (lambda b: b)
-            session_bytes = decrypt(session_bytes_raw)
-            await host_actions.opencode_import(
-                host, opencode_db, session_bytes,
-                opencode_executable=opencode_exec,
-            )
-            # Move the restored log channel out of the way BEFORE the
-            # protocol driver subscribes its tail. The snapshot tar
-            # includes optio.log from the previous run; without rotation,
-            # ``tail -F -n +1`` would re-emit every old DELIVERABLE /
-            # DONE / ERROR line and the resumed process would terminate
-            # within seconds of launch.  Preserve the historical content
-            # by appending it to optio.log.old.
-            await _rotate_optio_log(host)
-            preserved_session_id = snapshot["sessionId"]
-        except Exception as resume_exc:
-            # If the failure was the session-blob decrypt hook raising,
-            # this indicates the snapshot was tampered with or the
-            # consumer's keypair changed. Fail loud — silently dropping
-            # to fresh-start would mask the security-relevant signal.
-            if "decrypt" in repr(resume_exc).lower() and "blob" in repr(resume_exc).lower():
-                _LOG.error(
-                    "resume restore failed inside session_blob_decrypt; "
-                    "refusing to fall through to fresh-start. Operator must "
-                    "investigate the snapshot blob.",
-                )
-                raise
-            _LOG.exception(
-                "resume restore failed; falling back to fresh-start path "
-                "(Mongo blob preserved for inspection)",
+    async def _prepare(host: Host, hook_ctx: HookContext) -> None:
+        """Install opencode and restore a resume snapshot.
+
+        Handed to run_log_protocol_session, which runs it AFTER
+        host.setup_workdir() wiped the workdir and BEFORE it subscribes the
+        optio.log tail. The resume path needs ``opencode import`` to replay
+        the saved session DB (so opencode must be installed + resolved to an
+        absolute path first), and the restored optio.log is rotated away below
+        before the tail can re-emit its stale DELIVERABLE/DONE/ERROR lines.
+        """
+        nonlocal opencode_exec, resuming, preserved_session_id
+        opencode_exec = await host_actions.ensure_opencode_installed(
+            hook_ctx,
+            install_if_missing=config.install_if_missing,
+            install_dir=config.opencode_install_dir,
+        )
+
+        resume_requested = bool(getattr(ctx, "resume", False))
+        snapshot: dict | None = None
+        if resume_requested:
+            snapshot = await load_latest_snapshot(
+                ctx._db, prefix=ctx._prefix, process_id=ctx.process_id,
             )
+
+        resuming = snapshot is not None
+        if resuming:
             await host.remove_file(opencode_db)
-            resuming = False
-            preserved_session_id = None
+            try:
+                await host.restore_workdir(_stream_blob(ctx, snapshot["workdirBlobId"]))
+                session_bytes_raw = await _read_blob_bytes(ctx, snapshot["sessionBlobId"])
+                decrypt = config.session_blob_decrypt or (lambda b: b)
+                session_bytes = decrypt(session_bytes_raw)
+                await host_actions.opencode_import(
+                    host, opencode_db, session_bytes,
+                    opencode_executable=opencode_exec,
+                )
+                # Move the restored log channel out of the way BEFORE the
+                # protocol driver subscribes its tail. The snapshot tar
+                # includes optio.log from the previous run; without rotation,
+                # ``tail -F -n +1`` would re-emit every old DELIVERABLE /
+                # DONE / ERROR line and the resumed process would terminate
+                # within seconds of launch.  Preserve the historical content
+                # by appending it to optio.log.old.
+                await _rotate_optio_log(host)
+                preserved_session_id = snapshot["sessionId"]
+            except Exception as resume_exc:
+                # If the failure was the session-blob decrypt hook raising,
+                # this indicates the snapshot was tampered with or the
+                # consumer's keypair changed. Fail loud — silently dropping
+                # to fresh-start would mask the security-relevant signal.
+                if "decrypt" in repr(resume_exc).lower() and "blob" in repr(resume_exc).lower():
+                    _LOG.error(
+                        "resume restore failed inside session_blob_decrypt; "
+                        "refusing to fall through to fresh-start. Operator must "
+                        "investigate the snapshot blob.",
+                    )
+                    raise
+                _LOG.exception(
+                    "resume restore failed; falling back to fresh-start path "
+                    "(Mongo blob preserved for inspection)",
+                )
+                await host.remove_file(opencode_db)
+                resuming = False
+                preserved_session_id = None
 
     async def _opencode_body(host: Host, hook_ctx: HookContext) -> None:
         """Opencode-specific body that runs inside the protocol driver.
@@ -327,6 +330,13 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
             await _post_opencode_prompt(
                 worker_port, password, session_id, AUTO_START_PROMPT,
             )
+        elif resuming and config.supports_resume:
+            # Push notification: make the resumed agent NOTICE the resume
+            # promptly (resume.log remains the pull-based source of truth).
+            await _post_opencode_prompt(
+                worker_port, password, session_id,
+                f"{SYSTEM_MESSAGE_PREFIX}{RESUME_NOTICE}",
+            )
 
         # --- await opencode subprocess exit -----------------------------
         # The protocol driver runs this body alongside the tail dispatcher
@@ -343,6 +353,14 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
     # --- run the protocol session -----------------------------------------
     # host.connect() already happened up-front (before install + resume).
     session_error: BaseException | None = None
+
+    async def _agent_sender(message: str) -> None:
+        # worker_port / session_id are set by _opencode_body at launch;
+        # password is established at function scope. _post_opencode_prompt
+        # raises on a non-2xx / unreachable worker, which
+        # send_to_agent converts to False.
+        await _post_opencode_prompt(worker_port, password, session_id, message)
+
     try:
         # before_execute is wired manually inside _opencode_body (after
         # install, before launch) per opencode's documented timing.
@@ -352,9 +370,11 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
         await run_log_protocol_session(
             host, ctx,
             body=_opencode_body,
+            prepare=_prepare,
             on_deliverable=config.on_deliverable,
             after_execute=config.after_execute,
             protocol=protocol,
+            agent_sender=_agent_sender,
         )
     except _SessionFailed as fail:
         session_error = fail

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/src/optio_opencode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-opencode
-Version: 0.1.9
+Version: 0.2.1
 Summary: Run opencode web as an optio task; local subprocess or remote via SSH.
 Author-email: Kristof Csillag <kristof.csillag@deai-labs.com>
 License-Expression: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: optio-core<0.3,>=0.2
 Requires-Dist: optio-host<0.3,>=0.2
-Requires-Dist: optio-agents<0.2,>=0.1
+Requires-Dist: optio-agents<0.3,>=0.2
 Requires-Dist: asyncssh>=2.14
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/src/optio_opencode.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/optio_opencode.egg-info/SOURCES.txt
 src/optio_opencode.egg-info/dependency_links.txt
 src/optio_opencode.egg-info/requires.txt
 src/optio_opencode.egg-info/top_level.txt
+tests/test_agent_sender_opencode.py
 tests/test_host_actions.py
 tests/test_host_local.py
 tests/test_host_primitives_local.py
@@ -20,6 +21,7 @@ tests/test_host_remote_resume.py
 tests/test_host_resume.py
 tests/test_prompt.py
 tests/test_purge_seed.py
+tests/test_resume_sentence_opencode.py
 tests/test_sanity.py
 tests/test_seed_config.py
 tests/test_session_blob_hooks.py

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/src/optio_opencode.egg-info/requires.txt

@@ -1,6 +1,6 @@
 optio-core<0.3,>=0.2
 optio-host<0.3,>=0.2
-optio-agents<0.2,>=0.1
+optio-agents<0.3,>=0.2
 asyncssh>=2.14
 
 [dev]

optio_opencode-0.2.1/tests/test_agent_sender_opencode.py

@@ -0,0 +1,29 @@
+import pytest
+
+import optio_opencode.session as S
+from optio_agents import RESUME_NOTICE, SYSTEM_MESSAGE_PREFIX
+
+
+@pytest.mark.asyncio
+async def test_post_prompt_signature_used_by_sender(monkeypatch):
+    """The opencode sender forwards (port, password, session_id, message) to
+    _post_opencode_prompt verbatim. Mirrors the closure built in
+    run_opencode_session."""
+    calls = []
+
+    async def fake_post(port, password, session_id, message):
+        calls.append((port, password, session_id, message))
+
+    monkeypatch.setattr(S, "_post_opencode_prompt", fake_post)
+
+    worker_port, password, session_id = 4321, "pw", "sess-1"
+
+    async def _agent_sender(message: str) -> None:
+        await S._post_opencode_prompt(worker_port, password, session_id, message)
+
+    await _agent_sender("hello")
+    assert calls == [(4321, "pw", "sess-1", "hello")]
+
+
+def test_resume_notice_string():
+    assert f"{SYSTEM_MESSAGE_PREFIX}{RESUME_NOTICE}" == "System: you have been resumed"

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/tests/test_host_local.py

@@ -22,9 +22,27 @@ def local_host(tmp_workdir):
 async def test_setup_workdir_creates_workdir(local_host):
     await local_host.setup_workdir()
     assert os.path.isdir(local_host.workdir)
-    # As of the optio-host split, setup_workdir mkdirs the workdir only.
-    # The protocol-specific deliverables/ + optio.log are owned by the
-    # protocol session driver in optio_agents.protocol.session.
+    # setup_workdir destructively (re)creates the workdir (see the clean-start
+    # test below). The protocol-specific deliverables/ + optio.log are owned by
+    # the protocol session driver in optio_agents.protocol.session.
+
+
+async def test_setup_workdir_wipes_stale_workdir_but_keeps_taskdir(local_host):
+    # Clean-start invariant: a destructive wipe of the workdir on every setup, so
+    # leftovers from a prior run (e.g. a force-cancel that skipped teardown) never
+    # leak into a fresh run. taskdir-side state (opencode.db / .env) lives OUTSIDE
+    # the workdir and must survive.
+    await local_host.setup_workdir()
+    with open(os.path.join(local_host.workdir, "stale.txt"), "w") as fh:
+        fh.write("leftover from a previous run")
+    taskdir_db = os.path.join(local_host.taskdir, "opencode.db")
+    with open(taskdir_db, "w") as fh:
+        fh.write("session transcript")
+
+    await local_host.setup_workdir()
+
+    assert not os.path.exists(os.path.join(local_host.workdir, "stale.txt"))
+    assert os.path.exists(taskdir_db)
 
 
 @pytest.mark.asyncio

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/tests/test_host_primitives_remote.py

@@ -240,3 +240,19 @@ async def test_remote_setup_workdir_sets_taskdir_and_workdir_mode_0o700(remote_h
     res_w = await remote_host._conn.run(f"stat -c %a {qw}", check=True)
     assert res_t.stdout.strip() == "700", f"taskdir mode is {res_t.stdout!r}"
     assert res_w.stdout.strip() == "700", f"workdir mode is {res_w.stdout!r}"
+
+
+@pytest.mark.asyncio
+async def test_remote_setup_workdir_wipes_stale_workdir_but_keeps_taskdir(remote_host: RemoteHost):
+    """Clean-start invariant asserted over SSH (mirrors the local test)."""
+    await remote_host.setup_workdir()
+    qt = shlex.quote(remote_host.taskdir)
+    qw = shlex.quote(remote_host.workdir)
+    await remote_host._conn.run(
+        f"touch {qw}/stale.txt {qt}/opencode.db", check=True,
+    )
+    await remote_host.setup_workdir()
+    stale = await remote_host._conn.run(f"test -e {qw}/stale.txt; echo $?")
+    keep = await remote_host._conn.run(f"test -e {qt}/opencode.db; echo $?")
+    assert stale.stdout.strip() == "1", "workdir was not wiped"
+    assert keep.stdout.strip() == "0", "taskdir state was lost"

optio_opencode-0.2.1/tests/test_resume_sentence_opencode.py

@@ -0,0 +1,7 @@
+from optio_opencode.prompt import _render_resume_section
+
+
+def test_resume_section_mentions_system_notification():
+    section = _render_resume_section(None)
+    assert "`System:` message" in section
+    assert "resume.log" in section

{optio_opencode-0.1.9 → optio_opencode-0.2.1}/tests/test_session_seed.py

@@ -308,9 +308,10 @@ async def test_second_session_consumes_seed(
 async def test_auto_start_posts_on_fresh_and_not_on_resume(
     mongo_db, task_root, _supply_scenario, monkeypatch,
 ):
-    """auto_start=True POSTs the kickoff prompt on a fresh launch and is
-    suppressed on resume (the restored session already carries its
-    conversation)."""
+    """auto_start=True POSTs the kickoff prompt on a fresh launch; on resume
+    the kickoff is suppressed (the restored session already carries its
+    conversation) but a System: resume notice is POSTed so the agent notices
+    the resume."""
     import optio_opencode.session as session_mod
 
     _supply_scenario["name"] = "happy"
@@ -335,19 +336,29 @@ async def test_auto_start_posts_on_fresh_and_not_on_resume(
         # fall back to a fresh launch and POST the kickoff prompt again.
         before_execute=_plant_env,
     ))
-    assert len(posts) == 1
-    posted_session_id, posted_message = posts[0]
-    assert posted_message == session_mod.AUTO_START_PROMPT
-    assert posted_session_id  # a real (pre-created) session id
-
-    # resume the same process → must NOT POST again
+    # The 'happy' scenario also emits a DELIVERABLE, which the mandatory
+    # acknowledgment POSTs as a "deliverable ...: accepted" ack via the same
+    # _post_opencode_prompt. This test is about the kickoff / resume-notice
+    # posts, so filter those out.
+    notice = f"{session_mod.SYSTEM_MESSAGE_PREFIX}{session_mod.RESUME_NOTICE}"
+    kickoffs = [m for _sid, m in posts if m == session_mod.AUTO_START_PROMPT]
+    notices = [m for _sid, m in posts if m == notice]
+    assert kickoffs == [session_mod.AUTO_START_PROMPT]  # kickoff posted exactly once
+    assert notices == []                                # no resume notice on fresh
+    assert all(sid for sid, _m in posts)                # real (pre-created) session ids
+
+    # resume the same process → the kickoff is suppressed, but a System:
+    # resume notice is POSTed so the agent notices the resume.
     ctx_resume = await _make_ctx(mongo_db, pid, resume=True)
     await run_opencode_session(ctx_resume, OpencodeTaskConfig(
         consumer_instructions="(scenario: happy)",
         auto_start=True,
         before_execute=_plant_env,
     ))
-    assert len(posts) == 1, posts
+    kickoffs = [m for _sid, m in posts if m == session_mod.AUTO_START_PROMPT]
+    notices = [m for _sid, m in posts if m == notice]
+    assert kickoffs == [session_mod.AUTO_START_PROMPT]  # no NEW kickoff on resume
+    assert notices == [notice]                          # resume notice posted once
 
 
 def test_post_opencode_prompt_uses_prompt_async_parts_body(monkeypatch):