optio-opencode 0.1.3__tar.gz → 0.1.5__tar.gz

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-opencode
-Version: 0.1.3
+Version: 0.1.5
 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
@@ -20,8 +20,9 @@ Classifier: Topic :: Software Development :: Code Generators
 Classifier: Framework :: AsyncIO
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: optio-core<0.2,>=0.1
-Requires-Dist: optio-host<0.2,>=0.1
+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: asyncssh>=2.14
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/pyproject.toml

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

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode/__init__.py

@@ -2,9 +2,8 @@
 
 import logging as _logging
 
+from optio_agents import HookContext, HookContextProtocol
 from optio_host import (
-    HookContext,
-    HookContextProtocol,
     HostCommandError,
     RunResult,
     SSHConfig,

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode/host_actions.py

@@ -329,6 +329,7 @@ async def launch_opencode(
     ready_timeout_s: float = 30.0,
     opencode_executable: str = "opencode",
     hostname: str = "127.0.0.1",
+    extra_env: dict[str, str] | None = None,
 ) -> tuple[ProcessHandle, int]:
     """Launch ``opencode web`` on ``host``; wait for the listening URL.
 
@@ -336,10 +337,10 @@ async def launch_opencode(
     and references it via ``$(cat ...)`` in the launch command so the
     literal value never appears on the remote process's argv.
 
-    Lays down no-op browser-opener stubs (xdg-open, gio, open,
-    sensible-browser) under ``<workdir>/bin`` and prepends that
-    directory to PATH so opencode's automatic browser-launch is
-    suppressed.
+    Browser-open suppression is handled by the optio-agents protocol
+    driver (``get_protocol(browser="suppress")``), which installs no-op
+    opener stubs under ``<workdir>/bin`` and returns the ``BROWSER`` /
+    ``PATH`` env additions; the caller passes those in via ``extra_env``.
 
     ``hostname`` is passed to ``opencode web --hostname=`` so callers
     can bind to a non-loopback interface when consumers reach the server
@@ -354,48 +355,35 @@ async def launch_opencode(
     await host.write_text(pw_file, password)
     await host.run_command(f"chmod 600 {host.workdir}/{pw_file}")
 
-    # Browser-suppression bin shadow.
-    for noop in ("xdg-open", "gio", "open", "sensible-browser"):
-        await host.write_text(f"bin/{noop}", "#!/bin/sh\nexit 0\n")
-    chmod_result = await host.run_command(f"chmod +x {host.workdir}/bin/*")
-    if chmod_result.exit_code != 0:
-        # Non-fatal: the noop scripts may fail to be executable, but worst
-        # case opencode tries to open a browser and we just live with it.
-        pass
-
-    # Build cmd: read password from file via $(cat), set BROWSER=true,
-    # cd to workdir so opencode picks up opencode.json.
+    # Build cmd: read password from file via $(cat), cd to workdir so
+    # opencode picks up opencode.json. Browser suppression (the BROWSER
+    # env + the <workdir>/bin PATH prepend that shadows the openers) comes
+    # from the protocol driver's suppress shims, passed in via extra_env.
     #
     # NOTE: do NOT wrap in `bash -lc` / `bash -l`. A login shell sources
     # the user's profile (~/.profile, ~/.bash_profile, /etc/profile),
     # which on most Linux installs rewrites PATH from scratch and
-    # therefore wipes the workdir/bin prefix we set in `env` below. With
-    # the prefix gone, the noop xdg-open / sensible-browser / gio / open
-    # shadows below stop hiding the real ones and opencode succeeds at
-    # opening a real browser window. opencode_executable is an absolute
-    # path (resolved by ensure_opencode_installed), so login-shell PATH
-    # lookup is not needed to find the binary. Let LocalHost / RemoteHost
-    # launch_subprocess do the shell wrapping; we just need the env-var
-    # prefix and $(cat ...) substitution, which any POSIX sh handles.
+    # therefore wipes the workdir/bin prefix carried in `env` below. With
+    # the prefix gone, the suppress stubs stop hiding the real openers and
+    # opencode succeeds at opening a real browser window. opencode_executable
+    # is an absolute path (resolved by ensure_opencode_installed), so
+    # login-shell PATH lookup is not needed to find the binary.
     cmd = (
         f"exec env "
         f"OPENCODE_SERVER_PASSWORD=\"$(cat {shlex.quote(host.workdir + '/' + pw_file)})\" "
-        f"BROWSER=true "
         f"{opencode_executable} web --port=0 --hostname={shlex.quote(hostname)}"
     )
 
-    # Prepend the noop-browsers bin dir to PATH via env on launch_subprocess.
-    workdir_bin = f"{host.workdir}/bin"
-    extra_path = workdir_bin + ":" + os.environ.get("PATH", "/usr/local/bin:/usr/bin:/bin")
     # OPENCODE_DB must point at the same per-task db file used by the
     # subsequent export/import CLI calls. Without this, the server falls
     # back to opencode's global default db while export/import target the
     # taskdir-local file — causing snapshot capture to "Session not found"
     # against an empty file. Convention: opencode.db is a sibling of the
     # workdir under taskdir (session.py: opencode_db = f"{taskdir}/opencode.db").
+    # The browser-suppression env (PATH prepend + BROWSER) comes from extra_env.
     env = {
-        "PATH": extra_path,
         "OPENCODE_DB": f"{host.taskdir}/opencode.db",
+        **(extra_env or {}),
     }
 
     handle = await host.launch_subprocess(cmd, env=env, cwd=host.workdir)

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode/prompt.py

@@ -7,42 +7,14 @@ addressed. The consumer's own task description is then appended verbatim.
 """
 
 
-BASE_PROMPT_PRE = """# Coordination protocol with the host (optio-opencode)
+from optio_agents.protocol import build_log_channel_prompt
+
+
+_OPENCODE_INTRO = """# Coordination protocol with the host (optio-opencode)
 
 You are running inside a coordination harness. Follow these conventions
 throughout the session.
 
-## Log channel
-
-Append one line per entry to `./optio.log` in this directory. Each line
-must start with one of:
-
-- `STATUS:` — progress update for the human. Optional leading percent,
-  e.g. `STATUS: 50% counting my fingers`.
-- `DELIVERABLE:` — absolute or workdir-relative path to a file you've
-  just produced, e.g. `DELIVERABLE: ./deliverables/summary.md`.
-- `DONE` — you have finished the task. May be followed by an optional
-  summary on the same line: `DONE: wrote the report`.
-- `ERROR` — you cannot continue. May be followed by an optional
-  message: `ERROR: provider auth failed`.
-
-**Every entry must end with a newline character (`\\n`).** The host
-reads `optio.log` with a line-oriented tailer that only emits a line
-once it sees `\\n`; an entry written without a trailing newline (e.g.
-via `printf 'DONE'`) will be buffered indefinitely and never reach the
-host. Use `echo`, `>>` redirection of a heredoc, or any other mechanism
-that guarantees a trailing newline. If unsure, double-check with
-`tail -c 1 ./optio.log` — the result must be a newline.
-
-After writing `DONE` or `ERROR`, the session will terminate. Do not
-write further lines.
-
-## Deliverables
-
-Place files you want to hand back to the host under `./deliverables/`.
-For each file, write a `DELIVERABLE:` log line *after* the file exists
-and its contents are final. The host fetches files by reading these
-log lines.
 """
 
 
@@ -145,6 +117,7 @@ def compose_agents_md(
     consumer_instructions: str,
     *,
     workdir_exclude: list[str] | None,
+    documentation: str | None = None,
     supports_resume: bool = True,
 ) -> str:
     """Build the full AGENTS.md body.
@@ -155,12 +128,18 @@ def compose_agents_md(
         callers must pass it explicitly to prevent silent desync between
         archive.py defaults and the prompt's claims about what's preserved.
         Pass None to render with the framework defaults.
+      documentation: the keyword-protocol block; the session passes
+        ``get_protocol(browser="suppress").documentation``. Defaults (for
+        unit tests / standalone callers) to opencode's ``suppress`` docs.
       supports_resume: when False, the resume-detection section is omitted
         from the prompt. Default True.
     """
+    if documentation is None:
+        documentation = build_log_channel_prompt("suppress")
+    base_prompt_pre = _OPENCODE_INTRO + documentation
     body = consumer_instructions.rstrip()
     if supports_resume:
         resume_block = _render_resume_section(workdir_exclude) + "\n"
     else:
         resume_block = ""
-    return f"{BASE_PROMPT_PRE}\n{resume_block}{BASE_PROMPT_POST}\n{body}\n"
+    return f"{base_prompt_pre}\n{resume_block}{BASE_PROMPT_POST}\n{body}\n"

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode/session.py

@@ -7,7 +7,7 @@ Section 4 of the design spec.  The public entry point is the factory
 
 Most of the per-session work is generic log/deliverables protocol
 plumbing (parse ``optio.log``, fetch deliverables, watch for cancel) and
-lives in ``optio_host.protocol.run_log_protocol_session``.  This module
+lives in ``optio_agents.protocol.run_log_protocol_session``.  This module
 keeps only the opencode-specific work — write AGENTS.md / opencode.json,
 install/launch the opencode binary, set up tunnel and widget, and the
 resume/snapshot brackets around the protocol session.
@@ -29,12 +29,13 @@ from typing import AsyncIterator, Callable
 from optio_core.context import ProcessContext
 from optio_core.models import BasicAuth, TaskInstance
 
-from optio_host.context import HookContext
+from optio_agents import HookContext
 from optio_host.host import Host, LocalHost, ProcessHandle, RemoteHost
 from optio_host.paths import task_dir
-from optio_host.protocol.session import _SessionFailed, run_log_protocol_session
+from optio_agents.protocol.session import _SessionFailed, run_log_protocol_session
 from optio_opencode import host_actions
 from optio_opencode.prompt import compose_agents_md
+from optio_agents import get_protocol
 from optio_opencode.snapshots import (
     insert_snapshot,
     load_latest_snapshot,
@@ -71,6 +72,7 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
     """Execute function body for one optio-opencode task instance."""
     # --- per-task filesystem layout ---------------------------------------
     host: Host = _build_host(config, ctx.process_id)
+    protocol = get_protocol(browser="suppress")
     taskdir = task_dir(
         ssh=config.ssh, process_id=ctx.process_id, consumer_name="optio-opencode",
     )
@@ -172,6 +174,7 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
                 "AGENTS.md",
                 compose_agents_md(
                     config.consumer_instructions,
+                    documentation=protocol.documentation,
                     workdir_exclude=config.workdir_exclude,
                     supports_resume=config.supports_resume,
                 ),
@@ -241,6 +244,7 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
             ready_timeout_s=READY_TIMEOUT_S,
             opencode_executable=opencode_exec,
             hostname=opencode_hostname,
+            extra_env=hook_ctx.browser_launch_env,
         )
         launched_handle = handle
 
@@ -308,6 +312,7 @@ async def run_opencode_session(ctx: ProcessContext, config: OpencodeTaskConfig)
             body=_opencode_body,
             on_deliverable=config.on_deliverable,
             after_execute=config.after_execute,
+            protocol=protocol,
         )
     except _SessionFailed as fail:
         session_error = fail

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode/types.py

@@ -1,16 +1,15 @@
 """Public data types for optio-opencode consumers.
 
-The generic ``DeliverableCallback`` / ``HookCallback`` types and
-``SSHConfig`` are owned by ``optio-host`` (since they describe the
-log/deliverables protocol and SSH config in general). This module
-re-exports them so existing ``from optio_opencode.types import ...``
-imports keep working unchanged.
+The generic ``DeliverableCallback`` / ``HookCallback`` types are owned by
+``optio-agents`` (they describe the log/deliverables protocol); ``SSHConfig``
+is owned by ``optio-host``. This module re-exports them so existing
+``from optio_opencode.types import ...`` imports keep working unchanged.
 """
 
 from dataclasses import dataclass, field
 from typing import Any, Callable
 
-from optio_host.protocol.session import DeliverableCallback, HookCallback
+from optio_agents.protocol.session import DeliverableCallback, HookCallback
 from optio_host.types import SSHConfig
 
 

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/src/optio_opencode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-opencode
-Version: 0.1.3
+Version: 0.1.5
 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
@@ -20,8 +20,9 @@ Classifier: Topic :: Software Development :: Code Generators
 Classifier: Framework :: AsyncIO
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: optio-core<0.2,>=0.1
-Requires-Dist: optio-host<0.2,>=0.1
+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: asyncssh>=2.14
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"

optio_opencode-0.1.5/src/optio_opencode.egg-info/requires.txt

@@ -0,0 +1,8 @@
+optio-core<0.3,>=0.2
+optio-host<0.3,>=0.2
+optio-agents<0.2,>=0.1
+asyncssh>=2.14
+
+[dev]
+pytest>=8.0
+pytest-asyncio>=0.23

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_host_local.py

@@ -24,7 +24,7 @@ async def test_setup_workdir_creates_workdir(local_host):
     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_host.protocol.session.
+    # protocol session driver in optio_agents.protocol.session.
 
 
 @pytest.mark.asyncio
@@ -136,7 +136,7 @@ async def test_tail_file_yields_appended_lines(local_host):
 
 
 async def test_fetch_deliverable_text(local_host):
-    from optio_host.protocol.session import fetch_deliverable_text
+    from optio_agents.protocol.session import fetch_deliverable_text
     await local_host.setup_workdir()
     os.makedirs(os.path.join(local_host.workdir, "deliverables"), exist_ok=True)
     target = os.path.join(local_host.workdir, "deliverables", "a.txt")
@@ -146,7 +146,7 @@ async def test_fetch_deliverable_text(local_host):
 
 
 async def test_fetch_deliverable_non_utf8_raises(local_host):
-    from optio_host.protocol.session import fetch_deliverable_text
+    from optio_agents.protocol.session import fetch_deliverable_text
     await local_host.setup_workdir()
     os.makedirs(os.path.join(local_host.workdir, "deliverables"), exist_ok=True)
     target = os.path.join(local_host.workdir, "deliverables", "b.bin")

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_prompt.py

@@ -97,3 +97,14 @@ def test_compose_agents_md_empty_excludes_renders_no_paths_excluded_copy():
     # The 'inside an excluded subdirectory' clause should be absent (it's
     # only relevant when there are exclusions to live inside).
     assert "inside an excluded subdirectory" not in out
+
+
+def test_opencode_docs_omit_browser_keyword():
+    """opencode suppresses browser-opens, so it must NOT advertise BROWSER:."""
+    out = _compose()
+    assert "BROWSER:" not in out
+
+
+def test_opencode_docs_include_suppress_note():
+    out = _compose()
+    assert "impossible to launch a browser" in out

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_session_hooks.py

@@ -97,7 +97,7 @@ class _RecordingFakeHost:
         return b""
 
     async def run_command(self, *a, **kw):
-        from optio_host.context import RunResult
+        from optio_host.host import RunResult
         self.timeline.append(f"run_command:{a[0]}")
         return RunResult(stdout="", stderr="", exit_code=0)
 
@@ -118,7 +118,7 @@ def _patch_host_actions(monkeypatch, host):
     async def _version(_host, *, opencode_executable="opencode"):
         return None
 
-    async def _launch(_host, _password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1"):
+    async def _launch(_host, _password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1", extra_env=None):
         host.timeline.append("launch_opencode")
         raise RuntimeError("test never gets past launch")
 
@@ -255,8 +255,8 @@ async def test_on_deliverable_receives_hook_ctx_and_can_use_host_primitives(tmp_
     )
     # We don't run a full session here; we directly invoke
     # _deliverable_fetch_loop with a constructed HookContext.
-    from optio_host.protocol.session import _deliverable_fetch_loop
-    from optio_host.context import HookContext
+    from optio_agents.protocol.session import _deliverable_fetch_loop
+    from optio_agents import HookContext
 
     queue = asyncio.Queue()
     await queue.put(("/wd/deliverables/x.txt", "x.txt"))

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_session_local.py

@@ -105,7 +105,7 @@ def _supply_scenario(monkeypatch):
     orig_launch = host_actions.launch_opencode
     scenario_holder: dict = {"name": "happy"}
 
-    async def _launch(host, password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1"):
+    async def _launch(host, password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1", extra_env=None):
         del opencode_executable  # we substitute fully
         return await orig_launch(
             host, password,
@@ -115,6 +115,7 @@ def _supply_scenario(monkeypatch):
                 f"--scenario {scenario_holder['name']}"
             ),
             hostname=hostname,
+            extra_env=extra_env,
         )
     monkeypatch.setattr(host_actions, "launch_opencode", _launch)
 

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_session_resume.py

@@ -53,7 +53,7 @@ def _supply_scenario(monkeypatch):
     orig_launch = host_actions.launch_opencode
     holder = {"name": "happy"}
 
-    async def _launch(host, password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1"):
+    async def _launch(host, password, *, ready_timeout_s=30.0, opencode_executable="opencode", hostname="127.0.0.1", extra_env=None):
         del opencode_executable
         return await orig_launch(
             host, password,
@@ -62,6 +62,7 @@ def _supply_scenario(monkeypatch):
                 f"{sys.executable} {FAKE_OPENCODE} --scenario {holder['name']}"
             ),
             hostname=hostname,
+            extra_env=extra_env,
         )
     monkeypatch.setattr(host_actions, "launch_opencode", _launch)
 

{optio_opencode-0.1.3 → optio_opencode-0.1.5}/tests/test_smart_install.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from optio_host.context import RunResult
+from optio_host.host import RunResult
 
 
 class _FakeHost:
@@ -170,7 +170,7 @@ class _ExecutingFakeCtx:
 
 
 async def test_install_opencode_from_zip_happy_path(zip_server, tmp_path):
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_host.host import LocalHost
     from optio_opencode.host_actions import _install_opencode_from_zip
 
@@ -212,7 +212,7 @@ async def test_install_opencode_from_zip_happy_path(zip_server, tmp_path):
 
 async def test_install_opencode_from_zip_cleans_up_tempdir(zip_server, tmp_path):
     """The temp dir created on the host should be removed after install."""
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_host.host import LocalHost
     from optio_opencode.host_actions import _install_opencode_from_zip
 
@@ -264,7 +264,7 @@ async def test_install_opencode_from_zip_cleans_up_tempdir(zip_server, tmp_path)
 
 async def test_ensure_opencode_installed_returns_existing_path_when_ok(monkeypatch):
     """When smart-install says 'ok', resolve the on-PATH path and return it."""
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_opencode import host_actions
 
     async def stub_check(host, *, install_dir=None):
@@ -295,7 +295,7 @@ async def test_ensure_opencode_installed_returns_existing_path_when_ok(monkeypat
 
 
 async def test_ensure_opencode_installed_raises_when_install_disabled(monkeypatch):
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_opencode import host_actions
 
     async def stub_check(host, *, install_dir=None):
@@ -324,7 +324,7 @@ async def test_ensure_opencode_installed_installs_when_download_required(
     monkeypatch, zip_server, tmp_path,
 ):
     """End-to-end with a real LocalHost + fake zip server: install path."""
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_host.host import LocalHost
     from optio_opencode import host_actions
 
@@ -394,7 +394,7 @@ async def test_ensure_opencode_installed_respects_custom_install_dir(
 ):
     """End-to-end: an explicit ``install_dir`` flows through to the
     install target and to the post-ok ``command -v`` PATH augmentation."""
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_host.host import LocalHost
     from optio_opencode import host_actions
 
@@ -439,7 +439,7 @@ async def test_ensure_opencode_installed_default_install_dir_is_home_local_bin(
 ):
     """When ``install_dir`` is omitted, the default is
     ``<host_home>/.local/bin``."""
-    from optio_host.context import HookContext
+    from optio_agents import HookContext
     from optio_opencode import host_actions
 
     fake_home = tmp_path / "home"

optio_opencode-0.1.3/src/optio_opencode.egg-info/requires.txt

@@ -1,7 +0,0 @@
-optio-core<0.2,>=0.1
-optio-host<0.2,>=0.1
-asyncssh>=2.14
-
-[dev]
-pytest>=8.0
-pytest-asyncio>=0.23