admin/Moltbot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(daemon-cli): share status text styling

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 02:42:46 +00:00
parent c1655982d4
commit 7c27c2d659
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli/daemon-cli/shared.ts
View File

@@ -7,12 +7,26 @@ import { resolveGatewayLogPaths } from "../../daemon/launchd.js";
import { formatRuntimeStatus } from "../../daemon/runtime-format.js";
import { pickPrimaryLanIPv4 } from "../../gateway/net.js";
import { getResolvedLoggerSettings } from "../../logging.js";
import { colorize, isRich, theme } from "../../terminal/theme.js";
import { formatCliCommand } from "../command-format.js";
import { parsePort } from "../shared/parse-port.js";
export { formatRuntimeStatus };
export { parsePort };
export function createCliStatusTextStyles() {
const rich = isRich();
return {
rich,
label: (value: string) => colorize(rich, theme.muted, value),
accent: (value: string) => colorize(rich, theme.accent, value),
infoText: (value: string) => colorize(rich, theme.info, value),
okText: (value: string) => colorize(rich, theme.success, value),
warnText: (value: string) => colorize(rich, theme.warn, value),
errorText: (value: string) => colorize(rich, theme.error, value),
};
}
export function parsePortFromArgs(programArguments: string[] | undefined): number | null {
if (!programArguments?.length) {
return null;

12
src/cli/daemon-cli/status.print.ts
View File

@@ -12,10 +12,11 @@ import {
import { isWSLEnv } from "../../infra/wsl.js";
import { getResolvedLoggerSettings } from "../../logging.js";
import { defaultRuntime } from "../../runtime.js";
import { colorize, isRich, theme } from "../../terminal/theme.js";
import { colorize, theme } from "../../terminal/theme.js";
import { shortenHomePath } from "../../utils.js";
import { formatCliCommand } from "../command-format.js";
import {
createCliStatusTextStyles,
filterDaemonEnv,
formatRuntimeStatus,
renderRuntimeHints,
@@ -53,13 +54,8 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
return;
}
const rich = isRich();
const label = (value: string) => colorize(rich, theme.muted, value);
const accent = (value: string) => colorize(rich, theme.accent, value);
const infoText = (value: string) => colorize(rich, theme.info, value);
const okText = (value: string) => colorize(rich, theme.success, value);
const warnText = (value: string) => colorize(rich, theme.warn, value);
const errorText = (value: string) => colorize(rich, theme.error, value);
const { rich, label, accent, infoText, okText, warnText, errorText } =
createCliStatusTextStyles();
const spacer = () => defaultRuntime.log("");
const { service, rpc, extraServices } = status;

13
src/cli/node-cli/daemon.ts
View File

@@ -14,7 +14,7 @@ import { resolveGatewayLogPaths } from "../../daemon/launchd.js";
import { resolveNodeService } from "../../daemon/node-service.js";
import { loadNodeHostConfig } from "../../node-host/config.js";
import { defaultRuntime } from "../../runtime.js";
import { colorize, isRich, theme } from "../../terminal/theme.js";
import { colorize, theme } from "../../terminal/theme.js";
import { formatCliCommand } from "../command-format.js";
import {
runServiceRestart,
@@ -27,7 +27,7 @@ import {
createDaemonActionContext,
installDaemonServiceAndEmit,
} from "../daemon-cli/response.js";
import { formatRuntimeStatus, parsePort } from "../daemon-cli/shared.js";
import { createCliStatusTextStyles, formatRuntimeStatus, parsePort } from "../daemon-cli/shared.js";
type NodeDaemonInstallOptions = {
host?: string;
@@ -243,13 +243,8 @@ export async function runNodeDaemonStatus(opts: NodeDaemonStatusOptions = {}) {
return;
}
const rich = isRich();
const label = (value: string) => colorize(rich, theme.muted, value);
const accent = (value: string) => colorize(rich, theme.accent, value);
const infoText = (value: string) => colorize(rich, theme.info, value);
const okText = (value: string) => colorize(rich, theme.success, value);
const warnText = (value: string) => colorize(rich, theme.warn, value);
const errorText = (value: string) => colorize(rich, theme.error, value);
const { rich, label, accent, infoText, okText, warnText, errorText } =
createCliStatusTextStyles();
const serviceStatus = loaded ? okText(service.loadedText) : warnText(service.notLoadedText);
defaultRuntime.log(`${label("Service:")} ${accent(service.label)} (${serviceStatus})`);