pi-better-background-tasks 0.3.0 → 0.4.0

package/src/shared-log-utils.ts

@@ -798,6 +798,120 @@ export function revisionOf(value: unknown): string {
   return createHash("sha256").update(JSON.stringify(value) ?? "undefined").digest("base64url").slice(0, 32);
 }
 
+// ---------------------------------------------------------------------------
+// Shared output-control parameters, session scope keys, and log identity facts
+// (#321/#323). Subagent and background-task tools both read these, so the two
+// families cannot drift.
+// ---------------------------------------------------------------------------
+
+/**
+ * Canonical output-control parameter names and their deprecated aliases.
+ * Canonical names follow this repo's dominant snake_case tool-parameter style
+ * (`max_log_bytes`, `timeout_seconds`, `exclude_tools`, `sandbox_dir`, ...).
+ */
+export const OUTPUT_CONTROL_ALIASES = {
+  max_bytes: "maxBytes",
+  lines: "tail_lines",
+} as const;
+
+export interface OutputControls {
+  /** Raw requested byte budget (canonical `max_bytes`, else deprecated `maxBytes`). */
+  maxBytes?: unknown;
+  /** Raw requested line count (canonical `lines`, else deprecated `tail_lines`). */
+  lines?: unknown;
+  /** Deprecated alias names the caller used (whether or not the canonical name won). */
+  deprecated: string[];
+}
+
+/**
+ * Resolve output-control parameters. Both spellings work; when both are given
+ * the canonical name wins. Values are returned unvalidated so each surface
+ * keeps its own defaults and hard caps.
+ */
+export function readOutputControls(params: unknown): OutputControls {
+  const p = (params && typeof params === "object" ? params : {}) as Record<string, unknown>;
+  const deprecated: string[] = [];
+  const pick = (canonical: keyof typeof OUTPUT_CONTROL_ALIASES): unknown => {
+    const alias = OUTPUT_CONTROL_ALIASES[canonical];
+    if (p[alias] !== undefined) deprecated.push(alias);
+    return p[canonical] !== undefined ? p[canonical] : p[alias];
+  };
+  const maxBytes = pick("max_bytes");
+  const lines = pick("lines");
+  return {
+    ...(maxBytes !== undefined ? { maxBytes } : {}),
+    ...(lines !== undefined ? { lines } : {}),
+    deprecated,
+  };
+}
+
+/** Explicit opt-in sections for otherwise-omitted spend and tool facts. */
+export const OUTPUT_INCLUDE_VALUES = ["cost", "tools"] as const;
+export type OutputInclude = (typeof OUTPUT_INCLUDE_VALUES)[number];
+
+/** Parse an `include` request into known values and unknown ones (both deduplicated). */
+export function readOutputInclude(value: unknown): { include: Set<OutputInclude>; unknown: string[] } {
+  const raw = Array.isArray(value) ? value : typeof value === "string" ? value.split(",") : [];
+  const include = new Set<OutputInclude>();
+  const unknown: string[] = [];
+  for (const entry of raw) {
+    const name = String(entry ?? "").trim().toLowerCase();
+    if (!name) continue;
+    if ((OUTPUT_INCLUDE_VALUES as readonly string[]).includes(name)) include.add(name as OutputInclude);
+    else if (!unknown.includes(name)) unknown.push(name);
+  }
+  return { include, unknown };
+}
+
+/** Session identity that a read or mutation is scoped to. */
+export interface ScopeOrigin {
+  cwd: string;
+  sessionId?: string;
+}
+
+/** Stable digest of one cwd + session origin (the digest the subagent registry indexes by). */
+export function originScopeDigest(origin: ScopeOrigin): string {
+  return createHash("sha256").update(origin.cwd).update("\0").update(origin.sessionId ?? "").digest("hex").slice(0, 24);
+}
+
+/**
+ * Cursor scope. Every pagination and revision cursor binds this key, so a
+ * cursor never crosses session scopes. `unavailable` wins over an origin: a
+ * caller whose session identity could not be read is never the same scope as
+ * a readable one.
+ */
+export function sessionScopeKey(input: {
+  all?: boolean;
+  unavailable?: boolean;
+  origin?: ScopeOrigin;
+  /** Key when there is no origin at all (for example, a per-process scope). */
+  fallback?: string;
+}): string {
+  if (input.all) return "all";
+  if (input.unavailable) return "session:unavailable";
+  if (input.origin) return `session:${originScopeDigest(input.origin)}`;
+  return input.fallback ?? "none";
+}
+
+/**
+ * Identity facts of a retained log for a content revision: device, inode,
+ * size, and whole-millisecond mtime, or the read error. A deleted, replaced,
+ * or appended log is a content change.
+ */
+export function logIdentityFacts(path: string): unknown {
+  try {
+    const stats = statSync(path);
+    return [stats.dev, stats.ino, stats.size, Math.trunc(stats.mtimeMs)];
+  } catch (error) {
+    return ["unreadable", (error as NodeJS.ErrnoException).code ?? String(error)];
+  }
+}
+
+/** Content revision: consumer lifecycle facts followed by the retained log's identity. */
+export function lifecycleContentRevision(facts: readonly unknown[], logPath: string): string {
+  return revisionOf([...facts, logIdentityFacts(logPath)]);
+}
+
 // ---------------------------------------------------------------------------
 // Row pages (lists). Keyset cursors keep paging stable while new rows arrive.
 // ---------------------------------------------------------------------------

package/src/shared-navigator.ts

@@ -106,7 +106,7 @@ export const CLOSE_CONFIRM_STATUS_KEY = "background-work-close";
 export const MAIN_LIST_WIDGET_KEY = "background-work-list";
 export const DETAIL_TICK_MS = 10_000;
 export const CLOSE_ARM_MS = 3000;
-export const DEFAULT_LOG_TAIL_ROWS = 10;
+export const DEFAULT_LOG_TAIL_ROWS = 25;
 export const LOG_TAIL_ROW_CHOICES = [10, 25] as const;
 const MAIN_LIST_FALLBACK_WIDTH = 100;
 const DETAIL_OVERLAY_BOTTOM_MARGIN_ROWS = 0;
@@ -542,7 +542,10 @@ function stableFacts(facts: string[] | undefined): string[] {
 
 function rowSummary(row: InternalRow): string {
   if (row.providerId === "subagents") {
+    const attention = row.facts?.map(singleLine).filter(Boolean);
+    if (attention?.length) return `${singleLine(row.status)} · ${attention.join(" · ")}`;
     const parts: string[] = [];
+    if (row.statusTone !== "running" && row.kind !== "main agent") parts.push(singleLine(row.status));
     if (row.model) parts.push(row.effort ? `${singleLine(row.model)} ${singleLine(row.effort)}` : singleLine(row.model));
     if (row.tool) parts.push(`tool ${singleLine(row.tool)}`);
     if (row.tokens) parts.push(singleLine(row.tokens));
@@ -928,7 +931,7 @@ function createOverlayComponent(
         transcriptDetail = null;
         transcriptComponent = null;
         contentLines = mode === "detail"
-          ? buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, bottomFooter: false })
+          ? buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, maxRows: detailRows, bottomFooter: false })
           : buildListLines(overlayState, width, deps.truncate, fg);
       }
       if (mode !== "detail") return contentLines;
@@ -1024,14 +1027,11 @@ function buildTranscriptDetailLines(
   ];
   const transcriptHeader = ["", dim(section(`transcript · latest ${tailRows} rows`, width), fg)];
   if (detail.transcriptDiagnostic) transcriptHeader.push(`   ${dim(detail.transcriptDiagnostic, fg)}`);
+  // Metadata always renders; the transcript tail takes only the rows left over (the tail size is a cap, not a guarantee).
+  lines.push(...optionalMetadata);
   if (options.maxRows !== undefined) {
-    const fixedRows = lines.length + transcriptHeader.length + 1;
-    const transcriptBudget = Math.max(1, options.maxRows - fixedRows);
+    const transcriptBudget = Math.max(1, options.maxRows - lines.length - transcriptHeader.length - 1);
     shownTranscriptLines = shownTranscriptLines.slice(-transcriptBudget);
-    const metadataBudget = Math.max(0, options.maxRows - fixedRows - shownTranscriptLines.length);
-    lines.push(...optionalMetadata.slice(0, metadataBudget));
-  } else {
-    lines.push(...optionalMetadata);
   }
   lines.push(...transcriptHeader);
   lines.push(...shownTranscriptLines);
@@ -1120,7 +1120,7 @@ function buildDetailLines(
   width: number,
   truncate: (s: string, width: number) => string,
   fg: (color: string, value: string) => string,
-  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; bottomFooter?: boolean } = {},
+  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; maxRows?: number; bottomFooter?: boolean } = {},
 ): string[] {
   if (!detail) {
     const lines = [rule("Work unavailable", width), dim("   ← back · Esc close", fg), ""];
@@ -1184,7 +1184,9 @@ function buildDetailLines(
     const wrapped = /log/i.test(detail.evidence.label)
       ? wrapLogText(body, width - 6)
       : wrapEvidenceText(body, width - 6);
-    const shown = tailEvidence ? wrapped.slice(-tailRows) : wrapped;
+    let shown = tailEvidence ? wrapped.slice(-tailRows) : wrapped;
+    // Metadata above always renders; a tail that outgrows the remaining rows drops its oldest rows so the newest stay on screen (+1 for the trailing blank).
+    if (tailEvidence && options.maxRows !== undefined) shown = shown.slice(-Math.max(1, options.maxRows - lines.length - 1));
     for (const raw of shown) lines.push(raw ? `   ${raw}` : "   ");
   }
   lines.push("");