spiracha 1.1.1 → 1.1.2

package/apps/ui/dist/server/assets/{codex-server-BFZq2Y2O.js → codex-server-C01sv0JJ.js}

@@ -1631,6 +1631,15 @@ var buildBatchExportBaseName = (threads) => {
 var buildUniqueArchivePath = (exportDir, exportBaseName) => {
 	return path.join(exportDir, `${exportBaseName}-${randomUUID()}.zip`);
 };
+var buildUniqueBatchEntryBaseName = (baseName, threadId, usedBaseNames) => {
+	if (!usedBaseNames.has(baseName)) {
+		usedBaseNames.add(baseName);
+		return baseName;
+	}
+	const collisionSafeBaseName = `${baseName}-${threadId}`;
+	usedBaseNames.add(collisionSafeBaseName);
+	return collisionSafeBaseName;
+};
 var toDownloadOptions = (input) => {
 	return {
 		cwdFilter: null,
@@ -1829,6 +1838,7 @@ var renderCodexThreadsDownload = async (input) => {
 	const exportBaseName = buildBatchExportBaseName(threads);
 	const bundleDirectory = await createExportWorkspace(exportDir, exportBaseName);
 	const zipPath = buildUniqueArchivePath(exportDir, exportBaseName);
+	const usedBatchEntryBaseNames = /* @__PURE__ */ new Set();
 	logExportEvent("info", "batch_start", {
 		exportBaseName,
 		selectedThreadCount: threadIds.length,
@@ -1838,12 +1848,19 @@ var renderCodexThreadsDownload = async (input) => {
 	try {
 		for (const entry of browseEntries) {
 			const rolloutSnapshotBefore = await getRolloutSnapshot(entry.thread.rollout_path);
-			const relativeFileName = `${buildExportBaseName(entry.thread)}.${input.outputFormat === "md" ? "md" : "txt"}`;
+			const singleBaseName = buildExportBaseName(entry.thread);
+			const uniqueBaseName = buildUniqueBatchEntryBaseName(singleBaseName, entry.thread.id, usedBatchEntryBaseNames);
+			const relativeFileName = `${uniqueBaseName}.${input.outputFormat === "md" ? "md" : "txt"}`;
 			const savedPath = path.join(bundleDirectory, relativeFileName);
 			const transform = (text) => input.pathDisplaySettings ? applyPathTransforms(text, {
 				...input.pathDisplaySettings,
 				projectPath: entry.thread.cwd
 			}) : text;
+			if (uniqueBaseName !== singleBaseName) logExportEvent("warn", "batch_entry_name_collision", {
+				resolvedFileName: relativeFileName,
+				singleBaseName,
+				threadId: entry.thread.id
+			});
 			if (!await writeSessionFileExport({
 				fallbackReason: null,
 				outputRelativePath: relativeFileName,

package/apps/ui/dist/server/server.js

@@ -3498,47 +3498,47 @@ async function getStartManifest(matchedRoutes) {
 var manifest = {
 	"0814663c3bdc58135f97d210d145ef0be5ca54ef9a5f1e3030be9b1bfc901e30": {
 		functionName: "exportThreadFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"164ee82cdd565ed96591a64312f0f7bd961040baf066a89d9f5636330d11360b": {
 		functionName: "deleteProjectFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"29727b7ad5b8fe42e83817376653e064d9fe8888799f056b2e59296b3396568b": {
 		functionName: "deleteThreadFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"4712520da0f07bbd1f0907e5a162fe518516ff4caca3fd23876cc65539d87d7a": {
 		functionName: "getAnalyticsFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"59fb2cb4d60c8e7d47e0afcc914ee6f9d9f4bf076c8e66eab1693066753655b3": {
 		functionName: "listProjectThreadsFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"5da27045f7e28ded6353bc16aace284af7ef1b4010ef04d0186a6feadb466497": {
 		functionName: "getThreadTranscriptFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"72991e2b6e0adbf8d63bb8b139dad88a00b77b7030ec28ceac36c3cce7846b4c": {
 		functionName: "getThreadSnapshotFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"792690638a3b10035a5b7368c3d98bdc70cbfe1e36a4aa5f45b1c49b8b1025b0": {
 		functionName: "getDashboardSummaryFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"96aa60bf7dd9b5bde415bcf3ad6f6955a975eecd9aa0516cf401cc39bebebe6c": {
 		functionName: "deleteThreadsFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"b4e15c006e9a277470958bb008f89b5b0acc7256109581de44cf17d587d174a5": {
 		functionName: "exportThreadsFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	},
 	"ccefccb816ba13508f23db4e31067b3403e750225257592d3ae11071ffc3fd6f": {
 		functionName: "listProjectsFn_createServerFn_handler",
-		importer: () => import("./assets/codex-server-BFZq2Y2O.js")
+		importer: () => import("./assets/codex-server-C01sv0JJ.js")
 	}
 };
 async function getServerFnById(id, access) {

package/package.json

@@ -109,7 +109,7 @@
         "ui:preview": "bun run --cwd apps/ui preview"
     },
     "type": "module",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "workspaces": [
         "apps/*"
     ]

package/src/lib/codex-browser-export.ts

@@ -79,6 +79,17 @@ const buildUniqueArchivePath = (exportDir: string, exportBaseName: string) => {
     return path.join(exportDir, `${exportBaseName}-${randomUUID()}.zip`);
 };
 
+const buildUniqueBatchEntryBaseName = (baseName: string, threadId: string, usedBaseNames: Set<string>): string => {
+    if (!usedBaseNames.has(baseName)) {
+        usedBaseNames.add(baseName);
+        return baseName;
+    }
+
+    const collisionSafeBaseName = `${baseName}-${threadId}`;
+    usedBaseNames.add(collisionSafeBaseName);
+    return collisionSafeBaseName;
+};
+
 type RolloutSnapshot = {
     mtimeMs: number;
     sizeBytes: number;
@@ -340,6 +351,7 @@ export const renderCodexThreadsDownload = async (
     const exportBaseName = buildBatchExportBaseName(threads);
     const bundleDirectory = await createExportWorkspace(exportDir, exportBaseName);
     const zipPath = buildUniqueArchivePath(exportDir, exportBaseName);
+    const usedBatchEntryBaseNames = new Set<string>();
 
     logExportEvent('info', 'batch_start', {
         exportBaseName,
@@ -352,8 +364,13 @@ export const renderCodexThreadsDownload = async (
         for (const entry of browseEntries) {
             const rolloutSnapshotBefore = await getRolloutSnapshot(entry.thread.rollout_path);
             const singleBaseName = buildExportBaseName(entry.thread);
+            const uniqueBaseName = buildUniqueBatchEntryBaseName(
+                singleBaseName,
+                entry.thread.id,
+                usedBatchEntryBaseNames,
+            );
             const extension = input.outputFormat === 'md' ? 'md' : 'txt';
-            const relativeFileName = `${singleBaseName}.${extension}`;
+            const relativeFileName = `${uniqueBaseName}.${extension}`;
             const savedPath = path.join(bundleDirectory, relativeFileName);
             const transform = (text: string) =>
                 input.pathDisplaySettings
@@ -363,6 +380,14 @@ export const renderCodexThreadsDownload = async (
                       })
                     : text;
 
+            if (uniqueBaseName !== singleBaseName) {
+                logExportEvent('warn', 'batch_entry_name_collision', {
+                    resolvedFileName: relativeFileName,
+                    singleBaseName,
+                    threadId: entry.thread.id,
+                });
+            }
+
             const saved = await writeSessionFileExport(
                 {
                     fallbackReason: null,