@mp-lb/berth 0.1.2 → 0.1.4

package/dist/berth.js

@@ -5995,7 +5995,7 @@ var require_lib = __commonJS({
 });
 
 // package.json
-var version = "0.1.2";
+var version = "0.1.4";
 
 // src/runAuthCommand.ts
 import { spawn } from "node:child_process";
@@ -23251,6 +23251,36 @@ var runInstanceCommand = async (args2) => {
   });
 };
 
+// ../../packages/core/src/work/schemas/messageEventSchema.ts
+var messageEventSchema = external_exports.strictObject({
+  at: external_exports.iso.datetime(),
+  actor: external_exports.string().trim().min(1).nullable(),
+  action: external_exports.enum([
+    "assigned",
+    "commented",
+    "closed",
+    "reopened",
+    "requested",
+    "approved",
+    "rejected",
+    "deferred",
+    "restored"
+  ]),
+  assignee: external_exports.string().trim().min(1).nullable().optional(),
+  request: external_exports.strictObject({
+    summary: external_exports.string(),
+    evidence: external_exports.string(),
+    deliveryAttemptId: external_exports.string().nullable()
+  }).optional(),
+  note: external_exports.string().trim().max(8e3).optional()
+});
+
+// ../../packages/core/src/work/schemas/messageAppendSchema.ts
+var messageAppendSchema = messageEventSchema.omit({ at: true, request: true }).extend({
+  id: external_exports.string().min(1),
+  expectedLength: external_exports.number().int().nonnegative()
+});
+
 // ../../packages/core/src/work/schemas/messageTypeSchema.ts
 var messageTypeSchema = external_exports.string().trim().min(1).max(100).regex(/^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/);
 
@@ -23275,6 +23305,7 @@ var messageListSchema = external_exports.strictObject({
 // ../../packages/core/src/work/schemas/messageCreateSchema.ts
 var messageCreateSchema = external_exports.strictObject({
   recipient: messageRecipientSchema,
+  sender: external_exports.string().trim().min(1).nullable().default(null),
   type: messageTypeSchema.default("message"),
   priority: external_exports.number().int().default(0),
   projectId: slugSchema.nullable(),
@@ -23424,6 +23455,8 @@ var blockerSchema = external_exports.discriminatedUnion("type", [
 // ../../packages/core/src/work/schemas/messageSchema.ts
 var messageSchema = external_exports.strictObject({
   id: external_exports.string(),
+  sender: external_exports.string().min(1).nullable().optional(),
+  timeline: external_exports.array(messageEventSchema).optional(),
   type: messageTypeSchema,
   recipient: messageRecipientSchema,
   priority: external_exports.number().int(),
@@ -23457,33 +23490,39 @@ var runMessageCommand = async (args2) => {
   if (extra.length) throw new Error("Quote the JSON payload as one argument.");
   if (action === "schema") {
     const schemas = {
+      append: messageAppendSchema,
       create: messageCreateSchema,
       update: messageUpdateSchema,
       list: messageListSchema
     };
     const key = input ?? "create";
-    if (key !== "create" && key !== "update" && key !== "list")
-      throw new Error("Choose create, update or list schema.");
+    if (key !== "append" && key !== "create" && key !== "update" && key !== "list")
+      throw new Error("Choose create, update, append or list schema.");
     return external_exports.toJSONSchema(schemas[key], { io: "input" });
   }
   const api = createWorkClient().message;
   if (action === "types" && input === void 0) return api.types.query();
+  if (action === "read" && typeof input === "string")
+    return api.read.query(input);
   const payload = input === void 0 ? void 0 : JSON.parse(input);
   if (action === "list")
     return api.list.query(messageListSchema.optional().parse(payload));
   if (action === "read" && typeof input === "string")
     return api.read.query(input);
+  if (action === "append")
+    return api.append.mutate(messageAppendSchema.parse(payload));
   if (action === "create")
     return api.create.mutate(messageCreateSchema.parse(payload));
   if (action === "update")
     return api.update.mutate(messageUpdateSchema.parse(payload));
   throw new Error(
-    "Messages support types, create, update, read, list and schema."
+    "Messages support types, create, update, append, read, list and schema."
   );
 };
 
 // ../../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)
@@ -24064,6 +24103,13 @@ 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);
 
@@ -24071,7 +24117,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
@@ -24083,7 +24130,7 @@ var renderAgentPrompt = (prompts, key, variables) => import_handlebars.default.c
 })(variables);
 
 // src/runSessionCommand.ts
-import { setTimeout as delay2 } from "node:timers/promises";
+import { setTimeout as delay3 } from "node:timers/promises";
 import { realpathSync } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import { join as join6 } from "node:path";
@@ -24141,41 +24188,8 @@ var findWorkerType = (types, id) => {
   return type;
 };
 
-// ../../packages/core/src/work/data/resolveDefaultWorkerTypeId.ts
-var resolveDefaultWorkerTypeId = (types, current) => types.some((type) => type.id === current) ? current : types[0]?.id ?? null;
-
-// src/prepareTaskWorkerInstance.ts
-var prepareTaskWorkerInstance = async (taskId, instanceSlug) => {
-  external_exports.uuid().parse(taskId);
-  const config2 = await createWorkClient().config.read.query();
-  const workerTypeId = resolveDefaultWorkerTypeId(
-    config2.workerTypes ?? [],
-    config2.defaultWorkerTypeId
-  );
-  if (!workerTypeId) throw new Error("Configure a default worker type first.");
-  findWorkerType(config2.workerTypes ?? [], workerTypeId);
-  const context = await readTaskLaunchContext(taskId);
-  if (!["draft", "queue"].includes(context.task.status))
-    throw new Error(
-      "Only an unstarted Draft or Queue task can start a worker."
-    );
-  if (context.task.blocked || context.task.ownership?.worker || context.task.workerId)
-    throw new Error("Task is blocked or already assigned to a worker.");
-  if (context.state === "missing_instance") {
-    if (!context.project) throw new Error("Task has no project to prepare.");
-    await runInstanceCommand([
-      "prepare",
-      "--project",
-      context.project.id,
-      "--task",
-      context.task.slug,
-      ...instanceSlug ? ["--slug", instanceSlug] : []
-    ]);
-  } else if (context.state !== "ready") {
-    throw new Error(`Task instance is ${context.state}; cannot start worker.`);
-  }
-  return workerTypeId;
-};
+// src/recoverTerminalSession.ts
+import { setTimeout as delay2 } from "node:timers/promises";
 
 // src/tmuxSession.ts
 import { spawnSync } from "node:child_process";
@@ -24258,6 +24272,81 @@ var attachTmuxSession = (name) => {
     throw new Error("Could not attach to the tmux session.");
 };
 
+// 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))
+    throw new Error(
+      "Worker has no configured resume command or conversation ID."
+    );
+  if (worker && !/{{\s*prompt\s*}}/.test(worker.resumeCommand))
+    throw new Error("Resume command must include {{prompt}} to continue work.");
+  if (worker && !/{{\s*workerSessionId\s*}}/.test(worker.resumeCommand))
+    throw new Error(
+      "Resume command must include {{workerSessionId}} to resume the original conversation."
+    );
+  const command = worker ? renderWorkerCommand(worker.resumeCommand, {
+    prompt: renderAgentPrompt(prompts, "workerRecovery", {
+      taskId: session.taskId ?? ""
+    }),
+    sessionId: session.id,
+    workerSessionId: session.workerSessionId ?? "",
+    taskId: session.taskId ?? "",
+    directory: session.directory,
+    terminalSessionId: session.terminalSessionId
+  }) : null;
+  startTmuxSession(
+    session.terminalSessionId,
+    session.directory,
+    command,
+    session.id,
+    session.machineId
+  );
+  await delay2(250);
+  if (!tmuxSessionExists(session.terminalSessionId))
+    throw new Error("Worker exited immediately after recovery.");
+  return { id: session.id, recovered: true };
+};
+
+// ../../packages/core/src/work/data/resolveDefaultWorkerTypeId.ts
+var resolveDefaultWorkerTypeId = (types, current) => types.some((type) => type.id === current) ? current : types[0]?.id ?? null;
+
+// src/prepareTaskWorkerInstance.ts
+var prepareTaskWorkerInstance = async (taskId, instanceSlug) => {
+  external_exports.uuid().parse(taskId);
+  const config2 = await createWorkClient().config.read.query();
+  const workerTypeId = resolveDefaultWorkerTypeId(
+    config2.workerTypes ?? [],
+    config2.defaultWorkerTypeId
+  );
+  if (!workerTypeId) throw new Error("Configure a default worker type first.");
+  findWorkerType(config2.workerTypes ?? [], workerTypeId);
+  const context = await readTaskLaunchContext(taskId);
+  if (!["draft", "queue"].includes(context.task.status))
+    throw new Error(
+      "Only an unstarted Draft or Queue task can start a worker."
+    );
+  if (context.task.blocked || context.task.ownership?.worker || context.task.workerId)
+    throw new Error("Task is blocked or already assigned to a worker.");
+  if (context.state === "missing_instance") {
+    if (!context.project) throw new Error("Task has no project to prepare.");
+    await runInstanceCommand([
+      "prepare",
+      "--project",
+      context.project.id,
+      "--task",
+      context.task.slug,
+      ...instanceSlug ? ["--slug", instanceSlug] : []
+    ]);
+  } else if (context.state !== "ready") {
+    throw new Error(`Task instance is ${context.state}; cannot start worker.`);
+  }
+  return workerTypeId;
+};
+
 // src/runSessionCommand.ts
 var runSessionCommand = async (args2) => {
   const [action, value, agentValue, instanceSlug, ...extra] = args2;
@@ -24283,6 +24372,22 @@ var runSessionCommand = async (args2) => {
       live: session.machineId === machine.id ? tmuxSessionExists(session.terminalSessionId) : null
     };
   }
+  if (action === "recover" && value && !agentValue) {
+    const session = await client.terminalSession.read.query(
+      external_exports.uuid().parse(value)
+    );
+    const config2 = await client.config.read.query();
+    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(
+      session,
+      session.workerTypeId === "shell" ? null : findWorkerType(config2.workerTypes ?? [], session.workerTypeId),
+      config2.agentPrompts
+    );
+  }
   if (action === "attach" && value && !agentValue) {
     const session = await client.terminalSession.read.query(
       external_exports.uuid().parse(value)
@@ -24354,7 +24459,7 @@ var runSessionCommand = async (args2) => {
         session.id,
         machine.id
       );
-      await delay2(250);
+      await delay3(250);
       if (!tmuxSessionExists(session.terminalSessionId))
         throw new Error("Agent process exited immediately after launch.");
       return client.terminalSession.update.mutate({
@@ -24460,7 +24565,7 @@ var runSessionCommand = async (args2) => {
         session.id,
         context.machine.id
       );
-      await delay2(250);
+      await delay3(250);
       if (!tmuxSessionExists(session.terminalSessionId))
         throw new Error("Agent process exited immediately after launch.");
     } catch (error51) {
@@ -24479,7 +24584,7 @@ var runSessionCommand = async (args2) => {
     });
   }
   throw new Error(
-    "Use berth session list|read|status|create|start|launch|attach|kill|delete|register|schema. Run berth --help."
+    "Use berth session list|read|status|create|start|launch|recover|attach|kill|delete|register|schema. Run berth --help."
   );
 };
 
@@ -24573,6 +24678,9 @@ var runRoleCommand = async (args2) => {
 // ../../packages/core/src/work/schemas/signOffRequestSchema.ts
 var signOffRequestSchema = external_exports.strictObject({
   slug: taskSlugSchema,
+  sender: external_exports.string().trim().min(1).optional().describe(
+    "Requesting role within the project; defaults to delivery-owner."
+  ),
   deliveryAttemptId: external_exports.uuid().optional().describe(
     "Latest recorded delivery attempt; omitted selects latest. Legacy issued requests remain valid without an attempt."
   ),
@@ -25223,6 +25331,7 @@ berth session status <session-uuid>
 berth session create [shell|worker-type-id] [directory]
 berth session start <task-uuid> [instance-slug]
 berth session launch <task-uuid> <worker-type-id> [instance-slug]
+berth session recover <session-uuid>
 berth session attach <session-uuid>
 berth session kill <session-uuid>
 berth session delete <session-uuid>
@@ -25249,7 +25358,8 @@ berth message create '{"recipient":{"name":"delivery-owner","projectId":"bond"},
 berth message update '{"id":"<message-id>","recipient":{"name":"delivery-owner","projectId":"bond"}}'
 berth message read <message-id>
 berth message list '{"recipient":{"name":"delivery-owner","projectId":"bond"}}'
-berth message schema [create|update|list]
+berth message append '{"id":"<message-id>","expectedLength":1,"actor":"delivery-owner","action":"closed"}'
+berth message schema [create|update|append|list]
 Messages are stored records. Recipient, type, priority and status are independent.
 List includes stored messages; deleting one never deletes its task or blocker.
 

package/package.json

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