@makerbi/remodex 1.5.4 → 2.0.0

package/bin/remodex.js

@@ -11,6 +11,7 @@ const {
   printMacOSBridgeServiceStatus,
   readBridgeConfig,
   resetMacOSBridgePairing,
+  restartMacOSBridgeService,
   runMacOSBridgeService,
   startBridge,
   startMacOSBridgeService,
@@ -27,6 +28,7 @@ const defaultDeps = {
   printMacOSBridgeServiceStatus,
   readBridgeConfig,
   resetMacOSBridgePairing,
+  restartMacOSBridgeService,
   runMacOSBridgeService,
   startBridge,
   startMacOSBridgeService,
@@ -112,16 +114,13 @@ async function main({
       consoleImpl,
       exitImpl,
     });
-    deps.readBridgeConfig();
-    const result = await deps.startMacOSBridgeService({
-      waitForPairing: false,
-    });
+    const result = await deps.startMacOSBridgeService();
     emitResult({
       payload: {
         ok: true,
         currentVersion: version,
         plistPath: result?.plistPath,
-        pairingSession: result?.pairingSession,
+        pairingSession: sanitizePairingSessionForOutput(result?.pairingSession),
       },
       message: "[remodex] macOS bridge service is running.",
       jsonOutput,
@@ -136,16 +135,13 @@ async function main({
       consoleImpl,
       exitImpl,
     });
-    deps.readBridgeConfig();
-    const result = await deps.startMacOSBridgeService({
-      waitForPairing: false,
-    });
+    const result = await deps.restartMacOSBridgeService();
     emitResult({
       payload: {
         ok: true,
         currentVersion: version,
         plistPath: result?.plistPath,
-        pairingSession: result?.pairingSession,
+        pairingSession: sanitizePairingSessionForOutput(result?.pairingSession),
       },
       message: "[remodex] macOS bridge service restarted.",
       jsonOutput,
@@ -154,6 +150,32 @@ async function main({
     return;
   }
 
+  if (command === "qr" || command === "pair") {
+    assertMacOSCommand(command, {
+      platform,
+      consoleImpl,
+      exitImpl,
+    });
+    const result = await deps.startMacOSBridgeService({
+      waitForPairing: true,
+    });
+    if (jsonOutput) {
+      emitJson({
+        ok: true,
+        currentVersion: version,
+        plistPath: result?.plistPath,
+        pairingSession: result?.pairingSession,
+      });
+      return;
+    }
+
+    consoleImpl.log("[remodex] Refreshing bridge pairing QR...");
+    deps.printMacOSBridgePairingQr({
+      pairingSession: result.pairingSession,
+    });
+    return;
+  }
+
   if (command === "stop") {
     assertMacOSCommand(command, {
       platform,
@@ -181,7 +203,7 @@ async function main({
     });
     if (jsonOutput) {
       emitJson({
-        ...deps.getMacOSBridgeServiceStatus(),
+        ...sanitizeBridgeServiceStatusForOutput(deps.getMacOSBridgeServiceStatus()),
         currentVersion: version,
       });
       return;
@@ -257,9 +279,10 @@ async function main({
 
   consoleImpl.error(`Unknown command: ${command}`);
   consoleImpl.error(
-    "Usage: remodex up | remodex run [--extra-device|--extra-devices=N] | remodex start | remodex restart | remodex stop | remodex status | "
+    "Usage: remodex up | remodex run [--extra-device|--extra-devices=N] | remodex start | remodex restart | "
+    + "remodex qr | remodex pair | remodex stop | remodex status | "
     + "remodex reset-pairing | remodex resume | remodex watch [threadId] | remodex --version | "
-    + "append --json to start/restart/stop/status/reset-pairing/resume for machine-readable output"
+    + "append --json to start/restart/qr/pair/stop/status/reset-pairing/resume for machine-readable output"
   );
   exitImpl(1);
 }
@@ -348,6 +371,47 @@ function emitJson(payload) {
   process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
 }
 
+// Keeps machine-readable CLI output useful without exposing relay endpoints or live pairing payloads.
+function sanitizeBridgeServiceStatusForOutput(status = {}) {
+  const sanitized = {
+    ...status,
+    daemonConfig: sanitizeDaemonConfigForOutput(status.daemonConfig),
+    pairingSession: sanitizePairingSessionForOutput(status.pairingSession),
+  };
+  return sanitized;
+}
+
+function sanitizeDaemonConfigForOutput(config) {
+  if (!config || typeof config !== "object") {
+    return config || null;
+  }
+  const { relayUrl, pushServiceUrl, ...rest } = config;
+  return {
+    ...rest,
+    relayConfigured: Boolean(relayUrl),
+    pushServiceConfigured: Boolean(pushServiceUrl),
+  };
+}
+
+function sanitizePairingSessionForOutput(pairingSession) {
+  if (!pairingSession || typeof pairingSession !== "object") {
+    return pairingSession || null;
+  }
+  const payload = pairingSession.pairingPayload || {};
+  return {
+    createdAt: pairingSession.createdAt,
+    pairingCode: pairingSession.pairingCode,
+    pairingPayload: {
+      v: payload.v,
+      expiresAt: payload.expiresAt,
+      hasRelay: Boolean(payload.relay),
+      hasSessionId: Boolean(payload.sessionId),
+      hasMacIdentityPublicKey: Boolean(payload.macIdentityPublicKey),
+      displayName: payload.displayName,
+    },
+  };
+}
+
 function assertMacOSCommand(name, {
   platform = process.platform,
   consoleImpl = console,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makerbi/remodex",
-  "version": "1.5.4",
+  "version": "2.0.0",
   "description": "Local bridge between Codex and the Remodex mobile app. Run `remodex up` to start.",
   "repository": {
     "type": "git",

package/src/account-status.js

@@ -26,7 +26,8 @@ function composeAccountStatus({
   const tokenReady = Boolean(authToken);
   const requiresOpenaiAuth = Boolean(accountRead?.requiresOpenaiAuth || authStatus?.requiresOpenaiAuth);
   const hasPriorLoginContext = hasAccountLogin || Boolean(authMethod);
-  const needsReauth = !loginInFlight && requiresOpenaiAuth && hasPriorLoginContext;
+  const hasUsableChatGPTToken = tokenReady && isChatGPTAuthMethod(authMethod);
+  const needsReauth = !loginInFlight && requiresOpenaiAuth && hasPriorLoginContext && !hasUsableChatGPTToken;
   const isAuthenticated = !needsReauth && (tokenReady || hasAccountLogin);
   const status = isAuthenticated
     ? "authenticated"
@@ -53,6 +54,10 @@ function composeAccountStatus({
   };
 }
 
+function isChatGPTAuthMethod(authMethod) {
+  return authMethod === "chatgpt" || authMethod === "chatgptAuthTokens";
+}
+
 // Removes any token-bearing fields before the bridge sends auth state to the phone.
 function redactAuthStatus(authStatus = null, extras = {}) {
   const composed = composeAccountStatus({
@@ -165,6 +170,7 @@ function deriveHostCapabilities(platform) {
     displayWake: isMacOS,
     keepAwake: isMacOS,
     hostBrowserLogin: isMacOS,
+    bridgeUpdate: isMacOS,
   };
 }
 

package/src/apply-patch-changes.js

@@ -0,0 +1,185 @@
+// FILE: apply-patch-changes.js
+// Purpose: Converts Codex apply_patch transcript payloads into fileChange-compatible records.
+// Layer: Bridge util
+// Exports: parseApplyPatchChanges, buildApplyPatchFileChangeItem
+// Depends on: path
+
+const path = require("path");
+
+function buildApplyPatchFileChangeItem({
+  callId = "",
+  patch = "",
+  status = "completed",
+  idFallback = "apply-patch-file-change",
+  cwd = "",
+} = {}) {
+  const changes = parseApplyPatchChanges(patch, { cwd });
+  if (changes.length === 0) {
+    return null;
+  }
+
+  return {
+    id: readString(callId) || idFallback,
+    type: "fileChange",
+    status: readString(status) || "completed",
+    changes,
+  };
+}
+
+// Parses the custom apply_patch DSL saved in desktop rollouts into the same
+// change-array shape that iOS already decodes from app-server fileChange items.
+function parseApplyPatchChanges(patchText, { cwd = "" } = {}) {
+  const lines = String(patchText || "").split(/\r?\n/);
+  const changes = [];
+  let current = null;
+
+  function startChange(kind, rawPath) {
+    flushCurrentChange();
+    const filePath = normalizePatchPath(rawPath, cwd);
+    if (!filePath) {
+      current = null;
+      return;
+    }
+
+    current = {
+      path: filePath,
+      originalPath: filePath,
+      kind,
+      additions: 0,
+      deletions: 0,
+      bodyLines: [],
+    };
+  }
+
+  function flushCurrentChange() {
+    if (!current || !current.path) {
+      current = null;
+      return;
+    }
+
+    changes.push({
+      path: current.path,
+      kind: current.kind,
+      additions: current.additions,
+      deletions: current.deletions,
+      diff: buildUnifiedDiffForApplyPatchChange(current),
+    });
+    current = null;
+  }
+
+  for (const line of lines) {
+    if (line.startsWith("*** Add File: ")) {
+      startChange("add", line.slice("*** Add File: ".length));
+      continue;
+    }
+
+    if (line.startsWith("*** Update File: ")) {
+      startChange("update", line.slice("*** Update File: ".length));
+      continue;
+    }
+
+    if (line.startsWith("*** Delete File: ")) {
+      startChange("delete", line.slice("*** Delete File: ".length));
+      flushCurrentChange();
+      continue;
+    }
+
+    if (line.startsWith("*** Move to: ")) {
+      if (current) {
+        current.path = normalizePatchPath(line.slice("*** Move to: ".length), cwd) || current.path;
+        current.kind = "rename";
+      }
+      continue;
+    }
+
+    if (line === "*** End Patch") {
+      flushCurrentChange();
+      break;
+    }
+
+    if (line.startsWith("***")) {
+      continue;
+    }
+
+    if (!current) {
+      continue;
+    }
+
+    current.bodyLines.push(line);
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      current.additions += 1;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      current.deletions += 1;
+    }
+  }
+
+  flushCurrentChange();
+  return changes.filter((change) => (
+    change.additions > 0
+    || change.deletions > 0
+    || change.kind === "rename"
+    || change.kind === "delete"
+  ));
+}
+
+function buildUnifiedDiffForApplyPatchChange(change) {
+  const oldPath = change.originalPath || change.path;
+  const newPath = change.path || oldPath;
+  const diffLines = [`diff --git ${gitPatchPath("a", oldPath)} ${gitPatchPath("b", newPath)}`];
+
+  if (change.kind === "add") {
+    diffLines.push("new file mode 100644", "--- /dev/null", `+++ ${gitPatchPath("b", newPath)}`);
+  } else if (change.kind === "delete") {
+    diffLines.push("deleted file mode 100644", `--- ${gitPatchPath("a", oldPath)}`, "+++ /dev/null");
+  } else if (change.kind === "rename") {
+    diffLines.push(`rename from ${oldPath}`, `rename to ${newPath}`);
+    if (change.bodyLines.length > 0) {
+      diffLines.push(`--- ${gitPatchPath("a", oldPath)}`, `+++ ${gitPatchPath("b", newPath)}`);
+    }
+  } else {
+    diffLines.push(`--- ${gitPatchPath("a", oldPath)}`, `+++ ${gitPatchPath("b", newPath)}`);
+  }
+
+  const bodyLines = change.bodyLines || [];
+  if (bodyLines.length > 0) {
+    if (!bodyLines.some((line) => line.startsWith("@@"))) {
+      diffLines.push("@@");
+    }
+    diffLines.push(...bodyLines);
+  }
+
+  return diffLines.join("\n").trim();
+}
+
+function gitPatchPath(prefix, filePath) {
+  const trimmed = readString(filePath).replace(/^\/+/, "");
+  return `${prefix}/${trimmed || filePath || "unknown"}`;
+}
+
+function normalizePatchPath(rawPath, cwd) {
+  const filePath = readString(rawPath);
+  if (!filePath) {
+    return "";
+  }
+
+  const root = readString(cwd);
+  if (!root || !path.isAbsolute(filePath)) {
+    return filePath;
+  }
+
+  const relativePath = path.relative(root, filePath);
+  if (!relativePath || relativePath.startsWith("..") || path.isAbsolute(relativePath)) {
+    return filePath;
+  }
+
+  return relativePath;
+}
+
+function readString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : "";
+}
+
+module.exports = {
+  buildApplyPatchFileChangeItem,
+  parseApplyPatchChanges,
+};

package/src/bootstrap-codex-cli.js

@@ -32,7 +32,7 @@ if (!isGlobalInstall) {
 ensureCodexCLI({
   env: process.env,
   logger: console,
-  shouldUpdate: true,
+  shouldUpdate: false,
 });
 
 logCachedIOSAppCompatibilityWarning();

package/src/bridge-status.js

@@ -5,8 +5,9 @@
 // Depends on: timers
 
 const BRIDGE_STATUS_HEARTBEAT_INTERVAL_MS = 5_000;
-// Keep the watchdog above the relay heartbeat cadence so quiet healthy sockets survive idle gaps.
-const RELAY_WATCHDOG_STALE_AFTER_MS = 70_000;
+// Keep this above the 25s iOS foreground keepalive cadence so normal jitter
+// does not kill a healthy Mac relay socket, while still recovering quickly.
+const RELAY_WATCHDOG_STALE_AFTER_MS = 45_000;
 const STALE_RELAY_STATUS_MESSAGE = "Relay heartbeat stalled; reconnect pending.";
 
 // Wraps daemon status publication so bridge.js does not own heartbeat bookkeeping.