mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-06 13:22:55 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
305 lines
11 KiB
TypeScript
305 lines
11 KiB
TypeScript
import { APPROVALS_SCOPE, WRITE_SCOPE } from "../gateway/operator-scopes.js";
|
|
import {
|
|
requiresExecApproval,
|
|
resolveExecApprovalAllowedDecisions,
|
|
} from "../infra/exec-approvals.js";
|
|
import {
|
|
buildExecApprovalRequesterContext,
|
|
buildExecApprovalTurnSourceContext,
|
|
registerExecApprovalRequestForHostOrThrow,
|
|
} from "./bash-tools.exec-approval-request.js";
|
|
import {
|
|
analyzeNodeApprovalRequirement,
|
|
buildNodeSystemRunInvoke,
|
|
formatNodeRunToolResult,
|
|
invokeNodeSystemRunDirect,
|
|
prepareNodeSystemRun,
|
|
resolveNodeExecutionTarget,
|
|
shouldSkipNodeApprovalPrepare,
|
|
} from "./bash-tools.exec-host-node-phases.js";
|
|
import type { ExecuteNodeHostCommandParams } from "./bash-tools.exec-host-node.types.js";
|
|
import * as execHostShared from "./bash-tools.exec-host-shared.js";
|
|
import {
|
|
DEFAULT_NOTIFY_TAIL_CHARS,
|
|
createApprovalSlug,
|
|
normalizeNotifyOutput,
|
|
} from "./bash-tools.exec-runtime.js";
|
|
import type { ExecToolDetails } from "./bash-tools.exec-types.js";
|
|
import type { AgentToolResult } from "./runtime/index.js";
|
|
import { callGatewayTool } from "./tools/gateway.js";
|
|
|
|
export type { ExecuteNodeHostCommandParams } from "./bash-tools.exec-host-node.types.js";
|
|
|
|
const APPROVED_NODE_INVOKE_SCOPES = [WRITE_SCOPE, APPROVALS_SCOPE];
|
|
|
|
export async function executeNodeHostCommand(
|
|
params: ExecuteNodeHostCommandParams,
|
|
): Promise<AgentToolResult<ExecToolDetails>> {
|
|
const { hostSecurity, hostAsk, askFallback } = execHostShared.resolveExecHostApprovalContext({
|
|
agentId: params.agentId,
|
|
security: params.security,
|
|
ask: params.ask,
|
|
host: "node",
|
|
});
|
|
const target = await resolveNodeExecutionTarget(params);
|
|
if (
|
|
shouldSkipNodeApprovalPrepare({
|
|
hostSecurity,
|
|
hostAsk,
|
|
strictInlineEval: params.strictInlineEval,
|
|
})
|
|
) {
|
|
return await invokeNodeSystemRunDirect({ request: params, target });
|
|
}
|
|
|
|
const prepared = await prepareNodeSystemRun({ request: params, target });
|
|
const approvalAnalysis = await analyzeNodeApprovalRequirement({
|
|
request: params,
|
|
target,
|
|
prepared,
|
|
hostSecurity,
|
|
hostAsk,
|
|
});
|
|
const { analysisOk, allowlistSatisfied, durableApprovalSatisfied, inlineEvalHit } =
|
|
approvalAnalysis;
|
|
const requiresAsk =
|
|
requiresExecApproval({
|
|
ask: hostAsk,
|
|
security: hostSecurity,
|
|
analysisOk,
|
|
allowlistSatisfied,
|
|
durableApprovalSatisfied,
|
|
}) || inlineEvalHit !== null;
|
|
|
|
let inlineApprovedByAsk = false;
|
|
let inlineApprovalDecision: "allow-once" | "allow-always" | null = null;
|
|
let inlineApprovalId: string | undefined;
|
|
if (requiresAsk) {
|
|
const requestArgs = execHostShared.buildDefaultExecApprovalRequestArgs({
|
|
warnings: params.warnings,
|
|
approvalRunningNoticeMs: params.approvalRunningNoticeMs,
|
|
createApprovalSlug,
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
});
|
|
const registerNodeApproval = async (approvalId: string) =>
|
|
await registerExecApprovalRequestForHostOrThrow({
|
|
approvalId,
|
|
systemRunPlan: prepared.plan,
|
|
env: target.env,
|
|
workdir: prepared.cwd,
|
|
host: "node",
|
|
nodeId: target.nodeId,
|
|
security: hostSecurity,
|
|
ask: hostAsk,
|
|
commandHighlighting: params.commandHighlighting,
|
|
...buildExecApprovalRequesterContext({
|
|
agentId: prepared.agentId,
|
|
sessionKey: prepared.sessionKey,
|
|
}),
|
|
...buildExecApprovalTurnSourceContext(params),
|
|
});
|
|
const {
|
|
approvalId,
|
|
approvalSlug,
|
|
warningText,
|
|
expiresAtMs,
|
|
preResolvedDecision,
|
|
initiatingSurface,
|
|
sentApproverDms,
|
|
unavailableReason,
|
|
} = await execHostShared.createAndRegisterDefaultExecApprovalRequest({
|
|
...requestArgs,
|
|
register: registerNodeApproval,
|
|
});
|
|
if (
|
|
execHostShared.shouldResolveExecApprovalUnavailableInline({
|
|
trigger: params.trigger,
|
|
unavailableReason,
|
|
preResolvedDecision,
|
|
})
|
|
) {
|
|
const { baseDecision, approvedByAsk, deniedReason } =
|
|
execHostShared.createExecApprovalDecisionState({
|
|
decision: preResolvedDecision,
|
|
askFallback,
|
|
});
|
|
const strictInlineEvalDecision = execHostShared.enforceStrictInlineEvalApprovalBoundary({
|
|
baseDecision,
|
|
approvedByAsk,
|
|
deniedReason,
|
|
requiresInlineEvalApproval: inlineEvalHit !== null,
|
|
});
|
|
if (strictInlineEvalDecision.deniedReason || !strictInlineEvalDecision.approvedByAsk) {
|
|
throw new Error(
|
|
execHostShared.buildHeadlessExecApprovalDeniedMessage({
|
|
trigger: params.trigger,
|
|
host: "node",
|
|
security: hostSecurity,
|
|
ask: hostAsk,
|
|
askFallback,
|
|
}),
|
|
);
|
|
}
|
|
inlineApprovedByAsk = strictInlineEvalDecision.approvedByAsk;
|
|
inlineApprovalDecision = strictInlineEvalDecision.approvedByAsk ? "allow-once" : null;
|
|
inlineApprovalId = approvalId;
|
|
} else {
|
|
const followupTarget = execHostShared.buildExecApprovalFollowupTarget({
|
|
approvalId,
|
|
sessionKey: params.notifySessionKey ?? params.sessionKey,
|
|
bashElevated: params.bashElevated,
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceTo: params.turnSourceTo,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
turnSourceThreadId: params.turnSourceThreadId,
|
|
});
|
|
|
|
void (async () => {
|
|
const decision = await execHostShared.resolveApprovalDecisionOrUndefined({
|
|
approvalId,
|
|
preResolvedDecision,
|
|
onFailure: () =>
|
|
void execHostShared.sendExecApprovalFollowupResult(
|
|
followupTarget,
|
|
`Exec denied (node=${target.nodeId} id=${approvalId}, approval-request-failed): ${params.command}`,
|
|
),
|
|
});
|
|
if (decision === undefined) {
|
|
return;
|
|
}
|
|
|
|
const {
|
|
baseDecision,
|
|
approvedByAsk: initialApprovedByAsk,
|
|
deniedReason: initialDeniedReason,
|
|
} = execHostShared.createExecApprovalDecisionState({
|
|
decision,
|
|
askFallback,
|
|
});
|
|
let approvedByAsk = initialApprovedByAsk;
|
|
let approvalDecision: "allow-once" | "allow-always" | null = null;
|
|
let deniedReason = initialDeniedReason;
|
|
|
|
if (baseDecision.timedOut && askFallback === "full" && approvedByAsk) {
|
|
approvalDecision = "allow-once";
|
|
} else if (decision === "allow-once") {
|
|
approvedByAsk = true;
|
|
approvalDecision = "allow-once";
|
|
} else if (decision === "allow-always") {
|
|
approvedByAsk = true;
|
|
approvalDecision = "allow-always";
|
|
}
|
|
|
|
({ approvedByAsk, deniedReason } = execHostShared.enforceStrictInlineEvalApprovalBoundary({
|
|
baseDecision,
|
|
approvedByAsk,
|
|
deniedReason,
|
|
requiresInlineEvalApproval: inlineEvalHit !== null,
|
|
}));
|
|
if (deniedReason) {
|
|
approvalDecision = null;
|
|
}
|
|
|
|
if (deniedReason) {
|
|
await execHostShared.sendExecApprovalFollowupResult(
|
|
followupTarget,
|
|
`Exec denied (node=${target.nodeId} id=${approvalId}, ${deniedReason}): ${params.command}`,
|
|
);
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const raw = await callGatewayTool(
|
|
"node.invoke",
|
|
{ timeoutMs: target.invokeTimeoutMs },
|
|
buildNodeSystemRunInvoke({
|
|
target,
|
|
command: prepared.argv,
|
|
rawCommand: prepared.rawCommand,
|
|
cwd: prepared.cwd,
|
|
agentId: prepared.agentId,
|
|
sessionKey: prepared.sessionKey,
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceTo: params.turnSourceTo,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
turnSourceThreadId: params.turnSourceThreadId,
|
|
approved: approvedByAsk,
|
|
approvalDecision:
|
|
approvalDecision === "allow-always" && inlineEvalHit !== null
|
|
? "allow-once"
|
|
: approvalDecision,
|
|
runId: approvalId,
|
|
suppressNotifyOnExit: true,
|
|
notifyOnExit: params.notifyOnExit,
|
|
systemRunPlan: prepared.plan,
|
|
}),
|
|
{ scopes: APPROVED_NODE_INVOKE_SCOPES },
|
|
);
|
|
const payload =
|
|
raw?.payload && typeof raw.payload === "object"
|
|
? (raw.payload as {
|
|
stdout?: string;
|
|
stderr?: string;
|
|
error?: string | null;
|
|
exitCode?: number | null;
|
|
timedOut?: boolean;
|
|
})
|
|
: {};
|
|
const combined = [payload.stdout, payload.stderr, payload.error]
|
|
.filter(Boolean)
|
|
.join("\n");
|
|
const output = normalizeNotifyOutput(combined.slice(-DEFAULT_NOTIFY_TAIL_CHARS));
|
|
const exitLabel = payload.timedOut ? "timeout" : `code ${payload.exitCode ?? "?"}`;
|
|
const summary = output
|
|
? `Exec finished (node=${target.nodeId} id=${approvalId}, ${exitLabel})\n${output}`
|
|
: `Exec finished (node=${target.nodeId} id=${approvalId}, ${exitLabel})`;
|
|
await execHostShared.sendExecApprovalFollowupResult(followupTarget, summary);
|
|
} catch {
|
|
await execHostShared.sendExecApprovalFollowupResult(
|
|
followupTarget,
|
|
`Exec denied (node=${target.nodeId} id=${approvalId}, invoke-failed): ${params.command}`,
|
|
);
|
|
}
|
|
})();
|
|
|
|
return execHostShared.buildExecApprovalPendingToolResult({
|
|
host: "node",
|
|
command: params.command,
|
|
cwd: params.workdir,
|
|
warningText,
|
|
approvalId,
|
|
approvalSlug,
|
|
expiresAtMs,
|
|
initiatingSurface,
|
|
sentApproverDms,
|
|
unavailableReason,
|
|
allowedDecisions: resolveExecApprovalAllowedDecisions({ ask: hostAsk }),
|
|
nodeId: target.nodeId,
|
|
});
|
|
}
|
|
}
|
|
|
|
const startedAt = Date.now();
|
|
const invoke = buildNodeSystemRunInvoke({
|
|
target,
|
|
command: prepared.argv,
|
|
rawCommand: prepared.rawCommand,
|
|
cwd: prepared.cwd,
|
|
agentId: prepared.agentId,
|
|
sessionKey: prepared.sessionKey,
|
|
approved: inlineApprovedByAsk,
|
|
approvalDecision: inlineApprovalDecision,
|
|
runId: inlineApprovalId,
|
|
notifyOnExit: params.notifyOnExit,
|
|
systemRunPlan: prepared.plan,
|
|
});
|
|
const raw =
|
|
inlineApprovedByAsk && inlineApprovalId
|
|
? await callGatewayTool("node.invoke", { timeoutMs: target.invokeTimeoutMs }, invoke, {
|
|
scopes: APPROVED_NODE_INVOKE_SCOPES,
|
|
})
|
|
: await callGatewayTool("node.invoke", { timeoutMs: target.invokeTimeoutMs }, invoke);
|
|
return formatNodeRunToolResult({ raw, startedAt, cwd: params.workdir });
|
|
}
|