pi-pier 0.2.6 → 0.3.0

package/src/core/todo.ts

@@ -15,6 +15,10 @@ import { planTodoReadHook } from '../todo-read-hook.ts';
 import { TODO_REMINDER_CUSTOM_TYPE, planStopTodoReminder, todoReminderGraceMs } from '../todo-reminder-core.ts';
 import { makeProgressUpdate } from '../subagent-core.ts';
 import { TODO_DETAILS_KEY, TODO_TOOL_NAME, formatTodoConfirmation, type TodoItem } from '../vocab.ts';
+import { toolError } from '../tool-error.ts'
+
+/** Raw tool arguments: every field is validated inside the action handlers. */
+type ToolParams = Record<string, unknown> | undefined;;
 import { formatAge, isArchived } from '../stale-core.ts';
 import {
   TODO_EDIT_CUSTOM_TYPE,
@@ -27,10 +31,15 @@ import {
   validateTodos,
 } from '../todo-core.ts';
 import { anchorTodoRange, formatTodoSummary, renderTodoGroups } from '../todo-window.ts';
+import { swallow } from '../swallow.ts';
 
 export interface TodoUiSlot {
   /** Lets index lifecycle events render through the currently mounted plugin. */
   renderWidget: (ctx: unknown) => void;
+  /** Re-render from the last seen context without a fresh event (human-gate open/close). */
+  rerenderWidget?: () => void;
+  /** Cancel any pending unfinished-todo reminder timer. */
+  cancelReminder?: () => void;
 }
 
 interface TodoDeps {
@@ -41,10 +50,14 @@ interface TodoDeps {
   mirrorTodos: () => void;
   appendEntry: (customType: string, data: unknown) => void;
   state: TodoUiSlot;
+  /** Human-gate depth (ask_user_question / herdr:blocked); >0 collapses the widget to one line. */
+  getBlockedDepth?: () => number;
   /** Master-only unfinished-todo reminder; omitted on worker panes. */
   stopReminder?: {
     getBlockedDepth: () => number;
     getRunningSubs: () => number;
+    isCompactionInFlight?: () => boolean;
+    isIntentionalAbort?: () => boolean;
   };
 }
 
@@ -67,8 +80,18 @@ export const WIDGET_MAX_LINES = 10;
  * completions. A +N line points to /todos when the full plan cannot fit. This fixes 01a03c0d,
  * where active work scrolled out while only the final entries remained visible.
  */
-export function widgetLines(items: readonly TodoItem[], opts?: { archivedAgeMs?: number | null }): string[] {
+export function widgetLines(
+  items: readonly TodoItem[],
+  opts?: { archivedAgeMs?: number | null; blockedDepth?: number | null },
+): string[] {
   if (items.length === 0) return [];
+  // Human gate open (ask_user_question waiting): the question + editor own the fixed area, so the
+  // widget collapses to the one-line summary — /todos still reaches the full list. Without this,
+  // a 10-line widget plus a multi-line question leaves almost no scrollable transcript
+  // (user-reported: both blocks visible ⇒ history range too small).
+  if ((opts?.blockedDepth ?? 0) > 0) {
+    return [`${formatTodoSummary(items)} · /todos 全量`];
+  }
   // Collapse archived plans to two lines so stale work cannot monopolize the widget.
   if (opts?.archivedAgeMs != null) {
     return [
@@ -95,7 +118,7 @@ export function widgetLines(items: readonly TodoItem[], opts?: { archivedAgeMs?:
 
 export default function todoPlugin(ctx: Context): void {
   const surface = ctx.get('pi-herdr.surface') as PiSurface<object>;
-  const { todos, allowParallelInProgress, maxItems, mirrorTodos, appendEntry, state, stopReminder } =
+  const { todos, allowParallelInProgress, maxItems, mirrorTodos, appendEntry, state, stopReminder, getBlockedDepth } =
     ctx.get('pi-herdr.todo-deps') as TodoDeps;
   const scoped = surface.forModule(import.meta.url);
 
@@ -115,9 +138,15 @@ export default function todoPlugin(ctx: Context): void {
       : undefined;
   }
 
+  /** Gate transitions fire outside lifecycle events; remember one ctx so rerenderWidget can target the live ui. */
+  let lastEventCtx: unknown = null;
   function renderWidget(eventCtx: unknown): void {
+    if (eventCtx !== null && eventCtx !== undefined) lastEventCtx = eventCtx;
     try {
-      widgetUi(eventCtx)?.setWidget?.('todos', widgetLines(todos.items, { archivedAgeMs: archivedAgeMs() }));
+      widgetUi(eventCtx)?.setWidget?.('todos', widgetLines(todos.items, {
+        archivedAgeMs: archivedAgeMs(),
+        blockedDepth: getBlockedDepth?.() ?? 0,
+      }));
     } catch {
       /* Older pi versions may omit widget support without disabling todo tracking. */
     }
@@ -125,6 +154,7 @@ export default function todoPlugin(ctx: Context): void {
 
   // Let index lifecycle hooks call the current plugin implementation.
   state.renderWidget = renderWidget;
+  state.rerenderWidget = () => renderWidget(lastEventCtx);
 
   /* ── Read hook: D39 reminders and stale-plan thawing ────────────── */
   let todoReadTurn = 0;
@@ -133,7 +163,6 @@ export default function todoPlugin(ctx: Context): void {
   let lastWriteTurn: number | null = null;
   let staleNotices = 0;
   let lastStaleGuardTurn: number | null = null;
-  let lastArchivedMirror = false;
 
   // Any real edit ends the current stale period because the plan is active again.
   todos.on('todo.updated', () => {
@@ -168,10 +197,12 @@ export default function todoPlugin(ctx: Context): void {
       const edits = todos.items.map((it) => ({ op: 'rm' as const, content: it.content }));
       try {
         appendEntry(TODO_EDIT_CUSTOM_TYPE, { version: 1, edits, ts: Date.now() });
-      } catch {
-        /* Persistence is best-effort because the in-memory clear must still proceed. */
+      } catch (err) {
+        // Persistence is best-effort because the in-memory clear must still proceed, but a silent
+        // failure here is exactly how the archive/replay path broke unnoticed before (SA-13).
+        swallow('todo.persist-archive', err);
       }
-      todos.replace([]);
+      todos.replace([], { source: 'archive' });
     }
     todoReadTurn += 1;
     if (!plan.inject) return;
@@ -200,6 +231,7 @@ export default function todoPlugin(ctx: Context): void {
         todoReminderTimer = null;
       }
     }
+    state.cancelReminder = cancelTodoReminder;
     scoped.on('turn_end', async (event: unknown) => {
       if (event === null || typeof event !== 'object' || !('message' in event)) return;
       const msg = (event as { message: unknown }).message;
@@ -213,8 +245,12 @@ export default function todoPlugin(ctx: Context): void {
     scoped.on('session_shutdown', () => cancelTodoReminder());
     scoped.on('agent_settled', async () => {
       cancelTodoReminder();
+      const inFlight = stopReminder.isCompactionInFlight?.() ?? false;
+      const intentional = stopReminder.isIntentionalAbort?.() ?? false;
       const plan = planStopTodoReminder({
         lastStopReason: lastAssistantStopReason,
+        intentionalAbort: intentional,
+        compactionInFlight: inFlight,
         reminders: todoReminders,
         runningSubs: stopReminder.getRunningSubs(),
         blockedDepth: stopReminder.getBlockedDepth(),
@@ -224,6 +260,7 @@ export default function todoPlugin(ctx: Context): void {
       const content = plan.content;
       todoReminderTimer = setTimeout(() => {
         todoReminderTimer = null;
+        if (stopReminder.isCompactionInFlight?.()) return;
         void (async () => {
           const send = pi.sendMessage;
           if (typeof send !== 'function') return;
@@ -270,15 +307,13 @@ export default function todoPlugin(ctx: Context): void {
         { description: 'The COMPLETE task list; this call replaces the previous list' },
       ),
     }),
-    async execute(toolCallId, params, signal, onUpdate, eventCtx) {
+    async execute(toolCallId: string, params: ToolParams, signal: AbortSignal | undefined, onUpdate: ((update: unknown) => void) | undefined, eventCtx: unknown) {
       void toolCallId;
       void signal;
       const result = validateTodos(params?.todos, allowParallelInProgress);
       if (!result.ok) {
-        return {
-          content: [{ type: 'text', text: `Error: ${result.error}` }],
-          details: {},
-        };
+        // A1: an invalid list is a hard failure — throw so pi flags isError for the model.
+        return toolError(result.error ?? 'invalid todo list');
       }
       const strictMode = todos.config.strict; // D75 phase 2 keeps policy in the service config.
       let next = result.items!;
@@ -301,7 +336,7 @@ export default function todoPlugin(ctx: Context): void {
       // D36/D37 surface completion transitions and regressions to the caller.
       const completed = completionTransitions(todos.items, next);
       const reverted = revertedCompleted(todos.items, next);
-      todos.replace(next);
+      todos.replace(next, { source: 'tool' });
       if (todos.items.length > maxItems) {
         onUpdate?.(makeProgressUpdate(`Note: list has ${todos.items.length} entries; consider keeping it under ${maxItems}.`));
       }
@@ -351,7 +386,7 @@ export default function todoPlugin(ctx: Context): void {
         const content = candidates[0];
         const edit = { op: opArg as 'done' | 'drop' | 'rm' | 'unblock', content };
         const before = todos.items;
-        todos.applyEdits([edit]);
+        todos.applyEdits([edit], { source: 'human' });
         if (listsEqual(before, todos.items)) {
           ui?.notify?.(`no change: "${content}" is already in that state`, 'info');
           return;

package/src/dashboard-command.ts

@@ -0,0 +1,89 @@
+import type { HerdrClientLike, HerdrEnv } from './herdr-client.ts';
+import type { TodoItem } from './vocab.ts';
+
+export interface DashboardCommandDeps {
+  pi: {
+    registerCommand(name: string, options: { description: string; handler: (args: unknown, ctx: unknown) => Promise<void> }): void;
+  };
+  client: HerdrClientLike;
+  env: HerdrEnv | null;
+  getTodoItems?: () => readonly TodoItem[];
+  getHeldLocks?: () => readonly string[];
+}
+
+export function formatStandaloneDashboard(opts: {
+  todos: readonly TodoItem[];
+  locks: readonly string[];
+  now?: number;
+}): string {
+  const lines: string[] = [];
+  const timeStr = new Date(opts.now ?? Date.now()).toTimeString().split(' ')[0] ?? '';
+  lines.push(`==================== PIER OPS DASHBOARD ==================== [${timeStr}] (standalone)`);
+  lines.push('Mode: Standalone (Non-Herdr / Local Session)');
+  lines.push('--------------------------------------------------------------------------------');
+
+  const todos = opts.todos;
+  if (todos.length > 0) {
+    const inProg = todos.filter((t) => t.status === 'in_progress');
+    const blocked = todos.filter((t) => t.status === 'blocked');
+    const done = todos.filter((t) => t.status === 'completed');
+    const pending = todos.filter((t) => t.status === 'pending');
+    lines.push(
+      `Todos: ${todos.length} total (${done.length} done, ${inProg.length} working, ${blocked.length} blocked, ${pending.length} pending)`,
+    );
+    if (inProg.length > 0) {
+      lines.push(`Active: ▶ ${inProg.map((t) => t.content).join(', ')}`);
+    }
+    if (blocked.length > 0) {
+      lines.push(`Blocked: ■ ${blocked.map((t) => `${t.content}${t.blocker ? ` (${t.blocker})` : ''}`).join(', ')}`);
+    }
+    if (inProg.length === 0 && blocked.length === 0 && done.length > 0) {
+      lines.push(`Completed: ✓ ${done.slice(-3).map((t) => t.content).join(', ')}`);
+    }
+  } else {
+    lines.push('Todos: (none)');
+  }
+
+  const locks = opts.locks;
+  lines.push(`Write Locks: ${locks.length > 0 ? locks.join(', ') : '(none)'}`);
+  lines.push('--------------------------------------------------------------------------------');
+  lines.push('Tip: Inside Herdr 0.9.1, /dashboard opens the interactive modal popup.');
+  lines.push('================================================================================');
+  return lines.join('\n');
+}
+
+export function installDashboardCommand(deps: DashboardCommandDeps): void {
+  deps.pi.registerCommand('dashboard', {
+    description: 'Open the Pier Ops Dashboard (modal popup in Herdr 0.9.1, tab fallback, or local TUI view)',
+    handler: async (_args, ctx) => {
+      const ui = (ctx as { ui?: { notify?: (text: string, level?: string) => void } }).ui;
+
+      // Level 1 / Level 2: Herdr environment
+      if (deps.client.available && deps.env) {
+        try {
+          const res = await deps.client.openPluginPane({
+            pluginId: 'pier.workbench',
+            entrypoint: 'dashboard',
+            placement: 'popup',
+            width: '80%',
+            height: '80%',
+            focus: true,
+          });
+          if (res.mode === 'fallback_tab') {
+            ui?.notify?.('Herdr < 0.9.1: Pier Dashboard opened in new tab', 'info');
+          }
+          return;
+        } catch {
+          // If plugin is not installed or socket error occurs, fall through to Level 3 local view
+        }
+      }
+
+      // Level 3: Standalone / Non-Herdr fallback
+      const text = formatStandaloneDashboard({
+        todos: deps.getTodoItems?.() ?? [],
+        locks: deps.getHeldLocks?.() ?? [],
+      });
+      ui?.notify?.(text, 'info');
+    },
+  });
+}