The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.
TypeScript 3d-modelingagent-frameworkagent-harnessai-agentscadclaude-codecodexcoding-agentsdeveloper-toolsesp32game-developmentmcp-servermulti-agentopen-hardwareopencodeopenharnesspcbroboticsterminaltmux
fix(os): wait for the existing Harness session before migrating settings (#1006)
Deec7099956371b
diff --git a/os/root/usr/lib/harness-os/session-settings.py b/os/root/usr/lib/harness-os/session-settings.pyindex 6dd76f0c3..1150f8b33 100644--- a/os/root/usr/lib/harness-os/session-settings.py+++ b/os/root/usr/lib/harness-os/session-settings.py@@ -1,12 +1,29 @@#!/usr/bin/env python3"""Migrate earlier OS defaults through hn's API after its saved session attaches."""+import osfrom pathlib import Pathimport subprocessimport time+def server_socket():+ if target := os.environ.get('HN_SOCKET'):+ return Path(target)+ # Match tui/src/ipc.rs: an explicitly empty tmpdir is a relative directory,+ # while an empty server name selects the default name.+ base = os.environ.get('HN_TMPDIR', os.environ.get('TMUX_TMPDIR', '/tmp'))+ name = os.environ.get('HN_SOCKET_NAME') or 'default'+ return Path(base) / ('hn-' + str(os.getuid())) / (name + '.sock')++def hn(*args):- return subprocess.run(['/usr/bin/hn', *args], check=True, text=True,+ target = server_socket()+ if not target.is_socket():+ raise FileNotFoundError('Waiting for the OS hn server socket: ' + str(target))+ # ExecStartPost can run before foot starts its hn child. An unqualified CLI+ # command would create a headless owner of the saved workspace in that gap.+ # A stale or disappearing explicit socket fails into main's bounded retry.+ return subprocess.run(['/usr/bin/hn', '-S', str(target), *args], check=True, text=True,capture_output=True, timeout=3).stdout.strip()diff --git a/os/tests/test_session_settings.py b/os/tests/test_session_settings.pyindex 583fbe639..aa9764490 100644--- a/os/tests/test_session_settings.py+++ b/os/tests/test_session_settings.py@@ -1,7 +1,11 @@import importlib.util+import osfrom pathlib import Path+import socket+import subprocess+import tempfileimport unittest-from unittest.mock import patch+from unittest.mock import call, patchspec = importlib.util.spec_from_file_location('session_settings',Path(__file__).resolve().parents[1] / 'root/usr/lib/harness-os/session-settings.py')@@ -29,3 +33,101 @@ class SavedSessionSettings(unittest.TestCase):with patch.object(settings.Path, 'exists', return_value=True), patch.object(settings, 'migrate') as migrate:settings.main()migrate.assert_not_called()+++class MigrationConnection(unittest.TestCase):+ def setUp(self):+ # Keep real AF_UNIX paths below macOS's pathname-length limit.+ temporary = tempfile.TemporaryDirectory(prefix='hn-settings-', dir='/tmp')+ self.addCleanup(temporary.cleanup)+ self.root = Path(temporary.name)+ environment = patch.dict(os.environ, {'HN_TMPDIR': str(self.root)}, clear=True)+ environment.start()+ self.addCleanup(environment.stop)+ self.target = self.root / ('hn-' + str(os.getuid())) / 'default.sock'++ def bind(self):+ self.target.parent.mkdir(parents=True, exist_ok=True)+ listener = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)+ self.addCleanup(listener.close)+ listener.bind(str(self.target))+ listener.listen()+ return listener++ def test_socket_location_matches_tui_environment_precedence(self):+ cases = [+ ({}, Path('/tmp/hn-1234/default.sock')),+ ({'TMUX_TMPDIR': '/alternate', 'HN_SOCKET_NAME': 'screen'}, Path('/alternate/hn-1234/screen.sock')),+ ({'HN_TMPDIR': '/preferred', 'TMUX_TMPDIR': '/alternate'}, Path('/preferred/hn-1234/default.sock')),+ ({'HN_TMPDIR': '', 'TMUX_TMPDIR': '/alternate'}, Path('hn-1234/default.sock')),+ ({'HN_SOCKET_NAME': '', 'TMUX_TMPDIR': ''}, Path('hn-1234/default.sock')),+ ({'HN_SOCKET': '/chosen/client.sock', 'HN_TMPDIR': '/elsewhere'}, Path('/chosen/client.sock')),+ ({'HN_SOCKET': '', 'HN_SOCKET_NAME': 'screen'}, Path('/tmp/hn-1234/screen.sock')),+ ]+ for environment, expected in cases:+ with self.subTest(environment=environment), patch.dict(os.environ, environment, clear=True), \+ patch.object(settings.os, 'getuid', return_value=1234):+ self.assertEqual(settings.server_socket(), expected)++ def test_missing_or_nonsocket_path_never_invokes_hn(self):+ with patch.object(settings.subprocess, 'run') as run:+ with self.assertRaises(FileNotFoundError):+ settings.hn('show-options', '-gv', 'status-right')+ self.target.parent.mkdir(parents=True)+ self.target.write_text('not a server')+ with self.assertRaises(FileNotFoundError):+ settings.hn('show-options', '-gv', 'status-right')+ self.target.unlink()+ self.target.mkdir()+ with self.assertRaises(FileNotFoundError):+ settings.hn('show-options', '-gv', 'status-right')+ run.assert_not_called()++ def test_available_socket_is_always_explicit_and_command_is_bounded(self):+ self.bind()+ with patch.object(settings.subprocess, 'run', return_value=subprocess.CompletedProcess([], 0, 'my footer\n')) as run:+ self.assertEqual(settings.hn('show-options', '-gv', 'status-right'), 'my footer')+ run.assert_called_once_with(['/usr/bin/hn', '-S', str(self.target), 'show-options', '-gv', 'status-right'],+ check=True, text=True, capture_output=True, timeout=3)++ def test_startup_waits_without_starting_a_server_then_migrates(self):+ waits = []+ def ready_after_two_waits(seconds):+ self.assertEqual(run.call_count, 0, 'hn must not run before the graphical socket exists')+ waits.append(seconds)+ if len(waits) == 2:+ self.bind()+ replies = [subprocess.CompletedProcess([], 0, 'my own footer\n'), subprocess.CompletedProcess([], 0, '')]+ with patch.object(settings.Path, 'exists', return_value=False), \+ patch.object(settings.time, 'monotonic', side_effect=[0, .2, .4]), \+ patch.object(settings.time, 'sleep', side_effect=ready_after_two_waits), \+ patch.object(settings.subprocess, 'run', side_effect=replies) as run:+ settings.main()+ self.assertEqual(waits, [.2, .2])+ self.assertEqual([c.args[0] for c in run.call_args_list], [+ ['/usr/bin/hn', '-S', str(self.target), 'show-options', '-gv', 'status-right'],+ ['/usr/bin/hn', '-S', str(self.target), 'set-option', '-goq', '@hn-new-window', 'shell'],+ ])++ def test_unavailable_socket_stops_at_existing_retry_deadline(self):+ with patch.object(settings.Path, 'exists', return_value=False), \+ patch.object(settings.time, 'monotonic', side_effect=[10, 14.9, 25]), \+ patch.object(settings.time, 'sleep') as sleep, patch.object(settings.subprocess, 'run') as run:+ with self.assertRaises(FileNotFoundError):+ settings.main()+ sleep.assert_called_once_with(.2)+ run.assert_not_called()++ def test_stale_socket_and_cli_timeout_never_fall_back_or_retry_forever(self):+ self.bind().close() # The Unix socket pathname remains, with no listener.+ command = ['/usr/bin/hn', '-S', str(self.target), 'show-options', '-gv', 'status-right']+ for failure in (subprocess.CalledProcessError(1, command), subprocess.TimeoutExpired(command, 3)):+ with self.subTest(failure=type(failure).__name__), \+ patch.object(settings.Path, 'exists', return_value=False), \+ patch.object(settings.time, 'monotonic', side_effect=[10, 14.9, 25]), \+ patch.object(settings.time, 'sleep') as sleep, \+ patch.object(settings.subprocess, 'run', side_effect=failure) as run:+ with self.assertRaises(type(failure)):+ settings.main()+ self.assertEqual(run.call_args_list, [call(command, check=True, text=True, capture_output=True, timeout=3)] * 2)+ sleep.assert_called_once_with(.2)