惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

P
Proofpoint News Feed
V
V2EX
WordPress大学
WordPress大学
Google DeepMind News
Google DeepMind News
Martin Fowler
Martin Fowler
小众软件
小众软件
Blog — PlanetScale
Blog — PlanetScale
月光博客
月光博客
The Cloudflare Blog
T
Tailwind CSS Blog
H
Help Net Security
腾讯CDC
爱范儿
爱范儿
人人都是产品经理
人人都是产品经理
H
Hackread – Cybersecurity News, Data Breaches, AI and More
The GitHub Blog
The GitHub Blog
Microsoft Security Blog
Microsoft Security Blog
Stack Overflow Blog
Stack Overflow Blog
D
DataBreaches.Net
C
Check Point Blog
量子位
酷 壳 – CoolShell
酷 壳 – CoolShell
美团技术团队
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(cli): keep nodes list aligned with nodes status (#726...
vincentkoc · 2026-04-27 · via Recent Commits to openclaw:main

@@ -7,14 +7,17 @@ import {

77

normalizeOptionalLowercaseString,

88

normalizeOptionalString,

99

} from "../../shared/string-coerce.js";

10+

import { sanitizeTerminalText } from "../../terminal/safe-text.js";

1011

import { getTerminalTableWidth, renderTable } from "../../terminal/table.js";

1112

import { shortenHomeInString } from "../../utils.js";

1213

import { parseDurationMs } from "../parse-duration.js";

1314

import { getNodesTheme, runNodesCommand } from "./cli-utils.js";

1415

import { formatPermissions, parseNodeList, parsePairingList } from "./format.js";

1516

import { renderPendingPairingRequestsTable } from "./pairing-render.js";

1617

import { callGatewayCli, nodesCallOpts, resolveNodeId } from "./rpc.js";

17-

import type { NodesRpcOpts } from "./types.js";

18+

import type { NodeListNode, NodesRpcOpts, PairedNode } from "./types.js";

19+20+

type PairedNodeListRow = PairedNode & Partial<NodeListNode>;

18211922

function formatVersionLabel(raw: string) {

2023

const trimmed = raw.trim();

@@ -88,6 +91,11 @@ function formatClientLabel(node: { clientId?: string; clientMode?: string }): st

8891

return clientId || clientMode || null;

8992

}

909394+

function formatNodeTerminalLabel(node: { nodeId: string; displayName?: string }): string {

95+

const label = node.displayName?.trim() ? node.displayName.trim() : node.nodeId;

96+

return sanitizeTerminalText(label);

97+

}

98+9199

function parseSinceMs(raw: unknown, label: string): number | undefined {

92100

if (raw === undefined || raw === null) {

93101

return undefined;

@@ -111,6 +119,67 @@ function parseSinceMs(raw: unknown, label: string): number | undefined {

111119

}

112120

}

113121122+

function mergePairedNodeWithEffectiveNode(

123+

paired: PairedNode | undefined,

124+

effective: NodeListNode,

125+

): PairedNodeListRow {

126+

return {

127+

...paired,

128+

...effective,

129+

token: paired?.token,

130+

createdAtMs: paired?.createdAtMs,

131+

lastConnectedAtMs: paired?.lastConnectedAtMs ?? effective.connectedAtMs,

132+

displayName: effective.displayName ?? paired?.displayName,

133+

platform: effective.platform ?? paired?.platform,

134+

version: effective.version ?? paired?.version,

135+

coreVersion: effective.coreVersion ?? paired?.coreVersion,

136+

uiVersion: effective.uiVersion ?? paired?.uiVersion,

137+

remoteIp: effective.remoteIp ?? paired?.remoteIp,

138+

permissions: effective.permissions ?? paired?.permissions,

139+

approvedAtMs: effective.approvedAtMs ?? paired?.approvedAtMs,

140+

};

141+

}

142+143+

function mergePairedNodesWithEffectiveNodes(

144+

paired: PairedNode[],

145+

effectiveNodes: NodeListNode[] | null,

146+

): PairedNodeListRow[] {

147+

if (effectiveNodes === null) {

148+

return paired;

149+

}

150+

const pairedById = new Map(paired.map((node) => [node.nodeId, node]));

151+

const seen = new Set<string>();

152+

const rows: PairedNodeListRow[] = [];

153+

for (const effective of effectiveNodes) {

154+

const pairedNode = pairedById.get(effective.nodeId);

155+

if (!pairedNode && effective.paired !== true) {

156+

continue;

157+

}

158+

seen.add(effective.nodeId);

159+

rows.push(mergePairedNodeWithEffectiveNode(pairedNode, effective));

160+

}

161+

for (const node of paired) {

162+

if (!seen.has(node.nodeId)) {

163+

rows.push(node);

164+

}

165+

}

166+

return rows;

167+

}

168+169+

async function tryReadNodeList(opts: NodesRpcOpts): Promise<NodeListNode[] | null> {

170+

try {

171+

return parseNodeList(await callGatewayCli("node.list", opts, {}));

172+

} catch {

173+

return null;

174+

}

175+

}

176+177+

function sanitizePairedNodeForListJson(node: PairedNodeListRow): Omit<PairedNodeListRow, "token"> {

178+

const copy: Record<string, unknown> = { ...node };

179+

delete copy.token;

180+

return copy as Omit<PairedNodeListRow, "token">;

181+

}

182+114183

export function registerNodesStatusCommands(nodes: Command) {

115184

nodesCallOpts(

116185

nodes

@@ -176,7 +245,6 @@ export function registerNodesStatusCommands(nodes: Command) {

176245

}

177246178247

const rows = filtered.map((n) => {

179-

const name = n.displayName?.trim() ? n.displayName.trim() : n.nodeId;

180248

const perms = formatPermissions(n.permissions);

181249

const versions = formatNodeVersions(n);

182250

const pathEnv = formatPathEnv(n.pathEnv);

@@ -188,9 +256,11 @@ export function registerNodesStatusCommands(nodes: Command) {

188256

perms ? `perms: ${perms}` : null,

189257

versions,

190258

pathEnv ? `path: ${pathEnv}` : null,

191-

].filter(Boolean) as string[];

259+

]

260+

.filter(Boolean)

261+

.map((part) => sanitizeTerminalText(String(part)));

192262

const caps = Array.isArray(n.caps)

193-

? n.caps.map(String).filter(Boolean).toSorted().join(", ")

263+

? sanitizeTerminalText(n.caps.map(String).filter(Boolean).toSorted().join(", "))

194264

: "?";

195265

const paired = n.paired ? ok("paired") : warn("unpaired");

196266

const connected = n.connected ? ok("connected") : muted("disconnected");

@@ -200,9 +270,9 @@ export function registerNodesStatusCommands(nodes: Command) {

200270

: "";

201271202272

return {

203-

Node: name,

204-

ID: n.nodeId,

205-

IP: n.remoteIp ?? "",

273+

Node: formatNodeTerminalLabel(n),

274+

ID: sanitizeTerminalText(n.nodeId),

275+

IP: sanitizeTerminalText(n.remoteIp ?? ""),

206276

Detail: detailParts.join(" · "),

207277

Status: `${paired} · ${connected}${since}`,

208278

Caps: caps,

@@ -275,17 +345,17 @@ export function registerNodesStatusCommands(nodes: Command) {

275345

}`;

276346

const tableWidth = getTerminalTableWidth();

277347

const rows = [

278-

{ Field: "ID", Value: nodeId },

279-

displayName ? { Field: "Name", Value: displayName } : null,

280-

client ? { Field: "Client", Value: client } : null,

281-

ip ? { Field: "IP", Value: ip } : null,

282-

family ? { Field: "Device", Value: family } : null,

283-

model ? { Field: "Model", Value: model } : null,

284-

perms ? { Field: "Perms", Value: perms } : null,

285-

versions ? { Field: "Version", Value: versions } : null,

286-

pathEnv ? { Field: "PATH", Value: pathEnv } : null,

348+

{ Field: "ID", Value: sanitizeTerminalText(nodeId) },

349+

displayName ? { Field: "Name", Value: sanitizeTerminalText(displayName) } : null,

350+

client ? { Field: "Client", Value: sanitizeTerminalText(client) } : null,

351+

ip ? { Field: "IP", Value: sanitizeTerminalText(ip) } : null,

352+

family ? { Field: "Device", Value: sanitizeTerminalText(family) } : null,

353+

model ? { Field: "Model", Value: sanitizeTerminalText(model) } : null,

354+

perms ? { Field: "Perms", Value: sanitizeTerminalText(perms) } : null,

355+

versions ? { Field: "Version", Value: sanitizeTerminalText(versions) } : null,

356+

pathEnv ? { Field: "PATH", Value: sanitizeTerminalText(pathEnv) } : null,

287357

{ Field: "Status", Value: status },

288-

{ Field: "Caps", Value: caps ? caps.join(", ") : "?" },

358+

{ Field: "Caps", Value: caps ? sanitizeTerminalText(caps.join(", ")) : "?" },

289359

].filter(Boolean) as Array<{ Field: string; Value: string }>;

290360291361

defaultRuntime.log(heading("Node"));

@@ -329,28 +399,22 @@ export function registerNodesStatusCommands(nodes: Command) {

329399

const now = Date.now();

330400

const hasFilters = connectedOnly || sinceMs !== undefined;

331401

const pendingRows = hasFilters ? [] : pending;

332-

const connectedById = hasFilters

333-

? new Map(

334-

parseNodeList(await callGatewayCli("node.list", opts, {})).map((node) => [

335-

node.nodeId,

336-

node,

337-

]),

338-

)

339-

: null;

340-

const filteredPaired = paired.filter((node) => {

402+

const effectiveNodes = hasFilters

403+

? parseNodeList(await callGatewayCli("node.list", opts, {}))

404+

: await tryReadNodeList(opts);

405+

const effectivePairedRows = mergePairedNodesWithEffectiveNodes(paired, effectiveNodes);

406+

const filteredPaired = effectivePairedRows.filter((node) => {

341407

if (connectedOnly) {

342-

const live = connectedById?.get(node.nodeId);

343-

if (!live?.connected) {

408+

if (!node.connected) {

344409

return false;

345410

}

346411

}

347412

if (sinceMs !== undefined) {

348-

const live = connectedById?.get(node.nodeId);

349413

const lastConnectedAtMs =

350414

typeof node.lastConnectedAtMs === "number"

351415

? node.lastConnectedAtMs

352-

: typeof live?.connectedAtMs === "number"

353-

? live.connectedAtMs

416+

: typeof node.connectedAtMs === "number"

417+

? node.connectedAtMs

354418

: undefined;

355419

if (typeof lastConnectedAtMs !== "number") {

356420

return false;

@@ -368,7 +432,10 @@ export function registerNodesStatusCommands(nodes: Command) {

368432

);

369433370434

if (opts.json) {

371-

defaultRuntime.writeJson({ pending: pendingRows, paired: filteredPaired });

435+

defaultRuntime.writeJson({

436+

pending: pendingRows,

437+

paired: filteredPaired.map(sanitizePairedNodeForListJson),

438+

});

372439

return;

373440

}

374441

@@ -385,18 +452,17 @@ export function registerNodesStatusCommands(nodes: Command) {

385452

}

386453387454

if (filteredPaired.length > 0) {

388-

const pairedRows = filteredPaired.map((n) => {

389-

const live = connectedById?.get(n.nodeId);

455+

const pairedTableRows = filteredPaired.map((n) => {

390456

const lastConnectedAtMs =

391457

typeof n.lastConnectedAtMs === "number"

392458

? n.lastConnectedAtMs

393-

: typeof live?.connectedAtMs === "number"

394-

? live.connectedAtMs

459+

: typeof n.connectedAtMs === "number"

460+

? n.connectedAtMs

395461

: undefined;

396462

return {

397-

Node: n.displayName?.trim() ? n.displayName.trim() : n.nodeId,

398-

Id: n.nodeId,

399-

IP: n.remoteIp ?? "",

463+

Node: formatNodeTerminalLabel(n),

464+

Id: sanitizeTerminalText(n.nodeId),

465+

IP: sanitizeTerminalText(n.remoteIp ?? ""),

400466

LastConnect:

401467

typeof lastConnectedAtMs === "number"

402468

? formatTimeAgo(Math.max(0, now - lastConnectedAtMs))

@@ -414,7 +480,7 @@ export function registerNodesStatusCommands(nodes: Command) {

414480

{ key: "IP", header: "IP", minWidth: 10 },

415481

{ key: "LastConnect", header: "Last Connect", minWidth: 14 },

416482

],

417-

rows: pairedRows,

483+

rows: pairedTableRows,

418484

}).trimEnd(),

419485

);

420486

}