@mp-lb/berth 0.1.3 → 0.1.5

package/dist/berth.js

@@ -5995,7 +5995,7 @@ var require_lib = __commonJS({
 });
 
 // package.json
-var version = "0.1.3";
+var version = "0.1.5";
 
 // src/runAuthCommand.ts
 import { spawn } from "node:child_process";
@@ -23522,6 +23522,7 @@ var runMessageCommand = async (args2) => {
 
 // ../../packages/core/src/work/schemas/agentPromptsSchema.ts
 var agentPromptsSchema = external_exports.object({
+  workerRecovery: external_exports.string().min(1).optional(),
   workerLaunch: external_exports.string().min(1),
   roleMessage: external_exports.string().min(1),
   reassignedRoleMessage: external_exports.string().min(1)
@@ -24102,22 +24103,6 @@ var runPromptCommand = async (args2) => {
   );
 };
 
-// ../../packages/core/src/work/data/getSessionRecoveryProblem.ts
-var getSessionRecoveryProblem = (session, task) => {
-  if (!task || session.taskId !== task.uuid || task.status !== "working" || task.archivedAt)
-    return "Task is not in the working column.";
-  if (task.workerRun?.completedAt)
-    return "This worker has already completed its work.";
-  const owner = task.ownership?.worker;
-  if (owner && (!("sessionId" in owner) || owner.sessionId !== session.id || owner.machineId !== session.machineId))
-    return "Task is assigned to another worker.";
-  if (task.workerId && task.workerId !== session.workerSessionId)
-    return "Task is assigned to another worker.";
-  if (session.endedAt || !session.startedAt)
-    return "Session is not an unexpectedly exited session.";
-  return null;
-};
-
 // ../../packages/core/src/work/data/renderAgentPrompt.ts
 var import_handlebars = __toESM(require_lib(), 1);
 
@@ -24125,7 +24110,8 @@ var import_handlebars = __toESM(require_lib(), 1);
 var agentPromptDefaults_default = {
   workerLaunch: "Run fm read 'worker.md' --store 'mp-lb/roles' and follow its instructions for task {{taskId}}.",
   roleMessage: "You have a new Berth message ({{messageId}}). Read it with berth message read {{messageId}}.",
-  reassignedRoleMessage: "Berth message {{messageId}} is ready for you. Read it with berth message read {{messageId}}."
+  reassignedRoleMessage: "Berth message {{messageId}} is ready for you. Read it with berth message read {{messageId}}.",
+  workerRecovery: "Your terminal was interrupted. Review your conversation and the current state of task {{taskId}} if one is linked. Continue only unfinished work still assigned to you, respect blockers, and do not repeat completed actions. If work is complete or assigned elsewhere, wait for instructions."
 };
 
 // ../../packages/core/src/work/data/defaultAgentPrompts.ts
@@ -24169,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(
@@ -24177,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) => {
@@ -24280,9 +24268,7 @@ var attachTmuxSession = (name) => {
 };
 
 // src/recoverTerminalSession.ts
-var recoverTerminalSession = async (session, worker) => {
-  if (session.endedAt || !session.startedAt)
-    throw new Error("Session is not an unexpectedly exited session.");
+var recoverTerminalSession = async (session, worker, prompts) => {
   if (tmuxSessionExists(session.terminalSessionId))
     throw new Error("Session is already running.");
   if (session.workerTypeId !== "shell" && (!worker?.resumeCommand || !session.workerSessionId))
@@ -24296,7 +24282,9 @@ var recoverTerminalSession = async (session, worker) => {
       "Resume command must include {{workerSessionId}} to resume the original conversation."
     );
   const command = worker ? renderWorkerCommand(worker.resumeCommand, {
-    prompt: `Your terminal was interrupted. Review task ${session.taskId ?? ""} and your prior progress, then continue working. Respect any existing blockers and do not repeat completed actions.`,
+    prompt: renderAgentPrompt(prompts, "workerRecovery", {
+      taskId: session.taskId ?? ""
+    }),
     sessionId: session.id,
     workerSessionId: session.workerSessionId ?? "",
     taskId: session.taskId ?? "",
@@ -24385,18 +24373,19 @@ var runSessionCommand = async (args2) => {
     const machine = resolveSessionMachine(config2);
     if (session.machineId !== machine.id)
       throw new Error("Session belongs to another work machine.");
-    if (!session.taskId)
-      throw new Error("Only task sessions can be recovered.");
-    const tasks = await client.task.list.query({ status: "working" });
-    const problem = getSessionRecoveryProblem(
-      session,
-      tasks.find((task) => task.uuid === session.taskId)
-    );
-    if (problem) throw new Error(problem);
-    return recoverTerminalSession(
+    const result = await recoverTerminalSession(
       session,
-      session.workerTypeId === "shell" ? null : findWorkerType(config2.workerTypes ?? [], session.workerTypeId)
+      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(

package/package.json

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