@mp-lb/berth 0.1.5 → 0.1.6

package/dist/berth.js

@@ -5995,7 +5995,7 @@ var require_lib = __commonJS({
 });
 
 // package.json
-var version = "0.1.5";
+var version = "0.1.6";
 
 // src/runAuthCommand.ts
 import { spawn } from "node:child_process";
@@ -24222,6 +24222,8 @@ var startTmuxSession = (name, directory, command, sessionId, machineId) => {
       "-c",
       directory,
       "env",
+      "-u",
+      "CODEX_THREAD_ID",
       `BERTH_SESSION_ID=${sessionId}`,
       `BERTH_MACHINE_ID=${machineId}`,
       `PATH=${process.env.PATH ?? ""}`,
@@ -24304,6 +24306,38 @@ var recoverTerminalSession = async (session, worker, prompts) => {
   return { id: session.id, recovered: true };
 };
 
+// src/registerTerminalSession.ts
+var registerTerminalSession = async (value) => {
+  const id = external_exports.uuid().parse(value);
+  if (process.env.BERTH_SESSION_ID !== id || !process.env.TMUX)
+    throw new Error(
+      "Registration must run inside the matching Berth terminal session."
+    );
+  const client = createWorkClient();
+  let session = await client.terminalSession.read.query(id);
+  const machine = resolveSessionMachine(await client.config.read.query());
+  if (session.machineId !== machine.id || !tmuxSessionExists(session.terminalSessionId) || currentTmuxSessionName() !== session.terminalSessionId)
+    throw new Error("Registration must run in this exact terminal session.");
+  if (session.workerTypeId === "codex" && !session.workerSessionId && !process.env.CODEX_THREAD_ID)
+    throw new Error(
+      "Codex conversation ID is unavailable. Run registration from a shell command inside the Codex conversation."
+    );
+  if (session.workerTypeId === "codex" && process.env.CODEX_THREAD_ID) {
+    const workerSessionId = external_exports.uuid().parse(process.env.CODEX_THREAD_ID);
+    if (session.workerSessionId && session.workerSessionId !== workerSessionId)
+      throw new Error(
+        "Worker is already linked to a different Codex conversation."
+      );
+    if (!session.workerSessionId)
+      session = await client.terminalSession.update.mutate({
+        id,
+        startedAt: session.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        workerSessionId
+      });
+  }
+  return session.taskId ? client.terminalSession.register.mutate(id) : session;
+};
+
 // ../../packages/core/src/work/data/resolveDefaultWorkerTypeId.ts
 var resolveDefaultWorkerTypeId = (types, current) => types.some((type) => type.id === current) ? current : types[0]?.id ?? null;
 
@@ -24399,18 +24433,8 @@ var runSessionCommand = async (args2) => {
     attachTmuxSession(session.terminalSessionId);
     return { id: session.id, detached: true };
   }
-  if (action === "register" && value && !agentValue) {
-    const id = external_exports.uuid().parse(value);
-    if (process.env.BERTH_SESSION_ID !== id || !process.env.TMUX)
-      throw new Error(
-        "Registration must run inside the matching Berth terminal session."
-      );
-    const session = await client.terminalSession.read.query(id);
-    const machine = resolveSessionMachine(await client.config.read.query());
-    if (session.machineId !== machine.id || !tmuxSessionExists(session.terminalSessionId) || currentTmuxSessionName() !== session.terminalSessionId)
-      throw new Error("Registration must run in this exact terminal session.");
-    return client.terminalSession.register.mutate(id);
-  }
+  if (action === "register" && value && !agentValue)
+    return registerTerminalSession(value);
   if (action === "start" && value && !instanceSlug) {
     const taskId = external_exports.uuid().parse(value);
     const workerTypeId = await prepareTaskWorkerInstance(taskId, agentValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mp-lb/berth",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "bin": {