pairling 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairling",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Pair your iPhone with the AI coding agents running on your Mac. CLI and local runtime installer for the Pairling iOS app.",
   "keywords": [
     "pairling",
@@ -15,10 +15,6 @@
   "bugs": {
     "url": "https://pairling.dev/support"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mergimg0/pairling-helper"
-  },
   "license": "UNLICENSED",
   "author": "Pairling (https://pairling.dev)",
   "type": "module",
@@ -39,8 +35,12 @@
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mergimg0/pairling-helper"
+  },
   "optionalDependencies": {
-    "@pairling/runtime-darwin-arm64": "0.2.4",
-    "@pairling/runtime-darwin-x64": "0.2.4"
+    "@pairling/runtime-darwin-arm64": "0.2.5",
+    "@pairling/runtime-darwin-x64": "0.2.5"
   }
 }

package/payload/mac/SOURCE_REVISION

@@ -1 +1 @@
-7f88c1b
+2f094bd

package/payload/mac/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

package/payload/mac/install/install-runtime.sh

@@ -747,7 +747,20 @@ ptybroker_live_session_count() {
 import json
 import sys
 
-payload = json.loads(sys.argv[1])
+def load_json_arg(raw):
+    text = str(raw or "").strip()
+    decoder = json.JSONDecoder()
+    for index, char in enumerate(text):
+        if char not in "{[":
+            continue
+        try:
+            value, _ = decoder.raw_decode(text[index:])
+            return value
+        except json.JSONDecodeError:
+            continue
+    return {}
+
+payload = load_json_arg(sys.argv[1])
 status = payload.get("status") if isinstance(payload.get("status"), dict) else {}
 print(status.get("live_session_count", "unknown"))
 PY
@@ -799,7 +812,20 @@ ptybroker_live_revision() {
 import json
 import sys
 
-payload = json.loads(sys.argv[1])
+def load_json_arg(raw):
+    text = str(raw or "").strip()
+    decoder = json.JSONDecoder()
+    for index, char in enumerate(text):
+        if char not in "{[":
+            continue
+        try:
+            value, _ = decoder.raw_decode(text[index:])
+            return value
+        except json.JSONDecodeError:
+            continue
+    return {}
+
+payload = load_json_arg(sys.argv[1])
 status = payload.get("status") if isinstance(payload.get("status"), dict) else payload
 print(status.get("source_revision") or "")
 PY
@@ -813,7 +839,20 @@ import sys
 from pathlib import Path
 
 current = Path(sys.argv[1])
-payload = json.loads(sys.argv[2])
+def load_json_arg(raw):
+    text = str(raw or "").strip()
+    decoder = json.JSONDecoder()
+    for index, char in enumerate(text):
+        if char not in "{[":
+            continue
+        try:
+            value, _ = decoder.raw_decode(text[index:])
+            return value
+        except json.JSONDecodeError:
+            continue
+    return {}
+
+payload = load_json_arg(sys.argv[2])
 live = payload.get("status") if isinstance(payload.get("status"), dict) else payload
 
 def read_revision(root: Path):
@@ -881,7 +920,20 @@ ptybroker_report_deferred_restart() {
 import json
 import sys
 
-state = json.loads(sys.argv[1])
+def load_json_arg(raw):
+    text = str(raw or "").strip()
+    decoder = json.JSONDecoder()
+    for index, char in enumerate(text):
+        if char not in "{[":
+            continue
+        try:
+            value, _ = decoder.raw_decode(text[index:])
+            return value
+        except json.JSONDecodeError:
+            continue
+    return {}
+
+state = load_json_arg(sys.argv[1])
 if state.get("state") != "stale_deferred":
     raise SystemExit(0)
 live = state.get("live") if isinstance(state.get("live"), dict) else {}
@@ -902,7 +954,20 @@ ptybroker_state_field() {
 import json
 import sys
 
-payload = json.loads(sys.argv[1])
+def load_json_arg(raw):
+    text = str(raw or "").strip()
+    decoder = json.JSONDecoder()
+    for index, char in enumerate(text):
+        if char not in "{[":
+            continue
+        try:
+            value, _ = decoder.raw_decode(text[index:])
+            return value
+        except json.JSONDecodeError:
+            continue
+    return {}
+
+payload = load_json_arg(sys.argv[1])
 value = payload
 for part in sys.argv[2].split("."):
     if isinstance(value, dict):
@@ -1089,7 +1154,7 @@ install_runtime() {
   log "Installed Pairling runtime $RELEASE_NAME"
   if ! is_dry_run; then
     log ""
-    if ! pair_runtime --qr; then
+    if ! PAIRLING_CONNECTD_ROUTE_WAIT_SECONDS="${PAIRLING_CONNECTD_ROUTE_WAIT_SECONDS:-35}" pair_runtime --qr; then
       log "Pairling installed, but setup could not generate a pairing invitation. Run: pairling doctor --json; pairling pair --qr" >&2
       exit 1
     fi
@@ -1156,6 +1221,7 @@ import os
 import socket
 import subprocess
 import sys
+import time
 import urllib.parse
 import urllib.error
 import urllib.request
@@ -1268,34 +1334,64 @@ def detected_tailnet_ip() -> str:
             return ip
     return ""
 
+def connectd_route_wait_seconds() -> float:
+    try:
+        return min(max(float(os.environ.get("PAIRLING_CONNECTD_ROUTE_WAIT_SECONDS") or "0"), 0.0), 60.0)
+    except ValueError:
+        return 0.0
+
+def connectd_route_poll_seconds() -> float:
+    try:
+        return min(max(float(os.environ.get("PAIRLING_CONNECTD_ROUTE_POLL_SECONDS") or "0.5"), 0.1), 2.0)
+    except ValueError:
+        return 0.5
+
+def status_could_be_ready_soon(status: dict) -> bool:
+    if not status:
+        return True
+    if status.get("auth_url_present"):
+        return False
+    return True
+
+def ready_connectd_route():
+    wait_seconds = connectd_route_wait_seconds()
+    poll_seconds = connectd_route_poll_seconds()
+    deadline = time.monotonic() + wait_seconds
+    while True:
+        status = fetch_connectd_status(timeout_seconds=0.7)
+        connect_routes = advertised_pairling_connect_routes(status)
+        if connect_routes:
+            return connect_routes[0]
+        if wait_seconds <= 0 or time.monotonic() >= deadline or not status_could_be_ready_soon(status):
+            return None
+        time.sleep(min(poll_seconds, max(0.0, deadline - time.monotonic())))
+
 def default_pair_route(port_number: int) -> dict:
     for key in ("PAIRLING_PAIR_BASE_URL", "PAIRLING_PUBLIC_BASE_URL"):
         value = os.environ.get(key)
         if value:
             return {"base_url": value, "source": "explicit_override", "status": "override"}
-    # First-pair QR claims go through iOS URLSession before any persisted
-    # Pairling Connect route exists. TestFlight builds allow local HTTP via
-    # NSAllowsLocalNetworking, but ATS blocks plain HTTP to 100.64/10 tailnet
-    # addresses. Prefer ATS-local LAN/Bonjour bases for bootstrap; remote
-    # tailnet routes are validated and promoted after the claim.
-    lan_ip = detected_lan_ip()
-    if lan_ip:
-        return {"base_url": f"http://{lan_ip}:{port_number}", "source": "lan", "status": "fallback", "kind": "lan"}
-    if os.environ.get("PAIRLING_DISABLE_BONJOUR") != "1" and os.environ.get("PAIRLING_TEST_DISABLE_BONJOUR") != "1":
-        return {"base_url": f"http://{socket.gethostname()}.local:{port_number}", "source": "bonjour", "status": "fallback", "kind": "bonjour"}
-    connect_routes = advertised_pairling_connect_routes(fetch_connectd_status(timeout_seconds=0.7))
-    if connect_routes:
-        route = connect_routes[0]
+    # Remote-first pairing: if connectd reports a ready Pairling Connect route,
+    # the QR advertises that route and the iOS app claims it through the
+    # embedded pre-pair transport. LAN/Bonjour are explicit degraded fallbacks
+    # when Pairling Connect is not ready.
+    route = ready_connectd_route()
+    if route:
         return {
             "base_url": route["base_url"],
             "source": route["source"],
             "status": route["status"],
             "kind": route["kind"],
         }
+    lan_ip = detected_lan_ip()
+    if lan_ip:
+        return {"base_url": f"http://{lan_ip}:{port_number}", "source": "lan", "status": "fallback", "kind": "lan"}
+    if os.environ.get("PAIRLING_DISABLE_BONJOUR") != "1" and os.environ.get("PAIRLING_TEST_DISABLE_BONJOUR") != "1":
+        return {"base_url": f"http://{socket.gethostname()}.local:{port_number}", "source": "bonjour", "status": "fallback", "kind": "bonjour"}
     tailnet_ip = detected_tailnet_ip()
     if tailnet_ip:
-        return {"base_url": f"http://{tailnet_ip}:{port_number}", "source": "standalone_tailnet", "status": "fallback"}
-    return {"base_url": f"http://{socket.gethostname()}.local:{port_number}", "source": "bonjour", "status": "fallback"}
+        return {"base_url": f"http://{tailnet_ip}:{port_number}", "source": "standalone_tailnet", "status": "fallback", "kind": "standalone_tailnet"}
+    return {"base_url": f"http://{socket.gethostname()}.local:{port_number}", "source": "bonjour", "status": "fallback", "kind": "bonjour"}
 
 pair_route = default_pair_route(int(port))
 base_url = str(pair_route.get("base_url") or "")
@@ -1316,6 +1412,11 @@ if pair_id and secret:
         pair_params["route_status"] = "ready"
         pair_params["route_kind"] = str(pair_route.get("kind") or "tailnet")
         pair_params["route_contract"] = "pairling-runtime-v1"
+    elif pair_route.get("status") == "fallback":
+        pair_params["route_source"] = "local_fallback"
+        pair_params["route_status"] = "degraded"
+        pair_params["route_kind"] = str(pair_route.get("kind") or pair_route.get("source") or "local")
+        pair_params["route_contract"] = "pairling-runtime-v1"
     manual = {
         "base_url": base_url,
         "pair_id": pair_id,

package/payload-manifest.json

@@ -1,11 +1,11 @@
 {
   "connectd": {
     "darwin-arm64": {
-      "sha256": "d77d7299f92da3a72d38981dd8f31f7b5935cd297a29b0231a2b79b8b37ef7f4",
+      "sha256": "96400014bc7d32bd1b976216eb6dc76a6621d9da34a2ef02da87c72957dea170",
       "team_id": "965AVD34A3"
     },
     "darwin-x64": {
-      "sha256": "393c95dcd6128699614423d6414a21962d796a2baf8f249789d98d247668248e",
+      "sha256": "bb4df01a72f6c2032c8d7341f5d243fa3e6c99295c033dbf3f99a7d7eed650b7",
       "team_id": "965AVD34A3"
     }
   },
@@ -20,11 +20,11 @@
     },
     {
       "path": "payload/mac/SOURCE_REVISION",
-      "sha256": "e88a4e5e02bc17d75bd064d71908ab84750f877613ce56e1efb4be3d453a5a81"
+      "sha256": "6fba526ba8b27c395d71b9d6067bb09fe9458c5d650a92af80541ad7971a3ba3"
     },
     {
       "path": "payload/mac/VERSION",
-      "sha256": "1725bfa6524c5265e7c171cf06568417d39b947fff49c242f03859479c82334b"
+      "sha256": "e959f750e92dbb7614ae28ac96f0a37272caed81d8bbb758791af7bfbb6106a0"
     },
     {
       "path": "payload/mac/companiond/app_attest_lan.py",
@@ -252,7 +252,7 @@
     },
     {
       "path": "payload/mac/install/install-runtime.sh",
-      "sha256": "29e3e3ffd11d1dc5de96a29d5724752c4651168c5cf15b6ab8e5797e85e6a1ee"
+      "sha256": "87c1db89b281b78d0809b4360c54c5c57b8e4f25a473496373315236ffeb6117"
     },
     {
       "path": "payload/mac/install/psk_dependency_check.py",
@@ -276,8 +276,8 @@
     }
   ],
   "package": "pairling",
-  "package_version": "0.2.4",
+  "package_version": "0.2.5",
   "schema_version": 1,
   "source_dirty": false,
-  "source_revision": "7f88c1b"
+  "source_revision": "2f094bd"
 }