Add desktop shell prompt bridge

This commit is contained in:
jwinterm
2026-07-07 22:08:09 -04:00
parent 3906964c93
commit 86ed9aeb5c
8 changed files with 329 additions and 27 deletions
+23 -3
View File
@@ -8,6 +8,9 @@ import unittest
from unittest.mock import patch
from ampbrowser.cli import main
from ampbrowser.config import AppConfig
from ampbrowser.desktop_shell import DesktopShellResult
from ampbrowser.launch import prepare_open
from ampbrowser.transport_manager import ManagedTransportResult
from ampbrowser.transports import TransportStatus
@@ -25,7 +28,7 @@ class CliOpenTest(unittest.TestCase):
)
with patch("ampbrowser.plan.inspect_transport", return_value=status):
with patch("ampbrowser.cli.ensure_transport_ready") as ensure_transport_ready:
with patch("ampbrowser.open_runner.ensure_transport_ready") as ensure_transport_ready:
with patch.object(sys, "stdout", new_callable=io.StringIO) as stdout:
code = main(["open", "http://example.onion/", "--launch"])
@@ -69,8 +72,8 @@ class CliOpenTest(unittest.TestCase):
)
with patch("ampbrowser.plan.inspect_transport", return_value=status):
with patch("ampbrowser.cli.ensure_transport_ready", return_value=transport_result) as ensure_transport_ready:
with patch("ampbrowser.cli.execute_open", side_effect=fake_execute) as execute_open:
with patch("ampbrowser.open_runner.ensure_transport_ready", return_value=transport_result) as ensure_transport_ready:
with patch("ampbrowser.open_runner.execute_open", side_effect=fake_execute) as execute_open:
with patch.object(sys, "stdout", new_callable=io.StringIO) as stdout:
code = main(["open", "http://example.onion/", "--yes", "--launch"])
@@ -86,6 +89,23 @@ class CliOpenTest(unittest.TestCase):
self.assertIn("transport_setup_pid=1234", output)
self.assertIn("transport_setup_endpoint=socks5://127.0.0.1:9050", output)
def test_shell_command_prints_desktop_shell_result(self) -> None:
config = AppConfig(runtime_path="/opt/ampb/firefox", transport_modes={})
open_plan = prepare_open("https://wownero.org/", config=config)
result = DesktopShellResult(open_plan=open_plan, prompt_shown=False, prompt_approved=False)
with patch("ampbrowser.cli.launch_desktop_shell", return_value=result) as shell:
with patch.object(sys, "stdout", new_callable=io.StringIO) as stdout:
code = main(["shell", "https://wownero.org/"])
self.assertEqual(0, code)
shell.assert_called_once()
output = stdout.getvalue()
self.assertIn("AMPBROWSER_SHELL", output)
self.assertIn("status=ready", output)
self.assertIn("prompt_shown=false", output)
self.assertIn("prompt_approved=false", output)
if __name__ == "__main__":
unittest.main()
+103
View File
@@ -0,0 +1,103 @@
from __future__ import annotations
from dataclasses import replace
from pathlib import Path
import tempfile
import unittest
from unittest.mock import patch
from ampbrowser.config import AppConfig
from ampbrowser.desktop_shell import launch_desktop_shell
from ampbrowser.transports import TransportStatus
class DesktopShellTest(unittest.TestCase):
def test_shell_cancel_does_not_launch(self) -> None:
status = TransportStatus(
transport="tor",
installed=True,
running=False,
endpoint="socks5://127.0.0.1:9050",
adoptable=False,
manage_supported=True,
note="Tor SOCKS proxy",
)
with tempfile.TemporaryDirectory() as tmp:
with patch("ampbrowser.plan.inspect_transport", return_value=status):
with patch("ampbrowser.desktop_shell.launch_open_plan") as launch:
result = launch_desktop_shell(
"http://example.onion/",
config=AppConfig(transport_modes={}),
root=Path(tmp),
prompt_driver=lambda open_plan: False,
)
self.assertEqual("cancelled", result.open_plan.status)
self.assertTrue(result.prompt_shown)
self.assertFalse(result.prompt_approved)
launch.assert_not_called()
def test_shell_approval_launches_approved_plan(self) -> None:
status = TransportStatus(
transport="tor",
installed=True,
running=False,
endpoint="socks5://127.0.0.1:9050",
adoptable=False,
manage_supported=True,
note="Tor SOCKS proxy",
)
def fake_launch(open_plan, *, config: AppConfig, root: Path):
self.assertEqual("setup-approved", open_plan.status)
return replace(open_plan, status="launched", dry_run=False, browser_pid=1234)
with tempfile.TemporaryDirectory() as tmp:
with patch("ampbrowser.plan.inspect_transport", return_value=status):
with patch("ampbrowser.desktop_shell.launch_open_plan", side_effect=fake_launch) as launch:
result = launch_desktop_shell(
"http://example.onion/",
config=AppConfig(transport_modes={}),
root=Path(tmp),
prompt_driver=lambda open_plan: True,
)
self.assertEqual("launched", result.open_plan.status)
self.assertEqual(1234, result.open_plan.browser_pid)
self.assertTrue(result.prompt_shown)
self.assertTrue(result.prompt_approved)
launch.assert_called_once()
def test_shell_auto_approve_skips_prompt_driver(self) -> None:
status = TransportStatus(
transport="tor",
installed=True,
running=False,
endpoint="socks5://127.0.0.1:9050",
adoptable=False,
manage_supported=True,
note="Tor SOCKS proxy",
)
def fake_launch(open_plan, *, config: AppConfig, root: Path):
return replace(open_plan, status="launched", dry_run=False, browser_pid=1234)
with tempfile.TemporaryDirectory() as tmp:
with patch("ampbrowser.plan.inspect_transport", return_value=status):
with patch("ampbrowser.desktop_shell.launch_open_plan", side_effect=fake_launch):
result = launch_desktop_shell(
"http://example.onion/",
config=AppConfig(transport_modes={}),
root=Path(tmp),
auto_approve=True,
prompt_driver=lambda open_plan: False,
)
self.assertEqual("launched", result.open_plan.status)
self.assertFalse(result.prompt_shown)
self.assertTrue(result.prompt_approved)
if __name__ == "__main__":
unittest.main()