aoaoe 0.153.0 → 0.160.0

package/dist/index.js

@@ -16,7 +16,7 @@ import { wakeableSleep } from "./wake.js";
 import { classifyMessages, formatUserMessages, buildReceipts, shouldSkipSleep, hasPendingFile, isInsistMessage, stripInsistPrefix } from "./message.js";
 import { TaskManager, loadTaskDefinitions, loadTaskState, formatTaskTable, importAoeSessionsToTasks } from "./task-manager.js";
 import { runTaskCli, handleTaskSlashCommand, quickTaskUpdate } from "./task-cli.js";
-import { TUI, hitTestSession, nextSortMode, SORT_MODES, formatUptime, formatClipText, loadTuiPrefs, saveTuiPrefs, validateGroupName, CONTEXT_BURN_THRESHOLD, buildSnapshotData, formatSnapshotJson, formatSnapshotMarkdown, formatBroadcastSummary, rankSessions, TOP_SORT_MODES, formatIdleSince, CONTEXT_CEILING_THRESHOLD, buildSessionStats, formatSessionStatsLines, formatStatsJson, validateSessionTag, validateColorName, computeErrorTrend, parseQuietHoursRange, computeCostSummary, formatSessionReport, formatQuietStatus, formatSessionAge, formatHealthTrendChart, isOverBudget } from "./tui.js";
+import { TUI, hitTestSession, nextSortMode, SORT_MODES, formatUptime, formatClipText, loadTuiPrefs, saveTuiPrefs, validateGroupName, CONTEXT_BURN_THRESHOLD, buildSnapshotData, formatSnapshotJson, formatSnapshotMarkdown, formatBroadcastSummary, rankSessions, TOP_SORT_MODES, formatIdleSince, CONTEXT_CEILING_THRESHOLD, buildSessionStats, formatSessionStatsLines, formatStatsJson, validateSessionTag, validateColorName, computeErrorTrend, parseQuietHoursRange, computeCostSummary, formatSessionReport, formatQuietStatus, formatSessionAge, formatHealthTrendChart, isOverBudget, DRAIN_ICON, formatSessionsTable } from "./tui.js";
 import { isDaemonRunningFromState } from "./chat.js";
 import { sendNotification, sendTestNotification } from "./notify.js";
 import { startHealthServer } from "./health.js";
@@ -1023,6 +1023,105 @@ async function main() {
             tui.log("system", `quiet hours: ${specs.join(", ")} — watchdog+burn alerts suppressed`);
             persistPrefs();
         });
+        // wire /note-history
+        input.onNoteHistory((target) => {
+            const num = /^\d+$/.test(target) ? parseInt(target, 10) : undefined;
+            const sessions = tui.getSessions();
+            const session = num !== undefined
+                ? sessions[num - 1]
+                : sessions.find((s) => s.title.toLowerCase() === target.toLowerCase() || s.id.startsWith(target));
+            if (!session) {
+                tui.log("system", `session not found: ${target}`);
+                return;
+            }
+            const hist = tui.getNoteHistory(session.id);
+            if (hist.length === 0) {
+                tui.log("system", `note-history: no previous notes for ${session.title}`);
+            }
+            else {
+                tui.log("system", `note-history for ${session.title} (${hist.length}):`);
+                for (const n of hist)
+                    tui.log("system", `  "${n}"`);
+            }
+        });
+        // wire /label
+        input.onLabel((target, label) => {
+            const num = /^\d+$/.test(target) ? parseInt(target, 10) : undefined;
+            const ok = tui.setLabel(num ?? target, label || null);
+            if (ok) {
+                tui.log("system", label ? `label set for ${target}: "${label}"` : `label cleared for ${target}`);
+            }
+            else {
+                tui.log("system", `session not found: ${target}`);
+            }
+        });
+        // wire /sessions enhanced table
+        input.onSessionsTable(() => {
+            const sessions = tui.getSessions();
+            const now = Date.now();
+            const lines = formatSessionsTable(sessions, {
+                groups: tui.getAllGroups(),
+                tags: tui.getAllSessionTags(),
+                colors: tui.getAllSessionColors(),
+                notes: tui.getAllNotes(),
+                labels: tui.getAllLabels(),
+                aliases: tui.getAllSessionAliases(),
+                drainingIds: tui.getDrainingIds(),
+                healthScores: tui.getAllHealthScores(now),
+                costs: tui.getAllSessionCosts(),
+                firstSeen: tui.getAllFirstSeen(),
+            }, now);
+            for (const l of lines)
+                tui.log("system", l);
+        });
+        // wire /flap-log
+        input.onFlapLog(() => {
+            const log = tui.getFlapLog();
+            if (log.length === 0) {
+                tui.log("system", "flap-log: no flap events recorded");
+                return;
+            }
+            tui.log("system", `flap-log: ${log.length} event${log.length !== 1 ? "s" : ""}:`);
+            for (const e of log.slice(-20)) {
+                const time = new Date(e.ts).toLocaleTimeString();
+                tui.log("system", `  ${time}  ${e.title}: ${e.count} changes in window`);
+            }
+        });
+        // wire /drain and /undrain
+        input.onDrain((target, drain) => {
+            const num = /^\d+$/.test(target) ? parseInt(target, 10) : undefined;
+            const ok = drain ? tui.drainSession(num ?? target) : tui.undrainSession(num ?? target);
+            if (ok) {
+                tui.log("system", `${drain ? "drain" : "undrain"}: ${target} ${drain ? `marked draining (${DRAIN_ICON})` : "restored"}`);
+            }
+            else {
+                tui.log("system", `session not found: ${target}`);
+            }
+        });
+        // wire /export-all bulk export
+        input.onExportAll(() => {
+            const sessions = tui.getSessions();
+            if (sessions.length === 0) {
+                tui.log("system", "export-all: no sessions");
+                return;
+            }
+            const now = Date.now();
+            const ts = new Date(now).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+            const dir = join(homedir(), ".aoaoe");
+            try {
+                mkdirSync(dir, { recursive: true });
+                // snapshot JSON
+                const snapData = buildSnapshotData(sessions, tui.getAllGroups(), tui.getAllNotes(), tui.getAllFirstSeen(), tui.getSessionErrorCounts(), tui.getAllBurnRates(now), pkg ?? "dev", now);
+                writeFileSync(join(dir, `snapshot-${ts}.json`), formatSnapshotJson(snapData), "utf-8");
+                // stats JSON
+                const statEntries = buildSessionStats(sessions, tui.getSessionErrorCounts(), tui.getAllBurnRates(now), tui.getAllFirstSeen(), tui.getAllLastChangeAt(), tui.getAllHealthScores(now), tui.getAllSessionAliases(), now, new Map(sessions.map((s) => [s.id, tui.getSessionErrorTimestamps(s.id)])), tui.getAllSessionCosts(), new Map(sessions.map((s) => [s.id, tui.getSessionHealthHistory(s.id)])));
+                writeFileSync(join(dir, `stats-${ts}.json`), formatStatsJson(statEntries, pkg ?? "dev", now), "utf-8");
+                tui.log("system", `export-all: snapshot + stats saved to ~/.aoaoe/ (${sessions.length} sessions)`);
+            }
+            catch (err) {
+                tui.log("error", `export-all failed: ${err}`);
+            }
+        });
         // wire /budget cost alerts
         input.onBudget((target, budgetUSD) => {
             if (budgetUSD === null) {
@@ -2046,6 +2145,7 @@ async function daemonTick(config, poller, reasoner, executor, reasonerConsole, p
     try {
         tickResult = await loopTick({
             config, poller, reasoner: wrappedReasoner, executor, policyStates, pollCount, userMessage, taskContext, beforeExecute,
+            drainingSessionIds: tui ? [...tui.getDrainingIds()] : undefined,
         });
     }
     catch (err) {

package/dist/input.d.ts

@@ -62,6 +62,12 @@ export type HealthTrendHandler = (target: string, height: number) => void;
 export type AlertMuteHandler = (pattern: string | null) => void;
 export type BudgetsListHandler = () => void;
 export type BudgetStatusHandler = () => void;
+export type FlapLogHandler = () => void;
+export type DrainHandler = (target: string, drain: boolean) => void;
+export type ExportAllHandler = () => void;
+export type NoteHistoryHandler = (target: string) => void;
+export type LabelHandler = (target: string, label: string) => void;
+export type SessionsTableHandler = () => void;
 export interface MouseEvent {
     button: number;
     col: number;
@@ -146,6 +152,12 @@ export declare class InputReader {
     private alertMuteHandler;
     private budgetsListHandler;
     private budgetStatusHandler;
+    private flapLogHandler;
+    private drainHandler;
+    private exportAllHandler;
+    private noteHistoryHandler;
+    private labelHandler;
+    private sessionsTableHandler;
     private aliases;
     private mouseDataListener;
     onScroll(handler: (dir: ScrollDirection) => void): void;
@@ -213,6 +225,12 @@ export declare class InputReader {
     onAlertMute(handler: AlertMuteHandler): void;
     onBudgetsList(handler: BudgetsListHandler): void;
     onBudgetStatus(handler: BudgetStatusHandler): void;
+    onFlapLog(handler: FlapLogHandler): void;
+    onDrain(handler: DrainHandler): void;
+    onExportAll(handler: ExportAllHandler): void;
+    onNoteHistory(handler: NoteHistoryHandler): void;
+    onLabel(handler: LabelHandler): void;
+    onSessionsTable(handler: SessionsTableHandler): void;
     /** Set aliases from persisted prefs. */
     setAliases(aliases: Record<string, string>): void;
     /** Get current aliases as a plain object. */

package/dist/input.js

@@ -95,6 +95,12 @@ export class InputReader {
     alertMuteHandler = null;
     budgetsListHandler = null;
     budgetStatusHandler = null;
+    flapLogHandler = null;
+    drainHandler = null;
+    exportAllHandler = null;
+    noteHistoryHandler = null;
+    labelHandler = null;
+    sessionsTableHandler = null;
     aliases = new Map(); // /shortcut → /full command
     mouseDataListener = null;
     // register a callback for scroll key events (PgUp/PgDn/Home/End)
@@ -315,6 +321,12 @@ export class InputReader {
     onAlertMute(handler) { this.alertMuteHandler = handler; }
     onBudgetsList(handler) { this.budgetsListHandler = handler; }
     onBudgetStatus(handler) { this.budgetStatusHandler = handler; }
+    onFlapLog(handler) { this.flapLogHandler = handler; }
+    onDrain(handler) { this.drainHandler = handler; }
+    onExportAll(handler) { this.exportAllHandler = handler; }
+    onNoteHistory(handler) { this.noteHistoryHandler = handler; }
+    onLabel(handler) { this.labelHandler = handler; }
+    onSessionsTable(handler) { this.sessionsTableHandler = handler; }
     /** Set aliases from persisted prefs. */
     setAliases(aliases) {
         this.aliases.clear();
@@ -585,6 +597,13 @@ ${BOLD}navigation:${RESET}
    /health-trend N    show ASCII health score chart for session N [height]
    /budgets           list all active cost budgets
    /budget-status     show which sessions are over or under budget
+   /flap-log          show sessions recently flagged as flapping
+   /drain N           mark session N as draining (supervisor will skip it)
+   /undrain N         remove drain mark from session N
+   /export-all        bulk export snapshot + stats JSON for all sessions
+   /note-history N    show previous notes for a session (before they were cleared)
+   /label N [text]    set a freeform label shown in the session card (no text = clear)
+   /sessions          show rich session table (status, health, group, cost, flags)
    /history-stats     show aggregate statistics from persisted activity history
   /cost-summary      show total estimated spend across all sessions
   /session-report N  generate full markdown report for a session → ~/.aoaoe/report-<name>-<ts>.md
@@ -1212,6 +1231,79 @@ ${BOLD}other:${RESET}
                 else
                     console.error(`${DIM}budgets not available${RESET}`);
                 break;
+            case "/flap-log":
+                if (this.flapLogHandler)
+                    this.flapLogHandler();
+                else
+                    console.error(`${DIM}flap-log not available${RESET}`);
+                break;
+            case "/drain": {
+                const drainArg = line.slice("/drain".length).trim();
+                if (!drainArg) {
+                    console.error(`${DIM}usage: /drain <N|name>${RESET}`);
+                    break;
+                }
+                if (this.drainHandler)
+                    this.drainHandler(drainArg, true);
+                else
+                    console.error(`${DIM}drain not available${RESET}`);
+                break;
+            }
+            case "/undrain": {
+                const undrainArg = line.slice("/undrain".length).trim();
+                if (!undrainArg) {
+                    console.error(`${DIM}usage: /undrain <N|name>${RESET}`);
+                    break;
+                }
+                if (this.drainHandler)
+                    this.drainHandler(undrainArg, false);
+                else
+                    console.error(`${DIM}undrain not available${RESET}`);
+                break;
+            }
+            case "/note-history": {
+                const nhArg = line.slice("/note-history".length).trim();
+                if (!nhArg) {
+                    console.error(`${DIM}usage: /note-history <N|name>${RESET}`);
+                    break;
+                }
+                if (this.noteHistoryHandler)
+                    this.noteHistoryHandler(nhArg);
+                else
+                    console.error(`${DIM}note-history not available${RESET}`);
+                break;
+            }
+            case "/label": {
+                const lblArgs = line.slice("/label".length).trim();
+                if (!lblArgs) {
+                    console.error(`${DIM}usage: /label <N|name> [text]${RESET}`);
+                    break;
+                }
+                if (this.labelHandler) {
+                    const spaceIdx = lblArgs.indexOf(" ");
+                    if (spaceIdx > 0) {
+                        this.labelHandler(lblArgs.slice(0, spaceIdx), lblArgs.slice(spaceIdx + 1).trim());
+                    }
+                    else {
+                        this.labelHandler(lblArgs, ""); // clear
+                    }
+                }
+                else
+                    console.error(`${DIM}label not available${RESET}`);
+                break;
+            }
+            case "/sessions":
+                if (this.sessionsTableHandler)
+                    this.sessionsTableHandler();
+                else
+                    console.error(`${DIM}sessions not available${RESET}`);
+                break;
+            case "/export-all":
+                if (this.exportAllHandler)
+                    this.exportAllHandler();
+                else
+                    console.error(`${DIM}export-all not available${RESET}`);
+                break;
             case "/budget-status":
                 if (this.budgetStatusHandler)
                     this.budgetStatusHandler();

package/dist/loop.d.ts

@@ -32,5 +32,6 @@ export declare function tick(opts: {
     userMessage?: string;
     taskContext?: TaskState[];
     beforeExecute?: (action: Action) => Promise<boolean>;
+    drainingSessionIds?: string[];
 }): Promise<TickResult>;
 //# sourceMappingURL=loop.d.ts.map

package/dist/loop.js

@@ -7,7 +7,7 @@ import { detectPermissionPrompt } from "./reasoner/prompt.js";
  * Returns a structured result for testing and inspection.
  */
 export async function tick(opts) {
-    const { config, poller, reasoner, executor, policyStates, pollCount, userMessage, taskContext, beforeExecute } = opts;
+    const { config, poller, reasoner, executor, policyStates, pollCount, userMessage, taskContext, beforeExecute, drainingSessionIds } = opts;
     // 1. poll
     const observation = await poller.poll();
     const now = Date.now();
@@ -65,6 +65,10 @@ export async function tick(opts) {
     if (config.protectedSessions && config.protectedSessions.length > 0) {
         observation.protectedSessions = config.protectedSessions;
     }
+    // attach draining session IDs for the prompt formatter
+    if (drainingSessionIds && drainingSessionIds.length > 0) {
+        observation.drainingSessionIds = drainingSessionIds;
+    }
     // 2. reason
     const result = await reasoner.decide(observation);
     // 3. execute (skip wait-only results)

package/dist/reasoner/prompt.js

@@ -126,6 +126,7 @@ export function formatObservation(obs) {
     parts.push("");
     // resolve protected sessions list from config (attached by loop.ts)
     const protectedList = obs.protectedSessions ?? [];
+    const drainingList = new Set(obs.drainingSessionIds ?? []);
     // session summary table
     parts.push("Sessions:");
     const activeSessions = [];
@@ -133,7 +134,8 @@ export function formatObservation(obs) {
         const s = snap.session;
         const activeTag = snap.userActive ? " [USER ACTIVE]" : "";
         const protectedTag = protectedList.some((p) => p.toLowerCase() === s.title.toLowerCase()) ? " [PROTECTED]" : "";
-        parts.push(`  [${s.id.slice(0, 8)}] "${s.title}" tool=${s.tool} status=${s.status} path=${s.path}${activeTag}${protectedTag}`);
+        const drainingTag = drainingList.has(s.id) ? " [DRAINING — skip, do not send input]" : "";
+        parts.push(`  [${s.id.slice(0, 8)}] "${s.title}" tool=${s.tool} status=${s.status} path=${s.path}${activeTag}${protectedTag}${drainingTag}`);
         if (snap.userActive)
             activeSessions.push(s.title);
     }
@@ -142,6 +144,15 @@ export function formatObservation(obs) {
         parts.push(`WARNING: A human user is currently interacting with: ${activeSessions.join(", ")}.`);
         parts.push("Do NOT send input to these sessions. The user is actively working and your input would interfere.");
     }
+    if (drainingList.size > 0) {
+        const drainingTitles = obs.sessions
+            .filter((s) => drainingList.has(s.session.id))
+            .map((s) => `"${s.session.title}"`);
+        if (drainingTitles.length > 0) {
+            parts.push("");
+            parts.push(`DRAINING: ${drainingTitles.join(", ")} — do NOT assign new tasks or send_input to these sessions.`);
+        }
+    }
     parts.push("");
     // task context (goals, progress) — injected if tasks are defined
     if (obs.taskContext && obs.taskContext.length > 0) {

package/dist/tui.d.ts

@@ -160,6 +160,30 @@ export declare const FLAP_THRESHOLD = 5;
  * Returns true when there are >= FLAP_THRESHOLD status changes in FLAP_WINDOW_MS.
  */
 export declare function isFlapping(changes: readonly StatusChange[], now?: number, windowMs?: number, threshold?: number): boolean;
+/**
+ * Format sessions as a rich table for /sessions command output.
+ * Returns array of lines (one per session + header).
+ */
+export declare function formatSessionsTable(sessions: readonly DaemonSessionState[], opts: {
+    groups: ReadonlyMap<string, string>;
+    tags: ReadonlyMap<string, ReadonlySet<string>>;
+    colors: ReadonlyMap<string, string>;
+    notes: ReadonlyMap<string, string>;
+    labels: ReadonlyMap<string, string>;
+    aliases: ReadonlyMap<string, string>;
+    drainingIds: ReadonlySet<string>;
+    healthScores: ReadonlyMap<string, number>;
+    costs: ReadonlyMap<string, string>;
+    firstSeen: ReadonlyMap<string, number>;
+}, now?: number): string[];
+/** Max notes stored per session (in history before clear). */
+export declare const MAX_NOTE_HISTORY = 5;
+/** Max length of a session label (displayed below title in cards). */
+export declare const MAX_LABEL_LEN = 40;
+/** Truncate a label to the max length. */
+export declare function truncateLabel(label: string): string;
+/** Drain icon shown in session cards for draining sessions. */
+export declare const DRAIN_ICON = "\u21E3";
 /**
  * Check if an alert text matches any suppressed pattern (case-insensitive substring).
  * Returns true when the alert should be hidden.
@@ -440,6 +464,8 @@ export declare class TUI {
     private quietHoursRanges;
     private sessionHealthHistory;
     private alertLog;
+    private sessionNoteHistory;
+    private sessionLabels;
     private sessionBudgets;
     private globalBudget;
     private budgetAlerted;
@@ -447,6 +473,8 @@ export declare class TUI {
     private prevSessionStatus;
     private flapAlerted;
     private alertMutePatterns;
+    private drainingIds;
+    private flapLog;
     private viewMode;
     private drilldownSessionId;
     private sessionOutputs;
@@ -527,6 +555,18 @@ export declare class TUI {
     getNoteCount(): number;
     /** Return all session notes (for /notes listing). */
     getAllNotes(): ReadonlyMap<string, string>;
+    /** Return note history for a session (oldest first). */
+    getNoteHistory(id: string): readonly string[];
+    /**
+     * Set or clear a label for a session (by 1-indexed number, ID, or title).
+     * Label is displayed below the session title in normal cards.
+     * Returns true if session found.
+     */
+    setLabel(sessionIdOrIndex: string | number, label: string | null): boolean;
+    /** Get the label for a session ID (or undefined). */
+    getLabel(id: string): string | undefined;
+    /** Return all session labels. */
+    getAllLabels(): ReadonlyMap<string, string>;
     /** Return the current sessions (read-only, for resolving IDs to titles in the UI). */
     getSessions(): readonly DaemonSessionState[];
     /** Return the uptime in ms for a session (0 if not tracked). */
@@ -590,6 +630,21 @@ export declare class TUI {
     getAllSessionBudgets(): ReadonlyMap<string, number>;
     /** Return health history for a session (for sparkline). */
     getSessionHealthHistory(id: string): readonly HealthSnapshot[];
+    /** Mark a session as draining (by index, ID, or title). Returns true if found. */
+    drainSession(sessionIdOrIndex: string | number): boolean;
+    /** Remove drain mark from a session. Returns true if it was draining. */
+    undrainSession(sessionIdOrIndex: string | number): boolean;
+    /** Check if a session is draining. */
+    isDraining(id: string): boolean;
+    /** Return all draining session IDs (for reasoner prompt and display). */
+    getDrainingIds(): ReadonlySet<string>;
+    /** Return recent flap events (newest last). */
+    getFlapLog(): readonly {
+        sessionId: string;
+        title: string;
+        ts: number;
+        count: number;
+    }[];
     /** Return all alert log entries (last 100 "status" tag entries), filtered by mute patterns. */
     getAlertLog(includeAll?: boolean): readonly ActivityEntry[];
     /** Return status change history for a session. */
@@ -752,7 +807,7 @@ export declare class TUI {
     private repaintDrilldownContent;
     private paintInputLine;
 }
-declare function formatSessionCard(s: DaemonSessionState, maxWidth: number, errorSparkline?: string, idleSinceMs?: number, healthBadge?: string, displayName?: string, ageStr?: string): string;
+declare function formatSessionCard(s: DaemonSessionState, maxWidth: number, errorSparkline?: string, idleSinceMs?: number, healthBadge?: string, displayName?: string, ageStr?: string, label?: string): string;
 declare function formatActivity(entry: ActivityEntry, maxCols: number): string;
 declare function padBoxLine(line: string, totalWidth: number): string;
 declare function padBoxLineHover(line: string, totalWidth: number, hovered: boolean): string;

package/dist/tui.js

@@ -481,6 +481,55 @@ export function isFlapping(changes, now, windowMs = FLAP_WINDOW_MS, threshold =
     const recent = changes.filter((c) => c.ts >= cutoff);
     return recent.length >= threshold;
 }
+// ── Sessions table (pure, exported for testing) ────────────────────────────────
+/**
+ * Format sessions as a rich table for /sessions command output.
+ * Returns array of lines (one per session + header).
+ */
+export function formatSessionsTable(sessions, opts, now) {
+    if (sessions.length === 0)
+        return ["  no sessions"];
+    const nowMs = now ?? Date.now();
+    const lines = [];
+    lines.push(`  ${"#".padEnd(3)} ${"title".padEnd(20)} ${"status".padEnd(9)} ${"hlth".padEnd(5)} ${"group".padEnd(10)} ${"cost".padEnd(7)} ${"uptime".padEnd(8)} flags`);
+    lines.push(`  ${"-".repeat(3)} ${"-".repeat(20)} ${"-".repeat(9)} ${"-".repeat(5)} ${"-".repeat(10)} ${"-".repeat(7)} ${"-".repeat(8)} -----`);
+    for (let i = 0; i < sessions.length; i++) {
+        const s = sessions[i];
+        const alias = opts.aliases.get(s.id);
+        const titleStr = (alias || s.title).slice(0, 20).padEnd(20);
+        const statusStr = s.status.slice(0, 9).padEnd(9);
+        const health = opts.healthScores.get(s.id) ?? 100;
+        const healthStr = String(health).padEnd(5);
+        const group = opts.groups.get(s.id) ?? "";
+        const groupStr = group.slice(0, 10).padEnd(10);
+        const cost = opts.costs.get(s.id) ?? "";
+        const costStr = cost.slice(0, 7).padEnd(7);
+        const fs = opts.firstSeen.get(s.id);
+        const uptimeStr = fs !== undefined ? formatUptime(nowMs - fs).padEnd(8) : "?".padEnd(8);
+        // flags: D=drain, ⊹=tag, ✎=note, ·=label
+        const flags = [
+            opts.drainingIds.has(s.id) ? "D" : "",
+            (opts.tags.get(s.id)?.size ?? 0) > 0 ? "T" : "",
+            opts.notes.has(s.id) ? "N" : "",
+            opts.labels.has(s.id) ? "L" : "",
+        ].filter(Boolean).join("") || "-";
+        lines.push(`  ${String(i + 1).padEnd(3)} ${titleStr} ${statusStr} ${healthStr} ${groupStr} ${costStr} ${uptimeStr} ${flags}`);
+    }
+    return lines;
+}
+// ── Session note history ─────────────────────────────────────────────────────
+/** Max notes stored per session (in history before clear). */
+export const MAX_NOTE_HISTORY = 5;
+// ── Session label ────────────────────────────────────────────────────────────
+/** Max length of a session label (displayed below title in cards). */
+export const MAX_LABEL_LEN = 40;
+/** Truncate a label to the max length. */
+export function truncateLabel(label) {
+    return label.length > MAX_LABEL_LEN ? label.slice(0, MAX_LABEL_LEN - 2) + ".." : label;
+}
+// ── Session drain mode helpers ────────────────────────────────────────────────
+/** Drain icon shown in session cards for draining sessions. */
+export const DRAIN_ICON = "⇣";
 // ── Alert mute patterns (pure, exported for testing) ──────────────────────────
 /**
  * Check if an alert text matches any suppressed pattern (case-insensitive substring).
@@ -807,7 +856,8 @@ export const BUILTIN_COMMANDS = new Set([
     "/mute-errors", "/prev-goal", "/tag", "/tags", "/tag-filter", "/find", "/reset-health", "/timeline", "/color", "/clear-history",
     "/duplicate", "/color-all", "/quiet-hours", "/quiet-status", "/history-stats", "/cost-summary", "/session-report", "/alert-log",
     "/budget", "/budgets", "/budget-status", "/pause-all", "/resume-all",
-    "/health-trend", "/alert-mute",
+    "/health-trend", "/alert-mute", "/flap-log", "/drain", "/undrain", "/export-all",
+    "/note-history", "/label", "/sessions",
 ]);
 /** Resolve a slash command through the alias map. Returns the expanded command or the original. */
 export function resolveAlias(line, aliases) {
@@ -1081,6 +1131,8 @@ export class TUI {
     quietHoursRanges = []; // quiet-hour start/end pairs
     sessionHealthHistory = new Map(); // session ID → health snapshots
     alertLog = []; // recent auto-generated status alerts (ring buffer, max 100)
+    sessionNoteHistory = new Map(); // session ID → last N notes before clear
+    sessionLabels = new Map(); // session ID → freeform display label
     sessionBudgets = new Map(); // session ID → USD budget
     globalBudget = null; // global fallback budget in USD
     budgetAlerted = new Map(); // session ID → epoch ms of last budget alert
@@ -1088,6 +1140,8 @@ export class TUI {
     prevSessionStatus = new Map(); // session ID → last known status (for change detection)
     flapAlerted = new Map(); // session ID → epoch ms of last flap alert
     alertMutePatterns = new Set(); // substrings to hide from /alert-log display
+    drainingIds = new Set(); // session IDs marked as draining (skip by reasoner)
+    flapLog = []; // recent flap events
     // drill-down mode: show a single session's full output
     viewMode = "overview";
     drilldownSessionId = null;
@@ -1350,6 +1404,15 @@ export class TUI {
         if (!sessionId)
             return false;
         if (text.trim() === "") {
+            // push current note into history before clearing
+            const current = this.sessionNotes.get(sessionId);
+            if (current) {
+                const hist = this.sessionNoteHistory.get(sessionId) ?? [];
+                hist.push(current);
+                if (hist.length > MAX_NOTE_HISTORY)
+                    hist.shift();
+                this.sessionNoteHistory.set(sessionId, hist);
+            }
             this.sessionNotes.delete(sessionId);
         }
         else {
@@ -1375,6 +1438,46 @@ export class TUI {
     getAllNotes() {
         return this.sessionNotes;
     }
+    /** Return note history for a session (oldest first). */
+    getNoteHistory(id) {
+        return this.sessionNoteHistory.get(id) ?? [];
+    }
+    // ── Session labels ───────────────────────────────────────────────────────
+    /**
+     * Set or clear a label for a session (by 1-indexed number, ID, or title).
+     * Label is displayed below the session title in normal cards.
+     * Returns true if session found.
+     */
+    setLabel(sessionIdOrIndex, label) {
+        let sessionId;
+        if (typeof sessionIdOrIndex === "number") {
+            sessionId = this.sessions[sessionIdOrIndex - 1]?.id;
+        }
+        else {
+            const needle = sessionIdOrIndex.toLowerCase();
+            const match = this.sessions.find((s) => s.id === sessionIdOrIndex || s.id.startsWith(needle) || s.title.toLowerCase() === needle);
+            sessionId = match?.id;
+        }
+        if (!sessionId)
+            return false;
+        if (!label || label.trim() === "") {
+            this.sessionLabels.delete(sessionId);
+        }
+        else {
+            this.sessionLabels.set(sessionId, truncateLabel(label.trim()));
+        }
+        if (this.active)
+            this.paintSessions();
+        return true;
+    }
+    /** Get the label for a session ID (or undefined). */
+    getLabel(id) {
+        return this.sessionLabels.get(id);
+    }
+    /** Return all session labels. */
+    getAllLabels() {
+        return this.sessionLabels;
+    }
     /** Return the current sessions (read-only, for resolving IDs to titles in the UI). */
     getSessions() {
         return this.sessions;
@@ -1600,6 +1703,56 @@ export class TUI {
     getSessionHealthHistory(id) {
         return this.sessionHealthHistory.get(id) ?? [];
     }
+    // ── Session drain mode ───────────────────────────────────────────────────
+    /** Mark a session as draining (by index, ID, or title). Returns true if found. */
+    drainSession(sessionIdOrIndex) {
+        let sessionId;
+        if (typeof sessionIdOrIndex === "number") {
+            sessionId = this.sessions[sessionIdOrIndex - 1]?.id;
+        }
+        else {
+            const needle = sessionIdOrIndex.toLowerCase();
+            const match = this.sessions.find((s) => s.id === sessionIdOrIndex || s.id.startsWith(needle) || s.title.toLowerCase() === needle);
+            sessionId = match?.id;
+        }
+        if (!sessionId)
+            return false;
+        this.drainingIds.add(sessionId);
+        if (this.active)
+            this.paintSessions();
+        return true;
+    }
+    /** Remove drain mark from a session. Returns true if it was draining. */
+    undrainSession(sessionIdOrIndex) {
+        let sessionId;
+        if (typeof sessionIdOrIndex === "number") {
+            sessionId = this.sessions[sessionIdOrIndex - 1]?.id;
+        }
+        else {
+            const needle = sessionIdOrIndex.toLowerCase();
+            const match = this.sessions.find((s) => s.id === sessionIdOrIndex || s.id.startsWith(needle) || s.title.toLowerCase() === needle);
+            sessionId = match?.id;
+        }
+        if (!sessionId)
+            return false;
+        const had = this.drainingIds.delete(sessionId);
+        if (had && this.active)
+            this.paintSessions();
+        return had;
+    }
+    /** Check if a session is draining. */
+    isDraining(id) {
+        return this.drainingIds.has(id);
+    }
+    /** Return all draining session IDs (for reasoner prompt and display). */
+    getDrainingIds() {
+        return this.drainingIds;
+    }
+    // ── Flap log ─────────────────────────────────────────────────────────────
+    /** Return recent flap events (newest last). */
+    getFlapLog() {
+        return this.flapLog;
+    }
     /** Return all alert log entries (last 100 "status" tag entries), filtered by mute patterns. */
     getAlertLog(includeAll = false) {
         if (includeAll || this.alertMutePatterns.size === 0)
@@ -1963,7 +2116,11 @@ export class TUI {
                         const lastFlapAlert = this.flapAlerted.get(s.id) ?? 0;
                         if (now - lastFlapAlert >= 5 * 60_000) {
                             this.flapAlerted.set(s.id, now);
-                            this.log("status", `flap: ${s.title} is oscillating rapidly (${statusHist.filter((c) => c.ts >= now - FLAP_WINDOW_MS).length} status changes in ${Math.round(FLAP_WINDOW_MS / 60_000)}m)`, s.id);
+                            const flapCount = statusHist.filter((c) => c.ts >= now - FLAP_WINDOW_MS).length;
+                            this.flapLog.push({ sessionId: s.id, title: s.title, ts: now, count: flapCount });
+                            if (this.flapLog.length > 50)
+                                this.flapLog.shift();
+                            this.log("status", `flap: ${s.title} is oscillating rapidly (${flapCount} status changes in ${Math.round(FLAP_WINDOW_MS / 60_000)}m)`, s.id);
                         }
                     }
                 }
@@ -2563,6 +2720,8 @@ export class TUI {
                 const colorName = this.sessionColors.get(s.id);
                 const colorDot = colorName ? formatColorDot(colorName) : "";
                 const colorDotWidth = colorName ? 2 : 0; // dot + space
+                const draining = this.drainingIds.has(s.id);
+                const drainIcon = draining ? `${DIM}${DRAIN_ICON}${RESET} ` : "";
                 const muteBadge = muted ? formatMuteBadge(this.mutedEntryCounts.get(s.id) ?? 0) : "";
                 const muteBadgeWidth = muted ? String(Math.min(this.mutedEntryCounts.get(s.id) ?? 0, 9999)).length + 2 : 0; // "(N)" visible chars, 0 when count is 0
                 const actualBadgeWidth = (this.mutedEntryCounts.get(s.id) ?? 0) > 0 ? muteBadgeWidth + 1 : 0; // +1 for trailing space
@@ -2572,10 +2731,11 @@ export class TUI {
                 const note = noted ? `${TEAL}${NOTE_ICON}${RESET} ` : "";
                 const groupBadge = group ? `${formatGroupBadge(group)} ` : "";
                 const badgeSuffix = muteBadge ? `${muteBadge} ` : "";
-                const iconsWidth = (pinned ? 2 : 0) + (muted ? 2 : 0) + (noted ? 2 : 0) + actualBadgeWidth + groupBadgeWidth + tagsBadgeWidth + colorDotWidth;
+                const iconsWidth = (pinned ? 2 : 0) + (muted ? 2 : 0) + (noted ? 2 : 0) + actualBadgeWidth + groupBadgeWidth + tagsBadgeWidth + colorDotWidth + (draining ? 2 : 0);
                 const cardWidth = innerWidth - 1 - iconsWidth;
                 const cardAge = s.createdAt ? formatSessionAge(s.createdAt, nowMs) : undefined;
-                const line = `${bg}${SLATE}${BOX.v}${RESET}${bg} ${pin}${mute}${badgeSuffix}${note}${groupBadge}${tagsBadge}${colorDot}${formatSessionCard(s, cardWidth, errSparkline || undefined, idleSinceMs, healthBadge || undefined, displayName, cardAge || undefined)}`;
+                const sessionLabel = this.sessionLabels.get(s.id);
+                const line = `${bg}${SLATE}${BOX.v}${RESET}${bg} ${pin}${mute}${badgeSuffix}${note}${groupBadge}${tagsBadge}${colorDot}${drainIcon}${formatSessionCard(s, cardWidth, errSparkline || undefined, idleSinceMs, healthBadge || undefined, displayName, cardAge || undefined, sessionLabel)}`;
                 const padded = padBoxLineHover(line, this.cols, isHovered);
                 process.stderr.write(moveTo(startRow + 1 + i, 1) + CLEAR_LINE + padded);
             }
@@ -2643,10 +2803,13 @@ export class TUI {
         const note = noted ? `${TEAL}${NOTE_ICON}${RESET} ` : "";
         const groupBadge = group ? `${formatGroupBadge(group)} ` : "";
         const badgeSuffix = muteBadge ? `${muteBadge} ` : "";
-        const iconsWidth = (pinned ? 2 : 0) + (muted ? 2 : 0) + (noted ? 2 : 0) + actualBadgeWidth + groupBadgeWidth + tagsBadgeWidth2 + colorDotWidth2;
+        const draining2 = this.drainingIds.has(s.id);
+        const drainIcon2 = draining2 ? `${DIM}${DRAIN_ICON}${RESET} ` : "";
+        const iconsWidth = (pinned ? 2 : 0) + (muted ? 2 : 0) + (noted ? 2 : 0) + actualBadgeWidth + groupBadgeWidth + tagsBadgeWidth2 + colorDotWidth2 + (draining2 ? 2 : 0);
         const cardWidth = innerWidth - 1 - iconsWidth;
         const cardAge2 = s.createdAt ? formatSessionAge(s.createdAt, nowMs2) : undefined;
-        const line = `${bg}${SLATE}${BOX.v}${RESET}${bg} ${pin}${mute}${badgeSuffix}${note}${groupBadge}${tagsBadge2}${colorDot2}${formatSessionCard(s, cardWidth, errSparkline || undefined, idleSinceMs, healthBadge2 || undefined, displayName2, cardAge2 || undefined)}`;
+        const sessionLabel2 = this.sessionLabels.get(s.id);
+        const line = `${bg}${SLATE}${BOX.v}${RESET}${bg} ${pin}${mute}${badgeSuffix}${note}${groupBadge}${tagsBadge2}${colorDot2}${drainIcon2}${formatSessionCard(s, cardWidth, errSparkline || undefined, idleSinceMs, healthBadge2 || undefined, displayName2, cardAge2 || undefined, sessionLabel2)}`;
         const padded = padBoxLineHover(line, this.cols, isHovered);
         process.stderr.write(SAVE_CURSOR + moveTo(startRow + 1 + i, 1) + CLEAR_LINE + padded + RESTORE_CURSOR);
     }
@@ -2765,7 +2928,8 @@ export class TUI {
 // healthBadge: optional pre-formatted health score badge ("⬡83" colored)
 // displayName: optional custom name override (from /rename)
 // ageStr: optional session age string (from createdAt)
-function formatSessionCard(s, maxWidth, errorSparkline, idleSinceMs, healthBadge, displayName, ageStr) {
+// label: optional freeform label shown as DIM subtitle
+function formatSessionCard(s, maxWidth, errorSparkline, idleSinceMs, healthBadge, displayName, ageStr, label) {
     const dot = STATUS_DOT[s.status] ?? `${AMBER}${DOT.filled}${RESET}`;
     const title = displayName ?? s.title;
     const name = displayName ? `${BOLD}${displayName}${DIM} (${s.title})${RESET}` : `${BOLD}${s.title}${RESET}`;
@@ -2806,7 +2970,8 @@ function formatSessionCard(s, maxWidth, errorSparkline, idleSinceMs, healthBadge
         desc = `${SLATE}${s.status}${RESET}`;
     }
     const ageSuffix = ageStr ? ` ${DIM}age:${ageStr}${RESET}` : "";
-    return truncateAnsi(`${dot} ${healthPrefix}${name} ${toolBadge}${contextBadge} ${SLATE}${BOX.h}${RESET} ${desc}${ageSuffix}${sparkSuffix}`, maxWidth);
+    const labelSuffix = label ? ` ${DIM}· ${label}${RESET}` : "";
+    return truncateAnsi(`${dot} ${healthPrefix}${name} ${toolBadge}${contextBadge} ${SLATE}${BOX.h}${RESET} ${desc}${ageSuffix}${labelSuffix}${sparkSuffix}`, maxWidth);
 }
 // colorize an activity entry based on its tag
 function formatActivity(entry, maxCols) {

package/dist/types.d.ts

@@ -25,6 +25,7 @@ export interface Observation {
     userMessage?: string;
     taskContext?: TaskState[];
     protectedSessions?: string[];
+    drainingSessionIds?: string[];
     policyContext?: {
         policies: AoaoeConfig["policies"];
         sessionStates: Array<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aoaoe",
-  "version": "0.153.0",
+  "version": "0.160.0",
   "description": "Autonomous supervisor for agent-of-empires sessions using OpenCode or Claude Code",
   "type": "module",
   "main": "dist/index.js",