@mp-lb/berth 0.1.4 → 0.1.6

package/dist/berth.js

@@ -5995,7 +5995,7 @@ var require_lib = __commonJS({
 });
 
 // package.json
-var version = "0.1.4";
+var version = "0.1.6";
 
 // src/runAuthCommand.ts
 import { spawn } from "node:child_process";
@@ -24103,13 +24103,6 @@ var runPromptCommand = async (args2) => {
   );
 };
 
-// ../../packages/core/src/work/data/getSessionRecoveryProblem.ts
-var getSessionRecoveryProblem = (session) => {
-  if (session.endedAt) return "Worker was intentionally ended.";
-  if (!session.startedAt) return "Worker startup was never confirmed.";
-  return null;
-};
-
 // ../../packages/core/src/work/data/renderAgentPrompt.ts
 var import_handlebars = __toESM(require_lib(), 1);
 
@@ -24162,7 +24155,7 @@ var terminalSessionCreateSchema = terminalSessionSchema.pick({
 var terminalSessionUpdateSchema = external_exports.strictObject({
   id: external_exports.uuid(),
   startedAt: external_exports.iso.datetime().optional(),
-  endedAt: external_exports.iso.datetime().optional(),
+  endedAt: external_exports.iso.datetime().nullable().optional(),
   error: external_exports.string().max(2e3).nullable().optional(),
   workerSessionId: external_exports.string().max(200).nullable().optional()
 }).refine(
@@ -24170,7 +24163,9 @@ var terminalSessionUpdateSchema = external_exports.strictObject({
   {
     message: "Set startedAt or endedAt."
   }
-);
+).refine((input) => input.endedAt !== null || input.startedAt !== void 0, {
+  message: "Confirm startedAt when relaunching an ended worker."
+});
 
 // src/renderWorkerCommand.ts
 var renderWorkerCommand = (template, values) => {
@@ -24227,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 ?? ""}`,
@@ -24274,8 +24271,6 @@ var attachTmuxSession = (name) => {
 
 // src/recoverTerminalSession.ts
 var recoverTerminalSession = async (session, worker, prompts) => {
-  if (session.endedAt || !session.startedAt)
-    throw new Error("Session is not an unexpectedly exited session.");
   if (tmuxSessionExists(session.terminalSessionId))
     throw new Error("Session is already running.");
   if (session.workerTypeId !== "shell" && (!worker?.resumeCommand || !session.workerSessionId))
@@ -24311,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;
 
@@ -24380,13 +24407,19 @@ var runSessionCommand = async (args2) => {
     const machine = resolveSessionMachine(config2);
     if (session.machineId !== machine.id)
       throw new Error("Session belongs to another work machine.");
-    const problem = getSessionRecoveryProblem(session);
-    if (problem) throw new Error(problem);
-    return recoverTerminalSession(
+    const result = await recoverTerminalSession(
       session,
       session.workerTypeId === "shell" ? null : findWorkerType(config2.workerTypes ?? [], session.workerTypeId),
       config2.agentPrompts
     );
+    if (session.endedAt || !session.startedAt || session.error)
+      await client.terminalSession.update.mutate({
+        id: session.id,
+        startedAt: session.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        endedAt: null,
+        error: null
+      });
+    return result;
   }
   if (action === "attach" && value && !agentValue) {
     const session = await client.terminalSession.read.query(
@@ -24400,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.4",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "bin": {