refactor: polish CLI theme + progress helpers

This commit is contained in:
Peter Steinberger
2026-01-08 05:58:43 +01:00
parent e758cccd46
commit b8a186fbd3
6 changed files with 59 additions and 25 deletions

View File

@@ -23,6 +23,12 @@ export type ProgressReporter = {
done: () => void;
};
export type ProgressTotalsUpdate = {
completed: number;
total: number;
label?: string;
};
const noopReporter: ProgressReporter = {
setLabel: () => {},
setPercent: () => {},
@@ -133,3 +139,20 @@ export async function withProgress<T>(
progress.done();
}
}
export async function withProgressTotals<T>(
options: ProgressOptions,
work: (
update: (update: ProgressTotalsUpdate) => void,
progress: ProgressReporter,
) => Promise<T>,
): Promise<T> {
return await withProgress(options, async (progress) => {
const update = ({ completed, total, label }: ProgressTotalsUpdate) => {
if (label) progress.setLabel(label);
if (!Number.isFinite(total) || total <= 0) return;
progress.setPercent((completed / total) * 100);
};
return await work(update, progress);
});
}

View File

@@ -1,5 +1,4 @@
const DEFAULT_TAGLINE =
"Send, receive, and auto-reply on WhatsApp (web) and Telegram (bot).";
const DEFAULT_TAGLINE = "All your chats, one ClawdBot.";
const TAGLINES: string[] = [];

View File

@@ -4,7 +4,7 @@ import {
type ModelScanResult,
scanOpenRouterModels,
} from "../../agents/model-scan.js";
import { withProgress } from "../../cli/progress.js";
import { withProgressTotals } from "../../cli/progress.js";
import { CONFIG_PATH_CLAWDBOT, loadConfig } from "../../config/config.js";
import type { RuntimeEnv } from "../../runtime.js";
import { formatMs, formatTokenK, updateConfig } from "./shared.js";
@@ -189,13 +189,13 @@ export async function modelsScanCommand(
storedKey = undefined;
}
}
const results = await withProgress(
const results = await withProgressTotals(
{
label: "Scanning OpenRouter models...",
indeterminate: false,
enabled: opts.json !== true,
},
async (progress) =>
async (update) =>
await scanOpenRouterModels({
apiKey: storedKey ?? undefined,
minParamB: minParams,
@@ -206,10 +206,12 @@ export async function modelsScanCommand(
probe,
onProgress: ({ phase, completed, total }) => {
if (phase !== "probe") return;
if (total <= 0) return;
const labelBase = probe ? "Probing models" : "Scanning models";
progress.setLabel(`${labelBase} (${completed}/${total})`);
progress.setPercent((completed / total) * 100);
update({
completed,
total,
label: `${labelBase} (${completed}/${total})`,
});
},
}),
);

View File

@@ -1,6 +1,6 @@
import chalk from "chalk";
import { type ClawdbotConfig, loadConfig } from "../config/config.js";
import { resolveTelegramToken } from "../telegram/token.js";
import { theme } from "../terminal/theme.js";
import { normalizeE164 } from "../utils.js";
import {
getWebAuthAgeMs,
@@ -30,7 +30,7 @@ export async function buildProviderSummary(
const webEnabled = effective.web?.enabled !== false;
if (!webEnabled) {
lines.push(tint("WhatsApp: disabled", chalk.cyan));
lines.push(tint("WhatsApp: disabled", theme.muted));
} else {
const webLinked = await webAuthExists();
const authAgeMs = getWebAuthAgeMs();
@@ -40,28 +40,28 @@ export async function buildProviderSummary(
webLinked
? tint(
`WhatsApp: linked${e164 ? ` ${e164}` : ""}${authAge}`,
chalk.green,
theme.success,
)
: tint("WhatsApp: not linked", chalk.red),
: tint("WhatsApp: not linked", theme.error),
);
}
const telegramEnabled = effective.telegram?.enabled !== false;
if (!telegramEnabled) {
lines.push(tint("Telegram: disabled", chalk.cyan));
lines.push(tint("Telegram: disabled", theme.muted));
} else {
const { token: telegramToken } = resolveTelegramToken(effective);
const telegramConfigured = Boolean(telegramToken?.trim());
lines.push(
telegramConfigured
? tint("Telegram: configured", chalk.green)
: tint("Telegram: not configured", chalk.cyan),
? tint("Telegram: configured", theme.success)
: tint("Telegram: not configured", theme.muted),
);
}
const signalEnabled = effective.signal?.enabled !== false;
if (!signalEnabled) {
lines.push(tint("Signal: disabled", chalk.cyan));
lines.push(tint("Signal: disabled", theme.muted));
} else {
const signalConfigured =
Boolean(effective.signal) &&
@@ -75,20 +75,20 @@ export async function buildProviderSummary(
);
lines.push(
signalConfigured
? tint("Signal: configured", chalk.green)
: tint("Signal: not configured", chalk.cyan),
? tint("Signal: configured", theme.success)
: tint("Signal: not configured", theme.muted),
);
}
const imessageEnabled = effective.imessage?.enabled !== false;
if (!imessageEnabled) {
lines.push(tint("iMessage: disabled", chalk.cyan));
lines.push(tint("iMessage: disabled", theme.muted));
} else {
const imessageConfigured = Boolean(effective.imessage);
lines.push(
imessageConfigured
? tint("iMessage: configured", chalk.green)
: tint("iMessage: not configured", chalk.cyan),
? tint("iMessage: configured", theme.success)
: tint("iMessage: not configured", theme.muted),
);
}
@@ -97,7 +97,7 @@ export async function buildProviderSummary(
? effective.whatsapp.allowFrom.map(normalizeE164).filter(Boolean)
: [];
if (allowFrom.length) {
lines.push(tint(`AllowFrom: ${allowFrom.join(", ")}`, chalk.cyan));
lines.push(tint(`AllowFrom: ${allowFrom.join(", ")}`, theme.muted));
}
}

View File

@@ -1,5 +1,4 @@
import { existsSync } from "node:fs";
import chalk from "chalk";
import { promptYesNo } from "../cli/prompt.js";
import {
danger,
@@ -8,6 +7,7 @@ import {
shouldLogVerbose,
warn,
} from "../globals.js";
import { colorize, isRich, theme } from "../terminal/theme.js";
import { runExec } from "../process/exec.js";
import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
import { ensureBinary } from "./binaries.js";
@@ -180,8 +180,17 @@ export async function ensureFunnel(
),
);
if (shouldLogVerbose()) {
if (stdout.trim()) runtime.error(chalk.gray(`stdout: ${stdout.trim()}`));
if (stderr.trim()) runtime.error(chalk.gray(`stderr: ${stderr.trim()}`));
const rich = isRich();
if (stdout.trim()) {
runtime.error(
colorize(rich, theme.muted, `stdout: ${stdout.trim()}`),
);
}
if (stderr.trim()) {
runtime.error(
colorize(rich, theme.muted, `stderr: ${stderr.trim()}`),
);
}
runtime.error(err as Error);
}
runtime.exit(1);

View File

@@ -1,5 +1,6 @@
import chalk from "chalk";
// Semantic palette for CLI output. Keep in sync with docs/cli/index.md.
export const LOBSTER_PALETTE = {
accent: "#FF5A2D",
accentBright: "#FF7A3D",