parallel-codex-tui 0.1.0 → 0.1.3

package/dist/workers/native-attach.js

@@ -4,13 +4,20 @@ import { readdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { spawn } from "node-pty";
-import { pathExists, readJson, readTextIfExists, writeJson } from "../core/file-store.js";
+import { pathExists, pathIsDirectory, readJson, readTextIfExists, removeIfExists, writeJson } from "../core/file-store.js";
 import { NativeSessionSchema, TaskMetaSchema } from "../domain/schemas.js";
+import { detectResumeSessionId } from "./native-session-detection.js";
 const require = createRequire(import.meta.url);
 export async function buildNativeAttachLaunch(input) {
     const nativeSession = await readWorkerNativeSession(input.worker);
     const workerConfig = input.config.workers[input.worker.engine];
     const modelConfig = workerConfig.model;
+    if (!(await pathExists(nativeSession.cwd))) {
+        throw new Error(`Native session workspace not found for ${input.worker.label}: ${nativeSession.cwd}`);
+    }
+    if (!(await pathIsDirectory(nativeSession.cwd))) {
+        throw new Error(`Native session workspace is not a directory for ${input.worker.label}: ${nativeSession.cwd}`);
+    }
     return {
         command: workerConfig.interactive.command,
         args: workerConfig.interactive.args.map((arg) => renderTemplate(arg, nativeSession.session_id, modelConfig)),
@@ -65,7 +72,13 @@ function ensureNodePtySpawnHelperExecutable() {
 async function readWorkerNativeSession(worker) {
     const workerDir = dirname(worker.statusPath);
     const nativePath = join(workerDir, "native-session.json");
-    if (!(await pathExists(nativePath))) {
+    const record = await readAttachNativeSessionIfValid(nativePath);
+    if (!record) {
+        const recoveredCodex = await recoverCodexNativeSession(worker, workerDir);
+        if (recoveredCodex) {
+            await writeJson(nativePath, NativeSessionSchema.parse(recoveredCodex));
+            return recoveredCodex;
+        }
         const recovered = await recoverClaudeNativeSession(worker, workerDir);
         if (recovered) {
             await writeJson(nativePath, NativeSessionSchema.parse(recovered));
@@ -73,12 +86,53 @@ async function readWorkerNativeSession(worker) {
         }
         throw new Error(`No native session recorded for ${worker.label}. Run the worker once before attaching, or make sure ${worker.engine} persisted a resumable session.`);
     }
-    const record = await readJson(nativePath, NativeSessionSchema);
     if (record.engine !== worker.engine) {
         throw new Error(`Native session engine mismatch for ${worker.label}: expected ${worker.engine}, got ${record.engine}`);
     }
+    if (record.worker_id !== worker.id || record.role !== worker.role) {
+        throw new Error(`Native session worker mismatch for ${worker.label}: expected ${worker.role}/${worker.id}, got ${record.role}/${record.worker_id}`);
+    }
     return record;
 }
+async function readAttachNativeSessionIfValid(nativePath) {
+    if (!(await pathExists(nativePath))) {
+        return null;
+    }
+    try {
+        return await readJson(nativePath, NativeSessionSchema);
+    }
+    catch {
+        await removeIfExists(nativePath);
+        return null;
+    }
+}
+async function recoverCodexNativeSession(worker, workerDir) {
+    if (worker.engine !== "codex") {
+        return null;
+    }
+    const taskDir = dirname(workerDir);
+    const cwd = await readTaskCwdIfValid(join(taskDir, "meta.json"));
+    if (!cwd) {
+        return null;
+    }
+    const output = await readTextIfExists(join(workerDir, "output.log"));
+    const sessionId = detectResumeSessionId(output);
+    if (!sessionId) {
+        return null;
+    }
+    const now = new Date().toISOString();
+    return {
+        engine: "codex",
+        role: worker.role,
+        worker_id: worker.id,
+        session_id: sessionId,
+        scope: "task",
+        cwd,
+        created_at: now,
+        last_used_at: now,
+        source: "output-detected"
+    };
+}
 async function recoverClaudeNativeSession(worker, workerDir) {
     if (worker.engine !== "claude") {
         return null;
@@ -88,8 +142,7 @@ async function recoverClaudeNativeSession(worker, workerDir) {
         return null;
     }
     const taskDir = dirname(workerDir);
-    const metaPath = join(taskDir, "meta.json");
-    const cwd = (await pathExists(metaPath)) ? (await readJson(metaPath, TaskMetaSchema)).cwd : null;
+    const cwd = await readTaskCwdIfValid(join(taskDir, "meta.json"));
     if (!cwd) {
         return null;
     }
@@ -112,6 +165,17 @@ async function recoverClaudeNativeSession(worker, workerDir) {
         source: "claude-project-log"
     };
 }
+async function readTaskCwdIfValid(metaPath) {
+    if (!(await pathExists(metaPath))) {
+        return null;
+    }
+    try {
+        return (await readJson(metaPath, TaskMetaSchema)).cwd;
+    }
+    catch {
+        return null;
+    }
+}
 async function findClaudeProjectSession(input) {
     const projectDir = join(claudeProjectsDir(), claudeProjectSlug(input.cwd));
     if (!(await pathExists(projectDir))) {

package/dist/workers/native-session-detection.js

@@ -0,0 +1,17 @@
+export function detectNativeSessionId(text) {
+    const labeled = text.match(/\b(?:session id|session_id|session)\s*[:=]\s*([A-Za-z0-9._:@-]{4,})/i);
+    if (labeled?.[1] && isLikelyNativeSessionId(labeled[1])) {
+        return labeled[1];
+    }
+    return detectResumeSessionId(text);
+}
+export function detectResumeSessionId(text) {
+    const resume = text.match(/\b(?:codex|claude)\s+resume\s+([A-Za-z0-9._:@-]{4,})\b/i);
+    return resume?.[1] && isLikelyNativeSessionId(resume[1]) ? resume[1] : null;
+}
+export function isLikelyNativeSessionId(value) {
+    if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value)) {
+        return true;
+    }
+    return value.length >= 8 && /[0-9]/.test(value) && /[._:@-]/.test(value);
+}

package/dist/workers/process-adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { appendText, writeJson } from "../core/file-store.js";
+import { detectNativeSessionId } from "./native-session-detection.js";
 export class ProcessWorkerAdapter {
     name;
     command;
@@ -43,7 +44,7 @@ export class ProcessWorkerAdapter {
     }
     async runAttempt(runSpec, launch, options = {}) {
         await setStatus(runSpec, "starting", options.startPhase ?? "process-starting", options.startSummary ?? `Starting ${this.command}`);
-        await appendText(runSpec.outputLogPath, `$ ${this.command} ${launch.args.join(" ")}\n`);
+        await appendText(runSpec.outputLogPath, `$ ${formatShellCommand(this.command, launch.args)}\n`);
         return new Promise((resolve, reject) => {
             const child = spawn(this.command, launch.args, {
                 cwd: runSpec.cwd,
@@ -239,6 +240,15 @@ function renderTemplate(value, sessionId, modelConfig) {
         .replaceAll("{provider}", modelConfig?.provider ?? "")
         .replace(/\{env:([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, name) => process.env[name] ?? "");
 }
+function formatShellCommand(command, args) {
+    return [command, ...args].map(shellQuote).join(" ");
+}
+function shellQuote(value) {
+    if (value.length > 0 && /^[A-Za-z0-9_./:=@%+,-]+$/.test(value)) {
+        return value;
+    }
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
 function summarizeOutput(text) {
     const lines = text
         .split(/\r?\n/)
@@ -259,7 +269,3 @@ async function setStatus(spec, state, phase, summary, nativeSessionId) {
         ...(nativeSessionId ? { native_session_id: nativeSessionId } : {})
     });
 }
-function detectNativeSessionId(text) {
-    const match = text.match(/\b(?:session id|session_id|session)\s*[:=]\s*([A-Za-z0-9._:@-]{4,})/i);
-    return match?.[1] ?? null;
-}

package/package.json

@@ -1,9 +1,21 @@
 {
   "name": "parallel-codex-tui",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "A TypeScript TUI wrapper for routed parallel coding with Codex and Claude workers.",
   "license": "MIT",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/allendred/parallel-codex-tui.git"
+  },
+  "bugs": {
+    "url": "https://github.com/allendred/parallel-codex-tui/issues"
+  },
+  "homepage": "https://github.com/allendred/parallel-codex-tui#readme",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "keywords": [
     "codex",
     "claude",
@@ -12,7 +24,7 @@
     "agent-orchestration"
   ],
   "engines": {
-    "node": ">=22.5.0"
+    "node": ">=26.0.0"
   },
   "bin": {
     "parallel-codex-tui": "dist/cli.js"