@makerbi/remodex 1.5.3 → 1.5.8

package/src/codex-transport.js

@@ -13,6 +13,7 @@ function createCodexTransport({
   endpoint = "",
   env = process.env,
   appPath = "",
+  platform = process.platform,
   spawnImpl = spawn,
   WebSocketImpl = WebSocket,
 } = {}) {
@@ -20,11 +21,11 @@ function createCodexTransport({
     return createWebSocketTransport({ endpoint, WebSocketImpl });
   }
 
-  return createSpawnTransport({ env, appPath, spawnImpl });
+  return createSpawnTransport({ env, appPath, platform, spawnImpl });
 }
 
-function createSpawnTransport({ env, appPath, spawnImpl = spawn }) {
-  const launchPlans = createCodexLaunchPlans({ env, appPath });
+function createSpawnTransport({ env, appPath, platform, spawnImpl = spawn }) {
+  const launchPlans = createCodexLaunchPlans({ env, appPath, platform });
   let launchIndex = -1;
   let activeLaunch = null;
   let codex = null;
@@ -154,13 +155,12 @@ function createSpawnTransport({ env, appPath, spawnImpl = spawn }) {
         return;
       }
       stdoutBuffer += chunk.toString("utf8");
-      const lines = stdoutBuffer.split("\n");
-      stdoutBuffer = lines.pop() || "";
-
-      for (const line of lines) {
-        const trimmedLine = line.trim();
-        if (trimmedLine) {
-          listeners.emitMessage(trimmedLine);
+      let newlineIndex;
+      while ((newlineIndex = stdoutBuffer.indexOf("\n")) !== -1) {
+        const line = stdoutBuffer.substring(0, newlineIndex).trim();
+        stdoutBuffer = stdoutBuffer.substring(newlineIndex + 1);
+        if (line) {
+          listeners.emitMessage(line);
         }
       }
     });
@@ -254,7 +254,32 @@ function shutdownCodexProcess(codex) {
 function createCodexCloseError({ code, signal, stderrBuffer, launchDescription }) {
   const details = stderrBuffer.trim();
   const reason = details || `Process exited with code ${code}${signal ? ` (signal: ${signal})` : ""}.`;
-  return new Error(`Codex launcher ${launchDescription} failed: ${reason}`);
+  return new Error(formatCodexLaunchFailure({
+    launchDescription,
+    reason,
+  }));
+}
+
+// Turns common Codex auth/config failures into recovery guidance without handling secrets in Remodex.
+function formatCodexLaunchFailure({ launchDescription, reason }) {
+  const message = `Codex launcher ${launchDescription} failed: ${reason}`;
+  const missingEnvVar = extractMissingEnvironmentVariable(reason);
+  if (!missingEnvVar) {
+    return message;
+  }
+
+  const guidance = [
+    `Codex is asking for ${missingEnvVar}, which usually means your Codex config forces API-key auth or a custom provider env var.`,
+    "Remodex does not store or forward OpenAI API keys.",
+    "Recommended fix: run `codex login` on this Mac, then restart Remodex.",
+    "If you intentionally use API-key auth, run `printenv OPENAI_API_KEY | codex login --with-api-key` or make that env var available to the Remodex daemon yourself.",
+  ];
+  return `${message}\n${guidance.join("\n")}`;
+}
+
+function extractMissingEnvironmentVariable(reason) {
+  const match = String(reason || "").match(/Missing environment variable:\s*`?([A-Za-z_][A-Za-z0-9_]*)`?/i);
+  return match ? match[1] : "";
 }
 
 function appendOutputBuffer(buffer, chunk) {
@@ -350,4 +375,6 @@ function createListenerBag() {
 module.exports = {
   createCodexLaunchPlans,
   createCodexTransport,
+  extractMissingEnvironmentVariable,
+  formatCodexLaunchFailure,
 };

package/src/desktop-handler.js

@@ -1,5 +1,5 @@
 // FILE: desktop-handler.js
-// Purpose: Handles explicit desktop handoff, display wake, and bridge preference RPCs for Codex.app.
+// Purpose: Handles explicit desktop handoff, display wake, bridge update, and preference RPCs for Codex.app.
 // Layer: Bridge handler
 // Exports: handleDesktopRequest
 // Depends on: child_process, fs, os, path, ./rollout-watch
@@ -126,6 +126,8 @@ async function handleDesktopMethod(method, params, options = {}) {
       return readBridgePreferences(options);
     case "desktop/preferences/update":
       return updateBridgePreferences(params, options);
+    case "desktop/bridge/updateAndRestart":
+      return updateBridgePackageAndRestart(options);
     default:
       throw desktopError("unknown_method", `Unknown desktop method: ${method}`);
   }
@@ -360,6 +362,17 @@ async function updateBridgePreferences(params, options = {}) {
   });
 }
 
+async function updateBridgePackageAndRestart(options = {}) {
+  if (typeof options.updateBridgePackageAndRestart !== "function") {
+    throw desktopError(
+      "unsupported_bridge_update",
+      "This bridge does not support iPhone-triggered bridge updates yet."
+    );
+  }
+
+  return options.updateBridgePackageAndRestart();
+}
+
 function resolveThreadId(params) {
   if (!params || typeof params !== "object") {
     return "";

package/src/desktop-ipc-action-follower.js

@@ -11,17 +11,20 @@ const path = require("path");
 const FRAME_HEADER_BYTES = 4;
 const MAX_FRAME_BYTES = 256 * 1024 * 1024;
 const REQUEST_TIMEOUT_MS = 10_000;
+const DESKTOP_IPC_ACTION_SOURCE = "desktop-ipc-action-follower";
 const DESKTOP_RESUME_METHODS = new Set(["thread/read", "thread/resume"]);
 const ACTION_METHODS = new Set([
   "item/commandExecution/requestApproval",
   "item/fileChange/requestApproval",
   "item/fileRead/requestApproval",
+  "item/permissions/requestApproval",
   "item/tool/requestUserInput",
 ]);
 const REPLY_METHOD_BY_ACTION_METHOD = new Map([
   ["item/commandExecution/requestApproval", "thread-follower-command-approval-decision"],
   ["item/fileChange/requestApproval", "thread-follower-file-approval-decision"],
   ["item/fileRead/requestApproval", "thread-follower-file-approval-decision"],
+  ["item/permissions/requestApproval", "thread-follower-file-approval-decision"],
   ["item/tool/requestUserInput", "thread-follower-submit-user-input"],
 ]);
 const METHOD_VERSION_BY_NAME = new Map([
@@ -52,6 +55,7 @@ function createDesktopIpcActionFollower({
     onDisconnect,
   });
   const rawStatesByThreadId = new Map();
+  const assistantMessageTextsByThreadId = new Map();
   const pendingRoutesByRequestId = new Map();
   const activeThreadIds = new Set();
   const recoveringThreadIds = new Set();
@@ -82,6 +86,7 @@ function createDesktopIpcActionFollower({
 
   function stopAll() {
     rawStatesByThreadId.clear();
+    assistantMessageTextsByThreadId.clear();
     pendingRoutesByRequestId.clear();
     activeThreadIds.clear();
     recoveringThreadIds.clear();
@@ -130,11 +135,13 @@ function createDesktopIpcActionFollower({
     }
 
     rawStatesByThreadId.set(threadId, nextState);
+    syncProjectedAssistantDeltas(threadId, previousState, nextState);
     syncProjectedActions(threadId, projectPendingDesktopActions(threadId, nextState));
   }
 
   function onDisconnect() {
     rawStatesByThreadId.clear();
+    assistantMessageTextsByThreadId.clear();
     pendingRoutesByRequestId.clear();
     recoveringThreadIds.clear();
     queuedChangesByThreadId.clear();
@@ -271,9 +278,34 @@ function createDesktopIpcActionFollower({
     }
 
     rawStatesByThreadId.set(threadId, nextState);
+    syncProjectedAssistantDeltas(threadId, baselineState, nextState);
     syncProjectedActions(threadId, projectPendingDesktopActions(threadId, nextState));
   }
 
+  function syncProjectedAssistantDeltas(threadId, previousState, nextState) {
+    const previousTexts = assistantMessageTextsByThreadId.get(threadId);
+    if (!previousTexts && !previousState) {
+      assistantMessageTextsByThreadId.set(threadId, snapshotAssistantMessageTexts(nextState));
+      return;
+    }
+
+    const notifications = projectDesktopAssistantDeltaNotifications(
+      threadId,
+      previousState,
+      nextState,
+      previousTexts || snapshotAssistantMessageTexts(previousState)
+    );
+    if (notifications.length === 0) {
+      assistantMessageTextsByThreadId.set(threadId, snapshotAssistantMessageTexts(nextState));
+      return;
+    }
+
+    for (const notification of notifications) {
+      sendApplicationResponse(JSON.stringify(notification));
+    }
+    assistantMessageTextsByThreadId.set(threadId, snapshotAssistantMessageTexts(nextState));
+  }
+
   return {
     observeInbound,
     stopAll,
@@ -483,7 +515,7 @@ function desktopFollowerPayloadForResponse(route, responseMessage) {
     };
   }
 
-  const decision = readString(responseMessage?.result?.decision);
+  const decision = desktopApprovalDecisionForResponse(route.method, responseMessage?.result);
   if (!APPROVAL_DECISIONS.has(decision)) {
     return null;
   }
@@ -498,6 +530,47 @@ function desktopFollowerPayloadForResponse(route, responseMessage) {
   };
 }
 
+function desktopApprovalDecisionForResponse(method, result) {
+  const explicitDecision = readString(result?.decision);
+  if (explicitDecision) {
+    return explicitDecision;
+  }
+
+  if (method !== "item/permissions/requestApproval") {
+    return "";
+  }
+
+  // Permission approvals use a grant payload on app-server, while Desktop IPC
+  // currently exposes only decision-style follower replies.
+  return hasGrantedPermission(result?.permissions) ? "accept" : "decline";
+}
+
+function hasGrantedPermission(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return false;
+  }
+
+  if (Object.keys(value).length === 0) {
+    return false;
+  }
+
+  return Object.values(value).some((entry) => {
+    if (entry == null) {
+      return false;
+    }
+    if (typeof entry === "boolean") {
+      return entry;
+    }
+    if (Array.isArray(entry)) {
+      return entry.length > 0;
+    }
+    if (typeof entry === "object") {
+      return Object.keys(entry).length > 0;
+    }
+    return true;
+  });
+}
+
 function projectPendingDesktopActions(threadId, conversationState) {
   const requests = Array.isArray(conversationState?.requests) ? conversationState.requests : [];
   return requests
@@ -507,6 +580,93 @@ function projectPendingDesktopActions(threadId, conversationState) {
     .filter(Boolean);
 }
 
+// Desktop IPC exposes full conversation snapshots/patches, not app-server assistant delta events.
+// Mirror only suffix growth for assistant rows so phones can render the same live text progression.
+function projectDesktopAssistantDeltaNotifications(
+  threadId,
+  previousState,
+  nextState,
+  previousTexts = snapshotAssistantMessageTexts(previousState)
+) {
+  const nextMessages = collectAssistantMessages(nextState);
+  const notifications = [];
+
+  for (const message of nextMessages) {
+    const previousText = previousTexts.get(message.key) || "";
+    if (!message.text || !message.text.startsWith(previousText) || message.text.length <= previousText.length) {
+      continue;
+    }
+
+    const delta = message.text.slice(previousText.length);
+    notifications.push({
+      method: "item/agentMessage/delta",
+      params: {
+        threadId,
+        turnId: message.turnId,
+        itemId: message.itemId,
+        delta,
+      },
+    });
+  }
+
+  return notifications;
+}
+
+function snapshotAssistantMessageTexts(conversationState) {
+  return new Map(collectAssistantMessages(conversationState).map((message) => [message.key, message.text]));
+}
+
+function collectAssistantMessages(conversationState) {
+  const turns = Array.isArray(conversationState?.turns) ? conversationState.turns : [];
+  const messages = [];
+  for (const turn of turns) {
+    const turnId = readString(turn?.id) || readString(turn?.turnId) || readString(turn?.turn_id);
+    const items = Array.isArray(turn?.items) ? turn.items : [];
+    for (const item of items) {
+      if (!isAssistantMessageItem(item)) {
+        continue;
+      }
+
+      const itemId = readString(item?.id) || readString(item?.itemId) || readString(item?.item_id);
+      const text = assistantMessageText(item);
+      if (!turnId || !itemId) {
+        continue;
+      }
+
+      messages.push({
+        key: `${turnId}:${itemId}`,
+        turnId,
+        itemId,
+        text,
+      });
+    }
+  }
+  return messages;
+}
+
+function isAssistantMessageItem(item) {
+  const type = normalizeToken(item?.type);
+  if (type === "agentmessage" || type === "assistantmessage") {
+    return true;
+  }
+  return type === "message" && normalizeToken(item?.role) === "assistant";
+}
+
+function assistantMessageText(item) {
+  const directText = readString(item?.text) || readString(item?.message);
+  if (directText) {
+    return directText;
+  }
+
+  const content = Array.isArray(item?.content) ? item.content : [];
+  return content
+    .map((entry) => entry && typeof entry === "object" ? entry : null)
+    .filter(Boolean)
+    .map((entry) => readString(entry.text) || readString(entry?.data?.text))
+    .filter(Boolean)
+    .join("");
+}
+
 function projectPendingDesktopAction(threadId, request) {
   const requestId = requestIdKey(request.id);
   const method = readString(request.method);
@@ -529,6 +689,7 @@ function projectPendingDesktopAction(threadId, request) {
     method,
     params: {
       ...params,
+      remodexActionSource: DESKTOP_IPC_ACTION_SOURCE,
       threadId: readString(params.threadId) || readString(params.thread_id) || threadId,
     },
   };
@@ -631,6 +792,10 @@ function writeFrame(socket, payload, callback) {
 }
 
 function resolveDefaultIpcSocketPath() {
+  if (process.platform === "win32") {
+    return "\\\\.\\pipe\\codex-ipc";
+  }
+
   const uid = typeof process.getuid === "function" ? process.getuid() : 0;
   return path.join(os.tmpdir(), "codex-ipc", `ipc-${uid}.sock`);
 }
@@ -656,6 +821,12 @@ function readString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : "";
 }
 
+function normalizeToken(value) {
+  return typeof value === "string"
+    ? value.toLowerCase().replace(/[_-\s]+/g, "")
+    : "";
+}
+
 function cloneJSON(value) {
   return JSON.parse(JSON.stringify(value));
 }
@@ -672,6 +843,7 @@ module.exports = {
   applyConversationStateChange,
   createDesktopIpcActionFollower,
   desktopFollowerPayloadForResponse,
+  projectDesktopAssistantDeltaNotifications,
   projectPendingDesktopActions,
   resolveDefaultIpcSocketPath,
   seedConversationStateFromThreadRead,

package/src/index.js

@@ -5,7 +5,7 @@
 // Depends on: ./bridge, ./secure-device-state, ./session-state, ./rollout-watch, ./macos-launch-agent
 
 const { startBridge } = require("./bridge");
-const { readBridgeDeviceState, resetBridgeDeviceState } = require("./secure-device-state");
+const { readBridgeDeviceState, resetBridgeTrustState } = require("./secure-device-state");
 const { openLastActiveThread } = require("./session-state");
 const { watchThreadRollout } = require("./rollout-watch");
 const { readBridgeConfig } = require("./codex-desktop-refresher");
@@ -14,6 +14,7 @@ const {
   printMacOSBridgePairingQr,
   printMacOSBridgeServiceStatus,
   resetMacOSBridgePairing,
+  restartMacOSBridgeService,
   runMacOSBridgeService,
   startMacOSBridgeService,
   stopMacOSBridgeService,
@@ -26,11 +27,12 @@ module.exports = {
   readBridgeConfig,
   readBridgeDeviceState,
   resetMacOSBridgePairing,
+  restartMacOSBridgeService,
   startBridge,
   runMacOSBridgeService,
   startMacOSBridgeService,
   stopMacOSBridgeService,
-  resetBridgePairing: resetBridgeDeviceState,
+  resetBridgePairing: resetBridgeTrustState,
   openLastActiveThread,
   watchThreadRollout,
 };

package/src/macos-launch-agent.js

@@ -11,7 +11,7 @@ const path = require("path");
 const { startBridge } = require("./bridge");
 const { readBridgeConfig } = require("./codex-desktop-refresher");
 const { printQR } = require("./qr");
-const { resetBridgeDeviceState } = require("./secure-device-state");
+const { resetBridgeTrustState } = require("./secure-device-state");
 const {
   clearBridgeStatus,
   clearPairingSession,
@@ -122,6 +122,65 @@ async function startMacOSBridgeService({
   };
 }
 
+// Restarts the installed LaunchAgent without rewriting relay config, useful during local bridge development.
+async function restartMacOSBridgeService({
+  env = process.env,
+  platform = process.platform,
+  fsImpl = fs,
+  execFileSyncImpl = execFileSync,
+  osImpl = os,
+  waitForPairing = false,
+  pairingTimeoutMs = DEFAULT_PAIRING_WAIT_TIMEOUT_MS,
+  pairingPollIntervalMs = DEFAULT_PAIRING_WAIT_INTERVAL_MS,
+  ...startOptions
+} = {}) {
+  assertDarwinPlatform(platform);
+  const plistPath = resolveLaunchAgentPlistPath({ env, osImpl });
+  if (!fsImpl.existsSync(plistPath)) {
+    return startMacOSBridgeService({
+      env,
+      platform,
+      fsImpl,
+      execFileSyncImpl,
+      osImpl,
+      waitForPairing,
+      pairingTimeoutMs,
+      pairingPollIntervalMs,
+      ...startOptions,
+    });
+  }
+
+  const startedAt = Date.now();
+  if (waitForPairing) {
+    clearPairingSession({ env, fsImpl });
+  }
+
+  kickstartLaunchAgent({
+    env,
+    execFileSyncImpl,
+    plistPath,
+  });
+
+  if (waitForPairing) {
+    const pairingSession = await waitForFreshPairingSession({
+      env,
+      fsImpl,
+      startedAt,
+      timeoutMs: pairingTimeoutMs,
+      intervalMs: pairingPollIntervalMs,
+    });
+    return {
+      plistPath,
+      pairingSession,
+    };
+  }
+
+  return {
+    plistPath,
+    pairingSession: null,
+  };
+}
+
 function stopMacOSBridgeService({
   env = process.env,
   platform = process.platform,
@@ -150,7 +209,7 @@ function resetMacOSBridgePairing({
   platform = process.platform,
   execFileSyncImpl = execFileSync,
   fsImpl = fs,
-  resetBridgePairingImpl = resetBridgeDeviceState,
+  resetBridgePairingImpl = resetBridgeTrustState,
 } = {}) {
   assertDarwinPlatform(platform);
   stopMacOSBridgeService({
@@ -388,6 +447,31 @@ function restartLaunchAgent({
   ], { stdio: ["ignore", "ignore", "pipe"] });
 }
 
+function kickstartLaunchAgent({
+  env = process.env,
+  execFileSyncImpl = execFileSync,
+  plistPath,
+} = {}) {
+  try {
+    execFileSyncImpl("launchctl", [
+      "kickstart",
+      "-k",
+      launchAgentLabelDomain(env),
+    ], { stdio: ["ignore", "ignore", "pipe"] });
+  } catch {
+    execFileSyncImpl("launchctl", [
+      "bootstrap",
+      launchAgentDomain(env),
+      plistPath,
+    ], { stdio: ["ignore", "ignore", "pipe"] });
+    execFileSyncImpl("launchctl", [
+      "kickstart",
+      "-k",
+      launchAgentLabelDomain(env),
+    ], { stdio: ["ignore", "ignore", "pipe"] });
+  }
+}
+
 function bootoutLaunchAgent({
   env = process.env,
   execFileSyncImpl = execFileSync,
@@ -552,6 +636,7 @@ module.exports = {
   printMacOSBridgeServiceStatus,
   resetMacOSBridgePairing,
   resolveLaunchAgentPlistPath,
+  restartMacOSBridgeService,
   runMacOSBridgeService,
   startMacOSBridgeService,
   stopMacOSBridgeService,