pi-famulus 0.1.3 → 0.1.4

package/src/wake.ts

@@ -5,10 +5,13 @@
  * discriminator the renderer and the eval adapter both read.
  */
 
+// .ts suffix: eval/ loads this module with Node's own TypeScript support, which
+// needs explicit extensions (it imports wake.ts and behavior-guidelines.ts).
+import { fill, PROMPTS } from "./prompts.generated.ts";
+
 export const FAMULUS_WAKE_CUSTOM_TYPE = "pi-famulus-wake";
 
-export const FAMULUS_WAKE_LEAD_IN =
-  "System wake — not a new user message. Handle this <pi-famulus-wake> before other work.";
+export const FAMULUS_WAKE_LEAD_IN = PROMPTS["wakes.lead-in"];
 
 export interface WakeItem {
   id: string;
@@ -60,6 +63,21 @@ export interface OverrunShell {
   growing: boolean | null;
 }
 
+/** Context retained for every secondary child in a batched overrun wake. */
+export interface SubagentOverrunChild {
+  runId: string;
+  childId: string;
+  name: string;
+  elapsedMs: number;
+  budgetMs: number;
+  reminder: number;
+  nextReminderMs: number;
+  /** Time left until the opt-in hard ceiling aborts this child. */
+  hardCeilingMs?: number;
+  lastActivity: { agoMs: number; text: string };
+  shell?: OverrunShell;
+}
+
 /**
  * When the wake's content was generated (design.md §4.5): stamped by the
  * NotifyCenter when it receives or builds the wake. A steered wake can wait
@@ -133,6 +151,7 @@ type FamulusWakeBody =
       summary: string;
       lastActivity: { agoMs: number; text: string };
       shell?: OverrunShell;
+      additional?: SubagentOverrunChild[];
     }
   | { kind: "supervisor-request"; from: string; name: string; message: string }
   | { kind: "supervisor-update"; from: string; name: string; message: string };
@@ -177,6 +196,7 @@ export function wakeIds(details: { kind?: string }): string[] {
   };
   if (d.kind === "task") return (d.tasks ?? []).map((task) => task.id);
   if (d.kind === "subagent-done") return (d.children ?? []).map((child) => child.childId);
+  if (d.kind === "subagent-overrun") return [d.childId, ...((d as { additional?: { childId: string }[] }).additional ?? []).map((child) => child.childId)].filter((id): id is string => Boolean(id));
   return [d.id ?? d.taskId ?? d.childId ?? d.from].filter((id): id is string => Boolean(id));
 }
 
@@ -317,7 +337,7 @@ function renderHandover(details: Extract<FamulusWake, { kind: "subagent-handover
     parts.push(
       `  <changed-since-as-of>${escapeXml(
         `${details.name} (${details.childId}): ${details.statusAsOf} → ${details.status}.` +
-          (active ? " Its result arrives as a new wake when it finishes." : ""),
+          (active ? ` ${PROMPTS["wakes.handover.changed-active"]}` : ""),
       )}</changed-since-as-of>`,
     );
   }
@@ -344,7 +364,7 @@ function renderDone(details: Extract<FamulusWake, { kind: "subagent-done" }>): s
     const active = details.children.some((c) => c.status === "pending" || c.status === "running");
     parts.push(
       `  <changed-since-as-of>${escapeXml(
-        `${list}.` + (active ? " The run is active again; another subagent-done arrives when it finishes." : ""),
+        `${list}.` + (active ? ` ${PROMPTS["wakes.done.changed-active"]}` : ""),
       )}</changed-since-as-of>`,
     );
   }
@@ -387,17 +407,29 @@ function renderOverrun(details: Extract<FamulusWake, { kind: "subagent-overrun"
   parts.push(
     `  <last-activity ago-ms="${Math.round(details.lastActivity.agoMs)}">${escapeXml(details.lastActivity.text)}</last-activity>`,
   );
-  const shell = details.shell;
-  if (shell) {
-    const shellAttrs = [`task-id="${escapeXmlAttr(shell.taskId)}"`, `elapsed-ms="${Math.round(shell.elapsedMs)}"`];
-    if (shell.outputBytes !== null) shellAttrs.push(`output-bytes="${shell.outputBytes}"`);
-    if (shell.outputIdleMs !== null) shellAttrs.push(`output-idle-ms="${Math.round(shell.outputIdleMs)}"`);
-    if (shell.growing !== null) shellAttrs.push(`growing="${shell.growing ? "yes" : "no"}"`);
-    parts.push(`  <shell ${shellAttrs.join(" ")}>`);
-    parts.push(`    <command>${escapeXml(shell.command)}</command>`);
-    parts.push(`    <output-file>${escapeXml(shell.outputPath)}</output-file>`);
-    parts.push("  </shell>");
+  if (details.additional?.length) {
+    parts.push("  <also-overdue>");
+    for (const child of details.additional) {
+      const childAttrs = [
+        `run-id="${escapeXmlAttr(child.runId)}"`,
+        `child-id="${escapeXmlAttr(child.childId)}"`,
+        `name="${escapeXmlAttr(child.name)}"`,
+        `elapsed-ms="${Math.round(child.elapsedMs)}"`,
+        `budget-ms="${Math.round(child.budgetMs)}"`,
+        `reminder="${child.reminder}"`,
+        `next-reminder-ms="${Math.round(child.nextReminderMs)}"`,
+      ];
+      if (child.hardCeilingMs !== undefined) childAttrs.push(`hard-ceiling-ms="${Math.round(child.hardCeilingMs)}"`);
+      parts.push(`    <child ${childAttrs.join(" ")}>`);
+      parts.push(
+        `      <last-activity ago-ms="${Math.round(child.lastActivity.agoMs)}">${escapeXml(child.lastActivity.text)}</last-activity>`,
+      );
+      if (child.shell) parts.push(...renderOverrunShell(child.shell, "      "));
+      parts.push("    </child>");
+    }
+    parts.push("  </also-overdue>");
   }
+  if (details.shell) parts.push(...renderOverrunShell(details.shell, "  "));
   parts.push(`  <options>${escapeXml(overrunOptions(details))}</options>`);
   parts.push("</pi-famulus-wake>");
   return parts.join("\n");
@@ -405,37 +437,34 @@ function renderOverrun(details: Extract<FamulusWake, { kind: "subagent-overrun"
 
 /** The parent's three actions and what happens if it takes none. */
 function overrunOptions(details: Extract<FamulusWake, { kind: "subagent-overrun" }>): string {
-  const ids = `run_id: "${details.runId}", child_id: "${details.childId}"`;
-  const actions =
-    `give it more time with subagent({ action: "extend", ${ids}, timeout_ms: <ms from now> }); ` +
-    `redirect it with agent_message({ action: "send", to: "${details.childId}", message: "<instruction>" }); ` +
-    `or stop it with subagent({ action: "interrupt", ${ids} }). `;
+  const actions = fill("wakes.overrun.actions", { runId: details.runId, childId: details.childId });
+  const next = wakeDuration(details.nextReminderMs);
   const hard = details.hardCeilingMs;
-  if (hard === undefined) {
-    return (
-      "It has not been stopped. Choose one: " +
-      actions +
-      `If you do none of these, it keeps running and the next reminder is scheduled in ${wakeDuration(details.nextReminderMs)}; ` +
-      "its result arrives as usual when it finishes."
-    );
-  }
+  if (hard === undefined) return fill("wakes.overrun.options", { actions, next });
   // Opt-in hard ceiling: never promise "keeps running" past it.
   const ceiling = wakeDuration(hard);
   const noAction =
     details.nextReminderMs < hard
-      ? `If you do none of these, it keeps running and the next reminder is scheduled in ${wakeDuration(details.nextReminderMs)}, until the hard ceiling stops it in ${ceiling}.`
-      : "If you do none of these, it keeps running until the hard ceiling stops it.";
-  return (
-    `It has not been stopped yet, but the configured hard ceiling stops it in ${ceiling}, and extend does not move that ceiling. ` +
-    "Choose one: " +
-    actions +
-    noAction +
-    " Its result, or the interruption, arrives as a wake."
-  );
+      ? fill("wakes.overrun.ceiling-no-action-reminder", { next, ceiling })
+      : PROMPTS["wakes.overrun.ceiling-no-action"];
+  return fill("wakes.overrun.options-ceiling", { ceiling, actions, noAction });
+}
+
+function renderOverrunShell(shell: OverrunShell, indent: string): string[] {
+  const shellAttrs = [`task-id="${escapeXmlAttr(shell.taskId)}"`, `elapsed-ms="${Math.round(shell.elapsedMs)}"`];
+  if (shell.outputBytes !== null) shellAttrs.push(`output-bytes="${shell.outputBytes}"`);
+  if (shell.outputIdleMs !== null) shellAttrs.push(`output-idle-ms="${Math.round(shell.outputIdleMs)}"`);
+  if (shell.growing !== null) shellAttrs.push(`growing="${shell.growing ? "yes" : "no"}"`);
+  return [
+    `${indent}<shell ${shellAttrs.join(" ")}>`,
+    `${indent}  <command>${escapeXml(shell.command)}</command>`,
+    `${indent}  <output-file>${escapeXml(shell.outputPath)}</output-file>`,
+    `${indent}</shell>`,
+  ];
 }
 
 function renderRequest(details: Extract<FamulusWake, { kind: "supervisor-request" }>): string {
-  const recipe = `agent_message { action: "reply", to: "${details.from}", message: "<your decision>" }`;
+  const recipe = fill("wakes.request.reply-with", { from: details.from });
   return [
     `<pi-famulus-wake kind="supervisor-request" from="${escapeXmlAttr(details.from)}" name="${escapeXmlAttr(details.name)}">`,
     `  <message>${escapeXml(details.message)}</message>`,

package/src/work-index.ts

@@ -14,6 +14,10 @@ export const WORK_FINISHED_CAP = 50;
 export interface WorkItem {
   id: string;
   kind: WorkKind;
+  /** Daemon work-kind label for agents; shell commands are classified separately. */
+  workKind?: string;
+  /** Time queued for local/machine admission before the agent started. */
+  queueMs?: number;
   status: string;
   title: string;
   command?: string;