* feat(secrets): expand secret target coverage and gateway tooling * docs(secrets): align gateway and CLI secret docs * chore(protocol): regenerate swift gateway models for secrets methods * fix(config): restore talk apiKey fallback and stabilize runner test * ci(windows): reduce test worker count for shard stability * ci(windows): raise node heap for test shard stability * test(feishu): make proxy env precedence assertion windows-safe * fix(gateway): resolve auth password SecretInput refs for clients * fix(gateway): resolve remote SecretInput credentials for clients * fix(secrets): skip inactive refs in command snapshot assignments * fix(secrets): scope gateway.remote refs to effective auth surfaces * fix(secrets): ignore memory defaults when enabled agents disable search * fix(secrets): honor Google Chat serviceAccountRef inheritance * fix(secrets): address tsgo errors in command and gateway collectors * fix(secrets): avoid auth-store load in providers-only configure * fix(gateway): defer local password ref resolution by precedence * fix(secrets): gate telegram webhook secret refs by webhook mode * fix(secrets): gate slack signing secret refs to http mode * fix(secrets): skip telegram botToken refs when tokenFile is set * fix(secrets): gate discord pluralkit refs by enabled flag * fix(secrets): gate discord voice tts refs by voice enabled * test(secrets): make runtime fixture modes explicit * fix(cli): resolve local qr password secret refs * fix(cli): fail when gateway leaves command refs unresolved * fix(gateway): fail when local password SecretRef is unresolved * fix(gateway): fail when required remote SecretRefs are unresolved * fix(gateway): resolve local password refs only when password can win * fix(cli): skip local password SecretRef resolution on qr token override * test(gateway): cast SecretRef fixtures to OpenClawConfig * test(secrets): activate mode-gated targets in runtime coverage fixture * fix(cron): support SecretInput webhook tokens safely * fix(bluebubbles): support SecretInput passwords across config paths * fix(msteams): make appPassword SecretInput-safe in onboarding/token paths * fix(bluebubbles): align SecretInput schema helper typing * fix(cli): clarify secrets.resolve version-skew errors * refactor(secrets): return structured inactive paths from secrets.resolve * refactor(gateway): type onboarding secret writes as SecretInput * chore(protocol): regenerate swift models for secrets.resolve * feat(secrets): expand extension credential secretref support * fix(secrets): gate web-search refs by active provider * fix(onboarding): detect SecretRef credentials in extension status * fix(onboarding): allow keeping existing ref in secret prompt * fix(onboarding): resolve gateway password SecretRefs for probe and tui * fix(onboarding): honor secret-input-mode for local gateway auth * fix(acp): resolve gateway SecretInput credentials * fix(secrets): gate gateway.remote refs to remote surfaces * test(secrets): cover pattern matching and inactive array refs * docs(secrets): clarify secrets.resolve and remote active surfaces * fix(bluebubbles): keep existing SecretRef during onboarding * fix(tests): resolve CI type errors in new SecretRef coverage * fix(extensions): replace raw fetch with SSRF-guarded fetch * test(secrets): mark gateway remote targets active in runtime coverage * test(infra): normalize home-prefix expectation across platforms * fix(cli): only resolve local qr password refs in password mode * test(cli): cover local qr token mode with unresolved password ref * docs(cli): clarify local qr password ref resolution behavior * refactor(extensions): reuse sdk SecretInput helpers * fix(wizard): resolve onboarding env-template secrets before plaintext * fix(cli): surface secrets.resolve diagnostics in memory and qr * test(secrets): repair post-rebase runtime and fixtures * fix(gateway): skip remote password ref resolution when token wins * fix(secrets): treat tailscale remote gateway refs as active * fix(gateway): allow remote password fallback when token ref is unresolved * fix(gateway): ignore stale local password refs for none and trusted-proxy * fix(gateway): skip remote secret ref resolution on local call paths * test(cli): cover qr remote tailscale secret ref resolution * fix(secrets): align gateway password active-surface with auth inference * fix(cli): resolve inferred local gateway password refs in qr * fix(gateway): prefer resolvable remote password over token ref pre-resolution * test(gateway): cover none and trusted-proxy stale password refs * docs(secrets): sync qr and gateway active-surface behavior * fix: restore stability blockers from pre-release audit * Secrets: fix collector/runtime precedence contradictions * docs: align secrets and web credential docs * fix(rebase): resolve integration regressions after main rebase * fix(node-host): resolve gateway secret refs for auth * fix(secrets): harden secretinput runtime readers * gateway: skip inactive auth secretref resolution * cli: avoid gateway preflight for inactive secret refs * extensions: allow unresolved refs in onboarding status * tests: fix qr-cli module mock hoist ordering * Security: align audit checks with SecretInput resolution * Gateway: resolve local-mode remote fallback secret refs * Node host: avoid resolving inactive password secret refs * Secrets runtime: mark Slack appToken inactive for HTTP mode * secrets: keep inactive gateway remote refs non-blocking * cli: include agent memory secret targets in runtime resolution * docs(secrets): sync docs with active-surface and web search behavior * fix(secrets): keep telegram top-level token refs active for blank account tokens * fix(daemon): resolve gateway password secret refs for probe auth * fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled * fix(secrets): align token inheritance and exec timeout defaults * docs(secrets): clarify active-surface notes in cli docs * cli: require secrets.resolve gateway capability * gateway: log auth secret surface diagnostics * secrets: remove dead provider resolver module * fix(secrets): restore gateway auth precedence and fallback resolution * fix(tests): align plugin runtime mock typings --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
246 lines
7.3 KiB
JavaScript
246 lines
7.3 KiB
JavaScript
#!/usr/bin/env node
|
|
import { Readable, Writable } from "node:stream";
|
|
import { fileURLToPath } from "node:url";
|
|
import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk";
|
|
import { loadConfig } from "../config/config.js";
|
|
import {
|
|
buildGatewayConnectionDetails,
|
|
resolveGatewayCredentialsWithSecretInputs,
|
|
} from "../gateway/call.js";
|
|
import { GatewayClient } from "../gateway/client.js";
|
|
import { isMainModule } from "../infra/is-main.js";
|
|
import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
|
|
import { readSecretFromFile } from "./secret-file.js";
|
|
import { AcpGatewayAgent } from "./translator.js";
|
|
import type { AcpServerOptions } from "./types.js";
|
|
|
|
export async function serveAcpGateway(opts: AcpServerOptions = {}): Promise<void> {
|
|
const cfg = loadConfig();
|
|
const connection = buildGatewayConnectionDetails({
|
|
config: cfg,
|
|
url: opts.gatewayUrl,
|
|
});
|
|
const creds = await resolveGatewayCredentialsWithSecretInputs({
|
|
config: cfg,
|
|
explicitAuth: {
|
|
token: opts.gatewayToken,
|
|
password: opts.gatewayPassword,
|
|
},
|
|
env: process.env,
|
|
});
|
|
|
|
let agent: AcpGatewayAgent | null = null;
|
|
let onClosed!: () => void;
|
|
const closed = new Promise<void>((resolve) => {
|
|
onClosed = resolve;
|
|
});
|
|
let stopped = false;
|
|
let onGatewayReadyResolve!: () => void;
|
|
let onGatewayReadyReject!: (err: Error) => void;
|
|
let gatewayReadySettled = false;
|
|
const gatewayReady = new Promise<void>((resolve, reject) => {
|
|
onGatewayReadyResolve = resolve;
|
|
onGatewayReadyReject = reject;
|
|
});
|
|
const resolveGatewayReady = () => {
|
|
if (gatewayReadySettled) {
|
|
return;
|
|
}
|
|
gatewayReadySettled = true;
|
|
onGatewayReadyResolve();
|
|
};
|
|
const rejectGatewayReady = (err: unknown) => {
|
|
if (gatewayReadySettled) {
|
|
return;
|
|
}
|
|
gatewayReadySettled = true;
|
|
onGatewayReadyReject(err instanceof Error ? err : new Error(String(err)));
|
|
};
|
|
|
|
const gateway = new GatewayClient({
|
|
url: connection.url,
|
|
token: creds.token,
|
|
password: creds.password,
|
|
clientName: GATEWAY_CLIENT_NAMES.CLI,
|
|
clientDisplayName: "ACP",
|
|
clientVersion: "acp",
|
|
mode: GATEWAY_CLIENT_MODES.CLI,
|
|
onEvent: (evt) => {
|
|
void agent?.handleGatewayEvent(evt);
|
|
},
|
|
onHelloOk: () => {
|
|
resolveGatewayReady();
|
|
agent?.handleGatewayReconnect();
|
|
},
|
|
onConnectError: (err) => {
|
|
rejectGatewayReady(err);
|
|
},
|
|
onClose: (code, reason) => {
|
|
if (!stopped) {
|
|
rejectGatewayReady(new Error(`gateway closed before ready (${code}): ${reason}`));
|
|
}
|
|
agent?.handleGatewayDisconnect(`${code}: ${reason}`);
|
|
// Resolve only on intentional shutdown (gateway.stop() sets closed
|
|
// which skips scheduleReconnect, then fires onClose). Transient
|
|
// disconnects are followed by automatic reconnect attempts.
|
|
if (stopped) {
|
|
onClosed();
|
|
}
|
|
},
|
|
});
|
|
|
|
const shutdown = () => {
|
|
if (stopped) {
|
|
return;
|
|
}
|
|
stopped = true;
|
|
resolveGatewayReady();
|
|
gateway.stop();
|
|
// If no WebSocket is active (e.g. between reconnect attempts),
|
|
// gateway.stop() won't trigger onClose, so resolve directly.
|
|
onClosed();
|
|
};
|
|
|
|
process.once("SIGINT", shutdown);
|
|
process.once("SIGTERM", shutdown);
|
|
|
|
// Start gateway first and wait for hello before accepting ACP requests.
|
|
gateway.start();
|
|
await gatewayReady.catch((err) => {
|
|
shutdown();
|
|
throw err;
|
|
});
|
|
if (stopped) {
|
|
return closed;
|
|
}
|
|
|
|
const input = Writable.toWeb(process.stdout);
|
|
const output = Readable.toWeb(process.stdin) as unknown as ReadableStream<Uint8Array>;
|
|
const stream = ndJsonStream(input, output);
|
|
|
|
new AgentSideConnection((conn: AgentSideConnection) => {
|
|
agent = new AcpGatewayAgent(conn, gateway, opts);
|
|
agent.start();
|
|
return agent;
|
|
}, stream);
|
|
|
|
return closed;
|
|
}
|
|
|
|
function parseArgs(args: string[]): AcpServerOptions {
|
|
const opts: AcpServerOptions = {};
|
|
let tokenFile: string | undefined;
|
|
let passwordFile: string | undefined;
|
|
for (let i = 0; i < args.length; i += 1) {
|
|
const arg = args[i];
|
|
if (arg === "--url" || arg === "--gateway-url") {
|
|
opts.gatewayUrl = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--token" || arg === "--gateway-token") {
|
|
opts.gatewayToken = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--token-file" || arg === "--gateway-token-file") {
|
|
tokenFile = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--password" || arg === "--gateway-password") {
|
|
opts.gatewayPassword = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--password-file" || arg === "--gateway-password-file") {
|
|
passwordFile = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--session") {
|
|
opts.defaultSessionKey = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--session-label") {
|
|
opts.defaultSessionLabel = args[i + 1];
|
|
i += 1;
|
|
continue;
|
|
}
|
|
if (arg === "--require-existing") {
|
|
opts.requireExistingSession = true;
|
|
continue;
|
|
}
|
|
if (arg === "--reset-session") {
|
|
opts.resetSession = true;
|
|
continue;
|
|
}
|
|
if (arg === "--no-prefix-cwd") {
|
|
opts.prefixCwd = false;
|
|
continue;
|
|
}
|
|
if (arg === "--verbose" || arg === "-v") {
|
|
opts.verbose = true;
|
|
continue;
|
|
}
|
|
if (arg === "--help" || arg === "-h") {
|
|
printHelp();
|
|
process.exit(0);
|
|
}
|
|
}
|
|
if (opts.gatewayToken?.trim() && tokenFile?.trim()) {
|
|
throw new Error("Use either --token or --token-file.");
|
|
}
|
|
if (opts.gatewayPassword?.trim() && passwordFile?.trim()) {
|
|
throw new Error("Use either --password or --password-file.");
|
|
}
|
|
if (tokenFile?.trim()) {
|
|
opts.gatewayToken = readSecretFromFile(tokenFile, "Gateway token");
|
|
}
|
|
if (passwordFile?.trim()) {
|
|
opts.gatewayPassword = readSecretFromFile(passwordFile, "Gateway password");
|
|
}
|
|
return opts;
|
|
}
|
|
|
|
function printHelp(): void {
|
|
console.log(`Usage: openclaw acp [options]
|
|
|
|
Gateway-backed ACP server for IDE integration.
|
|
|
|
Options:
|
|
--url <url> Gateway WebSocket URL
|
|
--token <token> Gateway auth token
|
|
--token-file <path> Read gateway auth token from file
|
|
--password <password> Gateway auth password
|
|
--password-file <path> Read gateway auth password from file
|
|
--session <key> Default session key (e.g. "agent:main:main")
|
|
--session-label <label> Default session label to resolve
|
|
--require-existing Fail if the session key/label does not exist
|
|
--reset-session Reset the session key before first use
|
|
--no-prefix-cwd Do not prefix prompts with the working directory
|
|
--verbose, -v Verbose logging to stderr
|
|
--help, -h Show this help message
|
|
`);
|
|
}
|
|
|
|
if (isMainModule({ currentFile: fileURLToPath(import.meta.url) })) {
|
|
const argv = process.argv.slice(2);
|
|
if (argv.includes("--token") || argv.includes("--gateway-token")) {
|
|
console.error(
|
|
"Warning: --token can be exposed via process listings. Prefer --token-file or OPENCLAW_GATEWAY_TOKEN.",
|
|
);
|
|
}
|
|
if (argv.includes("--password") || argv.includes("--gateway-password")) {
|
|
console.error(
|
|
"Warning: --password can be exposed via process listings. Prefer --password-file or OPENCLAW_GATEWAY_PASSWORD.",
|
|
);
|
|
}
|
|
const opts = parseArgs(argv);
|
|
serveAcpGateway(opts).catch((err) => {
|
|
console.error(String(err));
|
|
process.exit(1);
|
|
});
|
|
}
|