@hypercarrier/rarebit 0.1.0-alpha.6 → 0.2.0

package/src/extension.mjs

@@ -13,6 +13,7 @@ import {
 } from "./rarebit-service.mjs";
 import {
   DEFAULT_RAREBIT_SUMMARY_POLICY,
+  normalizeRarebitSummaryPrompt,
   selectRarebits,
   sha256,
 } from "./rarebit-core.mjs";
@@ -23,6 +24,7 @@ import {
   getRarebitArgumentCompletions,
   parseRarebitCommand,
   rarebitCommandDescription,
+  rarebitCommandUsage,
 } from "./rarebit-command.mjs";
 import {
   buildRarebitForkPlan,
@@ -39,6 +41,12 @@ import {
   createDetachedMaterializer,
   registerRarebitLifecycle,
 } from "./lifecycle.mjs";
+import { createRarebitRecapController } from "./rarebit-recap.mjs";
+import {
+  openRarebitPalette,
+  openRarebitSettings,
+  rarebitPaletteCommand,
+} from "./rarebit-settings-ui.mjs";
 import {
   automaticSummaryInhibitionIdentity,
   queryAutomaticSummaryPolicy,
@@ -104,6 +112,10 @@ export async function readConfiguredRarebitSettings({
     },
     summaryPolicy: resolved.summaryPolicy,
     autoTitle: resolved.autoTitle,
+    maxInputTokens: resolved.maxInputTokens,
+    summaryPrompt: resolved.summaryPrompt,
+    diagnostics: resolved.diagnostics,
+    recap: resolved.recap,
     reserveTokens: resolveReserveTokens(global.value, project.value, model),
   };
 }
@@ -121,6 +133,10 @@ export default function registerPiRarebit(pi, config = {}) {
     });
   const activityReporter =
     explicit.activityReporter ?? createHerdrActivityReporter();
+  const recapController = createRarebitRecapController({
+    delayMs: explicit.recap?.delayMs,
+    timezone: explicit.recap?.timezone,
+  });
   const projectActivity = (ctx) => {
     const entries = ctx?.sessionManager?.getBranch?.() ?? [];
     return projectRarebitSessionActivity({
@@ -155,10 +171,11 @@ export default function registerPiRarebit(pi, config = {}) {
       ? `${name} tokens: ${value}`
       : `${name} tokens: unavailable`;
 
-  const notifyOutcome = (ctx, result, triggered) => {
-    if (!triggered || result?.duplicate || result?.inFlight) return;
+  const notifyOutcome = (ctx, result, triggered, diagnostics = {}) => {
+    if (result?.duplicate || result?.inFlight) return;
     switch (result?.record?.status) {
       case "ok":
+        if (!triggered || diagnostics.summaryUpdated !== true) return;
         notify(
           ctx,
           `Rarebit Summary updated (${tokenLabel("input", result.record.synthesis?.usage?.inputTokens)} · ${tokenLabel("output", result.record.synthesis?.usage?.outputTokens)} · model ${resultModelLabel(result)})`,
@@ -221,6 +238,16 @@ export default function registerPiRarebit(pi, config = {}) {
       ...injected,
       ...explicit,
       summaryPolicy,
+      maxInputTokens: explicit.maxInputTokens ?? injected.maxInputTokens,
+      summaryPrompt: explicit.summaryPrompt ?? injected.summaryPrompt,
+      diagnostics: {
+        ...(injected.diagnostics ?? {}),
+        ...(explicit.diagnostics ?? {}),
+      },
+      recap: {
+        ...(injected.recap ?? {}),
+        ...(explicit.recap ?? {}),
+      },
       piAi: explicit.piAi ?? {
         complete: async (...args) => (await import("@earendil-works/pi-ai/compat")).complete(...args),
       },
@@ -228,10 +255,23 @@ export default function registerPiRarebit(pi, config = {}) {
   };
 
   const materialize = async (ctx, { force = false } = {}) => {
+    const recapToken = recapController.captureMaterialization(ctx);
     let synthesisTriggered = false;
     const effective = await loadEffective(ctx);
+    let summaryPrompt;
+    try {
+      summaryPrompt = normalizeRarebitSummaryPrompt(effective.summaryPrompt).guidance;
+    } catch (error) {
+      notify(
+        ctx,
+        `Invalid rarebit.summary_prompt: ${error?.message ?? error}`,
+        "error",
+      );
+      return { record: { status: "invalid_configuration" } };
+    }
     const result = await processRarebitSummary(ctx, {
       ...effective,
+      summaryPrompt,
       forceSynthesis: force,
       lifecycleBoundary: force ? "manual" : ctx?.lifecycleBoundary,
       queryAutomaticSummaryPolicy:
@@ -239,14 +279,26 @@ export default function registerPiRarebit(pi, config = {}) {
       onSynthesisTriggered: (detail) => {
         synthesisTriggered = true;
         const count = detail.rarebitCount ?? detail.rarebitCount;
-        notify(
-          ctx,
-          `Rarebit Summary triggered (${count} Rarebits · input tokens: ~${detail.estimatedInputTokens} estimated (chars/4) · model ${modelLabel(detail.model)})`,
-          "info",
-        );
+        if (effective.diagnostics?.summaryTriggered === true)
+          notify(
+            ctx,
+            `Rarebit Summary triggered (${count} Rarebits · input tokens: ~${detail.estimatedInputTokens} estimated (chars/4) · model ${modelLabel(detail.model)})`,
+            "info",
+          );
       },
     });
-    notifyOutcome(ctx, result, synthesisTriggered);
+    notifyOutcome(ctx, result, synthesisTriggered, effective.diagnostics);
+    recapController.offer({
+      ctx,
+      result,
+      token: recapToken,
+      recapEnabled: effective.recap?.enabled !== false,
+      recapDelayMs: effective.recap?.delayMs,
+      recapTimezone: effective.recap?.timezone,
+      sessionRoot: effective.sessionRoot,
+      rarebitRoot: effective.rarebitRoot,
+      allowExternalSession: effective.allowExternalSession === true,
+    });
     return result;
   };
   const schedule = createDetachedMaterializer(materialize, (_error, ctx) => {
@@ -354,20 +406,33 @@ export default function registerPiRarebit(pi, config = {}) {
   );
 
   registerRarebitLifecycle(pi, schedule, {
-    onSessionStart: (ctx) => {
+    onSessionStart: (ctx, generation) => {
+      recapController.invalidate(ctx, generation);
       activeSession = identityFrom(ctx);
       activityReporter.start(projectActivity(ctx));
     },
-    onSessionTree: (ctx) => {
+    onAgentStart: (ctx, generation) => {
+      recapController.invalidate(ctx, generation);
+    },
+    onTurnStart: (ctx, generation) => {
+      recapController.invalidate(ctx, generation);
+    },
+    onInputSent: (ctx, generation) => {
+      recapController.invalidate(ctx, generation);
+    },
+    onSessionTree: (ctx, _event, generation) => {
+      recapController.invalidate(ctx, generation);
       activityReporter.update(projectActivity(ctx));
     },
     onSelectedUserPersisted: (ctx) => {
       activityReporter.update(projectActivity(ctx));
     },
     onAgentSettled: (ctx) => {
+      recapController.updateContext(ctx);
       activityReporter.update(projectActivity(ctx));
     },
-    onSessionShutdown: () => {
+    onSessionShutdown: (ctx, generation) => {
+      recapController.invalidate(ctx, generation);
       activeSession = undefined;
       activityReporter.stop();
     },
@@ -445,7 +510,35 @@ ${fence(requestText)}`;
     description: rarebitCommandDescription(),
     getArgumentCompletions: getRarebitArgumentCompletions,
     handler: async (args, ctx) => {
-      const command = parseRarebitCommand(args);
+      let commandInput = String(args ?? "");
+      const trimmedCommandInput = commandInput.trim();
+      if (!trimmedCommandInput || trimmedCommandInput === "menu") {
+        const currentUiState = () => ({
+          ...identityFrom(ctx),
+          branchLeafId: ctx?.sessionManager?.getBranch?.()?.at(-1)?.id ?? null,
+          cwd: ctx?.cwd ?? process.cwd(),
+          projectTrusted: ctx?.isProjectTrusted?.() === true,
+        });
+        const initial = currentUiState();
+        const selection = await openRarebitPalette(ctx, {
+          isCurrent: () => {
+            const current = currentUiState();
+            return current.sessionId === initial.sessionId &&
+              current.sessionFile === initial.sessionFile &&
+              current.branchLeafId === initial.branchLeafId &&
+              current.cwd === initial.cwd &&
+              current.projectTrusted === initial.projectTrusted;
+          },
+        });
+        commandInput = rarebitPaletteCommand(selection) ?? "";
+        if (!commandInput) return;
+        if (selection?.id === "recall") {
+          const prompt = await ctx.ui.input?.("Rarebit recall prompt", "");
+          if (prompt === undefined || !String(prompt).trim()) return;
+          commandInput = `recall ${prompt}`;
+        }
+      }
+      const command = parseRarebitCommand(commandInput);
       if (!command.ok) {
         notify(
           ctx,
@@ -457,6 +550,61 @@ ${fence(requestText)}`;
         return;
       }
       const { subcommand, arguments: rest } = command;
+      if (subcommand === "help") {
+        notify(
+          ctx,
+          [
+            rarebitCommandUsage(),
+            ...(commandInput.trim().split(/\s+/).length === 1
+              ? ["Use /rarebit to open the interactive command palette."]
+              : []),
+          ].join("\n"),
+          "info",
+        );
+        return;
+      }
+      if (subcommand === "settings") {
+        const currentUiState = () => ({
+          ...identityFrom(ctx),
+          branchLeafId: ctx?.sessionManager?.getBranch?.()?.at(-1)?.id ?? null,
+          cwd: ctx?.cwd ?? process.cwd(),
+          projectTrusted: ctx?.isProjectTrusted?.() === true,
+        });
+        const initial = currentUiState();
+        await openRarebitSettings(ctx, {
+          initialScope: rest[0] === "project" ? "project" : "global",
+          projectTrusted: initial.projectTrusted,
+          isCurrent: () => {
+            const current = currentUiState();
+            return current.sessionId === initial.sessionId &&
+              current.sessionFile === initial.sessionFile &&
+              current.branchLeafId === initial.branchLeafId &&
+              current.cwd === initial.cwd &&
+              current.projectTrusted === initial.projectTrusted;
+          },
+          onSaved: async ({ namespace, document }) => {
+            const previous = document?.namespace ?? {};
+            const changed = (path) => {
+              const read = (value) => path.reduce((current, key) => current?.[key], value);
+              return JSON.stringify(read(previous)) !== JSON.stringify(read(namespace));
+            };
+            if (changed(["max_rarebit_ratio"])) {
+              const next = { ...policyOverrides };
+              delete next.maxRarebitRatio;
+              policyOverrides = next;
+            }
+            if (changed(["min_total_length"])) {
+              const next = { ...policyOverrides };
+              delete next.minTotalLength;
+              policyOverrides = next;
+            }
+            if (changed(["auto_title"])) autoTitleOverride = undefined;
+            const effective = await loadEffective(ctx);
+            if (effective.recap?.enabled === false) recapController.invalidate(ctx);
+          },
+        });
+        return;
+      }
       if (subcommand === "fork") {
         if (typeof ctx?.switchSession !== "function") {
           notify(ctx, "Rarebit fork is unavailable in this Pi runtime", "error");
@@ -580,7 +728,7 @@ ${fence(requestText)}`;
           : "settings_or_default";
         notify(
           ctx,
-          `Rarebit ${subcommand}: auto-title=${autoTitleOverride ?? effective.autoTitle ?? true}; max_rarebit_ratio=${policy.maxRarebitRatio} (${ratioSource}); min_total_length=${policy.minTotalLength} estimated tokens via ceil(chars/4) (${lengthSource}); measurement=${policy.measurementVersion}; model=${modelLabel(effective.model)} from ${effective.modelProvenance?.settingsKey ?? "explicit config"}${policyStatus}`,
+          `Rarebit ${subcommand}: auto-title=${autoTitleOverride ?? effective.autoTitle ?? true}; recap=${effective.recap?.enabled !== false ? "on" : "off"} after ${effective.recap?.delayMs ?? 60000}ms (${effective.recap?.timezone ?? "host"}); diagnostics=triggered:${effective.diagnostics?.summaryTriggered === true ? "on" : "off"},updated:${effective.diagnostics?.summaryUpdated === true ? "on" : "off"}; max_input_tokens=${effective.maxInputTokens ?? 64000}; max_rarebit_ratio=${policy.maxRarebitRatio} (${ratioSource}); min_total_length=${policy.minTotalLength} estimated tokens via ceil(chars/4) (${lengthSource}); measurement=${policy.measurementVersion}; model=${modelLabel(effective.model)} from ${effective.modelProvenance?.settingsKey ?? "explicit config"}${policyStatus}`,
           "info",
         );
         return;
@@ -610,6 +758,28 @@ ${fence(requestText)}`;
         );
         return;
       }
+      if (subcommand === "recap") {
+        if (effective.recap?.enabled === false) {
+          recapController.invalidate(ctx);
+          notify(ctx, "Rarebit Recap is disabled in settings", "info");
+          return;
+        }
+        const recap = await recapController.showExisting(ctx, {
+          sessionRoot: effective.sessionRoot,
+          rarebitRoot: effective.rarebitRoot,
+          recapTimezone: effective.recap?.timezone,
+          allowExternalSession: effective.allowExternalSession === true,
+        });
+        if (!recap.shown)
+          notify(
+            ctx,
+            recap.reason === "no_current_summary"
+              ? "Rarebit has no current Summary for this Session branch"
+              : "Rarebit Recap is unavailable in this UI",
+            "warning",
+          );
+        return;
+      }
       if (subcommand === "title") {
         void generateTitle(ctx, { manual: true }).catch(() =>
           notify(ctx, "Rarebit title generation failed", "error"),

package/src/lifecycle.mjs

@@ -16,7 +16,12 @@ function messageText(event) {
     .join("\n");
 }
 
-function snapshotMaterializationContext(ctx, mayNotify, lifecycleBoundary) {
+function snapshotMaterializationContext(
+  ctx,
+  mayNotify,
+  lifecycleBoundary,
+  rarebitLifecycleGeneration,
+) {
   const sessionManager = ctx?.sessionManager;
   const header = sessionManager?.getHeader?.();
   const branch = sessionManager?.getBranch?.();
@@ -39,6 +44,7 @@ function snapshotMaterializationContext(ctx, mayNotify, lifecycleBoundary) {
     modelRegistry: ctx?.modelRegistry,
     sessionId: ctx?.sessionId,
     lifecycleBoundary,
+    rarebitLifecycleGeneration,
     isProjectTrusted: () => projectTrusted,
     sessionManager: {
       getHeader: () => header,
@@ -126,6 +132,7 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
   let ownerMessageSeen = false;
   let sessionGeneration = 0;
   let sessionLive = false;
+  let rarebitLifecycleGeneration = 0;
   const MAX_PENDING_INPUT_ORIGINS = 256;
 
   const clearInputOrigins = () => {
@@ -169,7 +176,8 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
   };
 
   pi.on("session_start", (_event, ctx) => {
-    options.onSessionStart?.(ctx);
+    rarebitLifecycleGeneration += 1;
+    options.onSessionStart?.(ctx, rarebitLifecycleGeneration);
     clearInputOrigins();
     persistedUserInputAwaitingProvider = false;
     selectedUserMessageAwaitingProvider = false;
@@ -185,13 +193,26 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
     // the selected Session evidence.
   });
 
-  pi.on("agent_start", () => {
+  pi.on("agent_start", (_event, ctx) => {
+    rarebitLifecycleGeneration += 1;
+    options.onAgentStart?.(ctx, rarebitLifecycleGeneration);
     // A retry, compaction pass, or queued continuation starts a new agent run;
     // an earlier stop is not the fully settled branch.
     normalStopAwaitingSettlement = false;
   });
 
-  pi.on("input", (event) => {
+  pi.on("turn_start", (_event, ctx) => {
+    rarebitLifecycleGeneration += 1;
+    options.onTurnStart?.(ctx, rarebitLifecycleGeneration);
+  });
+
+  pi.on("input", (event, ctx) => {
+    rarebitLifecycleGeneration += 1;
+    try {
+      options.onInputSent?.(ctx, rarebitLifecycleGeneration);
+    } catch {
+      // Human-facing cancellation is optional and must not alter input delivery.
+    }
     const bucket =
       event?.streamingBehavior === "steer"
         ? "steer"
@@ -235,8 +256,9 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
   });
 
   pi.on("session_tree", (event, ctx) => {
+    rarebitLifecycleGeneration += 1;
     try {
-      options.onSessionTree?.(ctx, event);
+      options.onSessionTree?.(ctx, event, rarebitLifecycleGeneration);
     } catch {
       // Tree recency is an optional projection, not materialization truth.
     }
@@ -261,6 +283,7 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
       ctx,
       () => sessionLive && sessionGeneration === generation,
       pendingLifecycleBoundary,
+      rarebitLifecycleGeneration,
     );
     pendingLifecycleBoundary = "owner_request";
     schedule(snapshot);
@@ -306,17 +329,19 @@ export function registerRarebitLifecycle(pi, schedule, options = {}) {
         ctx,
         () => sessionLive && sessionGeneration === generation,
         "agent_settled",
+        rarebitLifecycleGeneration,
       ),
     );
   });
 
-  pi.on("session_shutdown", () => {
+  pi.on("session_shutdown", (_event, ctx) => {
+    rarebitLifecycleGeneration += 1;
     clearInputOrigins();
     persistedUserInputAwaitingProvider = false;
     selectedUserMessageAwaitingProvider = false;
     firstOwnerInputAwaitingProvider = undefined;
     normalStopAwaitingSettlement = false;
     sessionLive = false;
-    options.onSessionShutdown?.();
+    options.onSessionShutdown?.(ctx, rarebitLifecycleGeneration);
   });
 }

package/src/rarebit-cli.mjs

@@ -205,6 +205,7 @@ export async function readRarebitCliSettings({
       rawRefs: [globalPath, projectPath],
     },
     summaryPolicy: resolved.summaryPolicy,
+    summaryPrompt: resolved.summaryPrompt,
     autoTitle: resolved.autoTitle,
   };
 }
@@ -351,6 +352,7 @@ export async function runRarebitCli(options, dependencies = {}) {
         model: runtime.model,
         modelProvenance: runtime.modelProvenance,
         summaryPolicy: runtime.summaryPolicy,
+        summaryPrompt: runtime.summaryPrompt,
         forceSynthesis: options.force === true,
         allowExternalSession: true,
         rarebitRoot: dependencies.rarebitRoot,

package/src/rarebit-command.mjs

@@ -17,8 +17,23 @@ const rest = (usage) => ({
 
 export const RAREBIT_COMMAND_GRAMMAR = Object.freeze({
   name: "rarebit",
-  defaultSubcommand: "status",
+  defaultSubcommand: "menu",
   subcommands: Object.freeze([
+    {
+      name: "menu",
+      description: "Open the interactive Rarebit command palette",
+      forms: [[]],
+    },
+    {
+      name: "settings",
+      description: "Open interactive Rarebit settings",
+      forms: [[], [literal("global", "Edit global Pi settings")], [literal("project", "Edit trusted project settings")]],
+    },
+    {
+      name: "help",
+      description: "Show Rarebit command help",
+      forms: [[]],
+    },
     {
       name: "status",
       description: "Show effective Rarebit configuration",
@@ -73,6 +88,11 @@ export const RAREBIT_COMMAND_GRAMMAR = Object.freeze({
       usageNote: "use Pi's native /name for a literal title",
       forms: [[]],
     },
+    {
+      name: "recap",
+      description: "Show the current Recap in the TUI",
+      forms: [[]],
+    },
     {
       name: "summarize",
       description: "Force a Rarebit Summary materialization",

package/src/rarebit-core.mjs

@@ -7,6 +7,16 @@ import { createHash } from "node:crypto";
 export const RAREBIT_SELECTOR_VERSION = "rarebit-selector-v1";
 export const RAREBIT_MEASUREMENT_VERSION = "rarebit-prose-chars-div4-v1";
 export const RAREBIT_SUMMARY_PROMPT_VERSION = "rarebit-summary-v6";
+export const RAREBIT_SUMMARY_PROMPT_IDENTITY_VERSION =
+  "rarebit-summary-prompt-v1";
+// User guidance is a UTF-16 string in JavaScript. Bound it before any Summary
+// provider work so a malformed settings value cannot create an unbounded job.
+export const MAX_RAREBIT_SUMMARY_PROMPT_CHARS = 64_000;
+// Receipts have a 48 KiB protocol limit. Keep the configurable Summary field
+// well below that limit even when the model returns multi-byte text.
+export const MAX_RAREBIT_SUMMARY_CHARS = 8_000;
+export const DEFAULT_RAREBIT_SUMMARY_PROMPT_GUIDANCE =
+  "The summary is free-form prose. State when evidence is uncertain, confusing, contradictory, or importantly missing instead of inventing a coherent account.";
 export const RAREBIT_TITLE_PROMPT_VERSION = "rarebit-title-v1";
 export const RAREBIT_JOB_IDENTITY_VERSION = "rarebit-job-identity-v2";
 
@@ -274,12 +284,50 @@ function semanticMessages(selection) {
   }));
 }
 
+/**
+ * Resolve the bounded Summary style contract. The setting is a scalar prompt
+ * fragment. The fixed evidence and status contract remains in this module.
+ * The normalized identity is used by the service to prevent a changed prompt
+ * from reusing an older receipt.
+ */
+export function normalizeRarebitSummaryPrompt(value) {
+  if (value === undefined) {
+    return {
+      guidance: DEFAULT_RAREBIT_SUMMARY_PROMPT_GUIDANCE,
+      promptIdentity: null,
+    };
+  }
+  if (typeof value !== "string")
+    throw new TypeError("summary_prompt must be a string");
+  const guidance = value.replace(/\r\n?/g, "\n").trim();
+  if (!guidance) throw new TypeError("summary_prompt must not be blank");
+  if (guidance.length > MAX_RAREBIT_SUMMARY_PROMPT_CHARS)
+    throw new RangeError(
+      `summary_prompt must not exceed ${MAX_RAREBIT_SUMMARY_PROMPT_CHARS} UTF-16 characters`,
+    );
+  if (/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/.test(guidance))
+    throw new TypeError("summary_prompt contains unsafe control characters");
+  return {
+    guidance,
+    promptIdentity:
+      guidance === DEFAULT_RAREBIT_SUMMARY_PROMPT_GUIDANCE
+        ? null
+        : sha256({
+            version: RAREBIT_SUMMARY_PROMPT_IDENTITY_VERSION,
+            guidance,
+          }),
+  };
+}
+
 function summaryPromptParts(messages, {
   lifecycleBoundary,
   omittedMessageCount = 0,
   omittedTextChars = 0,
+  summaryPrompt,
 } = {}) {
   const ownerRequest = lifecycleBoundary === "owner_request";
+  const resolvedPrompt = normalizeRarebitSummaryPrompt(summaryPrompt);
+  const styleLine = resolvedPrompt.guidance;
   const omission =
     omittedMessageCount > 0 || omittedTextChars > 0
       ? {
@@ -294,7 +342,7 @@ function summaryPromptParts(messages, {
     "You are the HyperCarrier Rarebit summarizer.",
     "Summarize only what is explicitly stated in the ordered Rarebit evidence stream below.",
     "If an omission record appears, it is authoritative: earlier evidence is unavailable to you. Do not infer what was trimmed, and state when important missing evidence makes the account uncertain or confusing.",
-    "The summary is free-form prose. State when evidence is uncertain, confusing, contradictory, or importantly missing instead of inventing a coherent account.",
+    styleLine,
     "Identify every active, non-superseded request visible in the supplied evidence, not only the last turn. Explicit cancellation, replacement, supersession, and later resolution make an earlier request inactive.",
     "Selected evidence contains only user and assistant message prose at Rarebit continuation or stop boundaries. Tool-call inputs, tool results, hidden reasoning, and transport records are deliberately absent.",
     "Absence of a tool transcript is unobservable and must never by itself imply that work was not performed.",
@@ -328,27 +376,32 @@ export function composeRarebitSummaryDerivationInput(
     promptVersion = RAREBIT_SUMMARY_PROMPT_VERSION,
     lifecycleBoundary = "manual",
     maxPromptChars = Number.MAX_SAFE_INTEGER,
+    summaryPrompt,
   } = {},
 ) {
-  void promptVersion;
   if (
     !RAREBIT_SUMMARY_WRITABLE_LIFECYCLE_BOUNDARIES.includes(lifecycleBoundary)
   )
     throw new TypeError("Unsupported Summary lifecycle boundary");
   if (!Number.isInteger(maxPromptChars) || maxPromptChars < 1)
     throw new RangeError("maxPromptChars must be a positive integer");
+  const resolvedPrompt = normalizeRarebitSummaryPrompt(summaryPrompt);
 
   const allMessages = semanticMessages(selection);
   let messages = allMessages.slice();
   let omittedMessageCount = 0;
   let omittedTextChars = 0;
-  let prompt = renderSummaryPrompt(messages, { lifecycleBoundary });
+  let prompt = renderSummaryPrompt(messages, {
+    lifecycleBoundary,
+    summaryPrompt,
+  });
   while (prompt.length > maxPromptChars && messages.length > 1) {
     messages.shift();
     omittedMessageCount += 1;
     prompt = renderSummaryPrompt(messages, {
       lifecycleBoundary,
       omittedMessageCount,
+      summaryPrompt,
     });
   }
   if (prompt.length > maxPromptChars && messages.length === 1) {
@@ -363,6 +416,7 @@ export function composeRarebitSummaryDerivationInput(
         lifecycleBoundary,
         omittedMessageCount,
         omittedTextChars: removed,
+        summaryPrompt,
       });
       if (candidatePrompt.length <= maxPromptChars) {
         best = { messages: candidate, prompt: candidatePrompt, removed };
@@ -377,6 +431,8 @@ export function composeRarebitSummaryDerivationInput(
   }
   return {
     prompt,
+    promptIdentity: resolvedPrompt.promptIdentity,
+    promptVersion,
     coverage: {
       totalMessageCount: allMessages.length,
       includedMessageCount: messages.length,
@@ -425,17 +481,35 @@ function compactLine(value) {
     .trim();
 }
 
-export function normalizeRarebitSummary(value, { maxChars = 2_000 } = {}) {
+function preserveProseLayout(value) {
+  return String(value ?? "")
+    .replace(/\r\n?/g, "\n")
+    .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g, "")
+    .replace(/[\u2028\u2029]/g, "\n")
+    .trim();
+}
+
+export function normalizeRarebitSummary(
+  value,
+  { maxChars = MAX_RAREBIT_SUMMARY_CHARS } = {},
+) {
   if (!Number.isInteger(maxChars) || maxChars < 1)
     throw new RangeError("maxChars must be a positive integer");
-  const compact = compactLine(value);
-  if (!compact) throw new Error("Summary model returned no usable summary");
-  return compact.slice(0, maxChars).trimEnd();
+  if (maxChars > MAX_RAREBIT_SUMMARY_CHARS)
+    throw new RangeError(
+      `maxChars must not exceed ${MAX_RAREBIT_SUMMARY_CHARS}`,
+    );
+  const normalized = preserveProseLayout(value);
+  if (!normalized) throw new Error("Summary model returned no usable summary");
+  if (normalized.length <= maxChars) return normalized;
+  throw new RangeError(
+    `Summary model returned ${normalized.length} characters; configured limit is ${maxChars}`,
+  );
 }
 
 export function normalizeRarebitSummarySynthesis(
   value,
-  { maxChars = 2_000 } = {},
+  { maxChars = MAX_RAREBIT_SUMMARY_CHARS } = {},
 ) {
   let synthesis;
   try {
@@ -456,7 +530,9 @@ export function normalizeRarebitSummarySynthesis(
   if (!RAREBIT_SESSION_STATUS_REASONS[status].includes(reason))
     throw new TypeError("Summary model response has an illegal statusReason");
   return {
-    summary: normalizeRarebitSummary(synthesis.summary, { maxChars }),
+    summary: normalizeRarebitSummary(synthesis.summary, {
+      maxChars,
+    }),
     sessionStatus: status,
     statusReason: reason,
   };
@@ -501,6 +577,7 @@ export function rarebitJobIdentity({
   selection,
   policy = null,
   promptVersion,
+  promptIdentity = null,
   model = null,
 } = {}) {
   if (!new Set(["summary", "title"]).has(operation))
@@ -520,6 +597,7 @@ export function rarebitJobIdentity({
     selectionManifestHash: selection.manifestHash,
     policy: policy === null ? null : normalizeRarebitSummaryPolicy(policy),
     promptVersion: promptVersion ?? null,
+    promptIdentity: promptIdentity ?? null,
     model,
   });
 }