codex-mobile-re 0.1.88 → 0.1.91

package/dist/index.html

@@ -12,8 +12,8 @@
     <link rel="icon" type="image/png" sizes="192x192" href="/icons/pwa-192x192.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="/icons/apple-touch-icon.png" />
     <title>Codex Web</title>
-    <script type="module" crossorigin src="/assets/index-BrpaGwQT.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-8nj0j9KO.css">
+    <script type="module" crossorigin src="/assets/index-D7o45WlH.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Dbxv7TvZ.css">
   </head>
   <body class="bg-slate-950">
     <div id="app"></div>

package/dist-cli/index.js

@@ -4862,6 +4862,23 @@ var ExternalSessionTracker = class {
     }
     return active;
   }
+  /**
+   * Thread ids whose session_meta marks them as subagent sessions
+   * (`thread_source` starts with "subagent"). Subagent sessions are materialized
+   * by the app-server with an interactive `source` (e.g. "cli"), so they show up
+   * in `thread/list`; callers that want a user-facing thread list can exclude them.
+   */
+  getSubagentThreadIds() {
+    if (!this.enabled) return [];
+    const ids = [];
+    for (const session of this.sessionByThreadId.values()) {
+      const source = (session.threadSource ?? "").toLowerCase();
+      if (source.startsWith("subagent")) {
+        ids.push(session.sessionId);
+      }
+    }
+    return ids;
+  }
   /** Run one discovery + parse + transition pass. Exposed for tests. */
   async tick() {
     if (!this.enabled || this.ticking || this.disposed) return;
@@ -5015,10 +5032,15 @@ var ExternalSessionTracker = class {
       const payload = asRecord6(record.payload);
       if (!payload) continue;
       const originator = readNonEmptyString(payload.originator);
-      if (!originator) continue;
-      session.originator = originator;
-      session.threadSource = readNonEmptyString(payload.thread_source) || null;
-      session.external = this.externalOrigins.has(originator);
+      const threadSource = readNonEmptyString(payload.thread_source);
+      if (!originator && !threadSource) continue;
+      if (originator) {
+        session.originator = originator;
+        session.external = this.externalOrigins.has(originator);
+      }
+      if (threadSource) {
+        session.threadSource = threadSource;
+      }
       const sessionId = readNonEmptyString(payload.session_id) || readNonEmptyString(payload.id);
       if (sessionId) {
         session.sessionId = sessionId;
@@ -7680,6 +7702,16 @@ function mergeImportedThreadsIntoThreadListResult(result) {
     })
   };
 }
+function filterThreadListByIds(result, threadIdsToExclude) {
+  const record = asRecord7(result);
+  const data = Array.isArray(record?.data) ? record.data : null;
+  if (!record || !data || threadIdsToExclude.size === 0) return result;
+  const filtered = data.filter((row) => {
+    const id = readNonEmptyString2(asRecord7(row)?.id);
+    return !(id.length > 0 && threadIdsToExclude.has(id));
+  });
+  return filtered.length === data.length ? result : { ...record, data: filtered };
+}
 async function collectProjectChatZipEntries(projectRoot) {
   const canonicalProjectRoot = await realpath(projectRoot);
   const codexHome = getCodexHomeDir5();
@@ -9244,7 +9276,11 @@ function applyV4aDiff(fileContent, diffText) {
   }
   return result.join("\n");
 }
-async function applyTurnFileChanges(cwd, turnInfos, allowedPatchIds) {
+function pathSetMatchesChange(allowedFilePaths, filePath, movedToPath) {
+  const candidates = movedToPath ? [filePath, movedToPath] : [filePath];
+  return candidates.some((candidate) => allowedFilePaths.has(candidate));
+}
+async function applyTurnFileChanges(cwd, turnInfos, allowedPatchIds, allowedFilePaths) {
   if (turnInfos.size === 0) return { applied: 0, errors: [], appliedPatchIds: [] };
   let applied = 0;
   const errors = [];
@@ -9257,6 +9293,7 @@ async function applyTurnFileChanges(cwd, turnInfos, allowedPatchIds) {
     for (const change of changes) {
       const filePath = isAbsolute2(change.path) ? change.path : join8(cwd, change.path);
       const movedToPath = change.movedToPath ? isAbsolute2(change.movedToPath) ? change.movedToPath : join8(cwd, change.movedToPath) : null;
+      if (allowedFilePaths && !pathSetMatchesChange(allowedFilePaths, filePath, movedToPath)) continue;
       try {
         if (change.operation === "add") {
           await mkdir4(dirname3(filePath), { recursive: true });
@@ -9311,7 +9348,7 @@ async function applyTurnFileChanges(cwd, turnInfos, allowedPatchIds) {
   }
   return { applied, errors, appliedPatchIds };
 }
-async function revertTurnFileChanges(cwd, turnInfos, allowedPatchIds) {
+async function revertTurnFileChanges(cwd, turnInfos, allowedPatchIds, allowedFilePaths) {
   if (turnInfos.size === 0) return { reverted: 0, errors: [], revertedPatchIds: [] };
   let reverted = 0;
   const errors = [];
@@ -9345,6 +9382,7 @@ async function revertTurnFileChanges(cwd, turnInfos, allowedPatchIds) {
       const change = changes[ci];
       const filePath = isAbsolute2(change.path) ? change.path : join8(cwd, change.path);
       const movedToPath = change.movedToPath ? isAbsolute2(change.movedToPath) ? change.movedToPath : join8(cwd, change.movedToPath) : null;
+      if (allowedFilePaths && !pathSetMatchesChange(allowedFilePaths, filePath, movedToPath)) continue;
       try {
         if (change.operation === "add") {
           const fileStat = await stat5(filePath).catch(() => null);
@@ -9462,29 +9500,42 @@ function mergeSessionCommandsIntoTurns(turns, sessionLogRaw) {
     const slots = orderByTurnId.get(turnId);
     if (!slots || slots.length === 0) return turn;
     const existingItems = Array.isArray(turnRecord.items) ? turnRecord.items : [];
-    if (existingItems.some((it) => typeof it.id === "string" && it.id.startsWith("session-"))) return turn;
     const agentMessages = existingItems.filter((it) => it.type === "agentMessage");
     const userMessages = existingItems.filter((it) => it.type === "userMessage");
-    let agentIdx = 0;
+    const agentSlotCount = slots.filter((slot) => slot.type === "agentMessage").length;
     const interleaved = [...userMessages];
     const recoveredIds = /* @__PURE__ */ new Set();
-    for (const slot of slots) {
-      if (slot.type === "agentMessage") {
-        if (agentIdx < agentMessages.length) {
-          interleaved.push(agentMessages[agentIdx]);
-          agentIdx++;
+    if (agentMessages.length < agentSlotCount) {
+      for (const slot of slots) {
+        if (slot.type === "commandExecution" && slot.command) {
+          interleaved.push(slot.command);
+          recoveredIds.add(slot.command.id);
+        } else if (slot.type === "fileChange" && slot.fileChange) {
+          interleaved.push(slot.fileChange);
+          recoveredIds.add(slot.fileChange.id);
         }
-      } else if (slot.type === "commandExecution" && slot.command) {
-        interleaved.push(slot.command);
-        recoveredIds.add(slot.command.id);
-      } else if (slot.type === "fileChange" && slot.fileChange) {
-        interleaved.push(slot.fileChange);
-        recoveredIds.add(slot.fileChange.id);
       }
-    }
-    while (agentIdx < agentMessages.length) {
-      interleaved.push(agentMessages[agentIdx]);
-      agentIdx++;
+      interleaved.push(...agentMessages);
+    } else {
+      let agentIdx = 0;
+      for (const slot of slots) {
+        if (slot.type === "agentMessage") {
+          if (agentIdx < agentMessages.length) {
+            interleaved.push(agentMessages[agentIdx]);
+            agentIdx++;
+          }
+        } else if (slot.type === "commandExecution" && slot.command) {
+          interleaved.push(slot.command);
+          recoveredIds.add(slot.command.id);
+        } else if (slot.type === "fileChange" && slot.fileChange) {
+          interleaved.push(slot.fileChange);
+          recoveredIds.add(slot.fileChange.id);
+        }
+      }
+      while (agentIdx < agentMessages.length) {
+        interleaved.push(agentMessages[agentIdx]);
+        agentIdx++;
+      }
     }
     const hasRecoveredWorkItems = recoveredIds.size > 0;
     for (const item of existingItems) {
@@ -12491,6 +12542,9 @@ function createCodexBridgeMiddleware() {
     });
     return changed ? { ...record, data } : result;
   }
+  function filterSubagentThreadsFromThreadListResult(result) {
+    return filterThreadListByIds(result, new Set(externalSessionTracker.getSubagentThreadIds()));
+  }
   function overlayExternalSessionOnThreadResult(result) {
     const record = asRecord7(result);
     const thread = asRecord7(record?.thread);
@@ -12968,7 +13022,8 @@ function createCodexBridgeMiddleware() {
         const trimmedResult = trimThreadTurnsInRpcResult(body.method, rpcResult);
         const errorMergedResult = THREAD_METHODS_WITH_TURNS.has(body.method) ? mergeStreamTurnErrorsIntoThreadResult(appServer, trimmedResult) : trimmedResult;
         const listMergedResult = body.method === "thread/list" ? mergeImportedThreadsIntoThreadListResult(errorMergedResult) : errorMergedResult;
-        const sanitizedResult = await sanitizeThreadTurnsInlinePayloads(body.method, listMergedResult);
+        const subagentFilteredResult = body.method === "thread/list" ? filterSubagentThreadsFromThreadListResult(listMergedResult) : listMergedResult;
+        const sanitizedResult = await sanitizeThreadTurnsInlinePayloads(body.method, subagentFilteredResult);
         const skillMergedResult = THREAD_METHODS_WITH_TURNS.has(body.method) ? await mergeSessionSkillInputsIntoThreadResult(sanitizedResult) : sanitizedResult;
         const result = THREAD_METHODS_WITH_TURNS.has(body.method) ? await mergeSessionCommandsIntoThreadResult(skillMergedResult) : skillMergedResult;
         if (THREAD_METHODS_WITH_THREAD_SNAPSHOT.has(body.method)) {
@@ -13182,6 +13237,7 @@ function createCodexBridgeMiddleware() {
           const action = readNonEmptyString2(body?.action) === "redo" ? "redo" : "undo";
           const scope = readNonEmptyString2(body?.scope) === "single_turn" ? "single_turn" : "turn_and_later";
           const patchIds = Array.isArray(body?.patchIds) ? new Set(body.patchIds.filter((value) => typeof value === "string" && value.length > 0)) : void 0;
+          const filePaths = Array.isArray(body?.filePaths) ? new Set(body.filePaths.filter((value) => typeof value === "string" && value.length > 0).map((value) => isAbsolute2(value) ? value : join8(cwd, value))) : void 0;
           if (!threadId || !turnId || !cwd) {
             setJson4(res, 400, { error: "Missing threadId, turnId, or cwd" });
             return;
@@ -13225,11 +13281,11 @@ function createCodexBridgeMiddleware() {
             return;
           }
           if (action === "redo") {
-            const result2 = await applyTurnFileChanges(cwd, turnInfos, patchIds);
+            const result2 = await applyTurnFileChanges(cwd, turnInfos, patchIds, filePaths);
             setJson4(res, 200, { ...result2, changed: result2.applied, message: `Reapplied ${result2.applied} file change(s)` });
             return;
           }
-          const result = await revertTurnFileChanges(cwd, turnInfos, patchIds);
+          const result = await revertTurnFileChanges(cwd, turnInfos, patchIds, filePaths);
           setJson4(res, 200, { ...result, changed: result.reverted, message: `Reverted ${result.reverted} file change(s)` });
         } catch (error) {
           setJson4(res, 500, { error: getErrorMessage6(error, "Failed to revert file changes") });