mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-03 00:31:33 +00:00
* feat(onboarding): recommend plugins and skills from installed apps Scan installed macOS apps during classic onboarding (TCC-free), gather candidates from official catalogs + ClawHub search, let the configured model pick genuine matches, and offer an opt-in multiselect install step. Adds a device.apps node-host command (default-off sharing, Android-parity envelope) so remote gateways can request a paired Mac's inventory, and a wizard.appRecommendations kill switch. Custom setup-inference completions no longer inherit the 32-token verification-probe output cap. * feat(onboarding): recommend apps in guided flow * fix(onboarding): harden app recommendations against ClawHub self-promotion Third-party ClawHub skills are never pre-selected regardless of model tier (publisher-controlled listing text reaches the matcher prompt and could promote itself); their labels now say they install third-party code. Installed-app scans follow symlinked .app bundles. Matcher output stays bounded by the resolved model's own maxTokens budget (documented invariant). * fix(onboarding): key official catalog candidates by resolved plugin id Real catalog entries are package manifests without a top-level id; keying the candidate map and channel/provider classification by entry.id collapsed the whole official catalog into one undefined-keyed entry, so no official plugin or channel was ever recommended. Regression test runs against the bundled catalogs. * fix(onboarding): satisfy lint, types, deadcode, and migration gates Split the guided-onboarding test into a self-contained custodian suite to stay under max-lines. Narrow app-recommendation exports (drop dead node-payload normalizer, unexport internal types/helpers, route candidate tests through the public API), replace map-spread with a helper, unexport device.apps result types, add installedAppsSharing to node-host migration expectations, cast the wizard multiselect mock, and regenerate the docs map. * test(onboarding): register new live test in the shard classifier
439 lines
15 KiB
TypeScript
439 lines
15 KiB
TypeScript
/** Transport-independent CLI node-host runtime shared by Gateway and app workers. */
|
|
import fs from "node:fs";
|
|
import type { OpenClawConfig } from "../config/config.js";
|
|
import { getRuntimeConfig } from "../config/config.js";
|
|
import type { SkillBinTrustEntry } from "../infra/exec-approvals.js";
|
|
import { resolveExecutableFromPathEnv } from "../infra/executable-path.js";
|
|
import {
|
|
NODE_AGENT_CLI_CLAUDE_RUN_COMMAND,
|
|
NODE_DEVICE_APPS_COMMAND,
|
|
NODE_DUPLEX_INVOKE_IDLE_TIMEOUT_MS,
|
|
NODE_EXEC_APPROVALS_COMMANDS,
|
|
NODE_FS_LIST_DIR_COMMAND,
|
|
NODE_MCP_TOOLS_CALL_COMMAND,
|
|
NODE_SYSTEM_RUN_COMMANDS,
|
|
NODE_TERMINAL_UPLOAD_COMMAND,
|
|
} from "../infra/node-commands.js";
|
|
import { ensureOpenClawCliOnPath } from "../infra/path-env.js";
|
|
import { ensureTerminalUploadCleanup } from "../infra/terminal-file-upload.js";
|
|
import { logDebug } from "../logger.js";
|
|
import type { OpenClawPluginNodeHostCommandIo } from "../plugins/types.js";
|
|
import type { OpenClawPluginNodeHostCommandContext } from "../plugins/types.node-host.js";
|
|
import { BoundedBuffer } from "../shared/bounded-buffer.js";
|
|
import type { NodeHostClient } from "./client.js";
|
|
import { handleInvoke, type NodeInvokeRequestPayload, type SkillBinsProvider } from "./invoke.js";
|
|
import { startNodeHostMcpManager, type NodeHostMcpManager } from "./mcp.js";
|
|
import { buildNodeEventParams } from "./node-event-params.js";
|
|
import { createNodeInvokeProgressWriter } from "./node-invoke-progress.js";
|
|
import {
|
|
ensureNodeHostPluginRegistry,
|
|
isRegisteredNodeHostCommandDuplex,
|
|
listRegisteredNodeHostCapsAndCommands,
|
|
watchRegisteredNodeHostCommandAvailability,
|
|
} from "./plugin-node-host.js";
|
|
import { scanNodeHostedSkills } from "./skills.js";
|
|
|
|
const DEFAULT_NODE_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
|
|
|
|
type NodeHostManifest = {
|
|
caps: string[];
|
|
commands: string[];
|
|
pathEnv: string;
|
|
};
|
|
|
|
export type NodeHostInventory = {
|
|
skills: unknown[] | null;
|
|
pluginTools: unknown[];
|
|
};
|
|
|
|
type PreparedNodeHostRuntime = {
|
|
manifest: NodeHostManifest;
|
|
initialInventory: NodeHostInventory;
|
|
start(params: {
|
|
client: NodeHostClient;
|
|
onInventoryChanged?: (inventory: NodeHostInventory) => void;
|
|
onManifestChanged?: (manifest: NodeHostManifest) => void;
|
|
}): ActiveNodeHostRuntime;
|
|
};
|
|
|
|
type ActiveNodeHostRuntime = {
|
|
invoke(frame: NodeInvokeRequestPayload): Promise<void>;
|
|
handleInput(invokeId: string, seq: number, payloadJSON: string): void;
|
|
cancel(invokeId: string): void;
|
|
cancelAll(): void;
|
|
close(): Promise<void>;
|
|
};
|
|
|
|
type NodeInvokeInputTarget = {
|
|
nextInputSeq: number;
|
|
input?: (payloadJSON: string) => void;
|
|
// Buffer spawn-window input so its sequence cannot wedge before PTY registration.
|
|
pendingInput: BoundedBuffer<string>;
|
|
inputFailed: boolean;
|
|
};
|
|
|
|
const MAX_PENDING_INVOKE_INPUT_BYTES = 64 * 1024;
|
|
|
|
function dispatchNodeInvokeInput(
|
|
target: NodeInvokeInputTarget | undefined,
|
|
seq: number,
|
|
payloadJSON: string,
|
|
): boolean {
|
|
if (!target || target.inputFailed || seq < target.nextInputSeq) {
|
|
return false;
|
|
}
|
|
if (seq > target.nextInputSeq) {
|
|
logDebug(`node-host: input sequence gap: expected ${target.nextInputSeq}, received ${seq}`);
|
|
}
|
|
target.nextInputSeq = seq + 1;
|
|
if (target.input) {
|
|
target.input(payloadJSON);
|
|
return true;
|
|
}
|
|
if (!target.pendingInput.push(payloadJSON)) {
|
|
target.inputFailed = true;
|
|
logDebug("node-host: aborted invoke after buffered input exceeded 64 KiB");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
function registerNodeInvokeInputHandler(
|
|
target: NodeInvokeInputTarget,
|
|
input: (payloadJSON: string) => void,
|
|
): void {
|
|
if (target.inputFailed) {
|
|
return;
|
|
}
|
|
target.input = input;
|
|
for (const pending of target.pendingInput.drain()) {
|
|
input(pending);
|
|
}
|
|
}
|
|
|
|
function resolveExecutablePathFromEnv(bin: string, pathEnv: string): string | null {
|
|
if (bin.includes("/") || bin.includes("\\")) {
|
|
return null;
|
|
}
|
|
return resolveExecutableFromPathEnv(bin, pathEnv) ?? null;
|
|
}
|
|
|
|
function resolveExecutableTrustPathFromEnv(bin: string, pathEnv: string): string | null {
|
|
const resolvedPath = resolveExecutablePathFromEnv(bin, pathEnv);
|
|
if (!resolvedPath) {
|
|
return null;
|
|
}
|
|
try {
|
|
return fs.realpathSync(resolvedPath);
|
|
} catch {
|
|
return resolvedPath;
|
|
}
|
|
}
|
|
|
|
function resolveSkillBinTrustEntries(bins: string[], pathEnv: string): SkillBinTrustEntry[] {
|
|
const trustEntries: SkillBinTrustEntry[] = [];
|
|
const seen = new Set<string>();
|
|
for (const raw of bins) {
|
|
const name = raw.trim();
|
|
if (!name) {
|
|
continue;
|
|
}
|
|
const resolvedPath = resolveExecutableTrustPathFromEnv(name, pathEnv);
|
|
if (!resolvedPath) {
|
|
continue;
|
|
}
|
|
const key = `${name}\u0000${resolvedPath}`;
|
|
if (seen.has(key)) {
|
|
continue;
|
|
}
|
|
seen.add(key);
|
|
trustEntries.push({ name, resolvedPath });
|
|
}
|
|
return trustEntries.toSorted(
|
|
(left, right) =>
|
|
left.name.localeCompare(right.name) || left.resolvedPath.localeCompare(right.resolvedPath),
|
|
);
|
|
}
|
|
|
|
class SkillBinsCache implements SkillBinsProvider {
|
|
private bins: SkillBinTrustEntry[] = [];
|
|
private lastRefresh = 0;
|
|
private readonly ttlMs = 90_000;
|
|
|
|
constructor(
|
|
private readonly client: NodeHostClient,
|
|
private readonly pathEnv: string,
|
|
) {}
|
|
|
|
async current(force = false): Promise<SkillBinTrustEntry[]> {
|
|
if (force || Date.now() - this.lastRefresh > this.ttlMs) {
|
|
await this.refresh();
|
|
}
|
|
return this.bins;
|
|
}
|
|
|
|
private async refresh() {
|
|
try {
|
|
const res = await this.client.request<{ bins: Array<unknown> }>("skills.bins", {});
|
|
const bins = Array.isArray(res?.bins) ? res.bins.map((bin) => String(bin)) : [];
|
|
this.bins = resolveSkillBinTrustEntries(bins, this.pathEnv);
|
|
this.lastRefresh = Date.now();
|
|
} catch {
|
|
if (!this.lastRefresh) {
|
|
this.bins = [];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
function ensureNodePathEnv(): string {
|
|
ensureOpenClawCliOnPath({ pathEnv: process.env.PATH ?? "" });
|
|
const current = process.env.PATH ?? "";
|
|
if (current.trim()) {
|
|
return current;
|
|
}
|
|
process.env.PATH = DEFAULT_NODE_PATH;
|
|
return DEFAULT_NODE_PATH;
|
|
}
|
|
|
|
function createInventory(params: {
|
|
skills: unknown[] | null;
|
|
pluginTools: unknown[];
|
|
mcpManager?: NodeHostMcpManager;
|
|
}): NodeHostInventory {
|
|
const pluginTools = [...params.pluginTools, ...(params.mcpManager?.descriptors ?? [])].toSorted(
|
|
(left, right) => {
|
|
const a = left as { pluginId?: string; name?: string };
|
|
const b = right as { pluginId?: string; name?: string };
|
|
return (
|
|
(a.pluginId ?? "").localeCompare(b.pluginId ?? "") ||
|
|
(a.name ?? "").localeCompare(b.name ?? "")
|
|
);
|
|
},
|
|
);
|
|
return { skills: params.skills, pluginTools };
|
|
}
|
|
|
|
function sameStringList(left: string[], right: string[]): boolean {
|
|
return left.length === right.length && left.every((value, index) => value === right[index]);
|
|
}
|
|
|
|
function sameManifest(left: NodeHostManifest, right: NodeHostManifest): boolean {
|
|
return (
|
|
left.pathEnv === right.pathEnv &&
|
|
sameStringList(left.caps, right.caps) &&
|
|
sameStringList(left.commands, right.commands)
|
|
);
|
|
}
|
|
|
|
export async function prepareNodeHostRuntime(params?: {
|
|
config?: OpenClawConfig;
|
|
env?: NodeJS.ProcessEnv;
|
|
/** The embedded app worker never advertises native agent runs. */
|
|
enableAgentRuns?: boolean;
|
|
/** Embedded workers may still host long-lived plugin commands over the app-owned socket. */
|
|
enableDuplexPluginCommands?: boolean;
|
|
installedAppsSharingEnabled?: boolean;
|
|
platform?: NodeJS.Platform;
|
|
}): Promise<PreparedNodeHostRuntime> {
|
|
void ensureTerminalUploadCleanup();
|
|
const config = params?.config ?? getRuntimeConfig();
|
|
const env = params?.env ?? process.env;
|
|
await ensureNodeHostPluginRegistry({ config, env });
|
|
const pathEnv = ensureNodePathEnv();
|
|
env.PATH = pathEnv;
|
|
const duplexEnabled =
|
|
params?.enableAgentRuns === true || params?.enableDuplexPluginCommands === true;
|
|
const platform = params?.platform ?? process.platform;
|
|
const installedAppsSharingEnabled =
|
|
platform === "darwin" && params?.installedAppsSharingEnabled === true;
|
|
const availabilityContext = { config, env };
|
|
const resolvePluginNodeHost = () =>
|
|
listRegisteredNodeHostCapsAndCommands(availabilityContext, {
|
|
includeDuplex: duplexEnabled,
|
|
});
|
|
const pluginNodeHost = resolvePluginNodeHost();
|
|
// Opt-in and binary resolution are node-local enforcement points. A Gateway
|
|
// cannot advertise or enable this command on the host's behalf.
|
|
const claudePath =
|
|
params?.enableAgentRuns === true && config.nodeHost?.agentRuns?.claude?.enabled === true
|
|
? resolveExecutableTrustPathFromEnv("claude", pathEnv)
|
|
: null;
|
|
const skills = config.nodeHost?.skills?.enabled === false ? null : scanNodeHostedSkills();
|
|
const buildManifest = (pluginManifest: typeof pluginNodeHost): NodeHostManifest => ({
|
|
caps: [
|
|
...new Set([
|
|
"system",
|
|
"mcp",
|
|
...(installedAppsSharingEnabled ? ["device"] : []),
|
|
...pluginManifest.caps,
|
|
]),
|
|
].toSorted(),
|
|
commands: [
|
|
...new Set([
|
|
...NODE_SYSTEM_RUN_COMMANDS,
|
|
...NODE_EXEC_APPROVALS_COMMANDS,
|
|
NODE_FS_LIST_DIR_COMMAND,
|
|
NODE_TERMINAL_UPLOAD_COMMAND,
|
|
NODE_MCP_TOOLS_CALL_COMMAND,
|
|
...(installedAppsSharingEnabled ? [NODE_DEVICE_APPS_COMMAND] : []),
|
|
...(claudePath ? [NODE_AGENT_CLI_CLAUDE_RUN_COMMAND] : []),
|
|
...pluginManifest.commands,
|
|
]),
|
|
].toSorted(),
|
|
pathEnv,
|
|
});
|
|
const manifest = buildManifest(pluginNodeHost);
|
|
const initialInventory = createInventory({
|
|
skills,
|
|
pluginTools: pluginNodeHost.nodePluginTools,
|
|
});
|
|
|
|
return {
|
|
manifest,
|
|
initialInventory,
|
|
start({ client, onInventoryChanged, onManifestChanged }) {
|
|
const mcpAbort = new AbortController();
|
|
const skillBins = new SkillBinsCache(client, pathEnv);
|
|
const activeInvokes = new Map<
|
|
string,
|
|
NodeInvokeInputTarget & { controller: AbortController }
|
|
>();
|
|
const pluginCommandContext: OpenClawPluginNodeHostCommandContext = {
|
|
sendNodeEvent: async (event, payload) =>
|
|
await client.request("node.event", buildNodeEventParams(event, payload)),
|
|
};
|
|
let currentPluginNodeHost = pluginNodeHost;
|
|
let currentManifest = manifest;
|
|
let manager: NodeHostMcpManager | undefined;
|
|
const startup = startNodeHostMcpManager(config.nodeHost?.mcp?.servers, {
|
|
signal: mcpAbort.signal,
|
|
}).then((resolved) => {
|
|
manager = resolved;
|
|
onInventoryChanged?.(
|
|
createInventory({
|
|
skills,
|
|
pluginTools: currentPluginNodeHost.nodePluginTools,
|
|
mcpManager: manager,
|
|
}),
|
|
);
|
|
return resolved;
|
|
});
|
|
const refreshAvailability = () => {
|
|
const nextPluginNodeHost = resolvePluginNodeHost();
|
|
const nextManifest = buildManifest(nextPluginNodeHost);
|
|
currentPluginNodeHost = nextPluginNodeHost;
|
|
onInventoryChanged?.(
|
|
createInventory({
|
|
skills,
|
|
pluginTools: currentPluginNodeHost.nodePluginTools,
|
|
mcpManager: manager,
|
|
}),
|
|
);
|
|
if (!sameManifest(currentManifest, nextManifest)) {
|
|
currentManifest = nextManifest;
|
|
onManifestChanged?.(nextManifest);
|
|
}
|
|
};
|
|
const stopAvailabilityWatch = onManifestChanged
|
|
? watchRegisteredNodeHostCommandAvailability(availabilityContext, refreshAvailability)
|
|
: () => {};
|
|
// The watcher cannot replay a socket change between preparation and
|
|
// registration. Resolve once after attachment to close that race.
|
|
if (onManifestChanged) {
|
|
refreshAvailability();
|
|
}
|
|
return {
|
|
async invoke(frame) {
|
|
const duplexCommand = duplexEnabled && isRegisteredNodeHostCommandDuplex(frame.command);
|
|
const controller =
|
|
(claudePath && frame.command === NODE_AGENT_CLI_CLAUDE_RUN_COMMAND) || duplexCommand
|
|
? new AbortController()
|
|
: undefined;
|
|
const active: (NodeInvokeInputTarget & { controller: AbortController }) | undefined =
|
|
controller
|
|
? {
|
|
controller,
|
|
nextInputSeq: 0,
|
|
pendingInput: new BoundedBuffer<string>(
|
|
MAX_PENDING_INVOKE_INPUT_BYTES,
|
|
{
|
|
mode: "fail-closed",
|
|
onOverflow: () =>
|
|
controller.abort(
|
|
new Error("terminal input exceeded the 64 KiB pre-spawn buffer"),
|
|
),
|
|
},
|
|
(payload) => Buffer.byteLength(payload, "utf8"),
|
|
),
|
|
inputFailed: false,
|
|
}
|
|
: undefined;
|
|
if (active) {
|
|
activeInvokes.set(frame.id, active);
|
|
}
|
|
const progress = duplexCommand
|
|
? createNodeInvokeProgressWriter({
|
|
client,
|
|
frame,
|
|
idleTimeoutMs: NODE_DUPLEX_INVOKE_IDLE_TIMEOUT_MS,
|
|
onError: () => controller?.abort(),
|
|
})
|
|
: undefined;
|
|
progress?.startHeartbeats();
|
|
const pluginCommandIo: OpenClawPluginNodeHostCommandIo | undefined =
|
|
controller && active && progress
|
|
? {
|
|
signal: controller.signal,
|
|
emitChunk: async (chunk) => await progress.write(chunk),
|
|
onInput: (callback) => {
|
|
if (activeInvokes.get(frame.id) === active) {
|
|
registerNodeInvokeInputHandler(active, callback);
|
|
}
|
|
},
|
|
}
|
|
: undefined;
|
|
try {
|
|
await handleInvoke(frame, client, skillBins, manager, {
|
|
...(claudePath ? { claudePath } : {}),
|
|
...(controller ? { signal: controller.signal } : {}),
|
|
...(pluginCommandIo ? { pluginCommandIo } : {}),
|
|
installedAppsSharingEnabled,
|
|
installedAppsPlatform: platform,
|
|
pluginCommandContext,
|
|
});
|
|
} finally {
|
|
progress?.stop();
|
|
await progress?.flush();
|
|
if (active && activeInvokes.get(frame.id) === active) {
|
|
activeInvokes.delete(frame.id);
|
|
}
|
|
}
|
|
},
|
|
handleInput(invokeId, seq, payloadJSON) {
|
|
const active = activeInvokes.get(invokeId);
|
|
if (!dispatchNodeInvokeInput(active, seq, payloadJSON)) {
|
|
logDebug(`node-host: dropped inactive or duplicate input for invoke ${invokeId}`);
|
|
}
|
|
},
|
|
cancel(invokeId) {
|
|
activeInvokes.get(invokeId)?.controller.abort();
|
|
},
|
|
cancelAll() {
|
|
for (const active of activeInvokes.values()) {
|
|
active.controller.abort();
|
|
}
|
|
activeInvokes.clear();
|
|
},
|
|
async close() {
|
|
this.cancelAll();
|
|
stopAvailabilityWatch();
|
|
mcpAbort.abort();
|
|
const resolved = manager ?? (await startup.catch(() => undefined));
|
|
await resolved?.close();
|
|
},
|
|
};
|
|
},
|
|
};
|
|
}
|