@fclef819/cdx 0.1.6 → 0.1.8

package/bin/cdx.js

@@ -126,28 +126,57 @@ function getLatestSessionSnapshot(verbose) {
   return { id, mtimeMs: latest.mtimeMs, path: latest.path };
 }
 
-function getLastHistorySessionId(verbose) {
-  if (!fs.existsSync(HISTORY_PATH)) return null;
-  const lines = fs.readFileSync(HISTORY_PATH, "utf8").trim().split("\n");
-  for (let i = lines.length - 1; i >= 0; i -= 1) {
-    try {
-      const record = JSON.parse(lines[i]);
-      if (record && record.session_id) return record.session_id;
-    } catch {
-      // ignore malformed lines
+function sessionHasUserMessage(filePath) {
+  try {
+    const lines = fs.readFileSync(filePath, "utf8").split("\n");
+    for (const line of lines) {
+      if (!line.trim()) continue;
+      const record = JSON.parse(line);
+      if (
+        record?.type === "event_msg" &&
+        record.payload?.type === "user_message"
+      ) {
+        return true;
+      }
     }
+  } catch {
+    // ignore malformed or missing files
   }
-  logVerbose("No session_id found in history.jsonl", verbose);
-  return null;
+  return false;
+}
+
+function getHistorySnapshot(verbose) {
+  if (!fs.existsSync(HISTORY_PATH)) return { size: 0 };
+  const stat = fs.statSync(HISTORY_PATH);
+  logVerbose(`History file size: ${stat.size}`, verbose);
+  return { size: stat.size };
 }
 
-function getNewestHistorySessionIdSince(previousId, verbose) {
+function getNewestHistorySessionIdSince(snapshot, verbose) {
   if (!fs.existsSync(HISTORY_PATH)) return null;
-  const lines = fs.readFileSync(HISTORY_PATH, "utf8").trim().split("\n");
+  const stat = fs.statSync(HISTORY_PATH);
+  const previousSize = snapshot?.size ?? 0;
+  const start = stat.size < previousSize ? 0 : previousSize;
+  if (stat.size <= start) {
+    logVerbose("No new history lines found in history.jsonl", verbose);
+    return null;
+  }
+
+  const fd = fs.openSync(HISTORY_PATH, "r");
+  let content = "";
+  try {
+    const buffer = Buffer.alloc(stat.size - start);
+    fs.readSync(fd, buffer, 0, buffer.length, start);
+    content = buffer.toString("utf8");
+  } finally {
+    fs.closeSync(fd);
+  }
+
+  const lines = content.trim().split("\n");
   for (let i = lines.length - 1; i >= 0; i -= 1) {
     try {
       const record = JSON.parse(lines[i]);
-      if (record && record.session_id && record.session_id !== previousId) {
+      if (record && record.session_id) {
         return record.session_id;
       }
     } catch {
@@ -166,33 +195,21 @@ function runCodex(args, cwd, verbose) {
     } catch {
       // ignore if not supported
     }
-    process.stdin.resume();
   }
   const result = spawnSync("codex", args, { stdio: "inherit", cwd });
   if (result.error) {
     if (result.error.code === "ENOENT" && process.platform === "win32") {
-      logVerbose("codex not found directly; trying where.exe lookup", verbose);
-      const whereResult = spawnSync("where.exe", ["codex"], { encoding: "utf8" });
-      const resolved = whereResult.stdout
-        ? whereResult.stdout.split(/\r?\n/).find(Boolean)
-        : null;
-      if (resolved) {
-        logVerbose(`Resolved codex path: ${resolved}`, verbose);
-        let resolvedResult;
-        if (resolved.toLowerCase().endsWith(".cmd") || resolved.toLowerCase().endsWith(".bat")) {
-          resolvedResult = spawnSync(
-            "cmd.exe",
-            ["/d", "/s", "/c", resolved, ...args],
-            { stdio: "inherit", cwd }
-          );
-        } else {
-          resolvedResult = spawnSync(resolved, args, { stdio: "inherit", cwd });
-        }
-        if (!resolvedResult.error) {
-          return { status: resolvedResult.status ?? 0 };
-        }
+      logVerbose("codex not found directly; trying cmd.exe /c", verbose);
+      const cmdResult = spawnSync(
+        "cmd.exe",
+        ["/d", "/s", "/c", "codex", ...args],
+        { stdio: "inherit", cwd }
+      );
+      if (!cmdResult.error) {
+        if (process.stdin.isTTY) process.stdin.pause();
+        return { status: cmdResult.status ?? 0 };
       }
-      logVerbose("codex not found via where.exe; trying PowerShell fallback", verbose);
+      logVerbose("codex not found via cmd.exe; trying PowerShell fallback", verbose);
       const psArgs = [
         "-NoProfile",
         "-Command",
@@ -203,6 +220,7 @@ function runCodex(args, cwd, verbose) {
         cwd
       });
       if (!psResult.error) {
+        if (process.stdin.isTTY) process.stdin.pause();
         return { status: psResult.status ?? 0 };
       }
     }
@@ -211,6 +229,7 @@ function runCodex(args, cwd, verbose) {
     );
     process.exit(1);
   }
+  if (process.stdin.isTTY) process.stdin.pause();
   return { status: result.status ?? 0 };
 }
 
@@ -289,21 +308,21 @@ async function runDefault(startDir, options) {
     const labelInput = await promptLabel();
     if (!labelInput) return;
     const label = sanitizeLabel(labelInput);
-    const previousHistoryId = getLastHistorySessionId(options.verbose);
+    const previousHistory = getHistorySnapshot(options.verbose);
     const previousSession = getLatestSessionSnapshot(options.verbose);
     const codexResult = runCodex([], workDir, options.verbose);
     const latestSession = getLatestSessionSnapshot(options.verbose);
-    let newId = null;
+    let newId = getNewestHistorySessionIdSince(previousHistory, options.verbose);
     if (
+      !newId &&
       latestSession &&
       latestSession.id &&
       (!previousSession ||
         latestSession.path !== previousSession.path ||
-        latestSession.mtimeMs > previousSession.mtimeMs)
+        latestSession.mtimeMs > previousSession.mtimeMs) &&
+      sessionHasUserMessage(latestSession.path)
     ) {
       newId = latestSession.id;
-    } else if (previousHistoryId) {
-      newId = getNewestHistorySessionIdSince(previousHistoryId, options.verbose);
     }
     if (!newId) {
       console.error("Could not determine new session UUID; not updating .cdx.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fclef819/cdx",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Codex session wrapper",
   "keywords": [
     "codex",
@@ -17,7 +17,8 @@
     "README.md"
   ],
   "scripts": {
-    "release": "npm login && npm pack && npm publish --access public"
+    "release": "npm pack && npm publish --access public",
+    "gh-release": "gh release create v$npm_package_version --generate-notes"
   },
   "engines": {
     "node": ">=18"