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

推荐订阅源

Y
Y Combinator Blog
Jina AI
Jina AI
雷峰网
雷峰网
有赞技术团队
有赞技术团队
WordPress大学
WordPress大学
美团技术团队
V
V2EX
酷 壳 – CoolShell
酷 壳 – CoolShell
小众软件
小众软件
博客园 - Franky
博客园 - 三生石上(FineUI控件)
月光博客
月光博客
博客园 - 叶小钗
大猫的无限游戏
大猫的无限游戏
爱范儿
爱范儿
Hugging Face - Blog
Hugging Face - Blog
宝玉的分享
宝玉的分享
Last Week in AI
Last Week in AI
Apple Machine Learning Research
Apple Machine Learning Research
量子位
IT之家
IT之家
人人都是产品经理
人人都是产品经理
博客园_首页
让小产品的独立变现更简单 - 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(doctor): stream bundled runtime dep repair progress ·...
steipete · 2026-04-27 · via Recent Commits to openclaw:main

@@ -10,6 +10,7 @@ import { createLowDiskSpaceWarning } from "../infra/disk-space.js";

1010

import { resolveHomeRelativePath } from "../infra/home-dir.js";

1111

import { createNpmProjectInstallEnv } from "../infra/npm-install-env.js";

1212

import { normalizeOptionalLowercaseString } from "../shared/string-coerce.js";

13+

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

1314

import { beginBundledRuntimeDepsInstall } from "./bundled-runtime-deps-activity.js";

1415

import { normalizePluginsConfig } from "./config-state.js";

1516

import { satisfies, validRange, validSemver } from "./semver.runtime.js";

@@ -65,6 +66,7 @@ const BUNDLED_RUNTIME_DEPS_LOCK_WAIT_MS = 100;

6566

const BUNDLED_RUNTIME_DEPS_LOCK_TIMEOUT_MS = 5 * 60_000;

6667

const BUNDLED_RUNTIME_DEPS_LOCK_STALE_MS = 10 * 60_000;

6768

const BUNDLED_RUNTIME_DEPS_OWNERLESS_LOCK_STALE_MS = 30_000;

69+

const BUNDLED_RUNTIME_DEPS_INSTALL_PROGRESS_INTERVAL_MS = 5_000;

6870

const BUNDLED_RUNTIME_MIRROR_MATERIALIZED_EXTENSIONS = new Set([".cjs", ".js", ".mjs"]);

6971

const BUNDLED_RUNTIME_MIRROR_PLUGIN_REGION_RE = /(?:^|\n)\/\/#region extensions\/[^/\s]+(?:\/|$)/u;

7072

const MIRRORED_PACKAGE_RUNTIME_DEP_NAMES = ["tslog"] as const;

@@ -1587,13 +1589,58 @@ function formatBundledRuntimeDepsInstallError(result: {

15871589

return output || "npm install failed";

15881590

}

158915911592+

function formatBundledRuntimeDepsInstallElapsed(ms: number): string {

1593+

const seconds = Math.max(0, Math.round(ms / 1000));

1594+

if (seconds < 60) {

1595+

return `${seconds}s`;

1596+

}

1597+

const minutes = Math.floor(seconds / 60);

1598+

const remainingSeconds = seconds % 60;

1599+

return remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;

1600+

}

1601+1602+

function emitBundledRuntimeDepsOutputProgress(

1603+

chunk: Buffer,

1604+

stream: "stdout" | "stderr",

1605+

onProgress: ((message: string) => void) | undefined,

1606+

): void {

1607+

if (!onProgress) {

1608+

return;

1609+

}

1610+

const lines = chunk

1611+

.toString("utf8")

1612+

.split(/\r\n|\n|\r/u)

1613+

.map((line) => sanitizeTerminalText(line).trim())

1614+

.filter((line) => line.length > 0)

1615+

.slice(-3);

1616+

for (const line of lines) {

1617+

onProgress(`npm ${stream}: ${line}`);

1618+

}

1619+

}

1620+15901621

async function spawnBundledRuntimeDepsInstall(params: {

15911622

command: string;

15921623

args: string[];

15931624

cwd: string;

15941625

env: NodeJS.ProcessEnv;

1626+

onProgress?: (message: string) => void;

15951627

}): Promise<void> {

15961628

await new Promise<void>((resolve, reject) => {

1629+

const startedAtMs = Date.now();

1630+

const heartbeat =

1631+

params.onProgress &&

1632+

setInterval(() => {

1633+

params.onProgress?.(

1634+

`npm install still running (${formatBundledRuntimeDepsInstallElapsed(Date.now() - startedAtMs)} elapsed)`,

1635+

);

1636+

}, BUNDLED_RUNTIME_DEPS_INSTALL_PROGRESS_INTERVAL_MS);

1637+

heartbeat?.unref?.();

1638+

const settle = (fn: () => void) => {

1639+

if (heartbeat) {

1640+

clearInterval(heartbeat);

1641+

}

1642+

fn();

1643+

};

15971644

const child = spawn(params.command, params.args, {

15981645

cwd: params.cwd,

15991646

env: params.env,

@@ -1602,24 +1649,32 @@ async function spawnBundledRuntimeDepsInstall(params: {

16021649

});

16031650

const stdout: Buffer[] = [];

16041651

const stderr: Buffer[] = [];

1605-

child.stdout?.on("data", (chunk: Buffer) => stdout.push(chunk));

1606-

child.stderr?.on("data", (chunk: Buffer) => stderr.push(chunk));

1652+

child.stdout?.on("data", (chunk: Buffer) => {

1653+

stdout.push(chunk);

1654+

emitBundledRuntimeDepsOutputProgress(chunk, "stdout", params.onProgress);

1655+

});

1656+

child.stderr?.on("data", (chunk: Buffer) => {

1657+

stderr.push(chunk);

1658+

emitBundledRuntimeDepsOutputProgress(chunk, "stderr", params.onProgress);

1659+

});

16071660

child.on("error", (error) => {

1608-

reject(new Error(formatBundledRuntimeDepsInstallError({ error })));

1661+

settle(() => reject(new Error(formatBundledRuntimeDepsInstallError({ error }))));

16091662

});

16101663

child.on("close", (status, signal) => {

16111664

if (status === 0 && !signal) {

1612-

resolve();

1665+

settle(resolve);

16131666

return;

16141667

}

1615-

reject(

1616-

new Error(

1617-

formatBundledRuntimeDepsInstallError({

1618-

status,

1619-

signal,

1620-

stdout: Buffer.concat(stdout).toString("utf8"),

1621-

stderr: Buffer.concat(stderr).toString("utf8"),

1622-

}),

1668+

settle(() =>

1669+

reject(

1670+

new Error(

1671+

formatBundledRuntimeDepsInstallError({

1672+

status,

1673+

signal,

1674+

stdout: Buffer.concat(stdout).toString("utf8"),

1675+

stderr: Buffer.concat(stderr).toString("utf8"),

1676+

}),

1677+

),

16231678

),

16241679

);

16251680

});

@@ -1703,6 +1758,7 @@ export async function installBundledRuntimeDepsAsync(params: {

17031758

missingSpecs: string[];

17041759

env: NodeJS.ProcessEnv;

17051760

warn?: (message: string) => void;

1761+

onProgress?: (message: string) => void;

17061762

}): Promise<void> {

17071763

const installExecutionRoot = params.installExecutionRoot ?? params.installRoot;

17081764

const isolatedExecutionRoot =

@@ -1731,11 +1787,15 @@ export async function installBundledRuntimeDepsAsync(params: {

17311787

env: installEnv,

17321788

npmArgs: createBundledRuntimeDepsInstallArgs(params.missingSpecs),

17331789

});

1790+

params.onProgress?.(

1791+

`Starting npm install for bundled plugin runtime deps: ${params.missingSpecs.join(", ")}`,

1792+

);

17341793

await spawnBundledRuntimeDepsInstall({

17351794

command: npmRunner.command,

17361795

args: npmRunner.args,

17371796

cwd: installExecutionRoot,

17381797

env: npmRunner.env ?? installEnv,

1798+

onProgress: params.onProgress,

17391799

});

17401800

assertBundledRuntimeDepsInstalled(installExecutionRoot, params.missingSpecs);

17411801

if (isolatedExecutionRoot) {

@@ -1858,6 +1918,7 @@ export async function repairBundledRuntimeDepsInstallRootAsync(params: {

18581918

env: NodeJS.ProcessEnv;

18591919

installDeps?: (params: BundledRuntimeDepsInstallParams) => Promise<void>;

18601920

warn?: (message: string) => void;

1921+

onProgress?: (message: string) => void;

18611922

}): Promise<{ installSpecs: string[] }> {

18621923

return await withBundledRuntimeDepsInstallRootLockAsync(params.installRoot, async () => {

18631924

const retainedManifestSpecs = readRetainedRuntimeDepsManifest(params.installRoot);

@@ -1872,6 +1933,7 @@ export async function repairBundledRuntimeDepsInstallRootAsync(params: {

18721933

missingSpecs: installParams.installSpecs ?? installParams.missingSpecs,

18731934

env: params.env,

18741935

warn: params.warn,

1936+

onProgress: params.onProgress,

18751937

}));

18761938

const finishActivity = beginBundledRuntimeDepsInstall({

18771939

installRoot: params.installRoot,