browser-workspace 0.4.1 → 0.4.5

package/session_daemon.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import ast, atexit, contextlib, io, json, os, secrets, socket, sys, threading, time, traceback
+import ast, atexit, contextlib, io, json, os, secrets, signal, socket, sys, threading, time, traceback
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parent
@@ -14,18 +14,80 @@ os.environ.setdefault('BH_WORKSPACE_NAME', 'Harness')
 
 from managed_chrome import ensure_managed_chrome
 MANAGED_CHROME = ensure_managed_chrome()
-from browser_harness.admin import ensure_daemon
-ensure_daemon()
+from browser_harness.admin import ensure_daemon, _process_start_time
+from browser_harness import _ipc as harness_ipc
 from browser_harness import helpers as bh
 
+HARNESS_OWNER_TOKEN = secrets.token_hex(24)
+HARNESS_OWNER_PID = os.getpid()
+HARNESS_OWNER_STARTED = _process_start_time(HARNESS_OWNER_PID)
+HARNESS_OWNER_PIPE = None
+
+
+def stop_owned_harness():
+    """Only a harness matching this daemon generation may stop."""
+    try:
+        conn, token = harness_ipc.connect(os.environ.get('BU_NAME', 'browser-workspace'), timeout=1)
+        with conn:
+            response = harness_ipc.request(conn, token, {'meta': 'owner_shutdown', 'owner_token': HARNESS_OWNER_TOKEN})
+        if isinstance(response, dict) and response.get('ok'):
+            # Allow the harness its graceful CDP/IPC cleanup before EOF of
+            # our owner pipe forces the crash-only exit path.
+            deadline = time.monotonic() + 2
+            while time.monotonic() < deadline and harness_ipc.ping(os.environ.get('BU_NAME', 'browser-workspace'), timeout=0.1):
+                time.sleep(0.05)
+    except (OSError, ValueError, TimeoutError):
+        pass
+
 DEFAULT_WORKSPACE = os.environ.get('BH_WORKSPACE_NAME','Harness')
 RUNTIME_DIR = Path.home()/'.config/browser-workspace/runtime'
 SOCKET_PATH = (Path(os.environ['BROWSER_WORKSPACE_SESSION_SOCKET']) if os.environ.get('BROWSER_WORKSPACE_TEST_MODE')=='1' and os.environ.get('BROWSER_WORKSPACE_SESSION_SOCKET') else RUNTIME_DIR/'session.sock')
-OWNER_LOCK_PATH = RUNTIME_DIR/'session-daemon.owner.lock'
+OWNER_LOCK_PATH = RUNTIME_DIR/'session.lock'
 SESSIONS = {}
 SESSIONS_LOCK = threading.Lock()
 BROWSER_LOCK = threading.RLock()
 
+SESSION_RECONCILE_SECONDS = 30
+
+
+def is_reclaimed(info):
+    url = info.get('url', '')
+    if not url.startswith('chrome-extension://'):
+        return False
+    try:
+        from urllib.parse import urlparse, parse_qs
+        parsed = urlparse(url)
+        return parsed.path == '/workspace.html' and parse_qs(parsed.query).get('role') == ['idle']
+    except ValueError:
+        return False
+
+
+def reconcile_sessions():
+    """Drop records for completely released leases, never release those tabs again."""
+    with BROWSER_LOCK:
+        try:
+            targets = bh.cdp('Target.getTargets')['targetInfos']
+        except Exception:
+            return []
+        pages = {i['targetId']: i for i in targets if i.get('type') == 'page'}
+        removed = []
+        with SESSIONS_LOCK:
+            for sid, session in list(SESSIONS.items()):
+                if session.lock.locked():
+                    continue
+                # A leased root may have opened child tabs: keep any live child.
+                if all(tid not in pages or is_reclaimed(pages[tid])
+                       for tid in session.owned_target_ids):
+                    del SESSIONS[sid]
+                    removed.append(sid)
+        return removed
+
+
+def reconciliation_loop():
+    while True:
+        time.sleep(SESSION_RECONCILE_SECONDS)
+        reconcile_sessions()
+
 
 def compilable_module_body(body):
     """Return a module body that remains valid after trailing-result extraction.
@@ -84,10 +146,13 @@ class Session:
         return result
 
     def _cdp(self, method, **kwargs):
+        if method == 'Target.createTarget':
+            raise RuntimeError(
+                'Target.createTarget is disabled in Browser Workspace sessions; '
+                'use new_tab(url) so the tab is owned by the active session/workspace'
+            )
         result=bh.cdp(method, **kwargs)
-        if method == 'Target.createTarget' and isinstance(result, dict):
-            self._remember_target(result.get('targetId'))
-        elif method == 'Target.closeTarget':
+        if method == 'Target.closeTarget':
             self.owned_target_ids.discard(kwargs.get('targetId'))
         return result
 
@@ -253,12 +318,31 @@ def stop_session(sid):
         if errors: release_error='; '.join(errors)
     return {'session_id':sid,'workspace':s.workspace,'target_id':s.target_id,'closed_tabs':closed_count,'release_error':release_error}
 
+SOCKET_IDENTITY = None
+
+def remove_owned_socket():
+    """Never unlink a socket replaced by another owner."""
+    if SOCKET_IDENTITY is None:
+        return
+    try:
+        st = SOCKET_PATH.lstat()
+        if (st.st_dev, st.st_ino) == SOCKET_IDENTITY:
+            SOCKET_PATH.unlink()
+    except FileNotFoundError:
+        pass
+
 def cleanup():
     with SESSIONS_LOCK: ids=list(SESSIONS)
     for sid in ids:
         try: stop_session(sid)
         except Exception: pass
-    try: SOCKET_PATH.unlink(missing_ok=True)
+    stop_owned_harness()
+    # The write end is close-on-exec; its final close also detects SIGKILL
+    # and parent re-exec without relying on a recycled numeric PID.
+    if HARNESS_OWNER_PIPE is not None:
+        try: os.close(HARNESS_OWNER_PIPE)
+        except OSError: pass
+    try: remove_owned_socket()
     except Exception: pass
 atexit.register(cleanup)
 
@@ -306,6 +390,7 @@ def serve_conn(conn):
         f.write((json.dumps(result,ensure_ascii=False)+'\n').encode()); f.flush()
 
 def main():
+    global SOCKET_IDENTITY
     RUNTIME_DIR.mkdir(parents=True,exist_ok=True)
     try: os.chmod(RUNTIME_DIR,0o700)
     except Exception: pass
@@ -315,8 +400,29 @@ def main():
         fcntl.flock(owner,fcntl.LOCK_EX|fcntl.LOCK_NB)
     except BlockingIOError:
         owner.close(); return
+    global HARNESS_OWNER_PIPE
+    read_fd, write_fd = os.pipe() if os.name == 'posix' else (None, None)
+    HARNESS_OWNER_PIPE = write_fd
+    try:
+        owner_env = {
+            'BH_OWNER_PID': str(HARNESS_OWNER_PID),
+            'BH_OWNER_STARTED': str(HARNESS_OWNER_STARTED or ''),
+            'BH_OWNER_TOKEN': HARNESS_OWNER_TOKEN,
+        }
+        if read_fd is not None:
+            owner_env['BH_OWNER_PIPE_FD'] = str(read_fd)
+        ensure_daemon(env=owner_env)
+    finally:
+        if read_fd is not None:
+            os.close(read_fd)
+    def terminate(_signum, _frame):
+        raise SystemExit(0)
+    signal.signal(signal.SIGTERM, terminate)
+    signal.signal(signal.SIGINT, terminate)
+    # Lock ownership is required before changing the shared socket path.
     SOCKET_PATH.unlink(missing_ok=True)
-    srv=socket.socket(socket.AF_UNIX,socket.SOCK_STREAM); srv.bind(str(SOCKET_PATH)); os.chmod(SOCKET_PATH,0o600); srv.listen(32)
+    srv=socket.socket(socket.AF_UNIX,socket.SOCK_STREAM); srv.bind(str(SOCKET_PATH)); os.chmod(SOCKET_PATH,0o600); SOCKET_IDENTITY=(SOCKET_PATH.stat().st_dev, SOCKET_PATH.stat().st_ino); srv.listen(32)
+    threading.Thread(target=reconciliation_loop, daemon=True).start()
     try:
         while True:
             conn,_=srv.accept(); threading.Thread(target=serve_conn,args=(conn,),daemon=True).start()

package/src/browser_workspace.egg-info/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: browser-workspace
-Version: 0.4.0
+Version: 0.4.5
 Summary: Agent browser workspace with persistent Python sessions, tab leasing, snapshots, and platform workflows.
 Requires-Python: >=3.11
+Requires-Dist: browser-harness @ git+https://github.com/lalalic/browser-harness.git@80b74e116b9126f5159c84e5e05a750573e5f192
 Requires-Dist: cdp-use==1.4.5
 Requires-Dist: fetch-use==0.4.0
 Requires-Dist: pillow==12.3.0

package/src/browser_workspace.egg-info/SOURCES.txt

@@ -1,28 +1,97 @@
 README.md
 pyproject.toml
-src/browser_harness/__init__.py
-src/browser_harness/_ipc.py
-src/browser_harness/admin.py
-src/browser_harness/auth.py
-src/browser_harness/daemon.py
-src/browser_harness/helpers.py
-src/browser_harness/macos.py
-src/browser_harness/mcp_cli.py
-src/browser_harness/paths.py
-src/browser_harness/recorder.py
-src/browser_harness/run.py
-src/browser_harness/telemetry.py
-src/browser_harness/video-template.html
-src/browser_harness/video.py
-src/browser_harness/video_render.py
 src/browser_workspace.egg-info/PKG-INFO
 src/browser_workspace.egg-info/SOURCES.txt
 src/browser_workspace.egg-info/dependency_links.txt
+src/browser_workspace.egg-info/entry_points.txt
 src/browser_workspace.egg-info/requires.txt
 src/browser_workspace.egg-info/top_level.txt
+src/browser_workspace_app/__init__.py
+src/browser_workspace_app/cli.py
+src/browser_workspace_app/managed_chrome.py
+src/browser_workspace_app/package.json
+src/browser_workspace_app/platform_runner.py
+src/browser_workspace_app/pyproject.toml
+src/browser_workspace_app/session_client.py
+src/browser_workspace_app/session_daemon.py
+src/browser_workspace_app/agent-workspace/agent_helpers.py
+src/browser_workspace_app/extension/manifest.json
+src/browser_workspace_app/extension/service-worker.mjs
+src/browser_workspace_app/extension/workspace-manager.mjs
+src/browser_workspace_app/extension/workspace-page.mjs
+src/browser_workspace_app/extension/workspace.html
+src/browser_workspace_app/interaction-skills/connection.md
+src/browser_workspace_app/interaction-skills/cookies.md
+src/browser_workspace_app/interaction-skills/cross-origin-iframes.md
+src/browser_workspace_app/interaction-skills/dialogs.md
+src/browser_workspace_app/interaction-skills/downloads.md
+src/browser_workspace_app/interaction-skills/drag-and-drop.md
+src/browser_workspace_app/interaction-skills/dropdowns.md
+src/browser_workspace_app/interaction-skills/iframes.md
+src/browser_workspace_app/interaction-skills/network-requests.md
+src/browser_workspace_app/interaction-skills/print-as-pdf.md
+src/browser_workspace_app/interaction-skills/profile-sync.md
+src/browser_workspace_app/interaction-skills/screenshots.md
+src/browser_workspace_app/interaction-skills/scrolling.md
+src/browser_workspace_app/interaction-skills/shadow-dom.md
+src/browser_workspace_app/interaction-skills/tabs.md
+src/browser_workspace_app/interaction-skills/uploads.md
+src/browser_workspace_app/interaction-skills/viewport.md
+src/browser_workspace_app/licenses/browser-harness-MIT.txt
+src/browser_workspace_app/node/admin.mjs
+src/browser_workspace_app/platforms/chatgpt/README.md
+src/browser_workspace_app/platforms/chatgpt/manifest.yaml
+src/browser_workspace_app/platforms/chatgpt/actions/_bootstrap_start.py
+src/browser_workspace_app/platforms/chatgpt/actions/_lifecycle_common.py
+src/browser_workspace_app/platforms/chatgpt/actions/_mcp_app.py
+src/browser_workspace_app/platforms/chatgpt/actions/_new_thread.py
+src/browser_workspace_app/platforms/chatgpt/actions/_new_turn.py
+src/browser_workspace_app/platforms/chatgpt/actions/_project_setup.py
+src/browser_workspace_app/platforms/chatgpt/actions/_readiness.py
+src/browser_workspace_app/platforms/chatgpt/actions/_submit_thread.py
+src/browser_workspace_app/platforms/chatgpt/actions/_temporary_submit.py
+src/browser_workspace_app/platforms/chatgpt/actions/_thread_turn.py
+src/browser_workspace_app/platforms/chatgpt/tests/test_contract.py
+src/browser_workspace_app/platforms/chrome-web-store/README.md
+src/browser_workspace_app/platforms/chrome-web-store/manifest.yaml
+src/browser_workspace_app/platforms/chrome-web-store/actions/_chrome_web_store.py
+src/browser_workspace_app/platforms/chrome-web-store/flows/check-status.md
+src/browser_workspace_app/platforms/chrome-web-store/flows/open-item.md
+src/browser_workspace_app/platforms/chrome-web-store/flows/submit-review.md
+src/browser_workspace_app/platforms/chrome-web-store/flows/update-listing.md
+src/browser_workspace_app/platforms/chrome-web-store/flows/upload-package.md
+src/browser_workspace_app/platforms/chrome-web-store/flows/verify-published.md
+src/browser_workspace_app/platforms/chrome-web-store/tests/test_contract.py
+src/browser_workspace_app/platforms/microsoft-teams/README.md
+src/browser_workspace_app/platforms/microsoft-teams/manifest.yaml
+src/browser_workspace_app/platforms/microsoft-teams/actions/_meeting.py
+src/browser_workspace_app/platforms/microsoft-teams/flows/instant-meeting.md
+src/browser_workspace_app/platforms/microsoft-teams/tests/test_contract.py
+src/browser_workspace_app/platforms/tiktok/README.md
+src/browser_workspace_app/platforms/tiktok/manifest.yaml
+src/browser_workspace_app/platforms/tiktok/actions/_post.py
+src/browser_workspace_app/platforms/wechat-channels/README.md
+src/browser_workspace_app/platforms/wechat-channels/manifest.yaml
+src/browser_workspace_app/platforms/wechat-channels/actions/_common.py
+src/browser_workspace_app/platforms/wechat-channels/actions/_manage.py
+src/browser_workspace_app/platforms/wechat-channels/actions/_post.py
+src/browser_workspace_app/platforms/wechat-channels/tests/test_contract.py
+src/browser_workspace_app/platforms/xhs/README.md
+src/browser_workspace_app/platforms/xhs/manifest.yaml
+src/browser_workspace_app/platforms/xhs/actions/_manage.py
+src/browser_workspace_app/platforms/xhs/actions/_post.py
+src/browser_workspace_app/platforms/xhs/tests/test_contract.py
+src/browser_workspace_app/platforms/youtube/README.md
+src/browser_workspace_app/platforms/youtube/manifest.yaml
+src/browser_workspace_app/platforms/youtube/actions/_post.py
+test/test_auth_cookie_audit.py
+test/test_auth_keepalive_visit.py
+test/test_harness_ownership.py
 test/test_managed_chrome.py
 test/test_platform_profile.py
 test/test_platform_runner.py
+test/test_pypi_package.py
 test/test_session_cli.py
 test/test_session_execution.py
+test/test_session_reconcile.py
 test/test_workspace_cli.py

package/src/browser_workspace.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+browser-workspace = browser_workspace_app.cli:main

package/src/browser_workspace.egg-info/requires.txt

@@ -1,3 +1,4 @@
+browser-harness @ git+https://github.com/lalalic/browser-harness.git@80b74e116b9126f5159c84e5e05a750573e5f192
 cdp-use==1.4.5
 fetch-use==0.4.0
 pillow==12.3.0

package/src/browser_workspace.egg-info/top_level.txt

@@ -1 +1 @@
-browser_harness
+browser_workspace_app

package/src/browser_workspace_app/__init__.py

@@ -0,0 +1 @@
+"""Browser Workspace Python distribution."""