remodex-windows-fix 1.0.6 → 1.0.7

package/README.md

@@ -30,27 +30,74 @@ remodex-windows-fix
 
 ## Usage
 
-Start the bridge:
-
-```bash
-remodex-windows-fix up
-```
-
-Resume the last active thread:
+Start the bridge:
+
+```bash
+remodex-windows-fix up
+```
+
+Reset the saved pairing state and force a brand new QR:
+
+```bash
+remodex-windows-fix reset-pairing
+```
+
+Resume the last active thread:
 
 ```bash
 remodex-windows-fix resume
 ```
 
-Watch rollout output:
-
-```bash
-remodex-windows-fix watch [threadId]
-```
-
-## Windows Override
-
-If you want to force a specific Codex binary, set one of these environment variables before running `remodex up`:
+Watch rollout output:
+
+```bash
+remodex-windows-fix watch [threadId]
+```
+
+Get a fresh QR on Windows without stale pairing state:
+
+```bat
+run-clean-qr.bat
+```
+
+This helper:
+
+- stops any existing `remodex-windows-fix` bridge process
+- runs `reset-pairing`
+- starts a fresh bridge in a new PowerShell window
+- waits for `C:\Users\%USERNAME%\.remodex\pairing-qr.png` and opens it automatically
+
+It defaults to:
+
+```text
+wss://remodex-relay.th07290828.workers.dev/relay
+```
+
+You can also pass a custom relay URL:
+
+```bat
+run-clean-qr.bat wss://YOUR-RELAY/relay
+```
+
+## Pairing Behavior
+
+The bridge now keeps a stable saved relay session id, so you only need to scan the QR once per paired iPhone in normal use.
+
+After the first QR pairing:
+
+- you can stop and start `remodex-windows-fix up` again
+- the same iPhone can reconnect with trusted reconnect
+- you do not need a fresh QR unless you intentionally reset pairing
+
+Use `remodex-windows-fix reset-pairing` when you want to:
+
+- pair a different iPhone
+- discard the saved trust/session state
+- force a brand new QR bootstrap
+
+## Windows Override
+
+If you want to force a specific Codex binary, set one of these environment variables before running `remodex up`:
 
 ```powershell
 $env:REMODEX_CODEX_BIN = "C:\Users\th072\AppData\Roaming\npm\codex.cmd"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remodex-windows-fix",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Local bridge between Codex and the Remodex mobile app with a Windows-safe Codex launcher.",
   "main": "src/index.js",
   "bin": {

package/src/secure-device-state.js

@@ -54,15 +54,22 @@ function resetBridgeDeviceState() {
   };
 }
 
-// Generates a fresh relay session for every bridge launch so QR pairing stays explicit per-run.
+// Reuses the saved relay session so the paired iPhone can reconnect without rescanning.
 function resolveBridgeRelaySession(state) {
+  const persistedSessionId = normalizeNonEmptyString(state?.relaySessionId);
   return {
-    deviceState: state,
-    isPersistent: false,
-    sessionId: randomUUID(),
+    deviceState: persistedSessionId
+      ? state
+      : rememberRelaySessionId(state, randomUUID(), { persist: true }),
+    isPersistent: true,
+    sessionId: persistedSessionId || readRelaySessionId(state),
   };
 }
 
+function readRelaySessionId(state) {
+  return normalizeNonEmptyString(state?.relaySessionId);
+}
+
 // Persists the trusted iPhone identity so reconnects can be authenticated during the current pairing flow.
 function rememberTrustedPhone(state, phoneDeviceId, phoneIdentityPublicKey, { persist = true } = {}) {
   const normalizedDeviceId = normalizeNonEmptyString(phoneDeviceId);
@@ -102,6 +109,7 @@ function createBridgeDeviceState() {
     macDeviceId: randomUUID(),
     macIdentityPublicKey: base64UrlToBase64(publicJwk.x),
     macIdentityPrivateKey: base64UrlToBase64(privateJwk.d),
+    relaySessionId: randomUUID(),
     trustedPhones: {},
   };
 }
@@ -310,6 +318,7 @@ function normalizeBridgeDeviceState(rawState) {
   const macDeviceId = normalizeNonEmptyString(rawState?.macDeviceId);
   const macIdentityPublicKey = normalizeNonEmptyString(rawState?.macIdentityPublicKey);
   const macIdentityPrivateKey = normalizeNonEmptyString(rawState?.macIdentityPrivateKey);
+  const relaySessionId = normalizeNonEmptyString(rawState?.relaySessionId) || randomUUID();
 
   if (!macDeviceId || !macIdentityPublicKey || !macIdentityPrivateKey) {
     throw new Error("Bridge device state is incomplete");
@@ -332,10 +341,27 @@ function normalizeBridgeDeviceState(rawState) {
     macDeviceId,
     macIdentityPublicKey,
     macIdentityPrivateKey,
+    relaySessionId,
     trustedPhones,
   };
 }
 
+function rememberRelaySessionId(state, relaySessionId, { persist = true } = {}) {
+  const normalizedRelaySessionId = normalizeNonEmptyString(relaySessionId);
+  if (!normalizedRelaySessionId) {
+    return state;
+  }
+
+  const nextState = normalizeBridgeDeviceState({
+    ...state,
+    relaySessionId: normalizedRelaySessionId,
+  });
+  if (persist) {
+    writeBridgeDeviceState(nextState);
+  }
+  return nextState;
+}
+
 function bridgeStatesEqual(left, right) {
   return JSON.stringify(left) === JSON.stringify(right);
 }

package/src/secure-transport.js

@@ -29,7 +29,7 @@ const HANDSHAKE_MODE_QR_BOOTSTRAP = "qr_bootstrap";
 const HANDSHAKE_MODE_TRUSTED_RECONNECT = "trusted_reconnect";
 const SECURE_SENDER_MAC = "mac";
 const SECURE_SENDER_IPHONE = "iphone";
-const MAX_PAIRING_AGE_MS = 5 * 60 * 1000;
+const MAX_PAIRING_AGE_MS = 365 * 24 * 60 * 60 * 1000;
 const MAX_BRIDGE_OUTBOUND_MESSAGES = 500;
 const MAX_BRIDGE_OUTBOUND_BYTES = 10 * 1024 * 1024;