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

推荐订阅源

Jina AI
Jina AI
Apple Machine Learning Research
Apple Machine Learning Research
宝玉的分享
宝玉的分享
M
MIT News - Artificial intelligence
S
SegmentFault 最新的问题
博客园 - 叶小钗
量子位
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
酷 壳 – CoolShell
酷 壳 – CoolShell
博客园 - Franky
博客园 - 司徒正美
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
人人都是产品经理
人人都是产品经理
Hugging Face - Blog
Hugging Face - Blog
V
Visual Studio Blog
阮一峰的网络日志
阮一峰的网络日志
博客园 - 【当耐特】
Google DeepMind News
Google DeepMind News
L
LangChain Blog
Stack Overflow Blog
Stack Overflow Blog
博客园_首页
U
Unit 42
月光博客
月光博客
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC

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(exec): cap node run timeouts · openclaw/openclaw@2106714
steipete · 2026-05-30 · via Recent Commits to openclaw:main

@@ -21,6 +21,7 @@ import {

2121

} from "../infra/system-run-approval-context.js";

2222

import { formatExecCommand, resolveSystemRunCommandRequest } from "../infra/system-run-command.js";

2323

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

24+

import { resolveSafeTimeoutDelayMs } from "../utils/timer-delay.js";

2425

import type { ExecuteNodeHostCommandParams } from "./bash-tools.exec-host-node.types.js";

2526

import { renderExecOutputText } from "./bash-tools.exec-output.js";

2627

import type { ExecToolDetails } from "./bash-tools.exec-types.js";

@@ -60,6 +61,30 @@ type NodeApprovalAnalysis = {

6061

autoReviewArgv?: string[];

6162

};

626364+

function resolveNodeRunTimeoutSec(

65+

timeoutSec: number | null | undefined,

66+

defaultTimeoutSec: number,

67+

): number {

68+

return typeof timeoutSec === "number" && Number.isFinite(timeoutSec)

69+

? timeoutSec

70+

: defaultTimeoutSec;

71+

}

72+73+

function resolveNodeInvokeTimeoutMs(runTimeoutSec: number, defaultTimeoutSec: number): number {

74+

const baseTimeoutSec =

75+

Number.isFinite(runTimeoutSec) && runTimeoutSec > 0 ? runTimeoutSec : defaultTimeoutSec;

76+

if (!Number.isFinite(baseTimeoutSec) || baseTimeoutSec <= 0) {

77+

return 10_000;

78+

}

79+

return Math.max(10_000, resolveSafeTimeoutDelayMs(baseTimeoutSec * 1000 + 5_000));

80+

}

81+82+

function resolveNodeRunTimeoutMs(runTimeoutSec: number): number {

83+

return Number.isFinite(runTimeoutSec) && runTimeoutSec > 0

84+

? resolveSafeTimeoutDelayMs(runTimeoutSec * 1000, { minMs: 0 })

85+

: 0;

86+

}

87+6388

export function shouldSkipNodeApprovalPrepare(params: {

6489

hostSecurity: ExecSecurity;

6590

hostAsk: ExecAsk;

@@ -142,15 +167,13 @@ export async function resolveNodeExecutionTarget(

142167

);

143168

}

144169145-

const runTimeoutSec =

146-

typeof params.timeoutSec === "number" ? params.timeoutSec : params.defaultTimeoutSec;

147-

const invokeBaseTimeoutSec = runTimeoutSec > 0 ? runTimeoutSec : params.defaultTimeoutSec;

170+

const runTimeoutSec = resolveNodeRunTimeoutSec(params.timeoutSec, params.defaultTimeoutSec);

148171

return {

149172

nodeId,

150173

platform: nodeInfo?.platform,

151174

argv: buildNodeShellCommand(params.command, nodeInfo?.platform),

152175

env: params.requestedEnv ? { ...params.requestedEnv } : undefined,

153-

invokeTimeoutMs: Math.max(10_000, invokeBaseTimeoutSec * 1000 + 5_000),

176+

invokeTimeoutMs: resolveNodeInvokeTimeoutMs(runTimeoutSec, params.defaultTimeoutSec),

154177

runTimeoutSec,

155178

supportsSystemRunPrepare: declaredCommands.includes("system.run.prepare"),

156179

};

@@ -174,8 +197,7 @@ export function buildNodeSystemRunInvoke(params: {

174197

notifyOnExit?: boolean;

175198

systemRunPlan?: SystemRunApprovalPlan;

176199

}): Record<string, unknown> {

177-

const timeoutMs =

178-

params.target.runTimeoutSec > 0 ? Math.floor(params.target.runTimeoutSec * 1000) : 0;

200+

const timeoutMs = resolveNodeRunTimeoutMs(params.target.runTimeoutSec);

179201

const runId = params.runId ?? crypto.randomUUID();

180202

return {

181203

nodeId: params.target.nodeId,