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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-opencode
-Version: 0.1.4
+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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "optio-opencode"
-version = "0.1.4"
+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"

{optio_opencode-0.1.4 → 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.4 → optio_opencode-0.1.5}/src/optio_opencode/prompt.py

@@ -7,7 +7,7 @@ addressed. The consumer's own task description is then appended verbatim.
 """
 
 
-from optio_agents.protocol.prompt import LOG_CHANNEL_PROMPT
+from optio_agents.protocol import build_log_channel_prompt
 
 
 _OPENCODE_INTRO = """# Coordination protocol with the host (optio-opencode)
@@ -18,9 +18,6 @@ throughout the session.
 """
 
 
-BASE_PROMPT_PRE = _OPENCODE_INTRO + LOG_CHANNEL_PROMPT
-
-
 BASE_PROMPT_POST = """## Task
 
 Here comes the description of your actual task to complete. Throughout
@@ -120,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.
@@ -130,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.4 → optio_opencode-0.1.5}/src/optio_opencode/session.py

@@ -35,6 +35,7 @@ from optio_host.paths import task_dir
 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.4 → 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.4
+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

{optio_opencode-0.1.4 → 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.4 → optio_opencode-0.1.5}/tests/test_session_hooks.py

@@ -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")
 

{optio_opencode-0.1.4 → 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.4 → 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)