@ouro.bot/cli 0.1.0-alpha.444 → 0.1.0-alpha.446

package/dist/heart/daemon/terminal-ui.js

@@ -4,9 +4,12 @@ exports.stripAnsi = stripAnsi;
 exports.visibleLength = visibleLength;
 exports.padAnsi = padAnsi;
 exports.wrapPlain = wrapPlain;
+exports.renderOverwriteFrame = renderOverwriteFrame;
 exports.renderOuroMasthead = renderOuroMasthead;
 exports.formatActionActorLabel = formatActionActorLabel;
+exports.renderTerminalWizard = renderTerminalWizard;
 exports.renderTerminalBoard = renderTerminalBoard;
+exports.renderTerminalGuide = renderTerminalGuide;
 exports.renderTerminalOperation = renderTerminalOperation;
 const runtime_1 = require("../../nerves/runtime");
 const RESET = "\x1b[0m";
@@ -16,6 +19,7 @@ const SCALE = "\x1b[38;2;45;148;71m";
 const GLOW = "\x1b[38;2;74;227;108m";
 const BONE = "\x1b[38;2;237;242;238m";
 const MIST = "\x1b[38;2;154;174;159m";
+const ALERT = "\x1b[38;2;255;106;106m";
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 const MASTHEAD_WORD = "OUROBOROS";
 const CLASSIC_WORDMARK_GLYPHS = {
@@ -71,6 +75,25 @@ function boardWidth(columns) {
     const requested = columns ?? 88;
     return Math.max(58, Math.min(requested, 96));
 }
+function renderOverwriteFrame(lines, prevLineCount, isTTY) {
+    if (!isTTY)
+        return `${lines.join("\n")}\n`;
+    let output = "";
+    if (prevLineCount > 0) {
+        output += `\x1b[${prevLineCount}A`;
+    }
+    for (const line of lines) {
+        output += `\x1b[2K${line}\n`;
+    }
+    const extraLineCount = Math.max(0, prevLineCount - lines.length);
+    for (let i = 0; i < extraLineCount; i++) {
+        output += "\x1b[2K\n";
+    }
+    if (extraLineCount > 0) {
+        output += `\x1b[${extraLineCount}A`;
+    }
+    return output;
+}
 function renderPanelTTY(title, lines, width) {
     const innerWidth = Math.max(8, width - 4);
     const topPrefix = `╭─ ${title} `;
@@ -94,15 +117,18 @@ function renderPanelPlain(title, lines) {
     ];
 }
 function mastheadArt(columns) {
-    if ((columns ?? 88) >= 74) {
-        const rows = Array.from({ length: 5 }, () => []);
-        for (const letter of MASTHEAD_WORD.split("")) {
-            const glyph = CLASSIC_WORDMARK_GLYPHS[letter];
-            for (const [index, line] of glyph.entries()) {
-                rows[index].push(line);
-            }
+    const rows = Array.from({ length: 5 }, () => []);
+    for (const letter of MASTHEAD_WORD.split("")) {
+        const glyph = CLASSIC_WORDMARK_GLYPHS[letter];
+        for (const [index, line] of glyph.entries()) {
+            rows[index].push(line);
         }
-        return rows.map((row) => row.join(" "));
+    }
+    const classicWordmark = rows.map((row) => row.join(" "));
+    const availableColumns = columns ?? 88;
+    const classicWidth = Math.max(...classicWordmark.map((line) => line.length));
+    if (availableColumns >= classicWidth) {
+        return classicWordmark;
     }
     return [MASTHEAD_WORD];
 }
@@ -121,6 +147,154 @@ function renderOuroMasthead(options) {
 function formatActionActorLabel(actor) {
     return actor.replace(/-/g, " ");
 }
+function formatWizardStatusLabel(status) {
+    return status;
+}
+function isQuietWizardStatus(status) {
+    return status === "ready" || status === "attached" || status === "not attached";
+}
+function renderWizardStatusBadge(status, isTTY) {
+    const symbol = status === "ready" || status === "attached"
+        ? "●"
+        : status === "not attached"
+            ? "◌"
+            : "◆";
+    const label = `${symbol} ${formatWizardStatusLabel(status)}`;
+    if (!isTTY)
+        return label;
+    if (status === "ready" || status === "attached")
+        return color(label, GLOW, true);
+    if (status === "not attached")
+        return color(label, MIST);
+    return color(label, ALERT, true);
+}
+function renderWizardActorBadge(actor, isTTY) {
+    const label = `[${formatActionActorLabel(actor)}]`;
+    if (!isTTY)
+        return label;
+    if (actor === "human-required")
+        return color(label, ALERT, true);
+    if (actor === "human-choice")
+        return color(label, SCALE, true);
+    return color(label, MIST);
+}
+function renderWizardRecommendedBadge(isTTY) {
+    if (!isTTY)
+        return "[recommended]";
+    return color("[recommended]", GLOW, true);
+}
+function wrapWizardDetailLines(lines, width, isTTY, tone) {
+    const rendered = [];
+    for (const line of lines) {
+        const wrapped = wrapPlain(line, width);
+        for (const segment of wrapped) {
+            rendered.push(isTTY ? color(segment, tone) : segment);
+        }
+    }
+    return rendered;
+}
+function renderWizardItem(item, width, isTTY) {
+    const badges = [
+        ...(item.status ? [renderWizardStatusBadge(item.status, isTTY)] : []),
+        ...(item.actor ? [renderWizardActorBadge(item.actor, isTTY)] : []),
+        ...(item.recommended ? [renderWizardRecommendedBadge(isTTY)] : []),
+    ];
+    const keyPrefix = item.key ? `${item.key}. ` : "";
+    const header = `${keyPrefix}${item.label}${badges.length > 0 ? `  ${badges.join("  ")}` : ""}`;
+    const detailWidth = Math.max(18, width - 6);
+    const detailTone = item.status && !isQuietWizardStatus(item.status) ? BONE : MIST;
+    const lines = [isTTY ? color(header, BONE, true) : header];
+    if (item.summary) {
+        lines.push(...wrapWizardDetailLines([item.summary], detailWidth, isTTY, detailTone));
+    }
+    if (item.detailLines && item.detailLines.length > 0) {
+        lines.push(...wrapWizardDetailLines(item.detailLines, detailWidth, isTTY, detailTone));
+    }
+    if (item.command) {
+        lines.push(...wrapWizardDetailLines([`run: ${item.command}`], detailWidth, isTTY, MIST));
+    }
+    return lines.flatMap((line, index) => index === 0 ? [line] : [`   ${line}`]);
+}
+function renderWizardSectionTTY(section, width) {
+    const lines = [];
+    if (section.summary) {
+        lines.push(...wrapWizardDetailLines([section.summary], Math.max(18, width - 4), true, MIST));
+    }
+    for (const [index, item] of section.items.entries()) {
+        if (index > 0)
+            lines.push("");
+        lines.push(...renderWizardItem(item, width, true));
+    }
+    return renderOperationSectionTTY(section.title, lines, width);
+}
+function renderWizardSectionPlain(section, width) {
+    const lines = [];
+    if (section.summary) {
+        lines.push(...wrapWizardDetailLines([section.summary], Math.max(18, width - 4), false, MIST));
+    }
+    for (const [index, item] of section.items.entries()) {
+        if (index > 0)
+            lines.push("");
+        lines.push(...renderWizardItem(item, width, false));
+    }
+    return renderOperationSectionPlain(section.title, lines);
+}
+function renderTerminalWizard(options) {
+    if (!options.suppressEvent) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.terminal_wizard_rendered",
+            message: "rendered shared terminal wizard",
+            meta: {
+                title: options.title,
+                sections: options.sections?.length ?? 0,
+                items: options.sections?.reduce((count, section) => count + section.items.length, 0) ?? 0,
+                hasNextStep: !!options.nextStep,
+                tty: options.isTTY,
+            },
+        });
+    }
+    const width = boardWidth(options.columns);
+    const blocks = [];
+    blocks.push(renderOuroMasthead({
+        isTTY: options.isTTY,
+        columns: width,
+        subtitle: options.masthead?.subtitle,
+    }).trimEnd());
+    const introLines = [
+        options.isTTY ? color(options.title, BONE, true) : options.title,
+        ...(options.summary
+            ? wrapPlain(options.summary, Math.max(20, width - 2)).map((line) => options.isTTY ? color(line, MIST) : line)
+            : []),
+    ];
+    blocks.push(introLines.join("\n"));
+    if (options.nextStep) {
+        const nextStepLines = [
+            options.isTTY ? color(options.nextStep.label, BONE, true) : options.nextStep.label,
+            ...(options.nextStep.detail
+                ? wrapPlain(options.nextStep.detail, Math.max(18, width - 4)).map((line) => options.isTTY ? color(line, MIST) : line)
+                : []),
+            ...(options.nextStep.command
+                ? wrapPlain(`run: ${options.nextStep.command}`, Math.max(18, width - 4)).map((line) => options.isTTY ? color(line, MIST) : line)
+                : []),
+        ];
+        blocks.push((options.isTTY
+            ? renderOperationSectionTTY("Recommended next step", nextStepLines, width)
+            : renderOperationSectionPlain("Recommended next step", nextStepLines)).join("\n"));
+    }
+    for (const section of options.sections ?? []) {
+        blocks.push((options.isTTY
+            ? renderWizardSectionTTY(section, width)
+            : renderWizardSectionPlain(section, width)).join("\n"));
+    }
+    if (options.footerLines && options.footerLines.length > 0) {
+        blocks.push(options.footerLines.map((line) => options.isTTY ? color(line, MIST) : line).join("\n"));
+    }
+    if (options.prompt) {
+        blocks.push(options.isTTY ? color(options.prompt, BONE, true) : options.prompt);
+    }
+    return `${blocks.join("\n\n")}\n`;
+}
 function renderActionLine(action) {
     const chips = [`[${formatActionActorLabel(action.actor)}]`];
     if (action.recommended)
@@ -171,6 +345,56 @@ function renderTerminalBoard(options) {
     }
     return `${blocks.join("\n\n")}\n`;
 }
+function renderTerminalGuide(options) {
+    if (!options.suppressEvent) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.terminal_guide_rendered",
+            message: "rendered shared terminal guide",
+            meta: {
+                title: options.title,
+                sections: options.sections?.length ?? 0,
+                actions: options.actions?.length ?? 0,
+                tty: options.isTTY,
+            },
+        });
+    }
+    const width = boardWidth(options.columns);
+    const blocks = [];
+    blocks.push(renderOuroMasthead({
+        isTTY: options.isTTY,
+        columns: width,
+        subtitle: options.masthead?.subtitle,
+    }).trimEnd());
+    const introLines = [
+        options.isTTY ? color(options.title, BONE, true) : options.title,
+        ...(options.summary
+            ? wrapPlain(options.summary, Math.max(20, width - 2)).map((line) => options.isTTY ? color(line, MIST) : line)
+            : []),
+    ];
+    blocks.push(introLines.join("\n"));
+    for (const section of options.sections ?? []) {
+        const lines = section.lines.map((line) => options.isTTY ? color(line, BONE) : line);
+        blocks.push((options.isTTY
+            ? renderOperationSectionTTY(section.title, lines, width)
+            : renderOperationSectionPlain(section.title, lines)).join("\n"));
+    }
+    const actionList = options.actions ?? [];
+    if (actionList.length > 0) {
+        const lines = [];
+        for (const [index, action] of actionList.entries()) {
+            lines.push(options.isTTY ? color(`${index + 1}. ${renderActionLine(action)}`, BONE, true) : `${index + 1}. ${renderActionLine(action)}`);
+            lines.push(options.isTTY ? color(`run: ${action.command}`, MIST) : `run: ${action.command}`);
+        }
+        blocks.push((options.isTTY
+            ? renderOperationSectionTTY("Next moves", lines, width)
+            : renderOperationSectionPlain("Next moves", lines)).join("\n"));
+    }
+    if (options.prompt) {
+        blocks.push(options.isTTY ? color(options.prompt, BONE, true) : options.prompt);
+    }
+    return `${blocks.join("\n\n")}\n`;
+}
 function formatOperationStep(step) {
     const marker = step.status === "done"
         ? "✓"
@@ -182,7 +406,58 @@ function formatOperationStep(step) {
     const detail = step.detail ? ` — ${step.detail}` : "";
     return `${marker} ${step.label}${detail}`;
 }
+function operationMarkerTone(status) {
+    switch (status) {
+        case "done":
+            return GLOW;
+        case "active":
+            return BONE;
+        case "failed":
+            return ALERT;
+        case "pending":
+        default:
+            return MIST;
+    }
+}
+function renderOperationStepTTY(step) {
+    const marker = step.status === "done"
+        ? "✓"
+        : step.status === "failed"
+            ? "✗"
+            : step.status === "active"
+                ? "→"
+                : "○";
+    const label = color(step.label, step.status === "pending" ? MIST : BONE, step.status !== "pending");
+    const detail = step.detail ? ` ${color(`— ${step.detail}`, MIST)}` : "";
+    return `${color(marker, operationMarkerTone(step.status), true)} ${label}${detail}`;
+}
+function renderOperationSectionTTY(title, lines, width) {
+    const rule = "─".repeat(Math.max(8, width - title.length - 3));
+    return [
+        `${color("─ ", CANOPY)}${color(title, BONE, true)} ${color(rule, CANOPY)}`,
+        ...lines.map((line) => `  ${line}`),
+    ];
+}
+function renderOperationSectionPlain(title, lines) {
+    return [
+        title,
+        ...lines.map((line) => `  ${plainLine(line)}`),
+    ];
+}
 function renderTerminalOperation(options) {
+    if (!options.suppressEvent) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.terminal_operation_rendered",
+            message: "rendered terminal operation surface",
+            meta: {
+                title: options.title,
+                steps: options.steps?.length ?? 0,
+                hasCurrentStep: !!options.currentStep,
+                tty: options.isTTY,
+            },
+        });
+    }
     const steps = options.steps ?? [];
     const currentLines = options.currentStep
         ? [
@@ -191,25 +466,34 @@ function renderTerminalOperation(options) {
         ]
         : ["Standing by."];
     const progressLines = steps.length > 0
-        ? steps.map((step) => formatOperationStep(step))
+        ? options.isTTY
+            ? steps.map((step) => renderOperationStepTTY(step))
+            : steps.map((step) => formatOperationStep(step))
         : ["No active steps yet."];
-    return renderTerminalBoard({
+    const width = boardWidth(options.columns);
+    const blocks = [];
+    blocks.push(renderOuroMasthead({
         isTTY: options.isTTY,
-        columns: options.columns,
-        masthead: options.masthead,
-        title: options.title,
-        summary: options.summary,
-        sections: [
-            {
-                title: options.currentTitle ?? "Right now",
-                lines: currentLines,
-            },
-            {
-                title: options.stepsTitle ?? "Progress",
-                lines: progressLines,
-            },
-        ],
-        prompt: options.prompt,
-        suppressEvent: options.suppressEvent,
-    });
+        columns: width,
+        subtitle: options.masthead?.subtitle,
+    }).trimEnd());
+    const introLines = [
+        options.isTTY ? color(options.title, BONE, true) : options.title,
+        ...(options.summary
+            ? wrapPlain(options.summary, Math.max(20, width - 2)).map((line) => options.isTTY ? color(line, MIST) : line)
+            : []),
+    ];
+    blocks.push(introLines.join("\n"));
+    const renderedSteps = options.isTTY
+        ? renderOperationSectionTTY(options.stepsTitle ?? "Checklist", progressLines, width)
+        : renderOperationSectionPlain(options.stepsTitle ?? "Checklist", progressLines);
+    const renderedCurrent = options.isTTY
+        ? renderOperationSectionTTY(options.currentTitle ?? "Current work", currentLines.map((line, index) => index === 0 ? color(line, BONE, true) : color(line, MIST)), width)
+        : renderOperationSectionPlain(options.currentTitle ?? "Current work", currentLines);
+    blocks.push(renderedSteps.join("\n"));
+    blocks.push(renderedCurrent.join("\n"));
+    if (options.prompt) {
+        blocks.push(options.isTTY ? color(options.prompt, BONE, true) : options.prompt);
+    }
+    return `${blocks.join("\n\n")}\n`;
 }

package/dist/heart/daemon/up-progress.js

@@ -219,19 +219,7 @@ class UpProgress {
             return "";
         }
         const lines = this.renderLines(now);
-        let output = "";
-        if (this.prevLineCount > 0) {
-            output += `\x1b[${this.prevLineCount}A`;
-        }
-        for (const line of lines) {
-            output += `\x1b[2K${line}\n`;
-        }
-        // Clear any leftover lines from previous render that are no longer needed
-        if (lines.length < this.prevLineCount) {
-            for (let i = 0; i < this.prevLineCount - lines.length; i++) {
-                output += `\x1b[2K\n`;
-            }
-        }
+        const output = (0, terminal_ui_1.renderOverwriteFrame)(lines, this.prevLineCount, true);
         this.prevLineCount = lines.length;
         return output;
     }
@@ -301,14 +289,8 @@ class UpProgress {
     }
     renderUpScreen(now) {
         const seenLabels = new Set();
-        const steps = this.completed.map((phase) => {
-            seenLabels.add(phase.label);
-            return {
-                label: this.renderUpStepLabel(phase.label),
-                status: phase.status === "failure" ? "failed" : "done",
-                detail: phase.detail,
-            };
-        });
+        const completedByLabel = new Map(this.completed.map((phase) => [phase.label, phase]));
+        const steps = [];
         let currentStepLabel = this.completed.some((phase) => phase.status === "failure")
             ? "Boot paused."
             : this.completed.length > 0
@@ -322,19 +304,44 @@ class UpProgress {
             const spinner = SPINNER_FRAMES[frameIndex];
             currentStepLabel = `${spinner} ${this.renderUpStepLabel(this.currentPhase.label)} (${elapsedSec}s)`;
             currentStepDetails = splitDetailLines(this.currentPhase.detail);
-            steps.push({
-                label: this.renderUpStepLabel(this.currentPhase.label),
-                status: "active",
-            });
-            seenLabels.add(this.currentPhase.label);
         }
         for (const label of this.upPhasePlan) {
-            if (!seenLabels.has(label)) {
+            seenLabels.add(label);
+            const completedPhase = completedByLabel.get(label);
+            if (completedPhase) {
+                steps.push({
+                    label: this.renderUpStepLabel(label),
+                    status: completedPhase.status === "failure" ? "failed" : "done",
+                    detail: completedPhase.detail,
+                });
+                continue;
+            }
+            if (this.currentPhase?.label === label) {
                 steps.push({
                     label: this.renderUpStepLabel(label),
-                    status: "pending",
+                    status: "active",
                 });
+                continue;
             }
+            steps.push({
+                label: this.renderUpStepLabel(label),
+                status: "pending",
+            });
+        }
+        for (const phase of this.completed) {
+            if (!seenLabels.has(phase.label)) {
+                steps.push({
+                    label: this.renderUpStepLabel(phase.label),
+                    status: phase.status === "failure" ? "failed" : "done",
+                    detail: phase.detail,
+                });
+            }
+        }
+        if (this.currentPhase && !seenLabels.has(this.currentPhase.label)) {
+            steps.push({
+                label: this.renderUpStepLabel(this.currentPhase.label),
+                status: "active",
+            });
         }
         return (0, terminal_ui_1.renderTerminalOperation)({
             isTTY: true,
@@ -342,8 +349,8 @@ class UpProgress {
             masthead: {
                 subtitle: "Booting the local agent runtime.",
             },
-            title: "Ouro boot checklist",
-            summary: "Ouro will check for updates, prepare this machine, verify the providers your agents use right now, start the background service, and make sure it stays up.",
+            title: "Starting Ouro",
+            summary: "Ouro is bringing the local agent runtime online and will stop here if anything needs attention.",
             currentStep: {
                 label: currentStepLabel,
                 detailLines: currentStepDetails,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.444",
+  "version": "0.1.0-alpha.446",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",